refactor: packages

core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt

@@ -12,7 +12,7 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import kotlinx.coroutines.asCoroutineDispatcher
 import me.rhunk.snapenhance.bridge.BridgeClient
-import me.rhunk.snapenhance.bridge.wrapper.TranslationWrapper
+import me.rhunk.snapenhance.bridge.wrapper.LocaleWrapper
 import me.rhunk.snapenhance.core.config.ModConfig
 import me.rhunk.snapenhance.core.eventbus.EventBus
 import me.rhunk.snapenhance.data.MessageSender
@@ -45,7 +45,7 @@ class ModContext {
     val event = EventBus(this)
     val eventDispatcher = EventDispatcher(this)
 
-    val translation = TranslationWrapper()
+    val translation = LocaleWrapper()
     val features = FeatureManager(this)
     val mappings = MappingManager(this)
     val actionManager = ActionManager(this)

core/src/main/kotlin/me/rhunk/snapenhance/SharedContext.kt

@@ -7,7 +7,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Environment
 import android.provider.Settings
-import me.rhunk.snapenhance.bridge.wrapper.TranslationWrapper
+import me.rhunk.snapenhance.bridge.wrapper.LocaleWrapper
 import me.rhunk.snapenhance.download.DownloadTaskManager
 import kotlin.system.exitProcess
 
@@ -16,7 +16,7 @@ import kotlin.system.exitProcess
  */
 object SharedContext {
     lateinit var downloadTaskManager: DownloadTaskManager
-    lateinit var translation: TranslationWrapper
+    lateinit var translation: LocaleWrapper
 
     private fun askForStoragePermission(context: Context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
@@ -70,7 +70,7 @@ object SharedContext {
             }
         }
         if (!this::translation.isInitialized) {
-            translation = TranslationWrapper().apply {
+            translation = LocaleWrapper().apply {
                 loadFromContext(context)
             }
         }

core/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt

@@ -6,7 +6,7 @@ import android.os.IBinder
 import me.rhunk.snapenhance.SharedContext
 import me.rhunk.snapenhance.bridge.types.BridgeFileType
 import me.rhunk.snapenhance.bridge.wrapper.MessageLoggerWrapper
-import me.rhunk.snapenhance.bridge.wrapper.TranslationWrapper
+import me.rhunk.snapenhance.bridge.wrapper.LocaleWrapper
 import me.rhunk.snapenhance.download.DownloadProcessor
 
 class BridgeService : Service() {
@@ -85,7 +85,7 @@ class BridgeService : Service() {
 
         override fun clearMessageLogger() = messageLoggerWrapper.clearMessages()
 
-        override fun fetchTranslations() = TranslationWrapper.fetchLocales(context = this@BridgeService).associate {
+        override fun fetchTranslations() = LocaleWrapper.fetchLocales(context = this@BridgeService).associate {
             it.locale to it.content
         }
 

core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/LocaleWrapper.kt

@@ -9,9 +9,9 @@ import me.rhunk.snapenhance.data.LocalePair
 import java.util.Locale
 
 
-class TranslationWrapper {
+class LocaleWrapper {
     companion object {
-        private const val DEFAULT_LOCALE = "en_US"
+        const val DEFAULT_LOCALE = "en_US"
 
         fun fetchLocales(context: Context): List<LocalePair> {
             val deviceLocale = Locale.getDefault().toString()
@@ -85,10 +85,10 @@ class TranslationWrapper {
         }
     }
 
-    fun getCategory(key: String): TranslationWrapper {
-        return TranslationWrapper().apply {
+    fun getCategory(key: String): LocaleWrapper {
+        return LocaleWrapper().apply {
             translationMap.putAll(
-                this@TranslationWrapper.translationMap
+                this@LocaleWrapper.translationMap
                     .filterKeys { it.startsWith("$key.") }
                     .mapKeys { it.key.substring(key.length + 1) }
             )

core/src/main/kotlin/me/rhunk/snapenhance/core/config/ModConfig.kt

@@ -8,17 +8,21 @@ import me.rhunk.snapenhance.Logger
 import me.rhunk.snapenhance.bridge.BridgeClient
 import me.rhunk.snapenhance.bridge.FileLoaderWrapper
 import me.rhunk.snapenhance.bridge.types.BridgeFileType
+import me.rhunk.snapenhance.bridge.wrapper.LocaleWrapper
 import me.rhunk.snapenhance.core.config.impl.RootConfig
 
-class ModConfig() {
-    val root = RootConfig()
+class ModConfig {
 
-    companion object {
-        val gson: Gson = GsonBuilder().setPrettyPrinting().create()
-    }
+    var locale: String = LocaleWrapper.DEFAULT_LOCALE
+        set(value) {
+            field = value
+            writeConfig()
+        }
 
+    private val gson: Gson = GsonBuilder().setPrettyPrinting().create()
     private val file = FileLoaderWrapper(BridgeFileType.CONFIG, "{}".toByteArray(Charsets.UTF_8))
 
+    val root = RootConfig()
     operator fun getValue(thisRef: Any?, property: Any?) = root
 
     private fun load() {
@@ -36,12 +40,14 @@ class ModConfig() {
     }
 
     private fun loadConfig() {
-        val configContent = file.read()
-        root.fromJson(gson.fromJson(configContent.toString(Charsets.UTF_8), JsonObject::class.java))
+        val configFileContent = file.read()
+        val configObject = gson.fromJson(configFileContent.toString(Charsets.UTF_8), JsonObject::class.java)
+        locale = configObject.get("language")?.asString ?: LocaleWrapper.DEFAULT_LOCALE
     }
 
     fun writeConfig() {
         val configObject = root.toJson()
+        configObject.addProperty("language", locale)
         file.write(configObject.toString().toByteArray(Charsets.UTF_8))
     }
 

core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt

@@ -16,13 +16,13 @@ import android.widget.TextView
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import me.rhunk.snapenhance.SharedContext
-import me.rhunk.snapenhance.bridge.wrapper.TranslationWrapper
+import me.rhunk.snapenhance.bridge.wrapper.LocaleWrapper
 import me.rhunk.snapenhance.core.BuildConfig
 import me.rhunk.snapenhance.core.R
 import me.rhunk.snapenhance.download.data.PendingDownload
 
 class DownloadManagerActivity : Activity() {
-    lateinit var translation: TranslationWrapper
+    lateinit var translation: LocaleWrapper
 
     private val backCallbacks = mutableListOf<() -> Unit>()
     private val fetchedDownloadTasks = mutableListOf<PendingDownload>()