use enums instead of constants for theme and api key state

you-apps · Jul 22, 2023 · f7e8eb9 · f7e8eb9
1 parent d4bbf90
commit f7e8eb9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/java/com/bnyro/translate/const/ApiKeyState.kt b/app/src/main/java/com/bnyro/translate/const/ApiKeyState.kt
@@ -17,8 +17,8 @@
 
 package com.bnyro.translate.const
 
-object ApiKeyState {
-    const val DISABLED = 0
-    const val OPTIONAL = 1
-    const val REQUIRED = 2
+enum class ApiKeyState {
+    DISABLED,
+    OPTIONAL,
+    REQUIRED
 }
diff --git a/app/src/main/java/com/bnyro/translate/const/ThemeMode.kt b/app/src/main/java/com/bnyro/translate/const/ThemeMode.kt
@@ -17,8 +17,8 @@
 
 package com.bnyro.translate.const
 
-object ThemeMode {
-    const val AUTO = 0
-    const val LIGHT = 1
-    const val DARK = 2
+enum class ThemeMode(val value: Int) {
+    AUTO(0),
+    LIGHT(1),
+    DARK(2)
 }
diff --git a/app/src/main/java/com/bnyro/translate/ui/MainActivity.kt b/app/src/main/java/com/bnyro/translate/ui/MainActivity.kt
@@ -43,9 +43,7 @@ import kotlinx.serialization.encodeToString
 
 class MainActivity : ComponentActivity() {
     private lateinit var mainModel: TranslationModel
-    var themeMode by mutableStateOf(
-        Preferences.getThemeMode()
-    )
+    var themeMode by mutableStateOf(Preferences.getThemeMode())
     var accentColor by mutableStateOf(Preferences.getAccentColor())
 
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/app/src/main/java/com/bnyro/translate/ui/components/ThemeModeDialog.kt b/app/src/main/java/com/bnyro/translate/ui/components/ThemeModeDialog.kt
@@ -40,22 +40,22 @@ fun ThemeModeDialog(
         options = listOf(
             ListPreferenceOption(
                 name = stringResource(R.string.theme_auto),
-                value = ThemeMode.AUTO,
+                value = ThemeMode.AUTO.value,
                 isSelected = activity.themeMode == ThemeMode.AUTO
             ),
             ListPreferenceOption(
                 name = stringResource(R.string.theme_light),
-                value = ThemeMode.LIGHT,
+                value = ThemeMode.LIGHT.value,
                 isSelected = activity.themeMode == ThemeMode.LIGHT
             ),
             ListPreferenceOption(
                 name = stringResource(R.string.theme_dark),
-                value = ThemeMode.DARK,
+                value = ThemeMode.DARK.value,
                 isSelected = activity.themeMode == ThemeMode.DARK
             )
         ),
         onOptionSelected = {
-            activity.themeMode = it.value
+            activity.themeMode = ThemeMode.values()[it.value]
         }
     )
 }
diff --git a/app/src/main/java/com/bnyro/translate/ui/theme/Theme.kt b/app/src/main/java/com/bnyro/translate/ui/theme/Theme.kt
@@ -41,7 +41,7 @@ const val defaultAccentColor = "d0bcff"
 
 @Composable
 fun TranslateYouTheme(
-    themeMode: Int = ThemeMode.AUTO,
+    themeMode: ThemeMode = ThemeMode.AUTO,
     accentColor: Color? = null,
     content: @Composable () -> Unit
 ) {

diff --git a/app/src/main/java/com/bnyro/translate/util/Preferences.kt b/app/src/main/java/com/bnyro/translate/util/Preferences.kt
@@ -36,7 +36,7 @@ object Preferences {
     const val charCounterLimitKey = "charCountLimit"
     const val tessLanguageKey = "tessLanguage"
 
-    const val themeModeKey = "themeMode"
+    const val themeModeKey = "themeModeKey"
     const val accentColorKey = "accentColor"
     const val sourceLanguage = "sourceLanguage"
     const val targetLanguage = "targetLanguage"
@@ -71,7 +71,7 @@ object Preferences {
         }
     }
 
-    fun getThemeMode() = get(themeModeKey, ThemeMode.AUTO.toString()).toInt()
+    fun getThemeMode() = ThemeMode.values()[get(themeModeKey, ThemeMode.AUTO.value.toString()).toInt()]
 
     fun getAccentColor() = prefs.getString(accentColorKey, null)
 }
diff --git a/app/src/main/java/com/bnyro/translate/util/TranslationEngine.kt b/app/src/main/java/com/bnyro/translate/util/TranslationEngine.kt
@@ -17,6 +17,7 @@
 
 package com.bnyro.translate.util
 
+import com.bnyro.translate.const.ApiKeyState
 import com.bnyro.translate.db.obj.Language
 import com.bnyro.translate.obj.Translation
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
@@ -25,7 +26,7 @@ abstract class TranslationEngine(
     val name: String,
     val defaultUrl: String,
     val urlModifiable: Boolean,
-    val apiKeyState: Int,
+    val apiKeyState: ApiKeyState,
     val autoLanguageCode: String?,
     var supportsSimTranslation: Boolean = true
 ) {