Fix theme import

rocka · rocka · commit 90cf96ecb439 · 2024-01-22T23:13:50.000+08:00
- write theme json file actually
- allow overwriting same background image files
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/CustomThemeSerializer.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/CustomThemeSerializer.kt
@@ -5,10 +5,14 @@
 package org.fcitx.fcitx5.android.data.theme
 
 import arrow.core.compose
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.JsonTransformingSerializer
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import org.fcitx.fcitx5.android.utils.NostalgicSerializer
-import org.fcitx.fcitx5.android.utils.identity
-import org.fcitx.fcitx5.android.utils.upcast
 
 object CustomThemeSerializer : JsonTransformingSerializer<Theme.Custom>(Theme.Custom.serializer()) {
 
@@ -35,17 +39,18 @@ object CustomThemeSerializer : JsonTransformingSerializer<Theme.Custom>(Theme.Cu
     private fun JsonObject.removeVersion() =
         JsonObject(this - VERSION)
 
+    private val EmptyTransform: (JsonObject) -> JsonObject = { it }
 
     private fun applyStrategy(oldVersion: String, obj: JsonObject) =
         strategies
             .takeWhile { it.version != oldVersion }
-            .foldRight(JsonObject::identity.upcast()) { f, acc -> f compose acc }
+            .foldRight(EmptyTransform) { it, acc -> it.transformation compose acc }
             .invoke(obj)
 
     data class MigrationStrategy(
         val version: String,
         val transformation: (JsonObject) -> JsonObject
-    ) : (JsonObject) -> JsonObject by transformation
+    )
 
     private val strategies: List<MigrationStrategy> =
         // Add migrations here
@@ -69,8 +74,7 @@ object CustomThemeSerializer : JsonTransformingSerializer<Theme.Custom>(Theme.Cu
                         put("genericActiveForegroundColor", getValue("accentKeyTextColor"))
                     }
                 })
-            },
-            MigrationStrategy("1.0", JsonObject::identity),
+            }
         )
 
     private const val VERSION = "version"
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeFilesManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/theme/ThemeFilesManager.kt
@@ -123,14 +123,29 @@ object ThemeFilesManager {
                     )
                     if (ThemeManager.BuiltinThemes.find { it.name == decoded.name } != null)
                         errorRuntime(R.string.exception_theme_name_clash)
-                    val exists = ThemeManager.getTheme(decoded.name) != null
+                    val oldTheme = ThemeManager.getTheme(decoded.name) as? Theme.Custom
+                    val newCreated = oldTheme == null
                     val newTheme = if (decoded.backgroundImage != null) {
                         val srcFile = File(dir, decoded.backgroundImage.srcFilePath)
-                        val croppedFile = File(dir, decoded.backgroundImage.croppedFilePath)
-                        extracted.find { it.name == srcFile.name }?.copyTo(srcFile)
+                        val oldSrcFile = oldTheme?.backgroundImage?.srcFilePath?.let { File(it) }
+                        val srcFileNameMatches = oldSrcFile?.name == srcFile.name
+                        extracted.find { it.name == srcFile.name }
+                            // allow overwriting background image files when theme and file names all are same
+                            ?.copyTo(srcFile, overwrite = srcFileNameMatches)
                             ?: errorRuntime(R.string.exception_theme_src_image)
-                        extracted.find { it.name == croppedFile.name }?.copyTo(croppedFile)
+                        val croppedFile = File(dir, decoded.backgroundImage.croppedFilePath)
+                        val oldCroppedFile =
+                            oldTheme?.backgroundImage?.croppedFilePath?.let { File(it) }
+                        val croppedFileNameMatches = oldCroppedFile?.name == croppedFile.name
+                        extracted.find { it.name == croppedFile.name }
+                            ?.copyTo(croppedFile, overwrite = croppedFileNameMatches)
                             ?: errorRuntime(R.string.exception_theme_cropped_image)
+                        if (!srcFileNameMatches) {
+                            oldSrcFile?.delete()
+                        }
+                        if (!croppedFileNameMatches) {
+                            oldCroppedFile?.delete()
+                        }
                         decoded.copy(
                             backgroundImage = decoded.backgroundImage.copy(
                                 croppedFilePath = croppedFile.path,
@@ -140,7 +155,8 @@ object ThemeFilesManager {
                     } else {
                         decoded
                     }
-                    Triple(!exists, newTheme, migrated)
+                    saveThemeFiles(newTheme)
+                    Triple(newCreated, newTheme, migrated)
                 }
             }
         }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeListAdapter.kt b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/theme/ThemeListAdapter.kt
@@ -57,23 +57,20 @@ abstract class ThemeListAdapter : RecyclerView.Adapter<ThemeListAdapter.ViewHold
         }
     }
 
+    private fun prependOffset(index: Int): Int {
+        return if (index == -1) 0 else 1
+    }
+
     fun prependTheme(it: Theme) {
         entries.add(0, it)
-        activeIndex += 1
-        lightIndex += 1
-        darkIndex += 1
+        activeIndex += prependOffset(activeIndex)
+        lightIndex += prependOffset(lightIndex)
+        darkIndex += prependOffset(darkIndex)
         notifyItemInserted(OFFSET)
     }
 
-    fun replaceTheme(theme: Theme) {
-        val index = entries.indexOfFirst { it.name == theme.name }
-        entries[index] = theme
-        notifyItemChanged(index + OFFSET)
-    }
-
-    private fun removedOffset(removedIndex: Int, offsetIndex: Int): Int {
-        val i = removedIndex - OFFSET - offsetIndex
-        return i.sign
+    private fun removedOffset(removedIndex: Int, index: Int): Int {
+        return if (index == -1) 0 else (removedIndex - OFFSET - index).sign
     }
 
     fun removeTheme(name: String) {
@@ -85,6 +82,21 @@ abstract class ThemeListAdapter : RecyclerView.Adapter<ThemeListAdapter.ViewHold
         darkIndex += removedOffset(index, darkIndex)
     }
 
+    private fun replaceIndex(replacedIndex: Int, index: Int): Int {
+        return if (replacedIndex + OFFSET == index) OFFSET else index
+    }
+
+    fun replaceTheme(theme: Theme) {
+        val index = entries.indexOfFirst { it.name == theme.name }
+        entries.removeAt(index)
+        entries.add(0, theme)
+        activeIndex = replaceIndex(index, activeIndex)
+        lightIndex = replaceIndex(index, lightIndex)
+        darkIndex = replaceIndex(index, darkIndex)
+        notifyItemMoved(index + OFFSET, OFFSET)
+        notifyItemChanged(OFFSET)
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
         ViewHolder(
             when (viewType) {
