更新界面

This commit is contained in:
HapeLee committed 2025-07-05 03:51:33 +08:00
1 parent 9f5a0eb483
commit a07935f466
56 files changed
+414 -260

No files matched your search

-1
View File
@@ -118,7 +118,6 @@
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
@@ -3,36 +3,26 @@ package io.legato.kazusa.base
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.res.Configuration import android.content.res.Configuration
import android.graphics.drawable.BitmapDrawable
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.util.AttributeSet import android.util.AttributeSet
import android.util.Log
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
import android.widget.FrameLayout
import androidx.activity.addCallback
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.viewbinding.ViewBinding import androidx.viewbinding.ViewBinding
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.color.DynamicColors import com.google.android.material.color.DynamicColors
import io.legato.kazusa.R import io.legato.kazusa.R
import io.legato.kazusa.constant.AppConst
import io.legato.kazusa.constant.AppLog import io.legato.kazusa.constant.AppLog
import io.legato.kazusa.constant.EventBus import io.legato.kazusa.constant.EventBus
import io.legato.kazusa.constant.PreferKey
import io.legato.kazusa.constant.Theme import io.legato.kazusa.constant.Theme
import io.legato.kazusa.help.config.ThemeConfig import io.legato.kazusa.help.config.ThemeConfig
//import io.legado.app.lib.theme.backgroundColor
//import io.legado.app.lib.theme.primaryColor
import io.legato.kazusa.utils.applyOpenTint import io.legato.kazusa.utils.applyOpenTint
import io.legato.kazusa.utils.applyTint import io.legato.kazusa.utils.applyTint
import io.legato.kazusa.utils.disableAutoFill import io.legato.kazusa.utils.disableAutoFill
import io.legato.kazusa.utils.getPrefBoolean
import io.legato.kazusa.utils.getPrefString import io.legato.kazusa.utils.getPrefString
import io.legato.kazusa.utils.hideSoftInput import io.legato.kazusa.utils.hideSoftInput
import io.legato.kazusa.utils.observeEvent import io.legato.kazusa.utils.observeEvent
@@ -88,7 +78,7 @@ abstract class BaseActivity<VB : ViewBinding>(
observeLiveBus() observeLiveBus()
onActivityCreated(savedInstanceState) //onActivityCreated(savedInstanceState)
} }
override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration) { override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration) {
@@ -107,7 +97,7 @@ abstract class BaseActivity<VB : ViewBinding>(
// //setupSystemBar() // //setupSystemBar()
// } // }
abstract fun onActivityCreated(savedInstanceState: Bundle?)
final override fun onCreateOptionsMenu(menu: Menu): Boolean { final override fun onCreateOptionsMenu(menu: Menu): Boolean {
val bool = onCompatCreateOptionsMenu(menu) val bool = onCompatCreateOptionsMenu(menu)
@@ -183,4 +183,5 @@ object PreferKey {
const val contentSelectSpeakMod = "contentReadAloudMod" const val contentSelectSpeakMod = "contentReadAloudMod"
const val themePref = "themePref" const val themePref = "themePref"
const val bookshelfSortOrder = "bookshelfSortOrder"
} }
@@ -539,6 +539,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
appCtx.putPrefInt(PreferKey.bookshelfSort, value) appCtx.putPrefInt(PreferKey.bookshelfSort, value)
} }
var bookshelfSortOrder: Int
get() = appCtx.getPrefInt(PreferKey.bookshelfSortOrder, 0)
set(value) {
appCtx.putPrefInt(PreferKey.bookshelfSortOrder, value)
}
fun getBookSortByGroupId(groupId: Long): Int { fun getBookSortByGroupId(groupId: Long): Int {
return appDb.bookGroupDao.getByID(groupId)?.getRealBookSort() return appDb.bookGroupDao.getByID(groupId)?.getRealBookSort()
?: bookshelfSort ?: bookshelfSort
@@ -20,8 +20,9 @@ class AboutActivity : BaseActivity<ActivityAboutBinding>() {
override val binding by viewBinding(ActivityAboutBinding::inflate) override val binding by viewBinding(ActivityAboutBinding::inflate)
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
//binding.llAbout.background = filletBackground super.onCreate(savedInstanceState)
val fTag = "aboutFragment" val fTag = "aboutFragment"
var aboutFragment = supportFragmentManager.findFragmentByTag(fTag) var aboutFragment = supportFragmentManager.findFragmentByTag(fTag)
if (aboutFragment == null) aboutFragment = AboutFragment() if (aboutFragment == null) aboutFragment = AboutFragment()
@@ -46,7 +46,8 @@ class ReadRecordActivity : BaseActivity<ActivityReadRecordBinding>() {
override val binding by viewBinding(ActivityReadRecordBinding::inflate) override val binding by viewBinding(ActivityReadRecordBinding::inflate)
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
initView() initView()
initAllTime() initAllTime()
initData() initData()
@@ -59,7 +59,8 @@ class FileAssociationActivity :
buildMainHandler() buildMainHandler()
} }