Skip to content

Commit

Permalink
Add missing scroll bar to remaining screens (#3895)
Browse files Browse the repository at this point in the history 
* Add missing scroll bar to remaining screens

* Add Scaffold to ThemeLazyColumn

* Remove unneeded variable

* Remove nested scaffold
  • Loading branch information
@dshokouhi
dshokouhi authored Sep 29, 2023
1 parent 2f777a1 commit a15f7b3
Show file tree
Hide file tree
Showing 15 changed files with 973 additions and 1,158 deletions.
161 changes: 74 additions & 87 deletions wear/src/main/java/io/homeassistant/companion/android/conversation/views/ConversationView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.Chip
import androidx.wear.compose.material.ChipDefaults
import androidx.wear.compose.material.LocalContentColor
import androidx.wear.compose.material.PositionIndicator
import androidx.wear.compose.material.Scaffold
import androidx.wear.compose.material.Text
import androidx.wear.compose.navigation.SwipeDismissableNavHost
import androidx.wear.compose.navigation.composable
Expand All @@ -55,7 +53,6 @@ import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.assist.AssistViewModelBase
import io.homeassistant.companion.android.common.data.websocket.impl.entities.AssistPipelineResponse
import io.homeassistant.companion.android.conversation.ConversationViewModel
import io.homeassistant.companion.android.home.views.TimeText
import io.homeassistant.companion.android.theme.WearAppTheme
import io.homeassistant.companion.android.util.KeepScreenOn
import io.homeassistant.companion.android.views.ListHeader
Expand Down Expand Up @@ -117,103 +114,93 @@ fun ConversationResultView(
onMicrophoneInput: () -> Unit
) {
val scrollState = rememberScalingLazyListState()

Scaffold(
positionIndicator = {
if (scrollState.isScrollInProgress) {
PositionIndicator(scalingLazyListState = scrollState)
LaunchedEffect(conversation.size) {
scrollState.scrollToItem(
if (inputMode != AssistViewModelBase.AssistInputMode.BLOCKED) conversation.size else (conversation.size - 1)
)
}
if (hapticFeedback) {
val haptic = LocalHapticFeedback.current
LaunchedEffect("${conversation.size}.${conversation.lastOrNull()?.message?.length}") {
val message = conversation.lastOrNull() ?: return@LaunchedEffect
if (conversation.size > 1 && !message.isInput && message.message != "…") {
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
}
},
timeText = { TimeText(scalingLazyListState = scrollState) }
) {
LaunchedEffect(conversation.size) {
scrollState.scrollToItem(
if (inputMode != AssistViewModelBase.AssistInputMode.BLOCKED) conversation.size else (conversation.size - 1)
)
}
if (hapticFeedback) {
val haptic = LocalHapticFeedback.current
LaunchedEffect("${conversation.size}.${conversation.lastOrNull()?.message?.length}") {
val message = conversation.lastOrNull() ?: return@LaunchedEffect
if (conversation.size > 1 && !message.isInput && message.message != "…") {
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
}

ThemeLazyColumn(state = scrollState) {
item {
if (currentPipeline != null) {
val textColor = LocalContentColor.current.copy(alpha = 0.38f) // disabled/hint alpha
Row(
modifier = Modifier
.clickable(
onClick = { onChangePipeline() },
onClickLabel = stringResource(R.string.assist_change_pipeline)
)
.padding(bottom = 4.dp)
) {
Text(
text = currentPipeline.name,
fontSize = 11.sp,
color = textColor
)
Image(
asset = CommunityMaterial.Icon.cmd_chevron_right,
modifier = Modifier
.size(16.dp)
.padding(start = 4.dp),
colorFilter = ColorFilter.tint(textColor)
)
}
} else {
Spacer(modifier = Modifier.height(16.dp))
}
}

ThemeLazyColumn(state = scrollState) {
items(conversation) {
SpeechBubble(text = it.message, isResponse = !it.isInput)
}
if (inputMode != AssistViewModelBase.AssistInputMode.BLOCKED) {
item {
if (currentPipeline != null) {
val textColor = LocalContentColor.current.copy(alpha = 0.38f) // disabled/hint alpha
Row(
modifier = Modifier
.clickable(
onClick = { onChangePipeline() },
onClickLabel = stringResource(R.string.assist_change_pipeline)
Box(
modifier = Modifier.size(64.dp),
contentAlignment = Alignment.Center
) {
val inputIsActive = inputMode == AssistViewModelBase.AssistInputMode.VOICE_ACTIVE
if (inputIsActive) {
KeepScreenOn()
val transition = rememberInfiniteTransition()
val scale by transition.animateFloat(
initialValue = 1f,
targetValue = 1.2f,
animationSpec = infiniteRepeatable(
animation = tween(600, easing = LinearEasing),
repeatMode = RepeatMode.Reverse
)
.padding(bottom = 4.dp)
) {
Text(
text = currentPipeline.name,
fontSize = 11.sp,
color = textColor
)
Image(
asset = CommunityMaterial.Icon.cmd_chevron_right,
Box(
modifier = Modifier
.size(16.dp)
.padding(start = 4.dp),
colorFilter = ColorFilter.tint(textColor)
.size(48.dp)
.scale(scale)
.background(color = colorResource(R.color.colorSpeechText), shape = CircleShape)
.clip(CircleShape)
)
}
} else {
Spacer(modifier = Modifier.height(16.dp))
}
}
items(conversation) {
SpeechBubble(text = it.message, isResponse = !it.isInput)
}
if (inputMode != AssistViewModelBase.AssistInputMode.BLOCKED) {
item {
Box(
modifier = Modifier.size(64.dp),
contentAlignment = Alignment.Center
) {
val inputIsActive = inputMode == AssistViewModelBase.AssistInputMode.VOICE_ACTIVE
Button(
onClick = { onMicrophoneInput() },
colors =
if (inputIsActive) {
KeepScreenOn()
val transition = rememberInfiniteTransition()
val scale by transition.animateFloat(
initialValue = 1f,
targetValue = 1.2f,
animationSpec = infiniteRepeatable(
animation = tween(600, easing = LinearEasing),
repeatMode = RepeatMode.Reverse
)
)
Box(
modifier = Modifier
.size(48.dp)
.scale(scale)
.background(color = colorResource(R.color.colorSpeechText), shape = CircleShape)
.clip(CircleShape)
)
}
Button(
onClick = { onMicrophoneInput() },
colors =
if (inputIsActive) {
ButtonDefaults.secondaryButtonColors(backgroundColor = Color.Transparent, contentColor = Color.Black)
} else {
ButtonDefaults.secondaryButtonColors()
}
) {
Image(
asset = CommunityMaterial.Icon3.cmd_microphone,
contentDescription = stringResource(R.string.assist_start_listening),
colorFilter = ColorFilter.tint(LocalContentColor.current)
)
ButtonDefaults.secondaryButtonColors(backgroundColor = Color.Transparent, contentColor = Color.Black)
} else {
ButtonDefaults.secondaryButtonColors()
}
) {
Image(
asset = CommunityMaterial.Icon3.cmd_microphone,
contentDescription = stringResource(R.string.assist_start_listening),
colorFilter = ColorFilter.tint(LocalContentColor.current)
)
}
}
}
Expand Down
Loading

0 comments on commit a15f7b3

Please sign in to comment.