diff --git a/android/core/design/src/debug/kotlin/se/hagstedt/kvitt/design/catalogue/Catalogue.kt b/android/core/design/src/debug/kotlin/se/hagstedt/kvitt/design/catalogue/Catalogue.kt index e67bd52..9c320ea 100644 --- a/android/core/design/src/debug/kotlin/se/hagstedt/kvitt/design/catalogue/Catalogue.kt +++ b/android/core/design/src/debug/kotlin/se/hagstedt/kvitt/design/catalogue/Catalogue.kt @@ -30,7 +30,6 @@ import se.hagstedt.kvitt.design.chart.StackedBarChart import se.hagstedt.kvitt.design.chart.TotalCard import se.hagstedt.kvitt.design.component.AccountBalanceHeader import se.hagstedt.kvitt.design.component.AccountCard -import se.hagstedt.kvitt.design.component.AccountChip import se.hagstedt.kvitt.design.component.AccountChoice import se.hagstedt.kvitt.design.component.AccountHeaderWords import se.hagstedt.kvitt.design.component.AccountPicker @@ -91,7 +90,6 @@ import se.hagstedt.kvitt.design.component.MoneyText import se.hagstedt.kvitt.design.component.NeedsConnectionBanner import se.hagstedt.kvitt.design.component.NeedsConnectionHint import se.hagstedt.kvitt.design.component.NotesField -import se.hagstedt.kvitt.design.component.PayerChip import se.hagstedt.kvitt.design.component.PersonAvatar import se.hagstedt.kvitt.design.component.ProvideHousehold import se.hagstedt.kvitt.design.component.RatioEditor @@ -102,7 +100,6 @@ import se.hagstedt.kvitt.design.component.SegmentedGroup import se.hagstedt.kvitt.design.component.SettingsRow import se.hagstedt.kvitt.design.component.Skeleton import se.hagstedt.kvitt.design.component.SplitBar -import se.hagstedt.kvitt.design.component.SplitChip import se.hagstedt.kvitt.design.component.SplitPreview import se.hagstedt.kvitt.design.component.SplitSection import se.hagstedt.kvitt.design.component.SplitSlider @@ -346,17 +343,11 @@ fun CategoryGridSheetContent() { @Composable fun ChipsSheet() { + // The date chip of S-9 (D-102 replaced the S-7 chips with option rows). EditorChipRow { - AccountChip("Vardag", 0, {}) DateChip("2026-10-17", {}) - PayerChip(Samples.jacob, Samples.anna, {}) - SplitChip(defaultModeLabel(viewerPercentOf(Samples.vardag.defaultShares, Samples.jacob.id)), open = false, onClick = {}) - } - EditorChipRow { DateChip("2026-10-16", {}) DateChip("2026-10-14", {}) - PayerChip(Samples.anna, Samples.jacob, {}) - SplitChip(w("Exakta belopp", "Exact amounts"), open = true, onClick = {}) } } diff --git a/android/core/design/src/main/kotlin/se/hagstedt/kvitt/design/component/Editor.kt b/android/core/design/src/main/kotlin/se/hagstedt/kvitt/design/component/Editor.kt index ba20db7..deea8e2 100644 --- a/android/core/design/src/main/kotlin/se/hagstedt/kvitt/design/component/Editor.kt +++ b/android/core/design/src/main/kotlin/se/hagstedt/kvitt/design/component/Editor.kt @@ -417,14 +417,6 @@ fun EditorChipRow(modifier: Modifier = Modifier, content: @Composable () -> Unit FlowRow(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(KvittDimens.chipGap)) { content() } } -/** - * The account chip: a 12 dp dot in the account's chart colour, its name, `expand_more`; TalkBack "Konto: Vardag". - */ -@Composable -fun AccountChip(name: String, colorIndex: Int, onClick: () -> Unit, modifier: Modifier = Modifier) { - EditorChip(name, stringResource(R.string.editor_account_spoken, name), onClick, modifier, leading = { AccountDot(colorIndex) }) -} - /** The date chip: `event`, "Idag" / "Igår" / "14 okt."; TalkBack "Datum: idag". */ @Composable fun DateChip(isoDate: String, onClick: () -> Unit, modifier: Modifier = Modifier, keyPrefix: String? = null) { @@ -439,37 +431,6 @@ fun DateChip(isoDate: String, onClick: () -> Unit, modifier: Modifier = Modifier ) } -/** The payer chip: payer avatar 24, "Betalt av Du", `swap_horiz`; one tap toggles (AC-8.3). */ -@Composable -fun PayerChip(payer: User, other: User, onToggle: () -> Unit, modifier: Modifier = Modifier) { - val prefix = stringResource(R.string.editor_paid_by) + " " - EditorChip( - personName(payer), - stringResource(R.string.editor_paid_by_toggle, personNameInSentence(payer), personNameInSentence(other)), - onToggle, - modifier, - keyPrefix = prefix, - trailing = KvittIcon.SwapHoriz, - leading = { PersonAvatar(payer, KvittDimens.avatarChip) }, - ) -} - -/** The split chip: `call_split`, "Delning ", expand_more / expand_less; selected while the section is open. */ -@Composable -fun SplitChip(modeLabel: String, open: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) { - val prefix = stringResource(R.string.editor_split) - EditorChip( - modeLabel, - "$prefix: ${modeLabel.replaceFirstChar { it.lowercaseChar() }}", - onClick, - modifier, - keyPrefix = "$prefix ", - selected = open, - trailing = if (open) KvittIcon.ExpandLess else KvittIcon.ExpandMore, - leading = { KvittIconImage(KvittIcon.CallSplit, null, size = KvittDimens.iconChip) }, - ) -} - /** "Idag" / "Igår" / "14 okt." (§9.8 list format) for the date chip and the date option row. */ @Composable private fun relativeDate(isoDate: String): String {