Merge pull request #137 from dmzz-yyhyy/new_ui

书架与设置页面新UI界面
dmzz-yyhyy · Dec 22, 2024 · a4a038a · a4a038a
2 parents 1ac6abe + ba95513
commit a4a038a
Show file tree

Hide file tree

Showing 15 changed files with 894 additions and 537 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,4 +1,3 @@
-
 import java.net.InetAddress
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -22,7 +21,7 @@ android {
         minSdk = 24
         targetSdk = 34
         // 版本号为x.y.z则versionCode为x*1000000+y*10000+z*100+debug版本号(开发需要时迭代, 两位数)
-        versionCode = 1_00_00_006
+        versionCode = 1_00_00_010
         versionName = "1.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/book/content/ContentScreen.kt b/app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/book/content/ContentScreen.kt
@@ -491,7 +491,7 @@ fun SettingsBottomSheet(
             ) {
                 item {
                     SettingsSliderEntry(
-                        description = "阅读器字体大小",
+                        title = "阅读器字体大小",
                         unit = "sp",
                         valueRange = 8f..64f,
                         value = settingState.fontSize,
@@ -500,7 +500,7 @@ fun SettingsBottomSheet(
                 }
                 item {
                     SettingsSliderEntry(
-                        description = "阅读器行距大小",
+                        title = "阅读器行距大小",
                         unit = "sp",
                         valueRange = 0f..32f,
                         value = settingState.fontLineHeight,
@@ -610,7 +610,7 @@ fun SettingsBottomSheet(
                 if(!settingState.autoPadding) {
                     item {
                     SettingsSliderEntry(
-                        description = "上边距",
+                        title = "上边距",
                         unit = "dp",
                         valueRange = 0f..128f,
                         value = settingState.topPadding,
@@ -621,7 +621,7 @@ fun SettingsBottomSheet(
                 if(!settingState.autoPadding) {
                     item {
                     SettingsSliderEntry(
-                        description = "下边距",
+                        title = "下边距",
                         unit = "dp",
                         valueRange = 0f..128f,
                         value = settingState.bottomPadding,
@@ -632,7 +632,7 @@ fun SettingsBottomSheet(
                 if(!settingState.autoPadding) {
                     item {
                     SettingsSliderEntry(
-                        description = "左边距",
+                        title = "左边距",
                         unit = "dp",
                         valueRange = 0f..128f,
                         value = settingState.leftPadding,
@@ -643,7 +643,7 @@ fun SettingsBottomSheet(
                 if(!settingState.autoPadding) {
                     item {
                     SettingsSliderEntry(
-                        description = "右边距",
+                        title = "右边距",
                         unit = "dp",
                         valueRange = 0f..128f,
                         value = settingState.rightPadding,