Skip to content

Use Material3 for Assist conversation #7281

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
TimoPtr wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use Material3 for Assist conversation #7281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d58bf5
Use Material3 for Assist conversation
TimoPtr Jul 31, 2026
38bd61f
Apply suggestions from Joris
TimoPtr Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/src/main/kotlin/io/homeassistant/companion/android/assist/AssistActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,22 @@ import android.view.WindowManager
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.core.content.ContextCompat
import androidx.core.content.getSystemService
import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.lifecycle.withCreationCallback
import io.homeassistant.companion.android.BaseActivity
import io.homeassistant.companion.android.assist.service.AssistVoiceInteractionService
import io.homeassistant.companion.android.assist.ui.AssistSheetView
import io.homeassistant.companion.android.assist.ui.AssistSheet
import io.homeassistant.companion.android.common.assist.AssistViewModelBase
import io.homeassistant.companion.android.common.compose.theme.HATheme
import io.homeassistant.companion.android.common.data.servers.ServerManager
import io.homeassistant.companion.android.common.util.SdkVersion
import io.homeassistant.companion.android.frontend.navigation.FrontendTarget
import io.homeassistant.companion.android.launch.LaunchActivity
import io.homeassistant.companion.android.launch.intentLaunchWithNavigateTo
import io.homeassistant.companion.android.util.compose.HomeAssistantAppTheme
import javax.inject.Inject
import kotlinx.coroutines.launch

Expand Down Expand Up @@ -78,6 +79,7 @@ class AssistActivity : BaseActivity() {
ActivityResultContracts.RequestPermission(),
) { viewModel.onPermissionResult(it) }

@OptIn(ExperimentalMaterial3Api::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
updateShowWhenLocked()
Expand Down Expand Up @@ -126,8 +128,8 @@ class AssistActivity : BaseActivity() {
return@setContent
}

HomeAssistantAppTheme {
AssistSheetView(
HATheme {
AssistSheet(
conversation = viewModel.conversation,
pipelines = viewModel.pipelines,
inputMode = viewModel.inputMode,
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/kotlin/io/homeassistant/companion/android/assist/AssistViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package io.homeassistant.companion.android.assist
import android.app.Application
import android.content.Intent
import androidx.annotation.VisibleForTesting
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
Expand Down Expand Up @@ -67,7 +68,14 @@ class AssistViewModel @AssistedInject constructor(
private val startMessage =
AssistMessage(application.getString(commonR.string.assist_how_can_i_assist), isInput = false)
private val _conversation = mutableStateListOf(startMessage)
val conversation: List<AssistMessage> = _conversation

/**
* Conversation messages to display. The input placeholder marking an active voice recording is
* hidden: listening is already conveyed by the microphone button animation.
*/
val conversation: List<AssistMessage> by derivedStateOf {
_conversation.filterNot { it.isInput && it.isPlaceholder }
}

private val _pipelines = mutableStateListOf<AssistUiPipeline>()
val pipelines: List<AssistUiPipeline> = _pipelines
Expand Down
Loading
Loading