This commit is contained in:
HapeLee
2025-09-30 19:23:20 +08:00
parent 2190310ffb
commit 1116ab9695
4 changed files with 7 additions and 5 deletions
@@ -82,10 +82,9 @@ abstract class BaseActivity<VB : ViewBinding>(
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q)
enableEdgeToEdge()
else{
window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
setupSystemBar()
}
//window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
window.setNavigationBarColorAuto(themeColor(com.google.android.material.R.attr.colorSurface))
//setupSystemBar()
setContentView(binding.root)
upBackgroundImage()
@@ -52,9 +52,11 @@ import io.legato.kazusa.ui.widget.dialog.TextDialog
import io.legato.kazusa.utils.gone
import io.legato.kazusa.utils.hideSoftInput
import io.legato.kazusa.utils.observeEvent
import io.legato.kazusa.utils.setNavigationBarColorAuto
import io.legato.kazusa.utils.shouldHideSoftInput
import io.legato.kazusa.utils.showDialogFragment
import io.legato.kazusa.utils.startActivity
import io.legato.kazusa.utils.themeColor
import io.legato.kazusa.utils.toastOnUi
import io.legato.kazusa.utils.viewbindingdelegate.viewBinding
import io.legato.kazusa.utils.visible
@@ -209,7 +211,7 @@ class MainActivity : VMBaseActivity<ActivityMainBinding, MainViewModel>(),
viewPagerMain.adapter = adapter
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() {
if (groupId == BookGroup.Companion.IdRoot) {
if (isAdded) {
binding.topBar.title = getString(R.string.bookshelf)
binding.collTopBar.title = getString(R.string.bookshelf)
binding.refreshLayout.isEnabled = true
enableRefresh = true
}
@@ -190,7 +190,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
bookGroups.firstOrNull {
groupId == it.groupId
}?.let {
binding.topBar.title = it.groupName
binding.collTopBar.title = it.groupName
binding.refreshLayout.isEnabled = it.enableRefresh
enableRefresh = it.enableRefresh
}