同步进度功能补充 #4352
Merged
同步进度功能补充 #4352
+161
−57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 23 commits
September 9, 2023 20:53
# Conflicts: # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt # app/src/main/res/values-es-rES/strings.xml # app/src/main/res/values-ja-rJP/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rHK/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values-zh/strings.xml
# Conflicts: # app/src/main/res/values-es-rES/strings.xml # app/src/main/res/values-ja-rJP/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rHK/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values-zh/strings.xml
# Conflicts: # app/src/main/res/values-es-rES/strings.xml # app/src/main/res/values-ja-rJP/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rHK/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values-zh/strings.xml
# Conflicts: # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
# Conflicts: # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
# Conflicts: # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
# Conflicts: # app/src/main/java/io/legado/app/model/ReadBook.kt # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
# Conflicts: # app/build.gradle # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
# Conflicts: # app/src/main/java/io/legado/app/model/ReadBook.kt # app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
This reverts commit d51d0f8.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
增加新的同步方式，通过设置中的开关进行开启，同步只会同步各设备间进度最新的记录，在每次的页面暂停时进行自动同步，同时当网络状态变更且变更状态为可用时也会进行同步操作，同时新增上传的点击区域设置以及右上角的覆盖云端进度选项
