Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@ import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.hasScrollAction
import androidx.compose.ui.test.hasScrollToIndexAction
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onAllNodesWithContentDescription
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollToIndex
import androidx.compose.ui.test.performTouchInput
import androidx.compose.ui.test.swipe
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.yugahashimoto.andcode.R
import com.yugahashimoto.andcode.core.api.OpenCodeModel
import com.yugahashimoto.andcode.core.api.OpenCodeProvider
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
Expand All @@ -38,6 +43,8 @@ class ModelAndRuntimePickerSheetInstrumentedTest {
selectedProviderId = testProvider.id,
selectedModelId = null,
onSelectModel = { _, _ -> },
favoriteModelKeys = emptySet(),
onToggleFavorite = { _, _ -> },
onDismiss = { dismissed = true },
)
}
Expand All @@ -53,6 +60,35 @@ class ModelAndRuntimePickerSheetInstrumentedTest {
composeRule.runOnIdle { assertFalse(dismissed) }
}

@Test
fun tappingStarTogglesFavoriteWithoutSelectingModel() {
val toggled = mutableListOf<Pair<String, String>>()
val selected = mutableListOf<Pair<String, String>>()

composeRule.setContent {
ModelAndRuntimePickerSheet(
runtimeTargets = emptyList(),
selectedRuntimeId = null,
onSelectRuntime = {},
providers = listOf(testProvider),
selectedProviderId = testProvider.id,
selectedModelId = null,
onSelectModel = { providerId, modelId -> selected += providerId to modelId },
favoriteModelKeys = emptySet(),
onToggleFavorite = { providerId, modelId -> toggled += providerId to modelId },
onDismiss = {},
)
}

val star = composeRule.activity.getString(R.string.cd_favorite)
composeRule.onAllNodesWithContentDescription(star)[0].performClick()

composeRule.runOnIdle {
assertEquals(1, toggled.size)
assertTrue(selected.isEmpty())
}
}

private companion object {
val testProvider =
OpenCodeProvider(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@ fun ModelAndRuntimePickerSheet(
selectedProviderId: String?,
selectedModelId: String?,
onSelectModel: (String, String) -> Unit,
favoriteModelKeys: Set<String> = emptySet(),
// Required, with no default: every row draws a star. A caller that forgot these used to get an
// empty set and a no-op, so its stars rendered but did nothing when tapped.
favoriteModelKeys: Set<String>,
onToggleFavorite: (String, String) -> Unit,
recentModelKeys: List<String> = emptyList(),
hiddenModelKeys: Set<String> = emptySet(),
onToggleFavorite: (String, String) -> Unit = { _, _ -> },
showLocalSuffix: Boolean = true,
onConnectProvider: (() -> Unit)? = null,
onDismiss: () -> Unit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ fun VoiceSettingsScreen(
workspaces: List<WorkspaceRef> = emptyList(),
assistantProviderId: String? = null,
assistantModelId: String? = null,
favoriteModelKeys: Set<String> = emptySet(),
assistantWorkspacePath: String = "",
onTtsChange: (Boolean) -> Unit,
onTtsProviderChange: (String) -> Unit = {},
Expand All @@ -129,6 +130,7 @@ fun VoiceSettingsScreen(
onWakeWordModelRemove: () -> Unit = {},
onAssistantRuntimeChange: (String) -> Unit = {},
onAssistantModelChange: (String, String) -> Unit = { _, _ -> },
onToggleFavoriteModel: (String, String) -> Unit = { _, _ -> },
onAssistantWorkspaceChange: (String) -> Unit = {},
onBack: () -> Unit,
) {
Expand Down Expand Up @@ -302,9 +304,11 @@ fun VoiceSettingsScreen(
assistantRuntimeId = assistantRuntimeId,
assistantProviderId = assistantProviderId,
assistantModelId = assistantModelId,
favoriteModelKeys = favoriteModelKeys,
assistantWorkspacePath = assistantWorkspacePath,
onRuntimeChange = onAssistantRuntimeChange,
onModelChange = onAssistantModelChange,
onToggleFavoriteModel = onToggleFavoriteModel,
onWorkspaceChange = onAssistantWorkspaceChange,
)
}
Expand Down Expand Up @@ -587,9 +591,11 @@ private fun AssistantTargetSection(
assistantRuntimeId: String?,
assistantProviderId: String?,
assistantModelId: String?,
favoriteModelKeys: Set<String>,
assistantWorkspacePath: String,
onRuntimeChange: (String) -> Unit,
onModelChange: (String, String) -> Unit,
onToggleFavoriteModel: (String, String) -> Unit,
onWorkspaceChange: (String) -> Unit,
) {
var showPicker by remember { mutableStateOf(false) }
Expand Down Expand Up @@ -648,6 +654,8 @@ private fun AssistantTargetSection(
providers = targetProviders,
selectedProviderId = assistantProviderId,
selectedModelId = assistantModelId,
favoriteModelKeys = favoriteModelKeys,
onToggleFavorite = onToggleFavoriteModel,
showLocalSuffix = false,
onSelectModel = { providerId, modelId ->
onModelChange(providerId, modelId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ fun NavGraphBuilder.settingsNavGraph(
onAssistantModelChange = { providerId, modelId ->
settingsViewModel.setAssistantModel(providerId, modelId)
},
favoriteModelKeys = settingsState.favoriteModelKeys,
onToggleFavoriteModel = settingsViewModel::toggleFavoriteModel,
onAssistantWorkspaceChange = { path ->
settingsViewModel.setAssistantWorkspacePath(path)
},
Expand Down
Loading