Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

书架与设置页面新UI界面 #137

Merged
merged 3 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import java.net.InetAddress
import java.text.SimpleDateFormat
import java.util.Date
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ fun SettingsBottomSheet(
) {
item {
SettingsSliderEntry(
description = "阅读器字体大小",
title = "阅读器字体大小",
unit = "sp",
valueRange = 8f..64f,
value = settingState.fontSize,
Expand All @@ -500,7 +500,7 @@ fun SettingsBottomSheet(
}
item {
SettingsSliderEntry(
description = "阅读器行距大小",
title = "阅读器行距大小",
unit = "sp",
valueRange = 0f..32f,
value = settingState.fontLineHeight,
Expand Down Expand Up @@ -610,7 +610,7 @@ fun SettingsBottomSheet(
if(!settingState.autoPadding) {
item {
SettingsSliderEntry(
description = "上边距",
title = "上边距",
unit = "dp",
valueRange = 0f..128f,
value = settingState.topPadding,
Expand All @@ -621,7 +621,7 @@ fun SettingsBottomSheet(
if(!settingState.autoPadding) {
item {
SettingsSliderEntry(
description = "下边距",
title = "下边距",
unit = "dp",
valueRange = 0f..128f,
value = settingState.bottomPadding,
Expand All @@ -632,7 +632,7 @@ fun SettingsBottomSheet(
if(!settingState.autoPadding) {
item {
SettingsSliderEntry(
description = "左边距",
title = "左边距",
unit = "dp",
valueRange = 0f..128f,
value = settingState.leftPadding,
Expand All @@ -643,7 +643,7 @@ fun SettingsBottomSheet(
if(!settingState.autoPadding) {
item {
SettingsSliderEntry(
description = "右边距",
title = "右边距",
unit = "dp",
valueRange = 0f..128f,
value = settingState.rightPadding,
Expand Down
Loading
Loading