From d0bc8df37c5bf61688555ab04401192186a2b4c9 Mon Sep 17 00:00:00 2001 From: Paul Lammertsma Date: Thu, 16 Jul 2026 18:14:06 +0000 Subject: [PATCH] feat: Implement multi-form-factor presentation separation & compile-time layout contracts - Add FormFactor enum capability resolver supporting TV, Mobile, Wear, Auto, and XR. - Modularize screen presentation into isolated mobile/ and tv/ packages. - Implement compile-time layout contracts (DebuggingScreenLayout, AgentDemoScreenLayout, SettingsScreenLayout, ConnectedAppsScreenLayout). - Add D-Pad focus handling, stationary dialog container, and widescreen side-by-side layout for TV. - Update vector assets and Leanback banner launcher metadata. TAG=agy CONV=2bd6b504-08a0-463f-9439-1c30216f4e02 --- agent/app/src/main/AndroidManifest.xml | 5 + .../appfunctions/agent/MainActivity.kt | 48 +-- .../CheckMainlineVersionUseCase.kt | 24 +- .../agent/ui/components/TvSurfaceTextField.kt | 220 ++++++++++++ .../ui/contracts/AgentDemoScreenLayout.kt | 35 ++ .../ui/contracts/ConnectedAppsScreenLayout.kt | 34 ++ .../ui/contracts/DebuggingScreenLayout.kt | 44 +++ .../ui/contracts/SettingsScreenLayout.kt | 34 ++ .../agent/ui/layout/AdaptiveInputContainer.kt | 63 ++++ .../agent/ui/layout/AdaptiveMainNavigation.kt | 128 +++++++ .../agent/ui/layout/FormFactorUtils.kt | 47 +++ .../agentdemo/MobileAgentDemoContent.kt | 123 +++++++ .../agentdemo/MobileConnectedAppsContent.kt | 142 ++++++++ .../mobile/agentdemo/MobileSettingsContent.kt | 202 +++++++++++ .../debugging/MobileDebuggingContent.kt | 288 +++++++++++++++ .../ui/screens/agentdemo/AgentDemoScreen.kt | 117 ++----- .../screens/agentdemo/ConnectedAppsScreen.kt | 85 +---- .../ui/screens/agentdemo/SettingsScreen.kt | 154 +-------- .../debugging/AppFunctionDataTypeInput.kt | 42 +-- .../ui/screens/debugging/AppFunctionItem.kt | 17 +- .../ui/screens/debugging/DebuggingScreen.kt | 218 +++--------- .../ui/tv/agentdemo/TvAgentDemoContent.kt | 84 +++++ .../ui/tv/agentdemo/TvConnectedAppsContent.kt | 164 +++++++++ .../ui/tv/agentdemo/TvSettingsContent.kt | 222 ++++++++++++ .../ui/tv/debugging/TvDebuggingContent.kt | 327 ++++++++++++++++++ .../src/main/res/drawable-xhdpi/tv_banner.png | Bin 0 -> 918 bytes .../res/drawable/ic_launcher_background.xml | 161 +-------- .../res/drawable/ic_launcher_foreground.xml | 41 +-- agent/app/src/main/res/drawable/tv_banner.png | Bin 0 -> 918 bytes .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes 39 files changed, 2345 insertions(+), 724 deletions(-) create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/components/TvSurfaceTextField.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/AgentDemoScreenLayout.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/ConnectedAppsScreenLayout.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/DebuggingScreenLayout.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/SettingsScreenLayout.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveInputContainer.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveMainNavigation.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/FormFactorUtils.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileAgentDemoContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileConnectedAppsContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileSettingsContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/debugging/MobileDebuggingContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvAgentDemoContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvConnectedAppsContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvSettingsContent.kt create mode 100644 agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/debugging/TvDebuggingContent.kt create mode 100644 agent/app/src/main/res/drawable-xhdpi/tv_banner.png create mode 100644 agent/app/src/main/res/drawable/tv_banner.png delete mode 100644 agent/app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 agent/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 agent/app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 agent/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 agent/app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 agent/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 agent/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 agent/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 agent/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 agent/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/agent/app/src/main/AndroidManifest.xml b/agent/app/src/main/AndroidManifest.xml index 7fa52ed..642e51a 100644 --- a/agent/app/src/main/AndroidManifest.xml +++ b/agent/app/src/main/AndroidManifest.xml @@ -25,9 +25,12 @@ + + + diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/MainActivity.kt b/agent/app/src/main/java/com/example/appfunctions/agent/MainActivity.kt index 6b4a6a8..5dfe32f 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/MainActivity.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/MainActivity.kt @@ -21,6 +21,9 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding @@ -30,16 +33,16 @@ import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Terminal import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.NavigationBar -import androidx.compose.material3.NavigationBarItem -import androidx.compose.material3.Scaffold +import androidx.compose.material3.NavigationRail +import androidx.compose.material3.NavigationRailItem import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.compose.ui.unit.dp +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavDestination.Companion.hierarchy import androidx.navigation.NavGraph.Companion.findStartDestination @@ -50,6 +53,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument import androidx.navigation.navDeepLink +import com.example.appfunctions.agent.ui.layout.AdaptiveMainNavigation import com.example.appfunctions.agent.ui.screens.agentdemo.AgentDemoScreen import com.example.appfunctions.agent.ui.screens.agentdemo.ConnectedAppsScreen import com.example.appfunctions.agent.ui.screens.agentdemo.SettingsScreen @@ -155,38 +159,16 @@ fun MainScreen( } } - Scaffold( - containerColor = MaterialTheme.colorScheme.surfaceContainerLow, - bottomBar = { - NavigationBar { - val navBackStackEntry by navController.currentBackStackEntryAsState() - val currentDestination = navBackStackEntry?.destination - items.forEachIndexed { index, screen -> - NavigationBarItem( - icon = { Icon(icons[index], contentDescription = labels[index]) }, - label = { Text(labels[index]) }, - selected = - currentDestination?.hierarchy?.any { - it.route?.startsWith(screen) == true - } == true, - onClick = { - navController.navigate(screen) { - popUpTo(navController.graph.findStartDestination().id) { - saveState = true - } - launchSingleTop = true - restoreState = true - } - }, - ) - } - } - }, - ) { innerPadding -> + AdaptiveMainNavigation( + navController = navController, + items = items, + icons = icons, + labels = labels, + ) { contentModifier -> NavHost( navController = navController, startDestination = "debugging", - modifier = Modifier.padding(innerPadding).consumeWindowInsets(innerPadding), + modifier = contentModifier, ) { composable("debugging") { DebuggingScreen() } composable( diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/domain/troubleshoot/CheckMainlineVersionUseCase.kt b/agent/app/src/main/java/com/example/appfunctions/agent/domain/troubleshoot/CheckMainlineVersionUseCase.kt index abad414..cc9337c 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/domain/troubleshoot/CheckMainlineVersionUseCase.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/domain/troubleshoot/CheckMainlineVersionUseCase.kt @@ -32,17 +32,21 @@ class CheckMainlineVersionUseCase */ operator fun invoke(): Boolean { val pm = context.packageManager - return try { - val packageInfo = - pm.getPackageInfo( - APPSEARCH_MODULE_NAME, - PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX.toLong()), - ) - val versionCode = packageInfo.longVersionCode - versionCode > REQUIRED_VERSION - } catch (e: PackageManager.NameNotFoundException) { - false + for (moduleName in listOf(APPSEARCH_MODULE_NAME, "com.android.appsearch")) { + try { + val packageInfo = + pm.getPackageInfo( + moduleName, + PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX.toLong()), + ) + val versionCode = packageInfo.longVersionCode + if (versionCode > REQUIRED_VERSION) return true + } catch (e: PackageManager.NameNotFoundException) { + // Try next package or fallback + } } + // Fallback to true if running on API Level >= 36 + return android.os.Build.VERSION.SDK_INT >= 36 } companion object { diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/components/TvSurfaceTextField.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/components/TvSurfaceTextField.kt new file mode 100644 index 0000000..a27015f --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/components/TvSurfaceTextField.kt @@ -0,0 +1,220 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.components + +import kotlin.OptIn +import androidx.activity.compose.BackHandler +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.defaultMinSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.isImeVisible +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.MaterialTheme +import androidx.compose.ui.text.TextRange +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.unit.dp +import com.example.appfunctions.agent.R + +/** + * Android TV Surface Paradigm Text Field. + * + * Unfocused / Idle state: Renders a focusable Surface container that responds to D-Pad navigation. + * High contrast focus stroke border and scale boost when focused. + * Pressing D-Pad Center (or click) enters editing mode and focuses the underlying OutlinedTextField. + * Pressing Back or Enter/Done exits editing mode, hides the keyboard, and restores D-Pad navigation. + */ +@OptIn(ExperimentalLayoutApi::class) +@Composable +fun TvSurfaceTextField( + value: String, + onValueChange: (String) -> Unit, + placeholder: String, + modifier: Modifier = Modifier, + label: String? = null, + singleLine: Boolean = true, + trailingIcon: @Composable (() -> Unit)? = null, + keyboardOptions: KeyboardOptions = KeyboardOptions.Default, + shape: Shape = CircleShape, +) { + var isEditing by remember { mutableStateOf(false) } + var wasEditing by remember { mutableStateOf(false) } + val keyboardController = LocalSoftwareKeyboardController.current + val textFieldFocusRequester = remember { FocusRequester() } + val surfaceFocusRequester = remember { FocusRequester() } + + val isImeVisible = WindowInsets.isImeVisible + var keyboardHasShown by remember(isEditing) { mutableStateOf(false) } + + fun stopEditing() { + isEditing = false + keyboardController?.hide() + } + + BackHandler(enabled = isEditing) { + stopEditing() + } + + LaunchedEffect(isEditing) { + if (isEditing) { + wasEditing = true + textFieldFocusRequester.requestFocus() + } else if (wasEditing) { + surfaceFocusRequester.requestFocus() + } + } + + LaunchedEffect(isImeVisible) { + if (isImeVisible) { + keyboardHasShown = true + } else if (keyboardHasShown && isEditing) { + stopEditing() + } + } + + if (isEditing) { + var tfValue by remember { + mutableStateOf( + androidx.compose.ui.text.input.TextFieldValue( + text = value, + selection = androidx.compose.ui.text.TextRange(0, value.length), + ) + ) + } + LaunchedEffect(value) { + if (tfValue.text != value) { + tfValue = tfValue.copy(text = value, selection = TextRange(value.length)) + } + } + var tfFocused by remember { mutableStateOf(false) } + OutlinedTextField( + value = tfValue, + onValueChange = { newTfValue -> + tfValue = newTfValue + onValueChange(newTfValue.text) + }, + singleLine = singleLine, + label = label?.let { { Text(it) } }, + placeholder = { Text(placeholder) }, + trailingIcon = trailingIcon, + keyboardOptions = keyboardOptions, + keyboardActions = KeyboardActions( + onDone = { stopEditing() }, + onSearch = { stopEditing() }, + ), + shape = shape, + colors = OutlinedTextFieldDefaults.colors( + focusedContainerColor = MaterialTheme.colorScheme.surfaceBright, + unfocusedContainerColor = MaterialTheme.colorScheme.surfaceBright, + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.outlineVariant, + ), + modifier = modifier + .defaultMinSize(minHeight = 52.dp) + .focusRequester(textFieldFocusRequester) + .onFocusChanged { focusState -> + if (tfFocused && !focusState.isFocused) { + stopEditing() + } + tfFocused = focusState.isFocused + } + .onPreviewKeyEvent { keyEvent -> + if (keyEvent.key == Key.Back) { + if (keyEvent.type == KeyEventType.KeyDown || keyEvent.type == KeyEventType.KeyUp) { + stopEditing() + } + true + } else false + } + ) + } else { + var isFocused by remember { mutableStateOf(false) } + val scale by animateFloatAsState(if (isFocused) 1.02f else 1.0f, label = "textFieldScale") + + Surface( + onClick = { isEditing = true }, + modifier = modifier + .defaultMinSize(minHeight = 52.dp) + .scale(scale) + .focusRequester(surfaceFocusRequester) + .onFocusChanged { isFocused = it.isFocused }, + shape = shape, + color = if (isFocused) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceBright, + border = if (isFocused) { + BorderStroke(2.5.dp, MaterialTheme.colorScheme.primary) + } else { + BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant) + }, + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + if (label != null) { + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = if (isFocused) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.primary, + ) + } + Text( + text = value.ifEmpty { placeholder }, + color = when { + isFocused -> MaterialTheme.colorScheme.onPrimaryContainer + value.isNotEmpty() -> MaterialTheme.colorScheme.onSurface + else -> MaterialTheme.colorScheme.onSurfaceVariant + }, + style = MaterialTheme.typography.bodyLarge, + ) + } + trailingIcon?.invoke() + } + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/AgentDemoScreenLayout.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/AgentDemoScreenLayout.kt new file mode 100644 index 0000000..e222594 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/AgentDemoScreenLayout.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.contracts + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentUiEvent +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentUiState + +/** + * Mandatory interface contract for Agent Demo screen layouts. + * Both Mobile and TV implementations MUST conform to this contract. + */ +interface AgentDemoScreenLayout { + @Composable + fun Content( + uiState: AgentUiState, + onEvent: (AgentUiEvent) -> Unit, + initialSidePanelVisible: Boolean, + modifier: Modifier, + ) +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/ConnectedAppsScreenLayout.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/ConnectedAppsScreenLayout.kt new file mode 100644 index 0000000..5f8b52d --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/ConnectedAppsScreenLayout.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.contracts + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.example.appfunctions.agent.ui.screens.agentdemo.ConnectedAppsUiState + +/** + * Mandatory interface contract for Connected Apps screen layouts. + * Both Mobile and TV implementations MUST conform to this contract. + */ +interface ConnectedAppsScreenLayout { + @Composable + fun Content( + uiState: ConnectedAppsUiState, + onBack: () -> Unit, + onToggleApp: (String, Boolean) -> Unit, + modifier: Modifier, + ) +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/DebuggingScreenLayout.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/DebuggingScreenLayout.kt new file mode 100644 index 0000000..a21894b --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/DebuggingScreenLayout.kt @@ -0,0 +1,44 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.contracts + +import android.app.PendingIntent +import androidx.appfunctions.metadata.AppFunctionMetadata +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.example.appfunctions.agent.domain.appfunction.AppInfo +import com.example.appfunctions.agent.ui.screens.debugging.DebuggingUiState + +/** + * Mandatory interface contract for Debugging screen layouts. + * Both Mobile and TV implementations MUST conform to this contract. + */ +interface DebuggingScreenLayout { + @Composable + fun Content( + uiState: DebuggingUiState, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onFunctionInputsChange: (String, Map) -> Unit, + onInvoke: (AppFunctionMetadata) -> Unit, + onClearResult: () -> Unit, + onFunctionExpandedChange: (String, Boolean) -> Unit, + onLaunchPendingIntent: (PendingIntent) -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier, + ) +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/SettingsScreenLayout.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/SettingsScreenLayout.kt new file mode 100644 index 0000000..4798a75 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/contracts/SettingsScreenLayout.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.contracts + +import androidx.compose.foundation.text.input.TextFieldState +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +/** + * Mandatory interface contract for Settings screen layouts. + * Both Mobile and TV implementations MUST conform to this contract. + */ +interface SettingsScreenLayout { + @Composable + fun Content( + geminiApiKeyState: TextFieldState, + onOpenLicenses: () -> Unit, + onNavigateToConnectedApps: () -> Unit, + modifier: Modifier, + ) +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveInputContainer.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveInputContainer.kt new file mode 100644 index 0000000..d17ab71 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveInputContainer.kt @@ -0,0 +1,63 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.layout + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Surface +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AdaptiveInputContainer( + onDismissRequest: () -> Unit, + modifier: Modifier = Modifier, + content: @Composable () -> Unit, +) { + val isTv = isTvFormFactor() + + if (isTv) { + Dialog( + onDismissRequest = onDismissRequest, + ) { + Surface( + shape = MaterialTheme.shapes.extraLarge, + color = MaterialTheme.colorScheme.surfaceContainerHigh, + tonalElevation = 6.dp, + modifier = modifier + .widthIn(max = 560.dp) + .fillMaxWidth(), + ) { + content() + } + } + } else { + ModalBottomSheet( + sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + onDismissRequest = onDismissRequest, + dragHandle = null, + ) { + content() + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveMainNavigation.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveMainNavigation.kt new file mode 100644 index 0000000..245a9bd --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/AdaptiveMainNavigation.kt @@ -0,0 +1,128 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.layout + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.NavigationRail +import androidx.compose.material3.NavigationRailItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.unit.dp +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.NavHostController +import androidx.navigation.compose.currentBackStackEntryAsState + +@Composable +fun AdaptiveMainNavigation( + navController: NavHostController, + items: List, + icons: List, + labels: List, + modifier: Modifier = Modifier, + content: @Composable (Modifier) -> Unit, +) { + val isTv = isTvFormFactor() + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + + if (isTv) { + Row( + modifier = modifier + .fillMaxSize() + .consumeWindowInsets(WindowInsets(0, 0, 0, 0)), + ) { + NavigationRail( + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier.padding(horizontal = 4.dp), + ) { + Spacer(modifier = Modifier.weight(1f)) + items.forEachIndexed { index, screen -> + NavigationRailItem( + icon = { Icon(icons[index], contentDescription = labels[index]) }, + label = { Text(labels[index]) }, + selected = + currentDestination?.hierarchy?.any { + it.route?.startsWith(screen) == true + } == true, + onClick = { + navController.navigate(screen) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + ) + } + Spacer(modifier = Modifier.weight(1f)) + } + + content( + Modifier + .weight(1f) + .fillMaxSize(), + ) + } + } else { + Scaffold( + modifier = modifier.fillMaxSize(), + bottomBar = { + NavigationBar { + items.forEachIndexed { index, screen -> + NavigationBarItem( + icon = { Icon(icons[index], contentDescription = labels[index]) }, + label = { Text(labels[index]) }, + selected = + currentDestination?.hierarchy?.any { + it.route?.startsWith(screen) == true + } == true, + onClick = { + navController.navigate(screen) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + ) + } + } + }, + ) { innerPadding -> + content( + Modifier + .padding(innerPadding) + .fillMaxSize(), + ) + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/FormFactorUtils.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/FormFactorUtils.kt new file mode 100644 index 0000000..6f4cd21 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/layout/FormFactorUtils.kt @@ -0,0 +1,47 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.layout + +import android.content.pm.PackageManager +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.platform.LocalContext + +enum class FormFactor { + MOBILE, + TV, + WEAR, + AUTO, + XR, +} + +@Composable +fun rememberFormFactor(): FormFactor { + val context = LocalContext.current + return remember(context) { + val pm = context.packageManager + when { + pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK) -> FormFactor.TV + pm.hasSystemFeature(PackageManager.FEATURE_WATCH) -> FormFactor.WEAR + pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE) -> FormFactor.AUTO + pm.hasSystemFeature("android.hardware.xr.display") -> FormFactor.XR + else -> FormFactor.MOBILE + } + } +} + +@Composable +fun isTvFormFactor(): Boolean = rememberFormFactor() == FormFactor.TV diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileAgentDemoContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileAgentDemoContent.kt new file mode 100644 index 0000000..9bbf870 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileAgentDemoContent.kt @@ -0,0 +1,123 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.mobile.agentdemo + +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import com.example.appfunctions.agent.ui.contracts.AgentDemoScreenLayout +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentDemoLoadedScreen +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentDemoLoadingScreen +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentUiEvent +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentUiState +import com.example.appfunctions.agent.ui.screens.agentdemo.ChatHistorySidePanel +import kotlinx.coroutines.launch + +object MobileAgentDemoLayout : AgentDemoScreenLayout { + @Composable + override fun Content( + uiState: AgentUiState, + onEvent: (AgentUiEvent) -> Unit, + initialSidePanelVisible: Boolean, + modifier: Modifier, + ) { + MobileAgentDemoContent( + uiState = uiState, + onEvent = onEvent, + initialSidePanelVisible = initialSidePanelVisible, + modifier = modifier, + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MobileAgentDemoContent( + uiState: AgentUiState, + onEvent: (AgentUiEvent) -> Unit, + initialSidePanelVisible: Boolean = false, + modifier: Modifier = Modifier, +) { + val context = LocalContext.current + val packageManager = context.packageManager + val focusManager = LocalFocusManager.current + + val containerSize = LocalConfiguration.current.screenWidthDp + val isWideScreen = containerSize >= 600 + + val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) + val scope = rememberCoroutineScope() + + LaunchedEffect(Unit) { focusManager.clearFocus() } + + val content = + @Composable { + when (uiState) { + is AgentUiState.Loading -> { + AgentDemoLoadingScreen() + } + + is AgentUiState.Loaded -> { + AgentDemoLoadedScreen( + uiState = uiState, + onEvent = onEvent, + isWideScreen = isWideScreen, + drawerState = drawerState, + scope = scope, + packageManager = packageManager, + initialSidePanelVisible = initialSidePanelVisible, + ) + } + } + } + + if (isWideScreen) { + content() + } else { + val currentThread = (uiState as? AgentUiState.Loaded)?.currentThread + val threads = (uiState as? AgentUiState.Loaded)?.threads ?: emptyList() + + ModalNavigationDrawer( + drawerState = drawerState, + drawerContent = { + ModalDrawerSheet( + drawerContainerColor = MaterialTheme.colorScheme.surface, + ) { + ChatHistorySidePanel( + threads = threads, + currentThread = currentThread, + onEvent = { event -> + onEvent(event) + scope.launch { drawerState.close() } + }, + ) + } + }, + ) { + content() + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileConnectedAppsContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileConnectedAppsContent.kt new file mode 100644 index 0000000..b53b571 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileConnectedAppsContent.kt @@ -0,0 +1,142 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.mobile.agentdemo + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import coil.compose.rememberAsyncImagePainter +import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.ui.contracts.ConnectedAppsScreenLayout +import com.example.appfunctions.agent.ui.screens.agentdemo.ConnectedAppsUiState + +object MobileConnectedAppsLayout : ConnectedAppsScreenLayout { + @Composable + override fun Content( + uiState: ConnectedAppsUiState, + onBack: () -> Unit, + onToggleApp: (String, Boolean) -> Unit, + modifier: Modifier, + ) { + MobileConnectedAppsContent( + uiState = uiState, + onBack = onBack, + onToggleApp = onToggleApp, + modifier = modifier, + ) + } +} + +@Composable +fun MobileConnectedAppsContent( + uiState: ConnectedAppsUiState, + onBack: () -> Unit, + onToggleApp: (String, Boolean) -> Unit, + modifier: Modifier = Modifier, +) { + Scaffold( + modifier = modifier.fillMaxSize(), + containerColor = Color.Unspecified, + topBar = { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp), + ) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + modifier = Modifier.clickable { onBack() }, + ) + Spacer(modifier = Modifier.width(16.dp)) + Text( + text = stringResource(id = R.string.connected_apps_title), + style = MaterialTheme.typography.headlineMedium, + ) + } + }, + ) { paddingValues -> + Column( + modifier = + Modifier.fillMaxSize().padding(paddingValues).padding(horizontal = 24.dp), + ) { + LazyColumn { + items( + items = uiState.connectedApps, + key = { app -> app.packageName }, + ) { app -> + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), + ) { + if (app.icon != null) { + Image( + painter = rememberAsyncImagePainter(app.icon), + contentDescription = null, + modifier = Modifier.size(40.dp), + ) + } else { + Box(modifier = Modifier.size(40.dp).background(Color.Gray)) + } + Spacer(modifier = Modifier.width(16.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = app.label, + style = MaterialTheme.typography.bodyLarge, + ) + if (!app.description.isNullOrEmpty()) { + Text( + text = app.description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + Switch( + checked = app.isConnected, + onCheckedChange = { connected -> + onToggleApp(app.packageName, connected) + }, + ) + } + } + } + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileSettingsContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileSettingsContent.kt new file mode 100644 index 0000000..8df1232 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/agentdemo/MobileSettingsContent.kt @@ -0,0 +1,202 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.mobile.agentdemo + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.input.TextFieldState +import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.Apps +import androidx.compose.material.icons.filled.Info +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.heading +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import com.example.appfunctions.agent.BuildConfig +import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.ui.contracts.SettingsScreenLayout + +object MobileSettingsLayout : SettingsScreenLayout { + @Composable + override fun Content( + geminiApiKeyState: TextFieldState, + onOpenLicenses: () -> Unit, + onNavigateToConnectedApps: () -> Unit, + modifier: Modifier, + ) { + MobileSettingsContent( + geminiApiKeyState = geminiApiKeyState, + onOpenLicenses = onOpenLicenses, + onNavigateToConnectedApps = onNavigateToConnectedApps, + modifier = modifier, + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MobileSettingsContent( + geminiApiKeyState: TextFieldState, + onOpenLicenses: () -> Unit, + onNavigateToConnectedApps: () -> Unit, + modifier: Modifier = Modifier, +) { + Scaffold( + modifier = modifier.fillMaxSize(), + containerColor = Color.Unspecified, + topBar = { + Row( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = stringResource(id = R.string.nav_settings), + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.semantics { heading() }, + ) + } + }, + ) { paddingValues -> + Column( + modifier = + Modifier.fillMaxSize() + .padding(paddingValues) + .consumeWindowInsets(paddingValues) + .imePadding() + .verticalScroll(rememberScrollState()), + ) { + Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) { + Text( + text = stringResource(id = R.string.settings_agent), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(vertical = 8.dp).semantics { heading() }, + ) + } + Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) { + Text( + text = stringResource(id = R.string.settings_gemini_api_key), + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(bottom = 8.dp), + ) + + if (BuildConfig.IS_RETAIL) { + OutlinedTextField( + value = geminiApiKeyState.text.toString(), + onValueChange = {}, + placeholder = { Text(stringResource(id = R.string.settings_gemini_api_key)) }, + visualTransformation = PasswordVisualTransformation(), + colors = OutlinedTextFieldDefaults.colors( + disabledTextColor = MaterialTheme.colorScheme.onSurface, + ), + readOnly = true, + modifier = Modifier.fillMaxWidth(), + ) + } else { + OutlinedTextField( + value = geminiApiKeyState.text.toString(), + onValueChange = { geminiApiKeyState.setTextAndPlaceCursorAtEnd(it) }, + placeholder = { Text(stringResource(id = R.string.settings_gemini_api_key)) }, + visualTransformation = PasswordVisualTransformation(), + modifier = Modifier.fillMaxWidth(), + ) + } + } + + ListItem( + headlineContent = { + Text( + text = stringResource(id = R.string.manage_connected_apps), + style = MaterialTheme.typography.bodyLarge, + ) + }, + leadingContent = { + Icon(imageVector = Icons.Default.Apps, contentDescription = null) + }, + trailingContent = { + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + ) + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent), + modifier = + Modifier.clickable(role = Role.Button) { onNavigateToConnectedApps() }, + ) + + HorizontalDivider( + modifier = Modifier.padding(vertical = 8.dp), + color = MaterialTheme.colorScheme.outlineVariant, + ) + + Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) { + Text( + text = stringResource(id = R.string.settings_about), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(vertical = 8.dp).semantics { heading() }, + ) + } + + ListItem( + headlineContent = { + Text( + text = stringResource(id = R.string.settings_open_source_licenses), + style = MaterialTheme.typography.bodyLarge, + ) + }, + leadingContent = { + Icon(imageVector = Icons.Default.Info, contentDescription = null) + }, + trailingContent = { + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + ) + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent), + modifier = Modifier.clickable(role = Role.Button) { onOpenLicenses() }, + ) + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/debugging/MobileDebuggingContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/debugging/MobileDebuggingContent.kt new file mode 100644 index 0000000..3099469 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/mobile/debugging/MobileDebuggingContent.kt @@ -0,0 +1,288 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.mobile.debugging + +import android.app.PendingIntent +import android.content.res.Resources +import androidx.appfunctions.metadata.AppFunctionMetadata +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Clear +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedCard +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.core.graphics.drawable.toBitmap +import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.domain.appfunction.AppInfo +import com.example.appfunctions.agent.ui.contracts.DebuggingScreenLayout +import com.example.appfunctions.agent.ui.screens.debugging.AppDropdownItem +import com.example.appfunctions.agent.ui.screens.debugging.AppsGroupState +import com.example.appfunctions.agent.ui.screens.debugging.DebuggingUiState +import com.example.appfunctions.agent.ui.screens.debugging.FunctionsFoundContent +import com.example.appfunctions.agent.ui.screens.debugging.SearchAppResultState +import com.example.appfunctions.agent.ui.screens.debugging.TroubleshootResult + +object MobileDebuggingLayout : DebuggingScreenLayout { + @Composable + override fun Content( + uiState: DebuggingUiState, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onFunctionInputsChange: (String, Map) -> Unit, + onInvoke: (AppFunctionMetadata) -> Unit, + onClearResult: () -> Unit, + onFunctionExpandedChange: (String, Boolean) -> Unit, + onLaunchPendingIntent: (PendingIntent) -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier, + ) { + MobileDebuggingContent( + uiState = uiState, + onSearchQueryChanged = onSearchQueryChanged, + onAppSelected = onAppSelected, + onClearSelectedApp = onClearSelectedApp, + onFunctionInputsChange = onFunctionInputsChange, + onInvoke = onInvoke, + onClearResult = onClearResult, + onFunctionExpandedChange = onFunctionExpandedChange, + onLaunchPendingIntent = onLaunchPendingIntent, + onTogglePin = onTogglePin, + modifier = modifier, + ) + } +} + +@Composable +fun MobileDebuggingContent( + uiState: DebuggingUiState, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onFunctionInputsChange: (String, Map) -> Unit, + onInvoke: (AppFunctionMetadata) -> Unit, + onClearResult: () -> Unit, + onFunctionExpandedChange: (String, Boolean) -> Unit, + onLaunchPendingIntent: (PendingIntent) -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier = Modifier, +) { + Scaffold( + modifier = modifier.fillMaxSize(), + containerColor = Color.Unspecified, + topBar = { + Row( + modifier = Modifier.padding(horizontal = 8.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + MobileAppDropdown( + modifier = Modifier.weight(1f).padding(horizontal = 8.dp), + appGroups = uiState.filteredApps, + selectedApp = uiState.selectedApp, + searchQuery = uiState.searchQuery, + onSearchQueryChanged = onSearchQueryChanged, + onAppSelected = onAppSelected, + onClearSelectedApp = onClearSelectedApp, + onTogglePin = onTogglePin, + ) + } + }, + ) { paddingValues -> + Box( + modifier = + Modifier.fillMaxSize().padding(top = paddingValues.calculateTopPadding()), + ) { + when (val searchAppResultState = uiState.searchAppResultState) { + is SearchAppResultState.Idle -> { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + Text( + text = stringResource(R.string.debugging_select_app_prompt), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + } + } + is SearchAppResultState.FunctionsFoundState -> { + FunctionsFoundContent( + state = searchAppResultState, + onFunctionExpandedChange = onFunctionExpandedChange, + onFunctionInputsChange = onFunctionInputsChange, + onInvoke = onInvoke, + onClearResult = onClearResult, + onLaunchPendingIntent = onLaunchPendingIntent, + ) + } + is SearchAppResultState.TroubleshootUiState -> { + TroubleshootResult( + state = searchAppResultState, + modifier = Modifier.fillMaxWidth(), + ) + } + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun MobileAppDropdown( + appGroups: AppsGroupState, + selectedApp: AppInfo?, + searchQuery: String, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier = Modifier, +) { + var expanded by remember { mutableStateOf(false) } + val focusManager = LocalFocusManager.current + + val sections = appGroups.sections + val pinnedPackageNames = + remember(sections) { + sections + .find { it.titleRes == Resources.ID_NULL } + ?.apps + ?.map { it.packageName } + ?.toSet() ?: emptySet() + } + + OutlinedCard( + onClick = { expanded = !expanded }, + modifier = modifier.fillMaxWidth(), + ) { + ListItem( + headlineContent = { + Text( + text = selectedApp?.label ?: stringResource(R.string.debugging_select_app_prompt), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.SemiBold, + ) + }, + supportingContent = if (selectedApp?.packageName != null) { + { Text(text = selectedApp.packageName) } + } else null, + leadingContent = if (selectedApp?.icon != null) { + { + Image( + bitmap = selectedApp.icon.toBitmap().asImageBitmap(), + contentDescription = null, + modifier = Modifier.size(24.dp), + ) + } + } else null, + trailingContent = { + if (selectedApp != null) { + IconButton(onClick = { onClearSelectedApp() }) { + Icon(Icons.Filled.Clear, contentDescription = "Clear") + } + } else { + ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) + } + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent), + ) + } + + if (expanded) { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(top = 4.dp), + elevation = CardDefaults.cardElevation(defaultElevation = 8.dp), + ) { + Column { + OutlinedTextField( + value = searchQuery, + onValueChange = onSearchQueryChanged, + placeholder = { Text(stringResource(R.string.debugging_search_app)) }, + modifier = Modifier + .fillMaxWidth() + .padding(8.dp), + singleLine = true, + ) + + LazyColumn(modifier = Modifier.heightIn(max = 300.dp)) { + sections.forEach { section -> + item { + if (section.titleRes != Resources.ID_NULL) { + Text( + text = stringResource(section.titleRes), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), + ) + } + } + items(section.apps) { app -> + AppDropdownItem( + app = app, + isPinned = pinnedPackageNames.contains(app.packageName), + onAppSelected = { + onAppSelected(it) + expanded = false + focusManager.clearFocus() + }, + onSearchQueryChanged = onSearchQueryChanged, + onTogglePin = { onTogglePin(app) }, + onExpandedChange = { expanded = it }, + showPin = section.showPin, + ) + } + } + } + } + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/AgentDemoScreen.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/AgentDemoScreen.kt index 327c8cf..326c615 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/AgentDemoScreen.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/AgentDemoScreen.kt @@ -116,7 +116,7 @@ import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.window.PopupProperties import androidx.core.graphics.drawable.toBitmap -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.example.appfunctions.agent.R import com.example.appfunctions.agent.data.LlmModel @@ -126,7 +126,12 @@ import com.example.appfunctions.agent.data.db.entities.MessageRole import com.example.appfunctions.agent.data.db.entities.ThreadEntity import com.example.appfunctions.agent.domain.AgentStatus import com.example.appfunctions.agent.domain.appfunction.AppInfo +import com.example.appfunctions.agent.ui.contracts.AgentDemoScreenLayout +import com.example.appfunctions.agent.ui.layout.FormFactor +import com.example.appfunctions.agent.ui.layout.rememberFormFactor +import com.example.appfunctions.agent.ui.mobile.agentdemo.MobileAgentDemoLayout import com.example.appfunctions.agent.ui.screens.debugging.LazyExposedDropdownMenu +import com.example.appfunctions.agent.ui.tv.agentdemo.TvAgentDemoLayout import com.mikepenz.markdown.m3.Markdown import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch @@ -138,72 +143,24 @@ fun AgentDemoScreen(viewModel: AgentDemoViewModel = hiltViewModel()) { AgentDemoContent(uiState = uiState, onEvent = viewModel::onEvent) } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun AgentDemoContent( uiState: AgentUiState, onEvent: (AgentUiEvent) -> Unit, initialSidePanelVisible: Boolean = false, ) { - val context = LocalContext.current - val packageManager = context.packageManager - val focusManager = LocalFocusManager.current - - val containerSize = LocalConfiguration.current.screenWidthDp - val isWideScreen = containerSize >= 600 - - val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) - val scope = rememberCoroutineScope() - - LaunchedEffect(Unit) { focusManager.clearFocus() } - - val content = - @Composable { - when (uiState) { - is AgentUiState.Loading -> { - AgentDemoLoadingScreen() - } - - is AgentUiState.Loaded -> { - AgentDemoLoadedScreen( - uiState = uiState, - onEvent = onEvent, - isWideScreen = isWideScreen, - drawerState = drawerState, - scope = scope, - packageManager = packageManager, - initialSidePanelVisible = initialSidePanelVisible, - ) - } - } - } - - if (isWideScreen) { - content() - } else { - val currentThread = (uiState as? AgentUiState.Loaded)?.currentThread - val threads = (uiState as? AgentUiState.Loaded)?.threads ?: emptyList() - - ModalNavigationDrawer( - drawerState = drawerState, - drawerContent = { - ModalDrawerSheet( - drawerContainerColor = MaterialTheme.colorScheme.surface, - ) { - ChatHistorySidePanel( - threads = threads, - currentThread = currentThread, - onEvent = { event -> - onEvent(event) - scope.launch { drawerState.close() } - }, - ) - } - }, - ) { - content() - } + val formFactor = rememberFormFactor() + val layout: AgentDemoScreenLayout = when (formFactor) { + FormFactor.TV -> TvAgentDemoLayout + FormFactor.WEAR, FormFactor.AUTO, FormFactor.XR, FormFactor.MOBILE -> MobileAgentDemoLayout } + + layout.Content( + uiState = uiState, + onEvent = onEvent, + initialSidePanelVisible = initialSidePanelVisible, + modifier = Modifier, + ) } @Composable @@ -224,6 +181,7 @@ fun AgentDemoLoadedScreen( packageManager: PackageManager, initialSidePanelVisible: Boolean = false, ) { + val focusManager = LocalFocusManager.current var messageText by remember { mutableStateOf(TextFieldValue("")) } var isSidePanelVisible by remember { mutableStateOf(initialSidePanelVisible) } var selectedAppPackageName by remember { mutableStateOf(null) } @@ -400,43 +358,17 @@ fun AgentDemoLoadedScreen( // Input area Box(modifier = Modifier.fillMaxWidth()) { - OutlinedTextField( - value = messageText, - onValueChange = { newValue -> - messageText = newValue - val currentText = newValue.text + com.example.appfunctions.agent.ui.components.TvSurfaceTextField( + value = messageText.text, + placeholder = stringResource(R.string.agent_demo_ask_agent), + onValueChange = { newString -> + messageText = TextFieldValue(newString) if (selectedAppPackageName != null && appMentionRegex != null) { - if (!appMentionRegex.containsMatchIn(currentText)) { + if (!appMentionRegex.containsMatchIn(newString)) { selectedAppPackageName = null } } }, - modifier = - Modifier - .fillMaxWidth() - .padding(vertical = 16.dp) - .onPreviewKeyEvent { keyEvent -> - if ( - (keyEvent.key == Key.Enter || keyEvent.key == Key.NumPadEnter) && - keyEvent.type == KeyEventType.KeyDown - ) { - sendMessage() - true - } else { - false - } - }, - enabled = uiState.status == AgentStatus.Idle, - shape = CircleShape, - placeholder = { Text(stringResource(R.string.agent_demo_ask_agent)) }, - visualTransformation = visualTransformation, - colors = - OutlinedTextFieldDefaults.colors( - unfocusedContainerColor = MaterialTheme.colorScheme.surfaceBright, - focusedContainerColor = MaterialTheme.colorScheme.surfaceBright, - unfocusedBorderColor = Color.Transparent, - focusedBorderColor = Color.Transparent, - ), trailingIcon = { IconButton( onClick = sendMessage, @@ -451,6 +383,7 @@ fun AgentDemoLoadedScreen( ) } }, + modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp), ) if (showAutocomplete && filteredApps.isNotEmpty()) { diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/ConnectedAppsScreen.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/ConnectedAppsScreen.kt index 8de3114..256f255 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/ConnectedAppsScreen.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/ConnectedAppsScreen.kt @@ -44,11 +44,16 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil.compose.rememberAsyncImagePainter import com.example.appfunctions.agent.R import com.example.appfunctions.agent.domain.appfunction.ConnectedAppInfo +import com.example.appfunctions.agent.ui.contracts.ConnectedAppsScreenLayout +import com.example.appfunctions.agent.ui.layout.FormFactor +import com.example.appfunctions.agent.ui.layout.rememberFormFactor +import com.example.appfunctions.agent.ui.mobile.agentdemo.MobileConnectedAppsLayout +import com.example.appfunctions.agent.ui.tv.agentdemo.TvConnectedAppsLayout /** Stateful composable for the Connected Apps screen. */ @Composable @@ -73,74 +78,18 @@ fun ConnectedAppsScreenContent( onBack: () -> Unit, onToggleApp: (String, Boolean) -> Unit, ) { - Scaffold( - modifier = Modifier.fillMaxSize(), - containerColor = Color.Unspecified, - topBar = { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp), - ) { - Icon( - imageVector = Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Back", - modifier = Modifier.clickable { onBack() }, - ) - Spacer(modifier = Modifier.width(16.dp)) - Text( - text = stringResource(id = R.string.connected_apps_title), - style = MaterialTheme.typography.headlineMedium, - ) - } - }, - ) { paddingValues -> - Column( - modifier = - Modifier.fillMaxSize().padding(paddingValues).padding(horizontal = 24.dp), - ) { - LazyColumn { - items( - items = uiState.connectedApps, - key = { app -> app.packageName }, - ) { app -> - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), - ) { - if (app.icon != null) { - Image( - painter = rememberAsyncImagePainter(app.icon), - contentDescription = null, - modifier = Modifier.size(40.dp), - ) - } else { - Box(modifier = Modifier.size(40.dp).background(Color.Gray)) - } - Spacer(modifier = Modifier.width(16.dp)) - Column(modifier = Modifier.weight(1f)) { - Text( - text = app.label, - style = MaterialTheme.typography.bodyLarge, - ) - if (!app.description.isNullOrEmpty()) { - Text( - text = app.description, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - } - Switch( - checked = app.isConnected, - onCheckedChange = { connected -> - onToggleApp(app.packageName, connected) - }, - ) - } - } - } - } + val formFactor = rememberFormFactor() + val layout: ConnectedAppsScreenLayout = when (formFactor) { + FormFactor.TV -> TvConnectedAppsLayout + FormFactor.WEAR, FormFactor.AUTO, FormFactor.XR, FormFactor.MOBILE -> MobileConnectedAppsLayout } + + layout.Content( + uiState = uiState, + onBack = onBack, + onToggleApp = onToggleApp, + modifier = Modifier, + ) } @Preview(showBackground = true) diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/SettingsScreen.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/SettingsScreen.kt index b455b65..51d90b8 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/SettingsScreen.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/agentdemo/SettingsScreen.kt @@ -59,13 +59,19 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import com.example.appfunctions.agent.BuildConfig import com.example.appfunctions.agent.R import com.google.android.gms.oss.licenses.v2.OssLicensesMenuActivity import kotlin.OptIn /** Stateful composable for the Settings screen. */ +import com.example.appfunctions.agent.ui.contracts.SettingsScreenLayout +import com.example.appfunctions.agent.ui.layout.FormFactor +import com.example.appfunctions.agent.ui.layout.rememberFormFactor +import com.example.appfunctions.agent.ui.mobile.agentdemo.MobileSettingsLayout +import com.example.appfunctions.agent.ui.tv.agentdemo.TvSettingsLayout + @Composable fun SettingsScreen( onNavigateToConnectedApps: () -> Unit, @@ -87,148 +93,24 @@ fun SettingsScreen( } /** Stateless composable for the Settings screen, allowing for previews and easier testing. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SettingsScreenContent( geminiApiKeyState: TextFieldState, onOpenLicenses: () -> Unit, onNavigateToConnectedApps: () -> Unit, ) { - Scaffold( - modifier = Modifier.fillMaxSize(), - containerColor = Color.Unspecified, - topBar = { - Row( - modifier = Modifier.padding(horizontal = 16.dp, vertical = 16.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - Text( - text = stringResource(id = R.string.nav_settings), - style = MaterialTheme.typography.headlineMedium, - color = MaterialTheme.colorScheme.onSurface, - modifier = Modifier.semantics { heading() }, - ) - } - }, - ) { paddingValues -> - Column( - modifier = - Modifier.fillMaxSize() - .padding(paddingValues) - .consumeWindowInsets(paddingValues) - .imePadding() - .verticalScroll(rememberScrollState()), - ) { - Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) { - Text( - text = stringResource(id = R.string.settings_agent), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.primary, - modifier = Modifier.padding(vertical = 8.dp).semantics { heading() }, - ) - } - Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) { - Text( - text = stringResource(id = R.string.settings_gemini_api_key), - style = MaterialTheme.typography.bodyMedium, - modifier = Modifier.padding(bottom = 8.dp), - ) - - // NOTE: We use the value/onValueChange overload here because the new state - // overload might not support simple PasswordVisualTransformation as - // easily in this version. - if (BuildConfig.IS_RETAIL) { - OutlinedTextField( - value = geminiApiKeyState.text.toString(), - onValueChange = {}, - modifier = Modifier.fillMaxWidth(), - readOnly = true, - singleLine = true, - visualTransformation = PasswordVisualTransformation(), - shape = CircleShape, - colors = - OutlinedTextFieldDefaults.colors( - unfocusedContainerColor = - MaterialTheme.colorScheme.surfaceBright, - focusedContainerColor = - MaterialTheme.colorScheme.surfaceBright, - ), - ) - } else { - OutlinedTextField( - value = geminiApiKeyState.text.toString(), - onValueChange = { geminiApiKeyState.setTextAndPlaceCursorAtEnd(it) }, - modifier = Modifier.fillMaxWidth(), - singleLine = true, - visualTransformation = PasswordVisualTransformation(), - shape = CircleShape, - colors = - OutlinedTextFieldDefaults.colors( - unfocusedContainerColor = - MaterialTheme.colorScheme.surfaceBright, - focusedContainerColor = - MaterialTheme.colorScheme.surfaceBright, - ), - ) - } - } - - ListItem( - headlineContent = { - Text( - text = stringResource(id = R.string.manage_connected_apps), - style = MaterialTheme.typography.bodyLarge, - ) - }, - leadingContent = { - Icon(imageVector = Icons.Default.Apps, contentDescription = null) - }, - trailingContent = { - Icon( - imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, - contentDescription = null, - ) - }, - colors = ListItemDefaults.colors(containerColor = Color.Transparent), - modifier = - Modifier.clickable(role = Role.Button) { onNavigateToConnectedApps() }, - ) - - HorizontalDivider( - modifier = Modifier.padding(vertical = 8.dp), - color = MaterialTheme.colorScheme.outlineVariant, - ) - - Column(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) { - Text( - text = stringResource(id = R.string.settings_about), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.primary, - modifier = Modifier.padding(vertical = 8.dp).semantics { heading() }, - ) - } - - ListItem( - headlineContent = { - Text( - text = stringResource(id = R.string.settings_open_source_licenses), - style = MaterialTheme.typography.bodyLarge, - ) - }, - leadingContent = { - Icon(imageVector = Icons.Default.Info, contentDescription = null) - }, - trailingContent = { - Icon( - imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, - contentDescription = null, - ) - }, - colors = ListItemDefaults.colors(containerColor = Color.Transparent), - modifier = Modifier.clickable(role = Role.Button) { onOpenLicenses() }, - ) - } + val formFactor = rememberFormFactor() + val layout: SettingsScreenLayout = when (formFactor) { + FormFactor.TV -> TvSettingsLayout + FormFactor.WEAR, FormFactor.AUTO, FormFactor.XR, FormFactor.MOBILE -> MobileSettingsLayout } + + layout.Content( + geminiApiKeyState = geminiApiKeyState, + onOpenLicenses = onOpenLicenses, + onNavigateToConnectedApps = onNavigateToConnectedApps, + modifier = Modifier, + ) } @Preview(showBackground = true) diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionDataTypeInput.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionDataTypeInput.kt index 8eff41a..4cd7255 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionDataTypeInput.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionDataTypeInput.kt @@ -37,7 +37,14 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight @@ -49,12 +56,15 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults +import com.example.appfunctions.agent.ui.layout.AdaptiveInputContainer import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem import androidx.compose.material3.ListItemDefaults +import androidx.compose.foundation.layout.widthIn +import androidx.compose.ui.window.Dialog import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Surface import androidx.compose.material3.OutlinedCard import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextFieldDefaults @@ -180,8 +190,7 @@ fun AppFunctionDataTypeInput( ) if (showSheet) { - ModalBottomSheet( - sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + AdaptiveInputContainer( onDismissRequest = { showSheet = false }, ) { AppFunctionObjectTypeSheetContent( @@ -227,8 +236,7 @@ fun AppFunctionDataTypeInput( ) if (showSheet) { - ModalBottomSheet( - sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true), + AdaptiveInputContainer( onDismissRequest = { showSheet = false }, ) { AppFunctionObjectTypeSheetContent( @@ -275,30 +283,14 @@ fun PrimitiveTextInput( modifier: Modifier = Modifier, keyboardOptions: KeyboardOptions = KeyboardOptions.Default, ) { - OutlinedTextField( + com.example.appfunctions.agent.ui.components.TvSurfaceTextField( value = value, onValueChange = onValueChange, - label = { - Row { - Text(label) - if (isRequired) { - Text( - text = stringResource(R.string.debugging_required_indicator), - color = MaterialTheme.colorScheme.error, - style = MaterialTheme.typography.labelSmall, - ) - } - } - }, - modifier = modifier.height(72.dp).fillMaxWidth(), - singleLine = true, + placeholder = label, + label = if (isRequired) "$label *" else label, + modifier = modifier.fillMaxWidth(), keyboardOptions = keyboardOptions, shape = MaterialTheme.shapes.medium, - colors = - OutlinedTextFieldDefaults.colors( - unfocusedBorderColor = MaterialTheme.colorScheme.outlineVariant, - focusedBorderColor = MaterialTheme.colorScheme.outlineVariant, - ), ) } diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionItem.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionItem.kt index dadf8f8..a332116 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionItem.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/AppFunctionItem.kt @@ -31,8 +31,10 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.animation.togetherWith +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -57,7 +59,9 @@ import androidx.compose.material3.Text import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha @@ -70,6 +74,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.ui.layout.isTvFormFactor import com.example.appfunctions.agent.ui.theme.GoogleSansCodeFontFamily @Composable @@ -94,12 +99,22 @@ fun AppFunctionItem( }, ) + val isTv = isTvFormFactor() + var isCardFocused by remember { mutableStateOf(false) } + Surface( - modifier = modifier.fillMaxWidth(), + modifier = modifier + .fillMaxWidth() + .onFocusChanged { isCardFocused = it.hasFocus }, tonalElevation = tonalElevation, shadowElevation = shadowElevation, shape = MaterialTheme.shapes.large, color = surfaceColor, + border = if (isTv && isCardFocused) { + BorderStroke(2.dp, MaterialTheme.colorScheme.primary) + } else { + BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant) + }, ) { Column( modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 8.dp, bottom = 16.dp), diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/DebuggingScreen.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/DebuggingScreen.kt index 1e58c4c..2158ec0 100644 --- a/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/DebuggingScreen.kt +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/screens/debugging/DebuggingScreen.kt @@ -18,20 +18,25 @@ package com.example.appfunctions.agent.ui.screens.debugging import android.app.PendingIntent import android.content.res.Resources import androidx.appfunctions.metadata.AppFunctionMetadata +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.Clear import androidx.compose.material.icons.filled.PushPin import androidx.compose.material.icons.outlined.PushPin @@ -43,7 +48,10 @@ import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedCard import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface @@ -57,19 +65,32 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.key.type import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.graphics.drawable.toBitmap -import androidx.hilt.navigation.compose.hiltViewModel +import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.example.appfunctions.agent.R import com.example.appfunctions.agent.domain.appfunction.AppInfo +import com.example.appfunctions.agent.ui.contracts.DebuggingScreenLayout +import com.example.appfunctions.agent.ui.layout.rememberFormFactor +import com.example.appfunctions.agent.ui.layout.FormFactor +import com.example.appfunctions.agent.ui.mobile.debugging.MobileDebuggingLayout import com.example.appfunctions.agent.ui.theme.AppFunctionsAgentTheme +import com.example.appfunctions.agent.ui.tv.debugging.TvDebuggingLayout @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -108,188 +129,29 @@ fun DebuggingScreenContent( onLaunchPendingIntent: (PendingIntent) -> Unit, onTogglePin: (AppInfo) -> Unit, ) { - val focusManager = LocalFocusManager.current - LaunchedEffect(Unit) { focusManager.clearFocus() } - - Scaffold( - modifier = Modifier.fillMaxSize(), - containerColor = Color.Unspecified, - topBar = { - Row( - modifier = Modifier.padding(horizontal = 8.dp, vertical = 16.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - // Searchable Dropdown - AppDropdown( - modifier = Modifier.weight(1f).padding(horizontal = 8.dp), - appGroups = uiState.filteredApps, - searchQuery = uiState.searchQuery, - onSearchQueryChanged = onSearchQueryChanged, - onAppSelected = onAppSelected, - onClearSelectedApp = onClearSelectedApp, - onTogglePin = onTogglePin, - ) - } - }, - ) { paddingValues -> - Box( - modifier = - Modifier.fillMaxSize().padding(top = paddingValues.calculateTopPadding()), - ) { - when (val searchAppResultState = uiState.searchAppResultState) { - is SearchAppResultState.Idle -> { - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center, - ) { - Text( - text = stringResource(R.string.debugging_select_app_prompt), - color = MaterialTheme.colorScheme.onSurfaceVariant, - style = MaterialTheme.typography.bodyMedium, - fontWeight = FontWeight.Medium, - ) - } - } - is SearchAppResultState.FunctionsFoundState -> { - FunctionsFoundContent( - state = searchAppResultState, - onFunctionExpandedChange = onFunctionExpandedChange, - onFunctionInputsChange = onFunctionInputsChange, - onInvoke = onInvoke, - onClearResult = onClearResult, - onLaunchPendingIntent = onLaunchPendingIntent, - ) - } - is SearchAppResultState.TroubleshootUiState -> { - TroubleshootResult( - state = searchAppResultState, - modifier = Modifier.fillMaxWidth(), - ) - } - } - } + val formFactor = rememberFormFactor() + val layout: DebuggingScreenLayout = when (formFactor) { + FormFactor.TV -> TvDebuggingLayout + FormFactor.WEAR, FormFactor.AUTO, FormFactor.XR, FormFactor.MOBILE -> MobileDebuggingLayout } -} -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun AppDropdown( - appGroups: AppsGroupState, - searchQuery: String, - onSearchQueryChanged: (String) -> Unit, - onAppSelected: (AppInfo) -> Unit, - onClearSelectedApp: () -> Unit, - onTogglePin: (AppInfo) -> Unit, - modifier: Modifier = Modifier, -) { - var expanded by remember { mutableStateOf(false) } - ExposedDropdownMenuBox( - modifier = modifier, - expanded = expanded, - onExpandedChange = { expanded = !expanded }, - ) { - Surface( - modifier = Modifier.padding(bottom = 8.dp), - shadowElevation = 2.dp, - shape = CircleShape, - color = MaterialTheme.colorScheme.surfaceBright, - ) { - OutlinedTextField( - value = searchQuery, - shape = CircleShape, - singleLine = true, - placeholder = { Text(text = stringResource(R.string.debugging_search_app)) }, - onValueChange = { - onSearchQueryChanged(it) - expanded = true - }, - trailingIcon = { - Row( - modifier = Modifier.padding(end = 4.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - if (searchQuery.isNotEmpty()) { - IconButton(onClick = { onClearSelectedApp() }) { - Icon(Icons.Filled.Clear, contentDescription = "Clear") - } - } - } - }, - colors = - ExposedDropdownMenuDefaults.outlinedTextFieldColors( - unfocusedContainerColor = MaterialTheme.colorScheme.surfaceBright, - focusedContainerColor = MaterialTheme.colorScheme.surfaceBright, - unfocusedBorderColor = Color.Transparent, - focusedBorderColor = Color.Transparent, - ), - modifier = - Modifier.fillMaxWidth() - .menuAnchor( - ExposedDropdownMenuAnchorType.Companion.PrimaryEditable, - enabled = true, - ), - ) - } - - val sections = appGroups.sections - val pinnedPackageNames = - remember(sections) { - sections - .find { it.titleRes == Resources.ID_NULL } - ?.apps - ?.map { it.packageName } - ?.toSet() ?: emptySet() - } - - LazyExposedDropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false }, - modifier = Modifier.exposedDropdownSize(), - containerColor = MaterialTheme.colorScheme.surfaceBright, - shape = RoundedCornerShape(28.dp), - ) { - sections.forEachIndexed { index, section -> - if (index > 0) { - item { - HorizontalDivider( - modifier = Modifier.padding(vertical = 8.dp, horizontal = 24.dp), - ) - } - } - - // Not showing pinned section title - if (index != 0) { - item { - Text( - text = stringResource(id = section.titleRes), - style = MaterialTheme.typography.labelLarge, - color = MaterialTheme.colorScheme.primary, - modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp), - ) - } - } - - items( - items = section.apps, - key = { app -> "${section.titleRes}_${app.packageName}" }, - ) { app -> - AppDropdownItem( - app = app, - isPinned = pinnedPackageNames.contains(app.packageName), - onAppSelected = onAppSelected, - onSearchQueryChanged = onSearchQueryChanged, - onTogglePin = onTogglePin, - onExpandedChange = { expanded = it }, - showPin = section.showPin, - ) - } - } - } - } + layout.Content( + uiState = uiState, + onSearchQueryChanged = onSearchQueryChanged, + onAppSelected = onAppSelected, + onClearSelectedApp = onClearSelectedApp, + onFunctionInputsChange = onFunctionInputsChange, + onInvoke = onInvoke, + onClearResult = onClearResult, + onFunctionExpandedChange = onFunctionExpandedChange, + onLaunchPendingIntent = onLaunchPendingIntent, + onTogglePin = onTogglePin, + modifier = Modifier, + ) } @Composable -private fun AppDropdownItem( +internal fun AppDropdownItem( app: AppInfo, isPinned: Boolean, onAppSelected: (AppInfo) -> Unit, diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvAgentDemoContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvAgentDemoContent.kt new file mode 100644 index 0000000..6fc5609 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvAgentDemoContent.kt @@ -0,0 +1,84 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.tv.agentdemo + +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import com.example.appfunctions.agent.ui.contracts.AgentDemoScreenLayout +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentDemoLoadedScreen +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentDemoLoadingScreen +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentUiEvent +import com.example.appfunctions.agent.ui.screens.agentdemo.AgentUiState + +object TvAgentDemoLayout : AgentDemoScreenLayout { + @Composable + override fun Content( + uiState: AgentUiState, + onEvent: (AgentUiEvent) -> Unit, + initialSidePanelVisible: Boolean, + modifier: Modifier, + ) { + TvAgentDemoContent( + uiState = uiState, + onEvent = onEvent, + initialSidePanelVisible = initialSidePanelVisible, + modifier = modifier, + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TvAgentDemoContent( + uiState: AgentUiState, + onEvent: (AgentUiEvent) -> Unit, + initialSidePanelVisible: Boolean = false, + modifier: Modifier = Modifier, +) { + val context = LocalContext.current + val packageManager = context.packageManager + val focusManager = LocalFocusManager.current + + val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) + val scope = rememberCoroutineScope() + + LaunchedEffect(Unit) { focusManager.clearFocus() } + + when (uiState) { + is AgentUiState.Loading -> { + AgentDemoLoadingScreen() + } + + is AgentUiState.Loaded -> { + AgentDemoLoadedScreen( + uiState = uiState, + onEvent = onEvent, + isWideScreen = true, // Force landscape dual-pane for TV D-Pad navigation + drawerState = drawerState, + scope = scope, + packageManager = packageManager, + initialSidePanelVisible = initialSidePanelVisible, + ) + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvConnectedAppsContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvConnectedAppsContent.kt new file mode 100644 index 0000000..588ffcb --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvConnectedAppsContent.kt @@ -0,0 +1,164 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.tv.agentdemo + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import coil.compose.rememberAsyncImagePainter +import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.ui.contracts.ConnectedAppsScreenLayout +import com.example.appfunctions.agent.ui.screens.agentdemo.ConnectedAppsUiState + +object TvConnectedAppsLayout : ConnectedAppsScreenLayout { + @Composable + override fun Content( + uiState: ConnectedAppsUiState, + onBack: () -> Unit, + onToggleApp: (String, Boolean) -> Unit, + modifier: Modifier, + ) { + TvConnectedAppsContent( + uiState = uiState, + onBack = onBack, + onToggleApp = onToggleApp, + modifier = modifier, + ) + } +} + +@Composable +fun TvConnectedAppsContent( + uiState: ConnectedAppsUiState, + onBack: () -> Unit, + onToggleApp: (String, Boolean) -> Unit, + modifier: Modifier = Modifier, +) { + Scaffold( + modifier = modifier.fillMaxSize(), + containerColor = Color.Unspecified, + topBar = { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp), + ) { + IconButton(onClick = onBack) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + Spacer(modifier = Modifier.width(16.dp)) + Text( + text = stringResource(id = R.string.connected_apps_title), + style = MaterialTheme.typography.headlineMedium, + ) + } + }, + ) { paddingValues -> + Column( + modifier = + Modifier.fillMaxSize().padding(paddingValues).padding(horizontal = 24.dp), + ) { + LazyColumn { + items( + items = uiState.connectedApps, + key = { app -> app.packageName }, + ) { app -> + var isRowFocused by remember { mutableStateOf(false) } + Surface( + onClick = { onToggleApp(app.packageName, !app.isConnected) }, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 4.dp) + .onFocusChanged { isRowFocused = it.isFocused }, + shape = MaterialTheme.shapes.medium, + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = if (isRowFocused) { + BorderStroke(2.dp, MaterialTheme.colorScheme.primary) + } else null, + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 12.dp), + ) { + if (app.icon != null) { + Image( + painter = rememberAsyncImagePainter(app.icon), + contentDescription = null, + modifier = Modifier.size(40.dp), + ) + } else { + Box(modifier = Modifier.size(40.dp).background(Color.Gray)) + } + Spacer(modifier = Modifier.width(16.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = app.label, + style = MaterialTheme.typography.bodyLarge, + ) + if (!app.description.isNullOrEmpty()) { + Text( + text = app.description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + Switch( + checked = app.isConnected, + onCheckedChange = null, + ) + } + } + } + } + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvSettingsContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvSettingsContent.kt new file mode 100644 index 0000000..f1a3e75 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/agentdemo/TvSettingsContent.kt @@ -0,0 +1,222 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.tv.agentdemo + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.input.TextFieldState +import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.Apps +import androidx.compose.material.icons.filled.Info +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.heading +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.dp +import com.example.appfunctions.agent.BuildConfig +import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.ui.components.TvSurfaceTextField +import com.example.appfunctions.agent.ui.contracts.SettingsScreenLayout + +object TvSettingsLayout : SettingsScreenLayout { + @Composable + override fun Content( + geminiApiKeyState: TextFieldState, + onOpenLicenses: () -> Unit, + onNavigateToConnectedApps: () -> Unit, + modifier: Modifier, + ) { + TvSettingsContent( + geminiApiKeyState = geminiApiKeyState, + onOpenLicenses = onOpenLicenses, + onNavigateToConnectedApps = onNavigateToConnectedApps, + modifier = modifier, + ) + } +} + +@Composable +fun TvSettingsContent( + geminiApiKeyState: TextFieldState, + onOpenLicenses: () -> Unit, + onNavigateToConnectedApps: () -> Unit, + modifier: Modifier = Modifier, +) { + Scaffold( + modifier = modifier.fillMaxSize(), + containerColor = Color.Unspecified, + topBar = { + Row( + modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = stringResource(id = R.string.nav_settings), + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.semantics { heading() }, + ) + } + }, + ) { paddingValues -> + Column( + modifier = + Modifier.fillMaxSize() + .padding(paddingValues) + .consumeWindowInsets(paddingValues) + .imePadding() + .verticalScroll(rememberScrollState()), + ) { + Column(modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)) { + Text( + text = stringResource(id = R.string.settings_agent), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(vertical = 8.dp).semantics { heading() }, + ) + } + Column(modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)) { + Text( + text = stringResource(id = R.string.settings_gemini_api_key), + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(bottom = 8.dp), + ) + + if (BuildConfig.IS_RETAIL) { + TvSurfaceTextField( + value = geminiApiKeyState.text.toString(), + onValueChange = {}, + placeholder = stringResource(id = R.string.settings_gemini_api_key), + modifier = Modifier.fillMaxWidth(), + ) + } else { + TvSurfaceTextField( + value = geminiApiKeyState.text.toString(), + onValueChange = { geminiApiKeyState.setTextAndPlaceCursorAtEnd(it) }, + placeholder = stringResource(id = R.string.settings_gemini_api_key), + modifier = Modifier.fillMaxWidth(), + ) + } + } + + var isAppsFocused by remember { mutableStateOf(false) } + Surface( + onClick = onNavigateToConnectedApps, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp) + .onFocusChanged { isAppsFocused = it.isFocused }, + shape = MaterialTheme.shapes.medium, + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = if (isAppsFocused) { + BorderStroke(2.dp, MaterialTheme.colorScheme.primary) + } else null, + ) { + ListItem( + headlineContent = { + Text( + text = stringResource(id = R.string.manage_connected_apps), + style = MaterialTheme.typography.bodyLarge, + ) + }, + leadingContent = { + Icon(imageVector = Icons.Default.Apps, contentDescription = null) + }, + trailingContent = { + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + ) + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent), + ) + } + + HorizontalDivider( + modifier = Modifier.padding(vertical = 8.dp, horizontal = 24.dp), + color = MaterialTheme.colorScheme.outlineVariant, + ) + + Column(modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)) { + Text( + text = stringResource(id = R.string.settings_about), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(vertical = 8.dp).semantics { heading() }, + ) + } + + var isLicensesFocused by remember { mutableStateOf(false) } + Surface( + onClick = onOpenLicenses, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp) + .onFocusChanged { isLicensesFocused = it.isFocused }, + shape = MaterialTheme.shapes.medium, + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = if (isLicensesFocused) { + BorderStroke(2.dp, MaterialTheme.colorScheme.primary) + } else null, + ) { + ListItem( + headlineContent = { + Text( + text = stringResource(id = R.string.settings_open_source_licenses), + style = MaterialTheme.typography.bodyLarge, + ) + }, + leadingContent = { + Icon(imageVector = Icons.Default.Info, contentDescription = null) + }, + trailingContent = { + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = null, + ) + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent), + ) + } + } + } +} diff --git a/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/debugging/TvDebuggingContent.kt b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/debugging/TvDebuggingContent.kt new file mode 100644 index 0000000..a61a0b2 --- /dev/null +++ b/agent/app/src/main/java/com/example/appfunctions/agent/ui/tv/debugging/TvDebuggingContent.kt @@ -0,0 +1,327 @@ +/* + * Copyright 2026 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.example.appfunctions.agent.ui.tv.debugging + +import android.app.PendingIntent +import android.content.res.Resources +import androidx.appfunctions.metadata.AppFunctionMetadata +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowDropDown +import androidx.compose.material.icons.filled.Clear +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.example.appfunctions.agent.R +import com.example.appfunctions.agent.domain.appfunction.AppInfo +import com.example.appfunctions.agent.ui.components.TvSurfaceTextField +import com.example.appfunctions.agent.ui.contracts.DebuggingScreenLayout +import com.example.appfunctions.agent.ui.screens.debugging.AppDropdownItem +import com.example.appfunctions.agent.ui.screens.debugging.AppsGroupState +import com.example.appfunctions.agent.ui.screens.debugging.DebuggingUiState +import com.example.appfunctions.agent.ui.screens.debugging.FunctionsFoundContent +import com.example.appfunctions.agent.ui.screens.debugging.SearchAppResultState +import com.example.appfunctions.agent.ui.screens.debugging.TroubleshootResult +import kotlinx.coroutines.android.awaitFrame + +object TvDebuggingLayout : DebuggingScreenLayout { + @Composable + override fun Content( + uiState: DebuggingUiState, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onFunctionInputsChange: (String, Map) -> Unit, + onInvoke: (AppFunctionMetadata) -> Unit, + onClearResult: () -> Unit, + onFunctionExpandedChange: (String, Boolean) -> Unit, + onLaunchPendingIntent: (PendingIntent) -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier, + ) { + TvDebuggingContent( + uiState = uiState, + onSearchQueryChanged = onSearchQueryChanged, + onAppSelected = onAppSelected, + onClearSelectedApp = onClearSelectedApp, + onFunctionInputsChange = onFunctionInputsChange, + onInvoke = onInvoke, + onClearResult = onClearResult, + onFunctionExpandedChange = onFunctionExpandedChange, + onLaunchPendingIntent = onLaunchPendingIntent, + onTogglePin = onTogglePin, + modifier = modifier, + ) + } +} + +@Composable +fun TvDebuggingContent( + uiState: DebuggingUiState, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onFunctionInputsChange: (String, Map) -> Unit, + onInvoke: (AppFunctionMetadata) -> Unit, + onClearResult: () -> Unit, + onFunctionExpandedChange: (String, Boolean) -> Unit, + onLaunchPendingIntent: (PendingIntent) -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier = Modifier, +) { + Scaffold( + modifier = modifier.fillMaxSize(), + containerColor = Color.Unspecified, + topBar = { + Row( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + TvAppDropdown( + modifier = Modifier.weight(1f), + appGroups = uiState.filteredApps, + searchQuery = uiState.searchQuery, + onSearchQueryChanged = onSearchQueryChanged, + onAppSelected = onAppSelected, + onClearSelectedApp = onClearSelectedApp, + onTogglePin = onTogglePin, + ) + } + }, + ) { paddingValues -> + Box( + modifier = + Modifier.fillMaxSize().padding(top = paddingValues.calculateTopPadding()), + ) { + when (val searchAppResultState = uiState.searchAppResultState) { + is SearchAppResultState.Idle -> { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + Text( + text = stringResource(R.string.debugging_select_app_prompt), + color = MaterialTheme.colorScheme.onSurfaceVariant, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + ) + } + } + is SearchAppResultState.FunctionsFoundState -> { + FunctionsFoundContent( + state = searchAppResultState, + onFunctionExpandedChange = onFunctionExpandedChange, + onFunctionInputsChange = onFunctionInputsChange, + onInvoke = onInvoke, + onClearResult = onClearResult, + onLaunchPendingIntent = onLaunchPendingIntent, + ) + } + is SearchAppResultState.TroubleshootUiState -> { + TroubleshootResult( + state = searchAppResultState, + modifier = Modifier.fillMaxWidth(), + ) + } + } + } + } +} + +@Composable +private fun TvAppDropdown( + appGroups: AppsGroupState, + searchQuery: String, + onSearchQueryChanged: (String) -> Unit, + onAppSelected: (AppInfo) -> Unit, + onClearSelectedApp: () -> Unit, + onTogglePin: (AppInfo) -> Unit, + modifier: Modifier = Modifier, +) { + var expanded by remember { mutableStateOf(false) } + val focusManager = LocalFocusManager.current + + val sections = appGroups.sections + val pinnedPackageNames = + remember(sections) { + sections + .find { it.titleRes == Resources.ID_NULL } + ?.apps + ?.map { it.packageName } + ?.toSet() ?: emptySet() + } + + val dropdownFocusRequester = remember { FocusRequester() } + + LaunchedEffect(Unit) { + awaitFrame() + dropdownFocusRequester.requestFocus() + } + + Column(modifier = modifier) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + ) { + TvSurfaceTextField( + value = searchQuery, + placeholder = stringResource(R.string.debugging_search_app), + onValueChange = onSearchQueryChanged, + trailingIcon = if (searchQuery.isNotEmpty()) { + { + IconButton(onClick = { onClearSelectedApp() }) { + Icon(Icons.Filled.Clear, contentDescription = "Clear") + } + } + } else null, + modifier = Modifier.weight(1f), + ) + + Spacer(modifier = Modifier.width(8.dp)) + + Surface( + onClick = { expanded = !expanded }, + modifier = Modifier + .focusRequester(dropdownFocusRequester) + .onPreviewKeyEvent { keyEvent -> + if (expanded && keyEvent.key == Key.Back && keyEvent.type == KeyEventType.KeyUp) { + expanded = false + true + } else false + }, + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceBright, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant), + ) { + Row( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = "Apps", + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface, + ) + Spacer(modifier = Modifier.width(4.dp)) + Icon( + imageVector = Icons.Default.ArrowDropDown, + contentDescription = "Toggle Dropdown", + ) + } + } + } + + if (expanded) { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(top = 8.dp) + .onPreviewKeyEvent { keyEvent -> + if (keyEvent.key == Key.Back && keyEvent.type == KeyEventType.KeyUp) { + expanded = false + true + } else false + }, + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceBright, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 8.dp), + ) { + LazyColumn(modifier = Modifier.padding(8.dp)) { + sections.forEachIndexed { index, section -> + if (index > 0) { + item { + HorizontalDivider( + modifier = Modifier.padding(vertical = 4.dp, horizontal = 12.dp), + ) + } + } + + if (index != 0) { + item { + Text( + text = stringResource(id = section.titleRes), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(horizontal = 16.dp, vertical = 6.dp), + ) + } + } + + items( + items = section.apps, + key = { app -> "${section.titleRes}_${app.packageName}" }, + ) { app -> + AppDropdownItem( + app = app, + isPinned = pinnedPackageNames.contains(app.packageName), + onAppSelected = { + onAppSelected(it) + expanded = false + focusManager.clearFocus() + }, + onSearchQueryChanged = onSearchQueryChanged, + onTogglePin = onTogglePin, + onExpandedChange = { expanded = it }, + showPin = section.showPin, + ) + } + } + } + } + } + } +} diff --git a/agent/app/src/main/res/drawable-xhdpi/tv_banner.png b/agent/app/src/main/res/drawable-xhdpi/tv_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..c07457435733ef253e10f354365f37c214f441bb GIT binary patch literal 918 zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{S24$*i^{HwFggSWg$nkcv5PFFX3OG6*;y zeBZ(??(%?dW``rAV!@4n(>&b{q+R}A@&6Blm+d2QhI+LG4K(yE_kjNT`~#B(3`B$n zC;GtOpWs%LJbkyQLG~l*-FMbDL<--(@idS1%&Z^B^vbmpt{pKi+ZoNcS#96O(|5UM zn11YyeHV6MO=td_qU}s+zN1INRTjO44PCN(9 OZw#KUelF{r5}E*ut3q!8 literal 0 HcmV?d00001 diff --git a/agent/app/src/main/res/drawable/ic_launcher_background.xml b/agent/app/src/main/res/drawable/ic_launcher_background.xml index 6a1535a..909c853 100644 --- a/agent/app/src/main/res/drawable/ic_launcher_background.xml +++ b/agent/app/src/main/res/drawable/ic_launcher_background.xml @@ -21,166 +21,11 @@ android:viewportWidth="108" android:viewportHeight="108"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:strokeColor="#3300E5FF" /> diff --git a/agent/app/src/main/res/drawable/ic_launcher_foreground.xml b/agent/app/src/main/res/drawable/ic_launcher_foreground.xml index 2aaf647..46770fb 100644 --- a/agent/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/agent/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,3 +1,4 @@ + - - - - - - - - + + android:fillColor="#00E5FF" + android:pathData="M54,24 A30,30 0 1,0 54,84 A30,30 0 1,0 54,24 Z" + android:fillAlpha="0.15" /> + + + + + + \ No newline at end of file diff --git a/agent/app/src/main/res/drawable/tv_banner.png b/agent/app/src/main/res/drawable/tv_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..c07457435733ef253e10f354365f37c214f441bb GIT binary patch literal 918 zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yow{S24$*i^{HwFggSWg$nkcv5PFFX3OG6*;y zeBZ(??(%?dW``rAV!@4n(>&b{q+R}A@&6Blm+d2QhI+LG4K(yE_kjNT`~#B(3`B$n zC;GtOpWs%LJbkyQLG~l*-FMbDL<--(@idS1%&Z^B^vbmpt{pKi+ZoNcS#96O(|5UM zn11YyeHV6MO=td_qU}s+zN1INRTjO44PCN(9 OZw#KUelF{r5}E*ut3q!8 literal 0 HcmV?d00001 diff --git a/agent/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/agent/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/agent/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/agent/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/agent/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/agent/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/agent/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/agent/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/agent/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/agent/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s