From d8acd0f2ded21a7027c720b176d8023692eac872 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 18:45:40 -0800 Subject: [PATCH 01/17] Update InputComponents.kt Adds a quad button block for 2025. --- .../app/components/InputComponents.kt | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/com/scouting/app/components/InputComponents.kt b/app/src/main/java/com/scouting/app/components/InputComponents.kt index 6c9875c..6f5587b 100755 --- a/app/src/main/java/com/scouting/app/components/InputComponents.kt +++ b/app/src/main/java/com/scouting/app/components/InputComponents.kt @@ -412,61 +412,61 @@ fun SettingsPreference( } } -@Compostable +@Composable fun QuadButtonBlock( - headerText: String, - buttonLabelOne: String, - buttonLabelTwo: String, - buttonLabelThree: String, - buttonLabelFour: String, - modifier: Modifier = Modifier, - onValueChange: (Int) -> Unit, - initialSelection: Int = 0, - enabled: Boolean = true, + headerText: String, + buttonLabelOne: String, + buttonLabelTwo: String, + buttonLabelThree: String, + buttonLabelFour: String, + modifier: Modifier = Modifier, + onValueChange: (Int) -> Unit, + initialSelection: Int = 0, + enabled: Boolean = true, ) { - var currentSelection by rememberInitial(initialSelection) - Column( - modifier = Modifier - .fillMaxWidth() - .then(modifier) - ) { - Text( - text = headerText, - style = MaterialTheme.typography.headlineSmall, - modifier = Modifier.padding(bottom = 20.dp) - ) - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically - ) { - listOf(buttonLabelOne, buttonLabelTwo, buttonLabelThree, buttonLabelFour).forEachIndexed { index, item -> - val color = if (currentSelection == index) { - MaterialTheme.colorScheme.primary - } else { - NeutralGrayLight - } - Button( - onClick = { - currentSelection = index - onValueChange.invoke(index) - }, - modifier = Modifier.height(55.dp), - shape = MaterialTheme.shapes.medium, - elevation = ButtonDefaults.buttonElevation(0.dp), - colors = ButtonDefaults.buttonColors( - containerColor = color, - disabledContainerColor = color, - disabledContentColor = MaterialTheme.colorScheme.onBackground - ), - enabled = enabled, - ) { - Text( - text = item, - style = MaterialTheme.typography.bodyLarge - ) - } - } - } - } + var currentSelection by rememberInitial(initialSelection) + Column( + modifier = Modifier + .fillMaxWidth() + .then(modifier) + ) { + Text( + text = headerText, + style = MaterialTheme.typography.headlineSmall, + modifier = Modifier.padding(bottom = 20.dp) + ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + listOf(buttonLabelOne, buttonLabelTwo, buttonLabelThree, buttonLabelFour).forEachIndexed { index, item -> + val color = if (currentSelection == index) { + MaterialTheme.colorScheme.primary + } else { + NeutralGrayLight + } + Button( + onClick = { + currentSelection = index + onValueChange.invoke(index) + }, + modifier = Modifier.height(55.dp), + shape = MaterialTheme.shapes.medium, + elevation = ButtonDefaults.buttonElevation(0.dp), + colors = ButtonDefaults.buttonColors( + containerColor = color, + disabledContainerColor = color, + disabledContentColor = MaterialTheme.colorScheme.onBackground + ), + enabled = enabled, + ) { + Text( + text = item, + style = MaterialTheme.typography.bodyLarge + ) + } + } + } + } } From ecb22a5d875871ab9fec91d77f7d476e810c4406 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 20:30:36 -0800 Subject: [PATCH 02/17] Update ScoutingView.kt Adding quad to the one place Grindle kept yelling about.r --- .../app/view/scouting/ScoutingView.kt | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt index 2824c65..72e832f 100644 --- a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt +++ b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt @@ -375,6 +375,28 @@ fun ScoutingTemplateLoadView(list: SnapshotStateList) { ) } + TemplateTypes.QUAD_BUTTON -> { + if (item.itemValueInt == null) { + item.itemValueInt = remember { mutableStateOf(0) } + } + QuadButtonBlock( + headerText = item.text, + buttonLabelOne = item.text2.toString(), + buttonLabelTwo = item.text3.toString(), + buttonLabelThree = item.text4.toString(), + buttonLabelFour = item.text5.toString() + onValueChange = { + item.itemValueInt!!.value = it + }, + initialSelection = item.itemValueInt!!.value, + modifier = Modifier.padding( + bottom = 10.dp, + start = 30.dp, + end = 30.dp, + ) + ) + } + TemplateTypes.IMAGE -> { EncodedImageComponent( base64Image = item.text, @@ -385,4 +407,4 @@ fun ScoutingTemplateLoadView(list: SnapshotStateList) { } } } -} \ No newline at end of file +} From 165aa855513b425fcf2b7d297f91493e4e0e9504 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 20:34:55 -0800 Subject: [PATCH 03/17] Update ScoutingView.kt I forgot a comma.... --- .../main/java/com/scouting/app/view/scouting/ScoutingView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt index 72e832f..2903fb7 100644 --- a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt +++ b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt @@ -384,7 +384,7 @@ fun ScoutingTemplateLoadView(list: SnapshotStateList) { buttonLabelOne = item.text2.toString(), buttonLabelTwo = item.text3.toString(), buttonLabelThree = item.text4.toString(), - buttonLabelFour = item.text5.toString() + buttonLabelFour = item.text5.toString(), onValueChange = { item.itemValueInt!!.value = it }, From 30d3d4608f20c960e411380406f77a1a40fa1df8 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 20:46:20 -0800 Subject: [PATCH 04/17] Update ScoutingView.kt 213:13 added quad_block --- .../main/java/com/scouting/app/view/scouting/ScoutingView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt index 2903fb7..0550f7d 100644 --- a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt +++ b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt @@ -216,7 +216,7 @@ fun ScoutingTemplateLoadView(list: SnapshotStateList) { item.itemValueInt = mutableStateOf(1) } } - TemplateTypes.SCORE_BAR, TemplateTypes.TRI_BUTTON -> { + TemplateTypes.SCORE_BAR, TemplateTypes.TRI_BUTTON, TemplateTypes.QUAD_BUTTON -> { if (item.itemValueInt == null) { item.itemValueInt = mutableStateOf(0) } @@ -384,7 +384,7 @@ fun ScoutingTemplateLoadView(list: SnapshotStateList) { buttonLabelOne = item.text2.toString(), buttonLabelTwo = item.text3.toString(), buttonLabelThree = item.text4.toString(), - buttonLabelFour = item.text5.toString(), + buttonLabelFour = item.text5.toString(), //need to resolve reference onValueChange = { item.itemValueInt!!.value = it }, From 8747e458c6eb5ae85cba254265c3fd80efd2ed27 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 20:52:47 -0800 Subject: [PATCH 05/17] Update TemplateEditorView.kt forgot what I fixed but I fixed it (hopefully) --- .../app/view/template/TemplateEditorView.kt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/template/TemplateEditorView.kt b/app/src/main/java/com/scouting/app/view/template/TemplateEditorView.kt index 7bb5f15..d3bbe3b 100644 --- a/app/src/main/java/com/scouting/app/view/template/TemplateEditorView.kt +++ b/app/src/main/java/com/scouting/app/view/template/TemplateEditorView.kt @@ -318,6 +318,19 @@ fun ListItemFromType(item: TemplateItem) { ) } + TemplateTypes.QUAD_BUTTON -> { + QuadButtonBlock( + headerText = item.text, + buttonLabelOne = item.text2.toString(), + buttonLabelTwo = item.text3.toString(), + buttonLabelThree = item.text4.toString(), + buttonLabelThree = item.text5.toString(), + onValueChange = {}, + enabled = false, + modifier = Modifier.padding(start = 30.dp, end = 15.dp, bottom = 10.dp) + ) + } + TemplateTypes.IMAGE -> { EncodedImageComponent( base64Image = item.text, @@ -326,4 +339,4 @@ fun ListItemFromType(item: TemplateItem) { ) } } -} \ No newline at end of file +} From 30324a54fe61523b78c687fd71031ddada7a59e0 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 20:54:35 -0800 Subject: [PATCH 06/17] Update EditTemplateDialog.kt Added save keys up to 5 to account for added quad block --- .../scouting/app/view/template/EditTemplateDialog.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index 7ac44a3..54dea6a 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -52,6 +52,9 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { } var textFieldValueLabel4 by remember { mutableStateOf(TextFieldValue(currentEditItem.text4.toString())) + + var textFieldValueLabel5 by remember { + mutableStateOf(TextFieldValue(currentEditItem.text5.toString())) } var textFieldValueSaveKey by remember { mutableStateOf(TextFieldValue(currentEditItem.saveKey)) @@ -61,6 +64,12 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { } var textFieldValueSaveKey3 by remember { mutableStateOf(TextFieldValue(currentEditItem.saveKey3.toString())) + + var textFieldValueSaveKey4 by remember { + mutableStateOf(TextFieldValue(currentEditItem.saveKey4.toString())) + + var textFieldValueSaveKey5 by remember { + mutableStateOf(TextFieldValue(currentEditItem.saveKey5.toString())) } if (currentEditItem.type != TemplateTypes.IMAGE) { BasicInputField( @@ -224,4 +233,4 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { } } } -} \ No newline at end of file +} From e35826bfacb90dcb090d069639da314b31863cb2 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 20:59:21 -0800 Subject: [PATCH 07/17] Update EditTemplateDialog.kt Fixed parenthesis issues --- .../java/com/scouting/app/view/template/EditTemplateDialog.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index 54dea6a..1bb53a8 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -230,7 +230,3 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { ) } } - } - } - } -} From e2de5876a1ea718ed5fc618536e2027884e65512 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 21:05:23 -0800 Subject: [PATCH 08/17] Update EditTemplateDialog.kt Yet another parenthesis issue --- .../java/com/scouting/app/view/template/EditTemplateDialog.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index 1bb53a8..250155b 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -230,3 +230,4 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { ) } } + } From 14e96d9f7e1f5312a84360ffd3ff0d81aff51e63 Mon Sep 17 00:00:00 2001 From: Chase Date: Tue, 4 Mar 2025 21:18:23 -0800 Subject: [PATCH 09/17] Update ScoutingView.kt gen save --- .../main/java/com/scouting/app/view/scouting/ScoutingView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt index 0550f7d..0af973e 100644 --- a/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt +++ b/app/src/main/java/com/scouting/app/view/scouting/ScoutingView.kt @@ -384,7 +384,7 @@ fun ScoutingTemplateLoadView(list: SnapshotStateList) { buttonLabelOne = item.text2.toString(), buttonLabelTwo = item.text3.toString(), buttonLabelThree = item.text4.toString(), - buttonLabelFour = item.text5.toString(), //need to resolve reference + buttonLabelFour = item.text5.toString(), onValueChange = { item.itemValueInt!!.value = it }, From 02e636b3c11dececce1c12b1effb0365de9e4444 Mon Sep 17 00:00:00 2001 From: Chase Date: Wed, 5 Mar 2025 00:17:37 -0800 Subject: [PATCH 10/17] Update EditTemplateDialog.kt removed unecessary '}' --- .../java/com/scouting/app/view/template/EditTemplateDialog.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index 250155b..1bb53a8 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -230,4 +230,3 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { ) } } - } From 964c83c4d14b23971cd01d6ea27b568117d2c2a7 Mon Sep 17 00:00:00 2001 From: Chase Date: Wed, 5 Mar 2025 09:41:55 -0800 Subject: [PATCH 11/17] Update EditTemplateDialog.kt Added quad code, string5, and text5 --- .../app/view/template/EditTemplateDialog.kt | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index 1bb53a8..39af08f 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -90,7 +90,8 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { ) } if (currentEditItem.type == TemplateTypes.TRI_SCORING || - currentEditItem.type == TemplateTypes.TRI_BUTTON + currentEditItem.type == TemplateTypes.TRI_BUTTON || + currentEditItem.type == TemplateTypes.QUAD_BUTTON ) { BasicInputField( icon = painterResource(id = R.drawable.ic_text_format_center), @@ -131,6 +132,20 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { .padding(horizontal = 30.dp, vertical = 10.dp) ) } + if (currentEditItem.type == TemplateTypes.QUAD_BUTTON) { + BasicInputField( + icon = painterResource(id = R.drawable.ic_text_format_center), + contentDescription = stringResource(id = R.string.ic_text_format_center_content_desc), + hint = stringResource(id = R.string.template_editor_edit_dialog_field_5_hint), + textFieldValue = textFieldValueLabel5, + onValueChange = { + textFieldValueLabel5 = it + }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 30.dp, vertical = 10.dp) + ) + } // Plain text has no user input, thus nothing to save if (currentEditItem.type != TemplateTypes.PLAIN_TEXT && currentEditItem.type != TemplateTypes.IMAGE) { BasicInputField( @@ -204,9 +219,12 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { text2 = textFieldValueLabel2.text text3 = textFieldValueLabel3.text text4 = textFieldValueLabel4.text + text5 = textFieldValueLabel5.text saveKey = textFieldValueSaveKey.text saveKey2 = textFieldValueSaveKey2.text saveKey3 = textFieldValueSaveKey3.text + saveKey4 = textFieldValueSaveKey4.text + saveKey5 = textFieldValueSaveKey5.text } } showingEditDialog = false From 5d8b8f4ea63a44bb6f81c6605c2eb0f0dec6d4c3 Mon Sep 17 00:00:00 2001 From: Chase Date: Wed, 5 Mar 2025 09:55:22 -0800 Subject: [PATCH 12/17] Update EditTemplateDialog.kt Hopefully fixes parenthesis issue --- .../java/com/scouting/app/view/template/EditTemplateDialog.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index 5ac626d..c6666e3 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -251,4 +251,5 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { } } } -} \ No newline at end of file +} + } From a1b22ae03fafab2a88e3d977e926e0e8bc036c6d Mon Sep 17 00:00:00 2001 From: Chase Date: Wed, 5 Mar 2025 10:56:45 -0800 Subject: [PATCH 13/17] Update EditTemplateDialog.kt I don't get Kotlin formatting, hopefully this is it chat --- .../com/scouting/app/view/template/EditTemplateDialog.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt index c6666e3..438b495 100644 --- a/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt +++ b/app/src/main/java/com/scouting/app/view/template/EditTemplateDialog.kt @@ -247,9 +247,3 @@ fun EditTemplateDialog(viewModel: TemplateEditorViewModel) { color = MaterialTheme.colorScheme.tertiary ) } - } - } - } - } -} - } From 72fdd9796163202cb0ee45c9d67dbbe2525c5fa7 Mon Sep 17 00:00:00 2001 From: Chase Date: Thu, 13 Mar 2025 19:45:50 -0700 Subject: [PATCH 14/17] Update TemplateItem.kt Adding 5th value for all categories to include space for a quad button block. --- app/src/main/java/com/scouting/app/model/TemplateItem.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/scouting/app/model/TemplateItem.kt b/app/src/main/java/com/scouting/app/model/TemplateItem.kt index d14e48e..b6bd0d2 100755 --- a/app/src/main/java/com/scouting/app/model/TemplateItem.kt +++ b/app/src/main/java/com/scouting/app/model/TemplateItem.kt @@ -10,6 +10,7 @@ data class TemplateItem( var text2: String? = null, var text3: String? = null, var text4: String? = null, + var text5: String? = null, var type: TemplateTypes, // The type of the item will always be non null so by using the type // we can determine which of these values we know will not be null @@ -17,10 +18,12 @@ data class TemplateItem( var itemValue2Int: MutableState? = null, var itemValue3Int: MutableState? = null, var itemValue4Int: MutableState? = null, + var itemValue5Int: MutableState? = null, var itemValueBoolean: MutableState? = null, var itemValueString: MutableState? = null, var saveKey: String, var saveKey2: String? = null, var saveKey3: String? = null, - var saveKey4: String? = null + var saveKey4: String? = null, + var saveKey5: String? = null ) From b1b33456ce45ac63092e529734d1bcc7f2b4bf04 Mon Sep 17 00:00:00 2001 From: Chase Date: Thu, 13 Mar 2025 20:21:36 -0700 Subject: [PATCH 15/17] Update InputComponents.kt Changed formatting --- .../app/components/InputComponents.kt | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/com/scouting/app/components/InputComponents.kt b/app/src/main/java/com/scouting/app/components/InputComponents.kt index 6f5587b..219fae1 100755 --- a/app/src/main/java/com/scouting/app/components/InputComponents.kt +++ b/app/src/main/java/com/scouting/app/components/InputComponents.kt @@ -367,51 +367,6 @@ fun LabeledRatingBar( } } -@Composable -fun SettingsPreference( - title: String, - modifier: Modifier = Modifier, - subtitle: String? = null, - icon: Painter? = null, - contentDescription: String? = null, - onClickAction: (() -> Unit) = {}, - endContent: (@Composable () -> Unit)? = null, -) { - Row( - modifier = modifier - .fillMaxWidth() - .clickable { onClickAction.invoke() } - .padding(horizontal = 30.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween - ) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(end = 10.dp) - ) { - icon?.let { - Icon( - painter = it, - contentDescription = contentDescription - ) - } - Column { - Text( - text = title, - style = MaterialTheme.typography.headlineSmall - ) - subtitle?.let { - Text( - text = it, - style = MaterialTheme.typography.bodyMedium - ) - } - } - } - endContent?.invoke() - } -} - @Composable fun QuadButtonBlock( headerText: String, @@ -470,3 +425,48 @@ fun QuadButtonBlock( } } } + +@Composable +fun SettingsPreference( + title: String, + modifier: Modifier = Modifier, + subtitle: String? = null, + icon: Painter? = null, + contentDescription: String? = null, + onClickAction: (() -> Unit) = {}, + endContent: (@Composable () -> Unit)? = null, +) { + Row( + modifier = modifier + .fillMaxWidth() + .clickable { onClickAction.invoke() } + .padding(horizontal = 30.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(end = 10.dp) + ) { + icon?.let { + Icon( + painter = it, + contentDescription = contentDescription + ) + } + Column { + Text( + text = title, + style = MaterialTheme.typography.headlineSmall + ) + subtitle?.let { + Text( + text = it, + style = MaterialTheme.typography.bodyMedium + ) + } + } + } + endContent?.invoke() + } +} From f857c3d7cc3ecb59e1687e78170d5f836b848b52 Mon Sep 17 00:00:00 2001 From: sabellad Date: Sat, 15 Mar 2025 15:04:27 -0700 Subject: [PATCH 16/17] got 4 buttons viggo and sabella --- .idea/gradle.xml | 6 ++-- .idea/inspectionProfiles/Project_Default.xml | 30 +++++++++++++++++++ .idea/misc.xml | 1 - .../app/view/template/EditTemplateDialog.kt | 10 ++++++- .../app/view/template/TemplateEditorView.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 6 files changed, 43 insertions(+), 7 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e20561f..639c779 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,11 +4,9 @@