feat(ui): redesign history prune button and compact search bar (#702)
This commit is contained in:
2 files changed
+63
-25
No files matched your search
@@ -1,17 +1,21 @@
|
|||||||
package com.m57.hermescontrol.ui.common
|
package com.m57.hermescontrol.ui.common
|
||||||
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.lazy.LazyRow
|
import androidx.compose.foundation.lazy.LazyRow
|
||||||
import androidx.compose.foundation.lazy.items
|
import androidx.compose.foundation.lazy.items
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.foundation.text.BasicTextField
|
||||||
|
import androidx.compose.foundation.text.KeyboardOptions
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Close
|
import androidx.compose.material.icons.filled.Close
|
||||||
import androidx.compose.material.icons.filled.Search
|
import androidx.compose.material.icons.filled.Search
|
||||||
@@ -21,7 +25,6 @@ import androidx.compose.material3.FilterChip
|
|||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.Switch
|
import androidx.compose.material3.Switch
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
@@ -34,6 +37,7 @@ import androidx.compose.ui.graphics.Color
|
|||||||
import androidx.compose.ui.graphics.vector.ImageVector
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.text.input.ImeAction
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import com.m57.hermescontrol.R
|
import com.m57.hermescontrol.R
|
||||||
import com.m57.hermescontrol.theme.LocalHermesStatusColors
|
import com.m57.hermescontrol.theme.LocalHermesStatusColors
|
||||||
@@ -201,30 +205,60 @@ fun SearchBar(
|
|||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
placeholder: String = "Search…",
|
placeholder: String = "Search…",
|
||||||
) {
|
) {
|
||||||
OutlinedTextField(
|
val textColor = MaterialTheme.colorScheme.onSurface
|
||||||
|
BasicTextField(
|
||||||
value = query,
|
value = query,
|
||||||
onValueChange = onQueryChange,
|
onValueChange = onQueryChange,
|
||||||
modifier = modifier.fillMaxWidth(),
|
modifier =
|
||||||
placeholder = { Text(placeholder) },
|
modifier
|
||||||
leadingIcon = {
|
.fillMaxWidth()
|
||||||
Icon(
|
.height(40.dp)
|
||||||
imageVector = Icons.Filled.Search,
|
.background(
|
||||||
contentDescription = null,
|
color = MaterialTheme.colorScheme.surfaceContainer,
|
||||||
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
shape = RoundedCornerShape(12.dp),
|
||||||
)
|
).border(
|
||||||
},
|
width = 1.dp,
|
||||||
trailingIcon = {
|
color = MaterialTheme.colorScheme.outline.copy(alpha = 0.3f),
|
||||||
if (query.isNotEmpty()) {
|
shape = RoundedCornerShape(12.dp),
|
||||||
IconButton(onClick = { onQueryChange("") }) {
|
).padding(horizontal = 12.dp),
|
||||||
Icon(
|
singleLine = true,
|
||||||
imageVector = Icons.Filled.Close,
|
textStyle = MaterialTheme.typography.bodyMedium.copy(color = textColor),
|
||||||
contentDescription = stringResource(R.string.content_desc_clear_search),
|
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
|
||||||
)
|
decorationBox = { innerTextField ->
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Filled.Search,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
modifier = Modifier.size(18.dp),
|
||||||
|
)
|
||||||
|
Box(modifier = Modifier.weight(1f)) {
|
||||||
|
if (query.isEmpty()) {
|
||||||
|
Text(
|
||||||
|
text = placeholder,
|
||||||
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
innerTextField()
|
||||||
|
}
|
||||||
|
if (query.isNotEmpty()) {
|
||||||
|
IconButton(
|
||||||
|
onClick = { onQueryChange("") },
|
||||||
|
modifier = Modifier.size(20.dp),
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Filled.Close,
|
||||||
|
contentDescription = stringResource(R.string.content_desc_clear_search),
|
||||||
|
modifier = Modifier.size(16.dp),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
singleLine = true,
|
|
||||||
shape = RoundedCornerShape(12.dp),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,9 +14,11 @@ import androidx.compose.foundation.layout.Box
|
|||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
import androidx.compose.foundation.layout.ExperimentalLayoutApi
|
||||||
import androidx.compose.foundation.layout.FlowRow
|
import androidx.compose.foundation.layout.FlowRow
|
||||||
|
import androidx.compose.foundation.layout.IntrinsicSize
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
@@ -607,6 +609,7 @@ fun SessionsScreen(
|
|||||||
modifier =
|
modifier =
|
||||||
Modifier
|
Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
|
.height(IntrinsicSize.Max)
|
||||||
.padding(horizontal = spacing.md, vertical = spacing.sm),
|
.padding(horizontal = spacing.md, vertical = spacing.sm),
|
||||||
horizontalArrangement = Arrangement.spacedBy(spacing.sm),
|
horizontalArrangement = Arrangement.spacedBy(spacing.sm),
|
||||||
) {
|
) {
|
||||||
@@ -614,18 +617,18 @@ fun SessionsScreen(
|
|||||||
label = stringResource(R.string.sessions_stat_total),
|
label = stringResource(R.string.sessions_stat_total),
|
||||||
value = if (state.isLoadingStats) "…" else state.stats.total.toString(),
|
value = if (state.isLoadingStats) "…" else state.stats.total.toString(),
|
||||||
icon = Icons.Filled.History,
|
icon = Icons.Filled.History,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f).fillMaxHeight(),
|
||||||
)
|
)
|
||||||
StatCard(
|
StatCard(
|
||||||
label = stringResource(R.string.sessions_stat_active),
|
label = stringResource(R.string.sessions_stat_active),
|
||||||
value = if (state.isLoadingStats) "…" else state.stats.active.toString(),
|
value = if (state.isLoadingStats) "…" else state.stats.active.toString(),
|
||||||
icon = Icons.Filled.CheckCircle,
|
icon = Icons.Filled.CheckCircle,
|
||||||
accentColor = statusColors.success,
|
accentColor = statusColors.success,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f).fillMaxHeight(),
|
||||||
)
|
)
|
||||||
// Prune button card
|
// Prune button card
|
||||||
Card(
|
Card(
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f).fillMaxHeight(),
|
||||||
colors =
|
colors =
|
||||||
CardDefaults.cardColors(
|
CardDefaults.cardColors(
|
||||||
containerColor = MaterialTheme.colorScheme.surfaceContainer,
|
containerColor = MaterialTheme.colorScheme.surfaceContainer,
|
||||||
@@ -633,7 +636,7 @@ fun SessionsScreen(
|
|||||||
onClick = { viewModel.showPruneDialog() },
|
onClick = { viewModel.showPruneDialog() },
|
||||||
) {
|
) {
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier.padding(spacing.md),
|
modifier = Modifier.fillMaxSize().padding(spacing.md),
|
||||||
contentAlignment = Alignment.Center,
|
contentAlignment = Alignment.Center,
|
||||||
) {
|
) {
|
||||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
@@ -646,8 +649,9 @@ fun SessionsScreen(
|
|||||||
Spacer(modifier = Modifier.height(spacing.xs))
|
Spacer(modifier = Modifier.height(spacing.xs))
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(R.string.sessions_action_prune),
|
text = stringResource(R.string.sessions_action_prune),
|
||||||
style = MaterialTheme.typography.labelSmall,
|
style = MaterialTheme.typography.labelMedium,
|
||||||
color = statusColors.warning,
|
color = statusColors.warning,
|
||||||
|
fontWeight = FontWeight.SemiBold,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user