mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only show not supported error after support check is complete and design tweaks (#3270)

Browse source 
* Only show not supported error after support check is complete

* Minor design tweaks
This commit is contained in:
Daniel Shokouhi 2023-01-26 15:01:06 -08:00 committed by GitHub
parent 65692af585
commit 00588d0270
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wear/src/main/java/io/homeassistant/companion/android/conversation/ConversationViewModel.kt
View file

@ -36,6 +36,9 @@ class ConversationViewModel @Inject constructor(
var isRegistered by mutableStateOf(false)
private set
var checkSupportProgress by mutableStateOf(true)
private set
fun getConversation() {
viewModelScope.launch {
conversationResult = integrationUseCase.getConversation(speechResult) ?: ""
@ -43,11 +46,13 @@ class ConversationViewModel @Inject constructor(
}
suspend fun isSupportConversation() {
checkSupportProgress = true
isRegistered = integrationUseCase.isRegistered()
supportsConversation =
integrationUseCase.isHomeAssistantVersionAtLeast(2023, 1, 0) &&
webSocketRepository.getConfig()?.components?.contains("conversation") == true
isHapticEnabled.value = wearPrefsRepository.getWearHapticFeedback()
checkSupportProgress = false
}
fun updateSpeechResult(result: String) {

17
wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt
View file

@ -52,18 +52,19 @@ fun ConversationResultView(
) {
item {
Column {
Spacer(Modifier.padding(24.dp))
Spacer(Modifier.padding(12.dp))
SpeechBubble(
text = conversationViewModel.speechResult.ifEmpty {
when {
(conversationViewModel.supportsConversation) -> stringResource(R.string.no_results)
(!conversationViewModel.supportsConversation && !conversationViewModel.checkSupportProgress) -> stringResource(R.string.no_conversation_support)
(!conversationViewModel.isRegistered) -> stringResource(R.string.not_registered)
else -> stringResource(R.string.no_conversation_support)
else -> "..."
}
},
false
)
Spacer(Modifier.padding(8.dp))
Spacer(Modifier.padding(4.dp))
}
}
if (conversationViewModel.conversationResult.isNotEmpty())
@ -105,10 +106,10 @@ fun SpeechBubble(text: String, isResponse: Boolean) {
else
colorResource(R.color.colorSpeechText),
AbsoluteRoundedCornerShape(
topLeftPercent = 40,
topRightPercent = 40,
bottomLeftPercent = if (isResponse) 0 else 40,
bottomRightPercent = if (isResponse) 40 else 0
topLeftPercent = 30,
topRightPercent = 30,
bottomLeftPercent = if (isResponse) 0 else 30,
bottomRightPercent = if (isResponse) 30 else 0
)
)
.padding(4.dp)
@ -120,7 +121,7 @@ fun SpeechBubble(text: String, isResponse: Boolean) {
else
Color.Black,
modifier = Modifier
.padding(4.dp)
.padding(2.dp)
)
}
}