Extract model string linked hash set

Taewan-P · May 31, 2024 · fd8b1e4 · fd8b1e4
1 parent c570db0
commit fd8b1e4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/app/src/main/java/dev/chungjungsoo/gptmobile/presentation/common/ModelConstants.kt b/app/src/main/java/dev/chungjungsoo/gptmobile/presentation/common/ModelConstants.kt
@@ -0,0 +1,8 @@
+package dev.chungjungsoo.gptmobile.presentation.common
+
+object ModelConstants {
+    // LinkedHashSet should be used to guarantee item order
+    val openaiModels = linkedSetOf("gpt-4o", "gpt-4-turbo", "gpt-4", "gpt-3.5-turbo")
+    val anthropicModels = linkedSetOf("claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307")
+    val googleModels = linkedSetOf("gemini-1.5-pro-latest", "gemini-1.5-flash-latest", "gemini-1.0-pro")
+}
diff --git a/app/src/main/java/dev/chungjungsoo/gptmobile/presentation/ui/setup/SelectModelScreen.kt b/app/src/main/java/dev/chungjungsoo/gptmobile/presentation/ui/setup/SelectModelScreen.kt
@@ -23,6 +23,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import dev.chungjungsoo.gptmobile.R
 import dev.chungjungsoo.gptmobile.data.dto.APIModel
 import dev.chungjungsoo.gptmobile.data.model.ApiType
+import dev.chungjungsoo.gptmobile.presentation.common.ModelConstants.anthropicModels
+import dev.chungjungsoo.gptmobile.presentation.common.ModelConstants.googleModels
+import dev.chungjungsoo.gptmobile.presentation.common.ModelConstants.openaiModels
 import dev.chungjungsoo.gptmobile.presentation.common.PrimaryLongButton
 import dev.chungjungsoo.gptmobile.presentation.common.RadioItem
 import dev.chungjungsoo.gptmobile.util.collectManagedState
@@ -44,9 +47,9 @@ fun SelectModelScreen(
     val title = getAPIModelSelectTitle(platformType)
     val description = getAPIModelSelectDescription(platformType)
     val availableModels = when (platformType) {
-        ApiType.OPENAI -> generateOpenAIModelList(models = setupViewModel.openaiModels)
-        ApiType.ANTHROPIC -> generateAnthropicModelList(models = setupViewModel.anthropicModels)
-        ApiType.GOOGLE -> generateGoogleModelList(models = setupViewModel.googleModels)
+        ApiType.OPENAI -> generateOpenAIModelList(models = openaiModels)
+        ApiType.ANTHROPIC -> generateAnthropicModelList(models = anthropicModels)
+        ApiType.GOOGLE -> generateGoogleModelList(models = googleModels)
     }
     val defaultModel = remember {
         derivedStateOf {

diff --git a/app/src/main/java/dev/chungjungsoo/gptmobile/presentation/ui/setup/SetupViewModel.kt b/app/src/main/java/dev/chungjungsoo/gptmobile/presentation/ui/setup/SetupViewModel.kt
@@ -6,6 +6,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dev.chungjungsoo.gptmobile.data.dto.Platform
 import dev.chungjungsoo.gptmobile.data.model.ApiType
 import dev.chungjungsoo.gptmobile.data.repository.SettingRepository
+import dev.chungjungsoo.gptmobile.presentation.common.ModelConstants.anthropicModels
+import dev.chungjungsoo.gptmobile.presentation.common.ModelConstants.googleModels
+import dev.chungjungsoo.gptmobile.presentation.common.ModelConstants.openaiModels
 import dev.chungjungsoo.gptmobile.presentation.common.Route
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -17,11 +20,6 @@ import kotlinx.coroutines.launch
 @HiltViewModel
 class SetupViewModel @Inject constructor(private val settingRepository: SettingRepository) : ViewModel() {
 
-    // LinkedHashSet should be used to guarantee item order
-    val openaiModels = linkedSetOf("gpt-4o", "gpt-4-turbo", "gpt-4", "gpt-3.5-turbo")
-    val anthropicModels = linkedSetOf("claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307")
-    val googleModels = linkedSetOf("gemini-1.5-pro-latest", "gemini-1.5-flash-latest", "gemini-1.0-pro")
-
     private val _platformState = MutableStateFlow(
         listOf(
             Platform(ApiType.OPENAI),