fix: 清理字体选择器冗余转换
This commit is contained in:
@@ -444,16 +444,16 @@ fun ReadBookScreen(
|
||||
}
|
||||
|
||||
is ReadBookSheet.ChangeBookSource -> {
|
||||
val changeSourceSheet = state.activeSheet as? ReadBookSheet.ChangeBookSource
|
||||
val changeSourceSheet = state.activeSheet
|
||||
val changeSourceBook = state.book
|
||||
if (changeSourceSheet != null && changeSourceBook == null) {
|
||||
if (changeSourceBook == null) {
|
||||
LaunchedEffect(changeSourceSheet) {
|
||||
onIntent(ReadBookIntent.DismissSheet)
|
||||
}
|
||||
}
|
||||
if (changeSourceBook != null) {
|
||||
ChangeSourceSheet(
|
||||
show = changeSourceSheet != null,
|
||||
show = true,
|
||||
oldBook = changeSourceBook,
|
||||
fromReadBookActivity = true,
|
||||
allowAddAsNew = false,
|
||||
|
||||
@@ -28,7 +28,10 @@ class ThemeConfigViewModel(
|
||||
) : ViewModel() {
|
||||
|
||||
val fontFolder = readSettingsRepository.preferences
|
||||
.map { it.fontFolder as String? }
|
||||
.map { preferences ->
|
||||
val fontFolder: String? = preferences.fontFolder
|
||||
fontFolder
|
||||
}
|
||||
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
|
||||
|
||||
fun setFontFolder(path: String) {
|
||||
|
||||
Reference in New Issue
Block a user