Skip to content

Fix going to intro screen when Ollama is only initially selected and used #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2024
Merged

Fix going to intro screen when Ollama is only initially selected and used #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ada3b
Change intro screen condition
Taewan-P Oct 26, 2024
ff590a6
Skip API Token input page when Ollama is only selected
Taewan-P Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/main/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MainViewModel @Inject constructor(private val settingRepository: SettingRe
viewModelScope.launch {
val platforms = settingRepository.fetchPlatforms()

if (platforms.all { it.token == null || it.model == null }) {
if (platforms.all { it.enabled.not() }) {
// Initialize
sendSplashEvent(SplashEvent.OpenIntro)
} else {
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setup/SetupViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class SetupViewModel @Inject constructor(private val settingRepository: SettingR
Route.OLLAMA_API_ADDRESS,
Route.SETUP_COMPLETE
)
val commonSteps = setOf(Route.SELECT_PLATFORM, Route.TOKEN_INPUT, Route.SETUP_COMPLETE)
val commonSteps = mutableSetOf(Route.SELECT_PLATFORM, Route.TOKEN_INPUT, Route.SETUP_COMPLETE)
val platformStep = mapOf(
Route.OPENAI_MODEL_SELECT to ApiType.OPENAI,
Route.ANTHROPIC_MODEL_SELECT to ApiType.ANTHROPIC,
Expand All @@ -129,6 +129,12 @@ class SetupViewModel @Inject constructor(private val settingRepository: SettingR

val currentIndex = steps.indexOfFirst { it == currentRoute }
val enabledPlatform = platformState.value.filter { it.selected }.map { it.name }.toSet()

if (enabledPlatform.size == 1 && ApiType.OLLAMA in enabledPlatform) {
// Skip API Token input page
commonSteps.remove(Route.TOKEN_INPUT)
}

val remainingSteps = steps.filterIndexed { index, setupStep ->
index > currentIndex &&
(setupStep in commonSteps || platformStep[setupStep] in enabledPlatform)
Expand Down