fix merge err

Author: TW0hank0

README_TW.md

@@ -7,7 +7,7 @@
     <a><img alt="Jetpack Compose" src="https://img.shields.io/badge/Jetpack%20Compose-4285F4?logo=jetpackcompose&logoColor=white&style=for-the-badge"></a>
     <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=P__gXIArh5UDBsEq7ttd4WhIYnNh3y1t&authKey=GAsRKEZ%2FwHpzRv19hNJsDnknOc86lYzNIHMPy2Jxt3S3U8f90qestOd760IAj%2F3l&noverify=0&group_code=867785526"><img alt="QQ Group" src="https://img.shields.io/badge/QQ讨论群-867785526-brightgreen.svg?logoColor=white&style=for-the-badge"></a>
     <a href="https://discord.gg/pnf4ABmDJt"><img alt="Discord" src="https://img.shields.io/badge/Discord-JOIN-4285F4.svg?logo=discord&logoColor=white&style=for-the-badge"></a>
-    <a href="https://t.me/lightnoble"><img alt="Discord" src="https://img.shields.io/badge/Telegram-JOIN-188FCA.svg?logo=telegram&logoColor=white&style=for-the-badge"></a>
+    <a href="https://t.me/lightnoble"><img alt="Telegram" src="https://img.shields.io/badge/Telegram-JOIN-188FCA.svg?logo=telegram&logoColor=white&style=for-the-badge"></a>
     <a href="https://f-droid.org/packages/indi.dmzz_yyhyy.lightnovelreader/"><img alt="F-droid" src="https://img.shields.io/f-droid/v/indi.dmzz_yyhyy.lightnovelreader?style=for-the-badge&logo=fdroid&logoColor=white"></a>
     <p>輕小說閱讀軟體，使用 Jetpack Compose 框架開發</p>
     <img src="assets/header.png" alt="drawing" width="80%"/>
@@ -30,21 +30,21 @@ LightNovelReader <sup>*重構版*</sup> 是一款開源的輕小說閱讀軟體
 
 ## 外掛程式開發與自訂資料來源
 
-您可以為LightNovelReader新增自訂的資料來源與插件
+您可以為LightNovelReader新增自訂的資料來源與外掛
 
 以下為相關資源鏈接
 - [範例外掛程式](https://github.com/dmzz-yyhyy/LightNovelReaderPlguin-Template)
-- [開髮指南](https://lnr.nariko.org/plugin-dev/)
+- [開發指南](https://lnr.nariko.org/plugin-dev/)
 - [LNR Api KDoc](https://api-doc.lnr.nariko.org/)
 
 歡迎各位開發者進行開發!
 
 ## 下載
 
-從 [GitHub Releases](https://github.com/dmzz-yyhyy/LightNovelReader/releases/latest) 下載最新發布版。要體驗最新的功能與錯誤修復，請從 [Actions](https://github.com/dmzz-yyhyy/LightNovelReader/actions) 下載最新建置。
+從 [GitHub Releases](https://github.com/dmzz-yyhyy/LightNovelReader/releases/latest) 下載最新發布版。要體驗最新的功能與錯誤修復，請從 [Actions](https://github.com/dmzz-yyhyy/LightNovelReader/actions) 下載最新Alpha開發版。
 
 [<img src="https://f-droid.org/badge/get-it-on-zh-tw.png"
-    alt="取得於 F-Droid 立即下載"
+    alt="立即在F-droid下載"
     height="80">](https://f-droid.org/packages/indi.dmzz_yyhyy.lightnovelreader)
 
 ## 支援

api/src/main/kotlin/io/nightfish/lightnovelreader/api/userdata/UserDataPath.kt

@@ -133,20 +133,9 @@ sealed class UserDataPath(
             data object DarkMode : UserDataPath("dark_mode", Display)
             /** 动态颜色设置 @since Api 2 */
             data object DynamicColors : UserDataPath("dynamic_color", Display)
-<<<<<<< HEAD
-<<<<<<< HEAD
             /** 启用 Material 3 Expressive @since Api 2 */
-=======
-            data object enableCostumeThemeScheme : UserDataPath("enable_costume_theme_scheme", Display)
-            data object CostumeThemeSurface : UserDataPath("costume_theme_surface", Display)
-            data object CostumeThemeBackground : UserDataPath("costume_theme_background", Display)
-<<<<<<< HEAD
->>>>>>> 5ea137dc (user costume color)
-=======
-            data object CostumeThemePrimary : UserDataPath("costume_theme_primary", Display)
->>>>>>> 59a396c7 (add primary color)
-=======
-            // costume theme scheme
+            data object EnableM3E : UserDataPath("enable_m3_expressive", Display)
+            /* 自定義調色盤 */
             data object EnableCostumeThemeScheme : UserDataPath("enable_costume_theme_scheme", Display)
             data object CostumeThemeSchemePrimary : UserDataPath("costume_theme_scheme_primary", Display)
             data object CostumeThemeSchemeOnPrimary : UserDataPath("costume_theme_scheme_on_primary", Display)
@@ -166,9 +155,6 @@ sealed class UserDataPath(
             data object CostumeThemeSchemeOnSurface : UserDataPath("costume_theme_scheme_on_surface", Display)
             data object CostumeThemeSchemeError : UserDataPath("costume_theme_scheme_error", Display)
             data object CostumeThemeSchemeOnError : UserDataPath("costume_theme_scheme_on_error", Display)
-            //
->>>>>>> d10c874c (自定意顏色移至CostumeThemeSchemeScreen (獨立設定畫面))
-            data object EnableM3E : UserDataPath("enable_m3_expressive", Display)
             /** 应用语言设置 @since Api 2 */
             data object AppLocale : UserDataPath("app_locale", Display)
             /** 浅色主题名称 @since Api 2 */

app/build.gradle.kts

@@ -24,7 +24,7 @@ android {
         minSdk = 24
         targetSdk = 36
         // 版本号为x.y.z则versionCode为x*1000000+y*10000+z*1000+debug版本号(开发需要时迭代, 三位数)
-        versionCode = 1_02_01_003
+        versionCode = 1_02_01_004
         versionName = "1.2.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -223,4 +223,4 @@ tasks.register("printVersionCode") {
     doFirst {
         println(android.defaultConfig.versionCode)
     }
-}
+}

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/data/work/ExportBookToEPUBWork.kt

@@ -51,10 +51,7 @@ class ExportBookToEPUBWork @AssistedInject constructor(
 ) : CoroutineWorker(appContext, workerParams) {
     companion object {
         fun ofId(id: String): String = "export_to_epub:$id"
-<<<<<<< HEAD
         private const val TAG = "ExportEPUB"
-=======
->>>>>>> 5ea137dc (user costume color)
     }
 
     private val notificationManager = appContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/downloadmanager/DownloadManagerViewModel.kt

@@ -1,13 +1,8 @@
 package indi.dmzz_yyhyy.lightnovelreader.ui.downloadmanager
 
-<<<<<<< HEAD
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-=======
-import androidx.compose.runtime.mutableStateMapOf
-import androidx.compose.runtime.snapshotFlow
->>>>>>> 5ea137dc (user costume color)
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.work.WorkManager
@@ -32,7 +27,6 @@ class DownloadManagerViewModel @Inject constructor(
     val workManager: WorkManager
 ) : ViewModel() {
     val downloadItemIdList get() = downloadProgressRepository.downloadItemIdList
-<<<<<<< HEAD
     var bookInformationMap: Map<String, BookInformation> by mutableStateOf(emptyMap())
         private set
     private val loadingJobs = mutableMapOf<String, Job>()
@@ -46,23 +40,6 @@ class DownloadManagerViewModel @Inject constructor(
                 bookRepository.getBookInformationFlow(bookId).collect { bookInformation ->
                     withContext(Dispatchers.Main) {
                         bookInformationMap = bookInformationMap + (bookId to bookInformation)
-=======
-    private val _bookInformationMap = mutableStateMapOf<String, BookInformation>()
-    val bookInformationMap: Map<String, BookInformation> = _bookInformationMap
-
-    init {
-        viewModelScope.launch(Dispatchers.IO) {
-            snapshotFlow {
-                downloadProgressRepository.downloadItemIdList
-            }.collect { downloadItems ->
-                downloadItems.forEach { downloadItem ->
-                    if (_bookInformationMap.containsKey(downloadItem.bookId))
-                         return@forEach
-                    viewModelScope.launch(Dispatchers.IO) {
-                        bookRepository.getBookInformationFlow(downloadItem.bookId).collect {
-                            _bookInformationMap[it.id] = it
-                        }
->>>>>>> 5ea137dc (user costume color)
                     }
                 }
             } finally {
@@ -83,4 +60,4 @@ class DownloadManagerViewModel @Inject constructor(
         downloadProgressRepository.removeExportItem(item)
     }
     fun onClickClearCompleted() = downloadProgressRepository.clearCompleted()
-}
+}

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/home/settings/pluginmanager/detail/PluginDetailNavigation.kt

@@ -2,10 +2,6 @@ package indi.dmzz_yyhyy.lightnovelreader.ui.home.settings.pluginmanager.detail
 
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-<<<<<<< HEAD
-=======
-import androidx.compose.runtime.mutableStateMapOf
->>>>>>> 5ea137dc (user costume color)
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -16,10 +12,6 @@ import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import indi.dmzz_yyhyy.lightnovelreader.ui.home.settings.pluginmanager.PluginManagerViewModel
 import indi.dmzz_yyhyy.lightnovelreader.ui.home.settings.pluginmanager.PluginSignatureDialog
-<<<<<<< HEAD
-=======
-import indi.dmzz_yyhyy.lightnovelreader.ui.navigation.Route
->>>>>>> 5ea137dc (user costume color)
 import indi.dmzz_yyhyy.lightnovelreader.utils.popBackStackIfResumed
 import io.nightfish.lightnovelreader.api.Route
 import io.nightfish.lightnovelreader.api.ui.LocalNavController

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/home/settings/theme/ThemeNavigation.kt

@@ -1,23 +1,16 @@
 package indi.dmzz_yyhyy.lightnovelreader.ui.home.settings.theme
 
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Color
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import indi.dmzz_yyhyy.lightnovelreader.theme.DEFAULT_COLOR_PRESETS
-import indi.dmzz_yyhyy.lightnovelreader.theme.DEFAULT_COLOR_PRESETS
 import indi.dmzz_yyhyy.lightnovelreader.ui.LocalAppTheme
 import indi.dmzz_yyhyy.lightnovelreader.ui.book.reader.ColorPickerDialogViewModel
-import indi.dmzz_yyhyy.lightnovelreader.ui.book.reader.ColorPickerDialogViewModel
 import indi.dmzz_yyhyy.lightnovelreader.ui.book.reader.navigateToColorPickerDialog
 import indi.dmzz_yyhyy.lightnovelreader.ui.book.reader.navigateToCostumeColorPickerDialog
 import io.nightfish.lightnovelreader.api.Route
-=======
-import indi.dmzz_yyhyy.lightnovelreader.ui.book.reader.navigateToCostumeColorPickerDialog
-import indi.dmzz_yyhyy.lightnovelreader.ui.navigation.Route
->>>>>>> d10c874c (自定意顏色移至CostumeThemeSchemeScreen (獨立設定畫面))
 import indi.dmzz_yyhyy.lightnovelreader.utils.popBackStackIfResumed
 import io.nightfish.lightnovelreader.api.ui.LocalNavController
 import io.nightfish.lightnovelreader.api.userdata.UserDataPath
@@ -52,13 +45,13 @@ fun NavGraphBuilder.settingsThemeDestination() {
             },
         )
     }
-    
+
     composable<Route.Main.Settings.Theme.CostumeThemeScheme> {
         val navController = LocalNavController.current
         val viewModel = hiltViewModel<ThemeViewModel>()
         val readerSettingState = viewModel.settingState
         val isDark = LocalAppTheme.current.isDark
-        
+
         CostumeThemeSchemeScreen(
             settingState = readerSettingState,
             onClickBack = navController::popBackStackIfResumed,

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/ui/home/settings/theme/ThemeScreen.kt

@@ -275,8 +275,8 @@ fun ThemeSettingsList(
         SettingsSwitchEntry(
             modifier = Modifier.background(colorScheme.surfaceContainer),
             painter = painterResource(R.drawable.palette_24px),
-            title = "啟用覆蓋主題配色",
-            description = "覆蓋主題原有顏色，字定義配色",
+            title = stringResource(R.string.settings_theme_enable_costume_color_scheme),
+            description = stringResource(R.string.settings_theme_enable_costume_color_scheme_desc),
             checked = settingState.enableCostumeThemeScheme,
             booleanUserData = settingState.enableCostumeThemeSchemeUserData
         )
@@ -304,8 +304,8 @@ fun ThemeSettingsList(
             SettingsClickableEntry(
                 modifier = Modifier.background(colorScheme.surfaceContainer),
                 painter = painterResource(R.drawable.palette_24px),
-                title = "覆蓋主題配色設定",
-                description = "開啟主題配色設定頁面調整所有配色",
+                title = stringResource(R.string.settings_theme_open_costume_color_scheme),
+                description = stringResource(R.string.settings_theme_open_costume_color_scheme_desc),
                 onClick = onClickOpenCostumeThemeScheme
             )
         }

app/src/main/kotlin/indi/dmzz_yyhyy/lightnovelreader/utils/Extentions.kt

@@ -33,11 +33,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import indi.dmzz_yyhyy.lightnovelreader.ui.home.reading.stats.TimeBarItem
-<<<<<<< HEAD
 import io.nightfish.lightnovelreader.api.Route
-=======
-import indi.dmzz_yyhyy.lightnovelreader.ui.navigation.Route
->>>>>>> 5ea137dc (user costume color)
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -217,4 +213,4 @@ fun List<TimeBarItem>.normalize(): List<Pair<TimeBarItem, Float>> {
     return map {
         it to (it.timeSeconds.toFloat() / total).coerceAtLeast(0.01f)
     }
-}
+}

app/src/main/res/values-zh-rTW/strings.xml

@@ -169,6 +169,12 @@
     <string name="settings_theme_dynamic_colors_desc">從系統主題套用動態配色</string>
     <string name="settings_theme_m3e">Material 3 Expressive</string>
     <string name="settings_theme_m3e_description">啟用 Material 3 Expressive 設計。此功能屬於實驗性內容，仍處於測試階段</string>
+
+    <string name="settings_theme_enable_costume_color_scheme">啟用覆蓋主題配色</string>
+    <string name="settings_theme_enable_costume_color_scheme_desc">覆蓋主題原有顏色，自定義配色</string>
+    <string name="settings_theme_open_costume_color_scheme">開啟覆蓋主題配色設定</string>
+    <string name="settings_theme_open_costume_color_scheme_desc">開啟主題配色設定頁面以調整配色</string>
+
     <string name="settings_formats">格式</string>
     <string name="settings_formats_desc">設定日期或文字格式</string>
     <string name="date_time_formats_settings">日期和時間</string>