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

fix: Remove unnecessary FrameLayouts in some fragments

Browse source
This commit is contained in:
Prathamesh More 2023-03-09 12:45:39 +05:30
parent bb99213848
commit ba59bf8216
13 changed files with 53 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt
View file

@ -41,6 +41,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback {
private fun setupToolbar() {
val navController: NavController = findNavController(R.id.contentFrame)
binding.appBarLayout.toolbar.setNavigationIcon(R.drawable.ic_arrow_back)
binding.appBarLayout.toolbar.isTitleCentered = false
navController.addOnDestinationChangedListener { _, _, _ ->
binding.appBarLayout.title =
navController.currentDestination?.let { getStringFromDestination(it) }.toString()

7
app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
View file

@ -11,6 +11,7 @@ import code.name.monkey.retromusic.databinding.SimpleAppbarLayoutBinding
import code.name.monkey.retromusic.util.PreferenceUtil
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.shape.MaterialShapeDrawable
import dev.chrisbanes.insetter.applyInsetter
@ -52,7 +53,7 @@ class TopAppBarLayout @JvmOverloads constructor(
}
}
val toolbar: Toolbar
val toolbar: MaterialToolbar
get() = if (mode == AppBarMode.COLLAPSING) {
collapsingAppbarBinding?.toolbar!!
} else {
@ -63,13 +64,13 @@ class TopAppBarLayout @JvmOverloads constructor(
get() = if (mode == AppBarMode.COLLAPSING) {
collapsingAppbarBinding?.collapsingToolbarLayout?.title.toString()
} else {
simpleAppbarBinding?.appNameText?.text.toString()
simpleAppbarBinding?.toolbar?.title.toString()
}
set(value) {
if (mode == AppBarMode.COLLAPSING) {
collapsingAppbarBinding?.collapsingToolbarLayout?.title = value
} else {
simpleAppbarBinding?.appNameText?.text = value
simpleAppbarBinding?.toolbar?.title = value
}
}