修复
This commit is contained in:
@@ -82,10 +82,9 @@ abstract class BaseActivity<VB : ViewBinding>(
|
|||||||
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q)
|
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
else{
|
else{
|
||||||
window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
|
|
||||||
setupSystemBar()
|
setupSystemBar()
|
||||||
}
|
}
|
||||||
//window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
|
window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
|
||||||
//setupSystemBar()
|
//setupSystemBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
upBackgroundImage()
|
upBackgroundImage()
|
||||||
|
|||||||
@@ -52,9 +52,11 @@ import io.legato.kazusa.ui.widget.dialog.TextDialog
|
|||||||
import io.legato.kazusa.utils.gone
|
import io.legato.kazusa.utils.gone
|
||||||
import io.legato.kazusa.utils.hideSoftInput
|
import io.legato.kazusa.utils.hideSoftInput
|
||||||
import io.legato.kazusa.utils.observeEvent
|
import io.legato.kazusa.utils.observeEvent
|
||||||
|
import io.legato.kazusa.utils.setNavigationBarColorAuto
|
||||||
import io.legato.kazusa.utils.shouldHideSoftInput
|
import io.legato.kazusa.utils.shouldHideSoftInput
|
||||||
import io.legato.kazusa.utils.showDialogFragment
|
import io.legato.kazusa.utils.showDialogFragment
|
||||||
import io.legato.kazusa.utils.startActivity
|
import io.legato.kazusa.utils.startActivity
|
||||||
|
import io.legato.kazusa.utils.themeColor
|
||||||
import io.legato.kazusa.utils.toastOnUi
|
import io.legato.kazusa.utils.toastOnUi
|
||||||
import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
|
import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
|
||||||
import io.legato.kazusa.utils.visible
|
import io.legato.kazusa.utils.visible
|
||||||
@@ -209,7 +211,7 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
|
|||||||
viewPagerMain.adapter = adapter
|
viewPagerMain.adapter = adapter
|
||||||
viewPagerMain.registerOnPageChangeCallback(PageChangeCallback())
|
viewPagerMain.registerOnPageChangeCallback(PageChangeCallback())
|
||||||
|
|
||||||
//window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
|
window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurfaceContainer))
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
|
|||||||
private fun initBooksData() {
|
private fun initBooksData() {
|
||||||
if (groupId == BookGroup.Companion.IdRoot) {
|
if (groupId == BookGroup.Companion.IdRoot) {
|
||||||
if (isAdded) {
|
if (isAdded) {
|
||||||
binding.topBar.title = getString(R.string.bookshelf)
|
binding.collTopBar.title = getString(R.string.bookshelf)
|
||||||
binding.refreshLayout.isEnabled = true
|
binding.refreshLayout.isEnabled = true
|
||||||
enableRefresh = true
|
enableRefresh = true
|
||||||
}
|
}
|
||||||
@@ -190,7 +190,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
|
|||||||
bookGroups.firstOrNull {
|
bookGroups.firstOrNull {
|
||||||
groupId == it.groupId
|
groupId == it.groupId
|
||||||
}?.let {
|
}?.let {
|
||||||
binding.topBar.title = it.groupName
|
binding.collTopBar.title = it.groupName
|
||||||
binding.refreshLayout.isEnabled = it.enableRefresh
|
binding.refreshLayout.isEnabled = it.enableRefresh
|
||||||
enableRefresh = it.enableRefresh
|
enableRefresh = it.enableRefresh
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
app:liftOnScroll="false">
|
app:liftOnScroll="false">
|
||||||
|
|
||||||
<com.google.android.material.appbar.CollapsingToolbarLayout
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||||
|
android:id="@+id/coll_top_bar"
|
||||||
style="?attr/collapsingToolbarLayoutMediumStyle"
|
style="?attr/collapsingToolbarLayoutMediumStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
|
android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
|
||||||
|
|||||||
Reference in New Issue
Block a user