diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index de647f213..319dbc2d3 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -193,6 +193,7 @@ object PreferKey { const val mangaClickActionBC = "mangaClickActionBottomCenter" const val mangaClickActionBR = "mangaClickActionBottomRight" const val mangaLongClick = "mangaLongClick" + const val mangaBackground = "mangaBackground" const val permissionChecked = "permissionChecked" const val notificationsPost = "notificationsPost" const val ignoreBatteryPermission = "ignoreBatteryPermission" diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index b6eec6115..81788ee67 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -775,6 +775,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { appCtx.putPrefBoolean(PreferKey.mangaLongClick, value) } + var mangaBackground: Int + get() = appCtx.getPrefInt(PreferKey.mangaBackground, 0xFF000000.toInt()) + set(value) { + appCtx.putPrefInt(PreferKey.mangaBackground, value) + } + //漫画滤镜 var mangaColorFilter get() = appCtx.getPrefString(PreferKey.mangaColorFilter, "") diff --git a/app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt b/app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt index c0565f809..0b1f8cf04 100644 --- a/app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt +++ b/app/src/main/java/io/legado/app/lib/permission/PermissionActivity.kt @@ -1,25 +1,16 @@ package io.legado.app.lib.permission -import android.annotation.SuppressLint import android.content.Intent -import android.content.pm.PackageManager import android.net.Uri -import android.os.Build import android.os.Bundle import android.provider.Settings -import androidx.activity.addCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder import io.legado.app.R import io.legado.app.constant.AppLog -import io.legado.app.exception.NoStackTraceException -import io.legado.app.utils.registerForActivityResult import io.legado.app.utils.toastOnUi -import kotlinx.coroutines.launch -import androidx.core.net.toUri class PermissionActivity : AppCompatActivity() { diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt index 57b12f530..85ff4a7ae 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt @@ -28,7 +28,10 @@ class PaddingConfigDialog : BaseDialogFragment(R.layout.dialog_read_padding) { override fun onStart() { super.onStart() - setLayout(0.9f, 0.9f) + if (resources.configuration.smallestScreenWidthDp > 600) + setLayout(0.6f, 0.6f) + else + setLayout(0.9f, 0.8f) } private fun initData() = binding.run { diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml index b5215116f..d237b5748 100644 --- a/app/src/main/res/values-zh-rHK/arrays.xml +++ b/app/src/main/res/values-zh-rHK/arrays.xml @@ -12,6 +12,7 @@ 標籤 文件夾 隐藏標籤 + 材料標籤 diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml index 339b5dcea..569ffb6ac 100644 --- a/app/src/main/res/values-zh-rTW/arrays.xml +++ b/app/src/main/res/values-zh-rTW/arrays.xml @@ -11,6 +11,7 @@ 標籤 資料夾 隐藏標籤 + 材料標籤