From ba8ff927361bf6e63a5e46d64bb036ef245fd9e9 Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 10 May 2024 03:11:13 +0530 Subject: [PATCH 1/2] Aplhabetical Order --- .../com/ivy/widget/balance/WalletBalanceWidgetContent.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt b/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt index b6dcfba66..b9502d5b7 100644 --- a/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt +++ b/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt @@ -201,3 +201,8 @@ fun ButtonsSection( } } } + +// Sort categories alphabetically +fun sortCategoriesAlphabetically(categories: List): List { + return categories.sorted() +} From edd6064215f410fe32cd06ebcf46f2898d97effd Mon Sep 17 00:00:00 2001 From: Tanmay Date: Fri, 10 May 2024 14:03:12 +0530 Subject: [PATCH 2/2] Aplhabetical Order1 --- .../ivy/widget/balance/WalletBalanceWidgetContent.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt b/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt index b9502d5b7..1a5d2275d 100644 --- a/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt +++ b/widget/balance/src/main/java/com/ivy/widget/balance/WalletBalanceWidgetContent.kt @@ -125,12 +125,15 @@ fun IncomeExpenseSection( expense: String, currency: String, ) { + val resources = LocalContext.current.resources + val sortedIncomeCategories = sortCategoriesAlphabetically(income.split(", ")) + val sortedExpenseCategories = sortCategoriesAlphabetically(expense.split(", ")) + Row( GlanceModifier.fillMaxWidth() .padding(horizontal = 12.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically ) { - val resources = LocalContext.current.resources Row( GlanceModifier .padding(10.dp) @@ -138,9 +141,9 @@ fun IncomeExpenseSection( .background(ImageProvider(R.drawable.income_shape_widget_background)), verticalAlignment = Alignment.CenterVertically, ) { - Image(ImageProvider(R.drawable.ic_income_white), resources.getString((R.string.income))) + Image(ImageProvider(R.drawable.ic_income_white), resources.getString(R.string.income)) Text( - text = "$income $currency", + text = sortedIncomeCategories.joinToString(separator = "\n") { "$it $currency" }, style = TextStyle( fontSize = 16.sp, fontWeight = FontWeight.Bold, @@ -161,7 +164,7 @@ fun IncomeExpenseSection( resources.getString(R.string.expense) ) Text( - text = "$expense $currency", + text = sortedExpenseCategories.joinToString(separator = "\n") { "$it $currency" }, style = TextStyle( fontSize = 16.sp, fontWeight = FontWeight.Bold,