From 00f1f2f6da77f77341bd961cc4d6b1d312ee811b Mon Sep 17 00:00:00 2001 From: ShiftHackZ Date: Thu, 19 Nov 2026 16:41:10 +0200 Subject: [PATCH 1/2] Match backup category cards to theme styling --- .../backup/component/BackupSelectionList.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt b/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt index df0da8cdb..ef957a3e1 100644 --- a/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt +++ b/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt @@ -15,10 +15,12 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.triStateToggleable import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ExpandLess import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults import androidx.compose.material3.Checkbox import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -60,7 +62,14 @@ internal fun BackupSelectionList( val hasSomeProviders = category == BackupCategory.PROVIDERS && state.selection.providers.isNotEmpty() val hasAllProviders = state.selection.providers.containsAll(state.inspection.providers) - Card(Modifier.fillMaxWidth()) { + Card( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(16.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceTint.copy(alpha = 0.8f), + contentColor = MaterialTheme.colorScheme.onSurface + ) + ) { Row( Modifier.fillMaxWidth().then( if (category == BackupCategory.PROVIDERS) Modifier.triStateToggleable( From 8fcb30e69c5e624739ff5a6383e7db0fadcbdb06 Mon Sep 17 00:00:00 2001 From: ShiftHackZ Date: Thu, 19 Nov 2026 16:50:25 +0200 Subject: [PATCH 2/2] Split backup header actions with shared press feedback --- .../backup/component/BackupCategoryHeader.kt | 135 ++++++++++++++++++ .../backup/component/BackupSelectionList.kt | 84 +++-------- 2 files changed, 154 insertions(+), 65 deletions(-) create mode 100644 presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupCategoryHeader.kt diff --git a/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupCategoryHeader.kt b/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupCategoryHeader.kt new file mode 100644 index 000000000..3a904ccfd --- /dev/null +++ b/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupCategoryHeader.kt @@ -0,0 +1,135 @@ +package com.shifthackz.aisdv1.presentation.backup.component + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.indication +import androidx.compose.foundation.interaction.MutableInteractionSource +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.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.selection.triStateToggleable +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ExpandLess +import androidx.compose.material.icons.filled.ExpandMore +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TriStateCheckbox +import androidx.compose.material3.ripple +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.AbsoluteAlignment +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.state.ToggleableState +import androidx.compose.ui.unit.dp +import com.shifthackz.aisdv1.core.localization.Localization + +/** + * Shows category metadata without constraining its text to the header's touch regions. + * Expandable headers reserve the physical left half for selection and the right half for disclosure; + * other headers use their entire width for selection. Both regions expose separate accessible actions. + * Their shared indication covers the full header, including hover and held presses. + * @param title Localized category name announced with its selection control. + * @param subtitle Localized inventory count or availability message. + * @param selectionState Current category selection, including partial provider selection. + * @param isSelectionEnabled Whether changing this category is currently permitted. + * @param onToggleSelection Requests a category selection change. + * @param modifier Placement of the complete header. + * @param isExpanded Whether the nested provider choices are visible. + * @param isExpansionEnabled Whether disclosure can change during the current operation. + * @param onToggleExpanded Optional disclosure action; its presence enables the split touch regions. + * @author Dmitriy Moroz + */ +@Composable +internal fun BackupCategoryHeader( + title: String, + subtitle: String, + selectionState: ToggleableState, + isSelectionEnabled: Boolean, + onToggleSelection: () -> Unit, + modifier: Modifier = Modifier, + isExpanded: Boolean = false, + isExpansionEnabled: Boolean = true, + onToggleExpanded: (() -> Unit)? = null, +) { + val interactionSource = remember { MutableInteractionSource() } + Box( + modifier.fillMaxWidth() + .clipToBounds() + .indication(interactionSource, ripple(bounded = false)) + ) { + Row( + modifier = Modifier.fillMaxWidth() + .clearAndSetSemantics { } + .padding(horizontal = 16.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + TriStateCheckbox( + state = selectionState, + onClick = null, + enabled = isSelectionEnabled, + ) + Spacer(Modifier.size(12.dp)) + Column(Modifier.weight(1f)) { + Text(title, style = MaterialTheme.typography.titleMedium) + Text( + subtitle, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + if (onToggleExpanded != null) { + Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) { + Icon( + imageVector = if (isExpanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore, + contentDescription = null, + tint = if (isExpansionEnabled) MaterialTheme.colorScheme.onSurface else + MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f), + ) + } + } + } + Box(Modifier.matchParentSize()) { + Box( + Modifier.align(AbsoluteAlignment.CenterLeft) + .fillMaxHeight() + .fillMaxWidth(if (onToggleExpanded != null) 0.5f else 1f) + .triStateToggleable( + state = selectionState, + interactionSource = interactionSource, + indication = null, + enabled = isSelectionEnabled, + role = Role.Checkbox, + onClick = onToggleSelection, + ) + .semantics { contentDescription = "$title, $subtitle" }, + ) + onToggleExpanded?.let { toggleExpanded -> + val expansionLabel = Localization.string("backup_provider_choices") + Box( + Modifier.align(AbsoluteAlignment.CenterRight) + .fillMaxHeight() + .fillMaxWidth(0.5f) + .clickable( + interactionSource = interactionSource, + indication = null, + enabled = isExpansionEnabled, + role = Role.Button, + onClick = toggleExpanded, + ) + .semantics { contentDescription = expansionLabel }, + ) + } + } + } +} diff --git a/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt b/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt index ef957a3e1..10fa37924 100644 --- a/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt +++ b/presentation/backup/src/commonMain/kotlin/com/shifthackz/aisdv1/presentation/backup/component/BackupSelectionList.kt @@ -13,20 +13,13 @@ 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.selection.triStateToggleable import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ExpandLess -import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.Checkbox -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TriStateCheckbox import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -70,64 +63,25 @@ internal fun BackupSelectionList( contentColor = MaterialTheme.colorScheme.onSurface ) ) { - Row( - Modifier.fillMaxWidth().then( - if (category == BackupCategory.PROVIDERS) Modifier.triStateToggleable( - state = when { - hasSomeProviders && !hasAllProviders -> ToggleableState.Indeterminate - isSelected -> ToggleableState.On - else -> ToggleableState.Off - }, - enabled = isEnabled && entry.isAvailable, - role = Role.Checkbox, - onClick = { processIntent(BackupIntent.ToggleCategory(category)) }, - ) else Modifier.toggleable( - value = isSelected, - enabled = isEnabled && entry.isAvailable, - role = Role.Checkbox, - onValueChange = { processIntent(BackupIntent.ToggleCategory(category)) }, - ) - ).padding(horizontal = 16.dp, vertical = 12.dp), - verticalAlignment = Alignment.CenterVertically - ) { - if (category == BackupCategory.PROVIDERS) { - TriStateCheckbox( - state = when { - hasSomeProviders && !hasAllProviders -> ToggleableState.Indeterminate - isSelected -> ToggleableState.On - else -> ToggleableState.Off - }, onClick = null, enabled = isEnabled && entry.isAvailable - ) - } else Checkbox( - checked = isSelected, - onCheckedChange = null, - enabled = isEnabled && entry.isAvailable - ) - Spacer(Modifier.size(12.dp)) - Column(Modifier.weight(1f)) { - Text( - Localization.string("backup_category_" + category.key), - style = MaterialTheme.typography.titleMedium - ) - Text( - if (entry.isAvailable) Localization.string( - "backup_items", - entry.itemCount - ) else Localization.string("backup_unavailable"), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) - } - if (category == BackupCategory.PROVIDERS && state.inspection.providers.isNotEmpty()) IconButton( - onClick = { processIntent(BackupIntent.ToggleProvidersExpanded) }, - enabled = isEnabled - ) { - Icon( - if (state.areProvidersExpanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore, - Localization.string("backup_provider_choices") - ) - } - } + BackupCategoryHeader( + title = Localization.string("backup_category_" + category.key), + subtitle = if (entry.isAvailable) Localization.string( + "backup_items", + entry.itemCount + ) else Localization.string("backup_unavailable"), + selectionState = when { + hasSomeProviders && !hasAllProviders -> ToggleableState.Indeterminate + isSelected -> ToggleableState.On + else -> ToggleableState.Off + }, + isSelectionEnabled = isEnabled && entry.isAvailable, + onToggleSelection = { processIntent(BackupIntent.ToggleCategory(category)) }, + isExpanded = state.areProvidersExpanded, + isExpansionEnabled = isEnabled, + onToggleExpanded = if (category == BackupCategory.PROVIDERS && state.inspection.providers.isNotEmpty()) { + { processIntent(BackupIntent.ToggleProvidersExpanded) } + } else null, + ) if (category == BackupCategory.PROVIDERS) { AnimatedVisibility( visible = state.areProvidersExpanded,