yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

fix: 清理字体选择器冗余转换

Browse Source
This commit is contained in:
HapeLee
2026-06-20 00:25:15 +08:00
parent ce9ca94441
commit 0d8c5df795
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/read/ReadBookScreen.kt
+3 -3
View File
@@ -444,16 +444,16 @@ fun ReadBookScreen(
} }
is ReadBookSheet.ChangeBookSource -> { is ReadBookSheet.ChangeBookSource -> {
val changeSourceSheet = state.activeSheet as? ReadBookSheet.ChangeBookSource val changeSourceSheet = state.activeSheet
val changeSourceBook = state.book val changeSourceBook = state.book
if (changeSourceSheet != null && changeSourceBook == null) { if (changeSourceBook == null) {
LaunchedEffect(changeSourceSheet) { LaunchedEffect(changeSourceSheet) {
onIntent(ReadBookIntent.DismissSheet) onIntent(ReadBookIntent.DismissSheet)
} }
} }
if (changeSourceBook != null) { if (changeSourceBook != null) {
ChangeSourceSheet( ChangeSourceSheet(
show = changeSourceSheet != null, show = true,
oldBook = changeSourceBook, oldBook = changeSourceBook,
fromReadBookActivity = true, fromReadBookActivity = true,
allowAddAsNew = false, allowAddAsNew = false,
app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigViewModel.kt
+4 -1
View File
@@ -28,7 +28,10 @@ class ThemeConfigViewModel(
) : ViewModel() { ) : ViewModel() {
val fontFolder = readSettingsRepository.preferences val fontFolder = readSettingsRepository.preferences
.map { it.fontFolder as String? } .map { preferences ->
val fontFolder: String? = preferences.fontFolder
fontFolder
}
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null) .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
fun setFontFolder(path: String) { fun setFontFolder(path: String) {