Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code cleanup

Browse source
This commit is contained in:
Prathamesh More 2021-11-11 20:21:57 +05:30
parent 5ee9c04924
commit 9d93d700be
6 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
View file

@ -89,9 +89,9 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener {
)
}
navController.graph = navGraph
getBottomNavigationView().setupWithNavController(navController)
bottomNavigationView.setupWithNavController(navController)
// Scroll Fragment to top
getBottomNavigationView().setOnItemReselectedListener {
bottomNavigationView.setOnItemReselectedListener {
currentFragment(R.id.fragment_container)
.also {
if (it is AbsRecyclerViewFragment<*, *>) {
@ -118,7 +118,6 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener {
}
else -> setBottomNavVisibility(visible = false, animate = true) // Hide Bottom Navigation Bar
}
}
}

11
app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
View file

@ -60,7 +60,6 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.model.CategoryInfo
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.RetroUtil
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.bottomsheet.BottomSheetBehavior.*
import org.koin.androidx.viewmodel.ext.android.viewModel
@ -103,7 +102,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
}
STATE_SETTLING, STATE_DRAGGING -> {
if (fromNotification) {
getBottomNavigationView().isVisible = true
bottomNavigationView.isVisible = true
}
}
else -> {
@ -125,7 +124,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
windowInsets = insets
insets
}
binding.bottomNavigationView.drawAboveSystemBarsWithPadding()
bottomNavigationView.drawAboveSystemBarsWithPadding()
if (RetroUtil.isLandscape()) {
binding.slidingPanel.drawAboveSystemBarsWithPadding(true)
}
@ -214,9 +213,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
})
}
fun getBottomNavigationView(): BottomNavigationView {
return binding.bottomNavigationView
}
val bottomNavigationView get() = binding.bottomNavigationView
override fun onServiceConnected() {
super.onServiceConnected()
@ -357,7 +354,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
bottomSheetBehavior.peekHeightAnimate(heightOfBar)
bottomNavAnimator?.end()
bottomNavAnimator =
getBottomNavigationView().translateYAnimate(dip(R.dimen.bottom_nav_height).toFloat())
bottomNavigationView.translateYAnimate(dip(R.dimen.bottom_nav_height).toFloat())
bottomNavAnimator?.doOnEnd {
binding.slidingPanel.bringToFront()
}