Skip to content

feat(home): reorganize service items and update greeting punctuation #3002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WizCoderr wants to merge 3 commits into
base: development
Choose a base branch
from
Open

feat(home): reorganize service items and update greeting punctuation #3002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53e7c90
Ui/Ux fix Done
WizCoderr Nov 8, 2025
8ba97ae
updated Ui
WizCoderr Nov 14, 2025
a9b3ca9
feat(home) Aligned Beneficiary and FAQ properly.
WizCoderr Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">إلغاء</string>
<string name="dialog_logout">هل أنت متأكد أنك تريد تسجيل الخروج؟</string>

<string name="feature_home_greet">مرحباً ‎%1$s،</string>
<string name="feature_home_greet">مرحباً، %1$s</string>
<string name="feature_home_services">الخدمات</string>
<string name="feature_home_saving_accounts">حسابات التوفير</string>
<string name="feature_home_loan_accounts">حسابات القروض</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-bn/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">বাতিল</string>
<string name="dialog_logout">আপনি কি সত্যিই লগআউট করতে চান?</string>

<string name="feature_home_greet">হ্যালো %1$s,</string>
<string name="feature_home_greet">হ্যালো, %1$s</string>
<string name="feature_home_services">সেবা</string>
<string name="feature_home_saving_accounts">সঞ্চয় অ্যাকাউন্ট</string>
<string name="feature_home_loan_accounts">ঋণ অ্যাকাউন্ট</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Cancelar</string>
<string name="dialog_logout">¿Estás seguro de que quieres cerrar sesión?</string>

<string name="feature_home_greet">Hola %1$s,</string>
<string name="feature_home_greet">Hola, %1$s</string>
<string name="feature_home_services">Servicios</string>
<string name="feature_home_saving_accounts">Cuentas de ahorro</string>
<string name="feature_home_loan_accounts">Cuentas de préstamo</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-fa/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">لغو</string>
<string name="dialog_logout">آیا مطمئن هستید که می‌خواهید خارج شوید؟</string>

<string name="feature_home_greet">سلام %1$s،</string>
<string name="feature_home_greet">سلام، %1$s</string>
<string name="feature_home_services">خدمات</string>
<string name="feature_home_saving_accounts">حساب‌های پس‌انداز</string>
<string name="feature_home_loan_accounts">حساب‌های وام</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Annuler</string>
<string name="dialog_logout">Êtes-vous sûr de vouloir vous déconnecter?</string>

<string name="feature_home_greet">Bonjour %1$s,</string>
<string name="feature_home_greet">Bonjour, %1$s</string>
<string name="feature_home_services">Services</string>
<string name="feature_home_saving_accounts">Comptes d'épargne</string>
<string name="feature_home_loan_accounts">Comptes de prêt</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-hi/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">रद्द करें</string>
<string name="dialog_logout">क्या आप वाकई लॉगआउट करना चाहते हैं?</string>

<string name="feature_home_greet">नमस्ते %1$s,</string>
<string name="feature_home_greet">नमस्ते, %1$s</string>
<string name="feature_home_services">सेवाएँ</string>
<string name="feature_home_saving_accounts">बचत खाते</string>
<string name="feature_home_loan_accounts">ऋण खाते</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-id/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Batal</string>
<string name="dialog_logout">Apakah Anda yakin ingin keluar?</string>

<string name="feature_home_greet">Halo %1$s,</string>
<string name="feature_home_greet">Halo, %1$s</string>
<string name="feature_home_services">Layanan</string>
<string name="feature_home_saving_accounts">Rekening Tabungan</string>
<string name="feature_home_loan_accounts">Rekening Pinjaman</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-km/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">បោះបង់</string>
<string name="dialog_logout">តើអ្នកប្រាកដថាចង់ចេញពីប្រព័ន្ធមែនទេ?</string>

<string name="feature_home_greet">សួស្តី %1$s,</string>
<string name="feature_home_greet">សួស្តី, %1$s</string>
<string name="feature_home_services">សេវាកម្ម</string>
<string name="feature_home_saving_accounts">គណនីសន្សំ</string>
<string name="feature_home_loan_accounts">គណនីប្រាក់កម្ចី</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-kn/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">ರದ್ದುಮಾಡು</string>
<string name="dialog_logout">ನೀವು ಲಾಗ್ ಔಟ್ ಮಾಡಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>

<string name="feature_home_greet">ನಮಸ್ಕಾರ %1$s,</string>
<string name="feature_home_greet">ನಮಸ್ಕಾರ, %1$s</string>
<string name="feature_home_services">ಸೇವೆಗಳು</string>
<string name="feature_home_saving_accounts">ಉಳಿತಾಯ ಖಾತೆಗಳು</string>
<string name="feature_home_loan_accounts">ಸಾಲ ಖಾತೆಗಳು</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-my/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">မလုပ်တော့ပါ</string>
<string name="dialog_logout">ထွက်လိုသည်မှာ သေချာပါသလား?</string>

<string name="feature_home_greet">ဟယ်လို %1$s,</string>
<string name="feature_home_greet">ဟယ်လို, %1$s</string>
<string name="feature_home_services">ဝန်ဆောင်မှုများ</string>
<string name="feature_home_saving_accounts">စုဆောင်းငွေ အကောင့်များ</string>
<string name="feature_home_loan_accounts">ချေးငွေ အကောင့်များ</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-pl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Anuluj</string>
<string name="dialog_logout">Czy na pewno chcesz się wylogować?</string>

<string name="feature_home_greet">Witaj %1$s,</string>
<string name="feature_home_greet">Witaj, %1$s</string>
<string name="feature_home_services">Usługi</string>
<string name="feature_home_saving_accounts">Konta oszczędnościowe</string>
<string name="feature_home_loan_accounts">Konta kredytowe</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-pt/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Cancelar</string>
<string name="dialog_logout">Tem certeza de que deseja sair?</string>

<string name="feature_home_greet">Olá %1$s,</string>
<string name="feature_home_greet">Olá, %1$s</string>
<string name="feature_home_services">Serviços</string>
<string name="feature_home_saving_accounts">Contas de Poupança</string>
<string name="feature_home_loan_accounts">Contas de Empréstimo</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Отмена</string>
<string name="dialog_logout">Вы уверены, что хотите выйти?</string>

<string name="feature_home_greet">Здравствуйте, %1$s,</string>
<string name="feature_home_greet">Здравствуйте, %1$s</string>
<string name="feature_home_services">Услуги</string>
<string name="feature_home_saving_accounts">Сберегательные счета</string>
<string name="feature_home_loan_accounts">Кредитные счета</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-sw/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">Ghairi</string>
<string name="dialog_logout">Una uhakika unataka kutoka?</string>

<string name="feature_home_greet">Habari %1$s,</string>
<string name="feature_home_greet">Habari, %1$s</string>
<string name="feature_home_services">Huduma</string>
<string name="feature_home_saving_accounts">Akaunti za Akiba</string>
<string name="feature_home_loan_accounts">Akaunti za Mikopo</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-te/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">రద్దు</string>
<string name="dialog_logout">మీరు నిజంగా లాగౌట్ అవ్వాలనుకుంటున్నారా?</string>

<string name="feature_home_greet">హలో %1$s,</string>
<string name="feature_home_greet">హలో, %1$s</string>
<string name="feature_home_services">సేవలు</string>
<string name="feature_home_saving_accounts">పొదుపు ఖాతాలు</string>
<string name="feature_home_loan_accounts">రుణ ఖాతాలు</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values-ur/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<string name="cancel">منسوخ کریں</string>
<string name="dialog_logout">کیا آپ واقعی لاگ آؤٹ کرنا چاہتے ہیں؟</string>

<string name="feature_home_greet">السلام علیکم ‎%1$s،</string>
<string name="feature_home_greet">السلام علیکم، %1$s</string>
<string name="feature_home_services">سروسز</string>
<string name="feature_home_saving_accounts">بچت اکاؤنٹس</string>
<string name="feature_home_loan_accounts">قرض اکاؤنٹس</string>
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<string name="cancel">Cancel</string>
<string name="dialog_logout">Are you sure you want to logout?</string>

<string name="feature_home_greet">Hello %1$s,</string>
<string name="feature_home_greet">Hello, %1$s</string>
<string name="feature_home_services">Services</string>
<string name="feature_home_saving_accounts">Savings Accounts</string>
<string name="feature_home_loan_accounts">Loan Accounts</string>
Expand Down
64 changes: 47 additions & 17 deletions feature/home/src/commonMain/kotlin/org/mifos/mobile/feature/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.rememberScrollState
Expand Down Expand Up @@ -229,25 +230,54 @@ internal fun ServiceBox(
onAction: (HomeAction) -> Unit,
modifier: Modifier = Modifier,
) {
FlowRow(
modifier = modifier
.fillMaxWidth(),
maxItemsInEachRow = 4,
horizontalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
verticalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
Column(
modifier = modifier.fillMaxWidth(),
) {
items.forEach { item ->
Box(
FlowRow(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
verticalArrangement = Arrangement.spacedBy(DesignToken.spacing.large),
maxItemsInEachRow = 4,
) {
items
.filter { it != ServiceItem.Beneficiary && it != ServiceItem.Faq }
.forEach { item ->
ServiceItemCard(
title = item.title,
icon = item.icon,
onClick = { onAction(HomeAction.OnNavigate(item.route)) },
modifier = Modifier
.width(72.dp)
.wrapContentHeight(),
)
}
}

Spacer(modifier = Modifier.height(DesignToken.spacing.large))

Row(
modifier = Modifier
.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(
DesignToken.spacing.medium,
Alignment.Start,
),
verticalAlignment = Alignment.CenterVertically,
) {
ServiceItemCard(
title = ServiceItem.Beneficiary.title,
icon = ServiceItem.Beneficiary.icon,
onClick = { onAction(HomeAction.OnNavigate(ServiceItem.Beneficiary.route)) },
modifier = Modifier
.weight(1f),
contentAlignment = Alignment.Center,
) {
ServiceItemCard(
title = item.title,
icon = item.icon,
onClick = { onAction(HomeAction.OnNavigate(item.route)) },
)
}
.width(72.dp),
)

ServiceItemCard(
title = ServiceItem.Faq.title,
icon = ServiceItem.Faq.icon,
onClick = { onAction(HomeAction.OnNavigate(ServiceItem.Faq.route)) },
modifier = Modifier.width(72.dp),
)
Copy link
Contributor

@Nagarjuna0033 Nagarjuna0033 Nov 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WizCoderr I think this is not correct way to organize the items on dashboard because you designed this for a fixed items for now it may work what if it the items increases in future, will UI stay consistence? so find a generic approach instead of this approach

}
}
}
Expand Down
Loading