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.

Sign up for GitHub

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

大规模的细节优化 #111

Merged
merged 8 commits into from
Sep 17, 2024
Merged

大规模的细节优化 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56abff1
优化翻页模式 #101
dmzz-yyhyy Sep 16, 2024
a469f97
内容页面视觉优化 #103
dmzz-yyhyy Sep 16, 2024
42a491b
删除新建书架时的"删除书架"选项 #105
dmzz-yyhyy Sep 16, 2024
133aff4
优化搜索页与探索页加载逻辑 #106
dmzz-yyhyy Sep 16, 2024
b2d5266
修复阅读进度恢复 #102
dmzz-yyhyy Sep 17, 2024
48d53c2
修复切换页面概率闪退与阅读中页面无法滚动问题 #97
dmzz-yyhyy Sep 17, 2024
51e3813
为翻页模式添加快速切换章节功能
dmzz-yyhyy Sep 17, 2024
159b752
修改版本号
dmzz-yyhyy Sep 17, 2024
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 .github/workflows/marge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: "34.0.0"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: LightNovelReader-${{steps.android_version.outputs.VERSION_NAME}}-${{steps.android_version.outputs.VERSION_CODE}}-release
path: ${{steps.sign_app.outputs.signedReleaseFile}}
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: "34.0.0"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: LightNovelReader-${{steps.android_version.outputs.VERSION_CODE}}-debug
path: ${{steps.sign_app.outputs.signedReleaseFile}}
31 changes: 31 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

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

22 changes: 11 additions & 11 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {
minSdk = 24
targetSdk = 34
// 版本号为x.y.z则versionCode为x*1000000+y*10000+z*100+debug版本号(开发需要时迭代, 两位数)
versionCode = 4_04_023
versionCode = 4_04_024
versionName = "0.4.4"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -77,24 +77,24 @@ android {

dependencies {
// desugaring support
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.1")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
// android lib
implementation("androidx.core:core-ktx:1.13.1")
implementation ("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
implementation("androidx.lifecycle:lifecycle-runtime-compose-android:2.8.4")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.5")
implementation("androidx.lifecycle:lifecycle-runtime-compose-android:2.8.5")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5")
// compose
implementation("androidx.activity:activity-compose:1.9.1")
implementation("androidx.compose.animation:animation-graphics-android:1.6.8")
implementation(platform("androidx.compose:compose-bom:2024.08.00"))
implementation("androidx.activity:activity-compose:1.9.2")
implementation("androidx.compose.animation:animation-graphics-android:1.7.1")
implementation(platform("androidx.compose:compose-bom:2024.09.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3:1.3.0-rc01")
implementation("androidx.compose.material3:material3:1.3.0")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.08.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
// junit
testImplementation("junit:junit:4.13.2")
Expand All @@ -111,7 +111,7 @@ dependencies {
implementation("androidx.hilt:hilt-work:$androidXHilt")
implementation("androidx.hilt:hilt-navigation-compose:$androidXHilt")
// navigation
val navVersion = "2.7.7"
val navVersion = "2.8.0"
implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
implementation("androidx.navigation:navigation-dynamic-features-fragment:$navVersion")
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/userdata/UserDataPath.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ sealed class UserDataPath(
data object IsUsingFlipPage : UserDataPath("isUsingFlipPage", Reader)
data object IsUsingClickFlipPage : UserDataPath("isUsingClickFlipPage", Reader)
data object IsUsingVolumeKeyFlip : UserDataPath("isUsingVolumeKeyFlip", Reader)
data object IsUsingFlipAnime : UserDataPath("isUsingFlipAnime", Reader)
data object FastChapterChange : UserDataPath("fastChapterChange", Reader)
data object EnableBatteryIndicator : UserDataPath("enableBatteryIndicator", Reader)
data object EnableTimeIndicator : UserDataPath("enableTimeIndicator", Reader)
data object EnableChapterTitleIndicator : UserDataPath("enableChapterTitleIndicator", Reader)
data object EnableReadingChapterProgressIndicator : UserDataPath("enableReadingChapterProgressIndicator", Reader)
data object AutoPadding : UserDataPath("autoPadding", Reader)
data object TopPadding : UserDataPath("topPadding", Reader)
data object BottomPadding : UserDataPath("bottomPadding", Reader)
data object LeftPadding : UserDataPath("leftPadding", Reader)
data object RightPadding : UserDataPath("rightPadding", Reader)
}
data object ReadingBooks : UserDataPath("reading_books")
data object Search: UserDataPath("search") {
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/book/BookScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ fun BookScreen(
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
val navController = rememberNavController()
var topBar : @Composable (TopAppBarScrollBehavior) -> Unit by remember { mutableStateOf(@Composable {}) }
var bottomBar : @Composable () -> Unit by remember { mutableStateOf(@Composable {}) }
var lastIncomingChapterId by remember { mutableStateOf(-1) }
Scaffold(
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
Expand All @@ -41,7 +40,6 @@ fun BookScreen(
topBar(scrollBehavior)
}
},
bottomBar = bottomBar
) { paddingValues ->
NavHost(
modifier = Modifier.padding(paddingValues),
Expand All @@ -67,7 +65,6 @@ fun BookScreen(
cacheBook = cacheBook,
requestAddBookToBookshelf = requestAddBookToBookshelf,
)
bottomBar = {}
}
composable(
route = Screen.Book.Content.route,
Expand All @@ -81,9 +78,6 @@ fun BookScreen(
topBar = { newTopBar ->
topBar = newTopBar
},
bottomBar = { newBottomBar ->
bottomBar = newBottomBar
},
bookId = bookId,
chapterId = bundle.getInt("chapterId")
)
Expand Down
Loading
Loading