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

修复自动下载失败 #122

Merged
merged 2 commits into from
Oct 26, 2024
+11 −6
Merged

修复自动下载失败 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e200a6
修复自动更新检查中，自动下载失败问题
dmzz-yyhyy Oct 26, 2024
b94360d
Merge remote-tracking branch 'origin/refactoring' into update_downloa…
dmzz-yyhyy Oct 26, 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 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 = 1_00_00_002
versionCode = 1_00_00_003
versionName = "1.0.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
5 changes: 4 additions & 1 deletion app/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@
-dontwarn javax.lang.model.util.ElementFilter
-dontwarn javax.lang.model.util.SimpleElementVisitor8
-dontwarn javax.lang.model.util.SimpleTypeVisitor8
-dontwarn javax.lang.model.util.Types
-dontwarn javax.lang.model.util.Types
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
-keep,allowobfuscation,allowshrinking class retrofit2.Response
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
2 changes: 1 addition & 1 deletion app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/work/CheckUpdateWork.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CheckUpdateWork @AssistedInject constructor(
notify(
it.id,
NotificationCompat.Builder(appContext, "BookUpdate")
.setSmallIcon(R.drawable.lightnovelreader_big_01)
.setSmallIcon(R.drawable.icon_foreground)
.setContentTitle(appContext.getString(R.string.app_name))
.setContentText("您关注的轻小说 ${it.title} 更新了")
.setPriority(NotificationCompat.PRIORITY_DEFAULT)
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/home/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package indi.dmzz_yyhyy.lightnovelreader.ui.home.settings

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -38,7 +40,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
Expand Down Expand Up @@ -69,13 +70,14 @@ fun SettingsScreen(
checkUpdate: () -> Unit,
viewModel: SettingsViewModel = hiltViewModel()
) {
val context = LocalContext.current
val pinnedScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
topBar {
TopBar(pinnedScrollBehavior,)
}
AnimatedVisibility(
viewModel.settingState != null
visible = viewModel.settingState != null,
enter = fadeIn(),
exit = fadeOut()
) {
val settingState = viewModel.settingState!!
Column(
Expand Down
Loading