From bd96d5d3ba12501c3d602aca72f317640ee65308 Mon Sep 17 00:00:00 2001 From: Aditya-gupta99 Date: Wed, 19 Jun 2024 23:03:45 +0530 Subject: [PATCH] fix : fix scaffold --- .../designsystem/component/MifosScaffold.kt | 57 +++++++- .../center_details/CenterDetailsScreen.kt | 75 +++------- .../center/center_list/ui/CenterListScreen.kt | 10 +- .../ui/CheckerInboxTasksScreen.kt | 44 +----- .../clientDetails/ui/ClientDetailsScreen.kt | 136 +++++++----------- .../ui/IndividualCollectionSheetScreen.kt | 48 +------ .../ui/NewIndividualCollectionSheetScreen.kt | 2 +- .../group_details/GroupDetailsScreen.kt | 108 +++++--------- 8 files changed, 178 insertions(+), 302 deletions(-) diff --git a/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosScaffold.kt b/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosScaffold.kt index dacd8e7765a..d2b7906c17f 100644 --- a/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosScaffold.kt +++ b/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosScaffold.kt @@ -1,17 +1,36 @@ +@file:OptIn(ExperimentalMaterial3Api::class) + package com.mifos.core.designsystem.component import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.sp +import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White @Composable fun MifosScaffold( modifier: Modifier = Modifier, - topBar: @Composable () -> Unit, + isAppBarPresent: Boolean = true, + icon: ImageVector? = null, + title: String? = null, + onBackPressed: () -> Unit = {}, + actions: @Composable () -> Unit = {}, snackbarHostState: SnackbarHostState?, bottomBar: @Composable () -> Unit = {}, floatingActionButton: @Composable () -> Unit = {}, @@ -20,7 +39,41 @@ fun MifosScaffold( Scaffold( modifier = modifier, - topBar = topBar, + topBar = { + if (isAppBarPresent) { + TopAppBar( + colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = White), + navigationIcon = { + if (icon != null) { + IconButton( + onClick = { onBackPressed() }, + ) { + Icon( + imageVector = icon, + contentDescription = null, + tint = Black, + ) + } + } + }, + title = { + title?.let { + Text( + text = it, + style = TextStyle( + fontSize = 24.sp, + fontWeight = FontWeight.Medium, + fontStyle = FontStyle.Normal + ), + color = Black, + textAlign = TextAlign.Start + ) + } + }, + actions = { actions() } + ) + } + }, snackbarHost = { snackbarHostState?.let { SnackbarHost(it) } }, containerColor = White, bottomBar = bottomBar, diff --git a/feature/center/src/main/java/com/mifos/feature/center/center_details/CenterDetailsScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/center_details/CenterDetailsScreen.kt index 97fe0136c4e..1acb56137f8 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/center_details/CenterDetailsScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/center_details/CenterDetailsScreen.kt @@ -14,12 +14,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.MoreVert -import androidx.compose.material.icons.outlined.DateRange -import androidx.compose.material.icons.outlined.EventRepeat -import androidx.compose.material.icons.outlined.Group -import androidx.compose.material.icons.outlined.Person -import androidx.compose.material.icons.outlined.PersonOutline -import androidx.compose.material.icons.rounded.ArrowBackIosNew import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.DropdownMenu @@ -29,8 +23,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -114,54 +106,27 @@ fun CenterDetailsScreen( var centerActive by remember { mutableStateOf(true) } MifosScaffold( - topBar = { - TopAppBar( - colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = White), - navigationIcon = { - IconButton( - onClick = { onBackPressed() }, - ) { - Icon( - imageVector = MifosIcons.arrowBack, - contentDescription = null, - tint = Black, - ) - } - - }, - title = { - Text( - text = stringResource(id = R.string.feature_center_center), - style = TextStyle( - fontSize = 24.sp, - fontWeight = FontWeight.Medium, - fontStyle = FontStyle.Normal - ), - color = Black, - textAlign = TextAlign.Start - ) - - }, - actions = { - IconButton(onClick = { showMenu = showMenu.not() }) { - Icon(imageVector = Icons.Default.MoreVert, contentDescription = null) - } - DropdownMenu( - modifier = Modifier.background(White), - expanded = showMenu, - onDismissRequest = { showMenu = false } - ) { - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_center_add_savings_account)) { - onMenuClick(MenuItems.ADD_SAVINGS_ACCOUNT) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_center_group_list)) { - onMenuClick(MenuItems.GROUP_LIST) - showMenu = false - } - } + icon = MifosIcons.arrowBack, + title = stringResource(id = R.string.feature_center_center), + onBackPressed = onBackPressed, + actions = { + IconButton(onClick = { showMenu = showMenu.not() }) { + Icon(imageVector = Icons.Default.MoreVert, contentDescription = null) + } + DropdownMenu( + modifier = Modifier.background(White), + expanded = showMenu, + onDismissRequest = { showMenu = false } + ) { + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_center_add_savings_account)) { + onMenuClick(MenuItems.ADD_SAVINGS_ACCOUNT) + showMenu = false } - ) + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_center_group_list)) { + onMenuClick(MenuItems.GROUP_LIST) + showMenu = false + } + } }, snackbarHostState = snackbarHostState, bottomBar = { diff --git a/feature/center/src/main/java/com/mifos/feature/center/center_list/ui/CenterListScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/center_list/ui/CenterListScreen.kt index 67086a88d0e..10d466d0504 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/center_list/ui/CenterListScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/center_list/ui/CenterListScreen.kt @@ -18,8 +18,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Add import androidx.compose.material.pullrefresh.PullRefreshIndicator import androidx.compose.material.pullrefresh.pullRefresh import androidx.compose.material.pullrefresh.rememberPullRefreshState @@ -27,6 +25,8 @@ import androidx.compose.material3.CardDefaults import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.OutlinedCard +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -60,7 +60,6 @@ import androidx.paging.compose.collectAsLazyPagingItems import coil.compose.AsyncImage import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosPagingAppendProgress -import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black @@ -135,7 +134,7 @@ fun CenterListScreen( } } - MifosScaffold( + Scaffold( modifier = Modifier, topBar = { if (isInSelectionMode) { @@ -146,8 +145,7 @@ fun CenterListScreen( ) } }, - snackbarHostState = snackbarHostState, - bottomBar = { }, + snackbarHost = { SnackbarHost(hostState = snackbarHostState) }, floatingActionButton = { FloatingActionButton( onClick = { createNewCenter() }, diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checker_inbox_task/ui/CheckerInboxTasksScreen.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checker_inbox_task/ui/CheckerInboxTasksScreen.kt index a0d88f94462..4aca866d34a 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checker_inbox_task/ui/CheckerInboxTasksScreen.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checker_inbox_task/ui/CheckerInboxTasksScreen.kt @@ -8,16 +8,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.ArrowBackIosNew import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -26,9 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -40,7 +32,7 @@ import com.google.accompanist.swiperefresh.rememberSwipeRefreshState import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError -import com.mifos.core.designsystem.theme.Black +import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.White import com.mifos.feature.checker_inbox_task.R @@ -65,37 +57,9 @@ fun CheckerInboxTasksScreen( } MifosScaffold( - topBar = { - TopAppBar( - colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = White), - navigationIcon = { - IconButton( - onClick = { onBackPressed() }, - ) { - Icon( - imageVector = Icons.Rounded.ArrowBackIosNew, - contentDescription = null, - tint = Black, - ) - } - - }, - title = { - Text( - text = stringResource(id = R.string.feature_checker_inbox_task_checker_inbox_and_pending_tasks), - style = TextStyle( - fontSize = 24.sp, - fontWeight = FontWeight.Medium, - fontStyle = FontStyle.Normal - ), - color = Black, - textAlign = TextAlign.Start - ) - }, - actions = { } - ) - - }, + icon = MifosIcons.arrowBack, + title = stringResource(id = R.string.feature_checker_inbox_task_checker_Inbox), + onBackPressed = onBackPressed, snackbarHostState = null, bottomBar = { }) { padding -> diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt index 4725e4d8b55..f493a3c5c00 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt @@ -40,7 +40,6 @@ import androidx.compose.material.icons.outlined.Groups import androidx.compose.material.icons.outlined.HomeWork import androidx.compose.material.icons.outlined.MobileFriendly import androidx.compose.material.icons.outlined.Numbers -import androidx.compose.material.icons.rounded.ArrowBackIosNew import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card @@ -51,8 +50,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -93,6 +90,7 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosMenuDropDownItem import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError +import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark @@ -224,87 +222,59 @@ fun ClientDetailsScreen( } MifosScaffold( - topBar = { - TopAppBar( - colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = White), - navigationIcon = { - - IconButton( - onClick = { onBackPressed() }, - ) { - Icon( - imageVector = Icons.Rounded.ArrowBackIosNew, - contentDescription = null, - tint = Black, - ) - } - - }, - title = { - Text( - text = stringResource(id = R.string.feature_client), - style = TextStyle( - fontSize = 24.sp, - fontWeight = FontWeight.Medium, - fontStyle = FontStyle.Normal - ), - color = Black, - textAlign = TextAlign.Start - ) - - }, - actions = { - IconButton(onClick = { showMenu = showMenu.not() }) { - Icon(imageVector = Icons.Default.MoreVert, contentDescription = null) - } - DropdownMenu( - modifier = Modifier.background(White), - expanded = showMenu, - onDismissRequest = { showMenu = false } - ) { - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_add_loan_account)) { - addLoanAccount(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_add_savings_account)) { - addSavingsAccount(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_charges)) { - charges(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_documents)) { - documents(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_identifiers)) { - identifiers(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_more_client_info)) { - moreClientInfo(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_notes)) { - notes(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_pinpoint_location)) { - pinpointLocation(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_survey)) { - survey(clientId) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_upload_signature)) { - uploadSignature(clientId) - showMenu = false - } - } + icon = MifosIcons.arrowBack, + title = stringResource(id = R.string.feature_client), + onBackPressed = onBackPressed, + actions = { + IconButton(onClick = { showMenu = showMenu.not() }) { + Icon(imageVector = Icons.Default.MoreVert, contentDescription = null) + } + DropdownMenu( + modifier = Modifier.background(White), + expanded = showMenu, + onDismissRequest = { showMenu = false } + ) { + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_add_loan_account)) { + addLoanAccount(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_add_savings_account)) { + addSavingsAccount(clientId) + showMenu = false } - ) + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_charges)) { + charges(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_documents)) { + documents(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_identifiers)) { + identifiers(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_more_client_info)) { + moreClientInfo(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_notes)) { + notes(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_pinpoint_location)) { + pinpointLocation(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_survey)) { + survey(clientId) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_client_upload_signature)) { + uploadSignature(clientId) + showMenu = false + } + } }, snackbarHostState = snackbarHostState, bottomBar = { diff --git a/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/individual_collection_sheet/ui/IndividualCollectionSheetScreen.kt b/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/individual_collection_sheet/ui/IndividualCollectionSheetScreen.kt index d1fea855731..e8d31d76b32 100644 --- a/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/individual_collection_sheet/ui/IndividualCollectionSheetScreen.kt +++ b/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/individual_collection_sheet/ui/IndividualCollectionSheetScreen.kt @@ -6,29 +6,16 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.ArrowBackIosNew import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontStyle -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.sp import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosTabRow -import com.mifos.core.designsystem.theme.Black -import com.mifos.core.designsystem.theme.White +import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.utility.TabContent import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet import com.mifos.feature.collection_sheet.R @@ -57,36 +44,9 @@ fun IndividualCollectionSheetScreen( ) MifosScaffold( - topBar = { - TopAppBar( - colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = White), - navigationIcon = { - IconButton( - onClick = { onBackPressed() }, - ) { - Icon( - imageVector = Icons.Rounded.ArrowBackIosNew, - contentDescription = null, - tint = Black, - ) - } - - }, - title = { - Text( - text = stringResource(id = R.string.feature_collection_sheet_individual_collection_sheet), - style = TextStyle( - fontSize = 24.sp, - fontWeight = FontWeight.Medium, - fontStyle = FontStyle.Normal - ), - color = Black, - textAlign = TextAlign.Start - ) - - } - ) - }, + icon = MifosIcons.arrowBack, + title = stringResource(id = R.string.feature_collection_sheet_individual_collection_sheet), + onBackPressed = onBackPressed, snackbarHostState = snackbarHostState ) { paddingValues -> Column( diff --git a/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/new_individual_collection_sheet/ui/NewIndividualCollectionSheetScreen.kt b/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/new_individual_collection_sheet/ui/NewIndividualCollectionSheetScreen.kt index a9b1df3c83d..9d6c24eb387 100644 --- a/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/new_individual_collection_sheet/ui/NewIndividualCollectionSheetScreen.kt +++ b/feature/collection-sheet/src/main/java/com/mifos/feature/individual_collection_sheet/new_individual_collection_sheet/ui/NewIndividualCollectionSheetScreen.kt @@ -131,7 +131,7 @@ fun NewIndividualCollectionSheetScreen( } MifosScaffold( - topBar = { }, + isAppBarPresent = false, snackbarHostState = snackbarHostState ) { paddingValues -> if (showDatePicker) { diff --git a/feature/groups/src/main/java/com/mifos/feature/groupsList/group_details/GroupDetailsScreen.kt b/feature/groups/src/main/java/com/mifos/feature/groupsList/group_details/GroupDetailsScreen.kt index 184ade71a09..51240e995f9 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groupsList/group_details/GroupDetailsScreen.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groupsList/group_details/GroupDetailsScreen.kt @@ -1,5 +1,3 @@ -@file:OptIn(ExperimentalMaterial3Api::class) - package com.mifos.feature.groupsList.group_details import androidx.compose.animation.animateContentSize @@ -28,21 +26,16 @@ import androidx.compose.material.icons.outlined.DateRange import androidx.compose.material.icons.outlined.HomeWork import androidx.compose.material.icons.outlined.Numbers import androidx.compose.material.icons.outlined.PersonOutline -import androidx.compose.material.icons.rounded.ArrowBackIosNew import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.Divider import androidx.compose.material3.DropdownMenu -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -71,6 +64,7 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosMenuDropDownItem import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError +import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark @@ -161,71 +155,43 @@ fun GroupDetailsScreen( var groupActive by remember { mutableStateOf(true) } MifosScaffold( - topBar = { - TopAppBar( - colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = White), - navigationIcon = { - - IconButton( - onClick = { onBackPressed() }, - ) { - Icon( - imageVector = Icons.Rounded.ArrowBackIosNew, - contentDescription = null, - tint = Black, - ) - } - - }, - title = { - Text( - text = stringResource(id = R.string.feature_groups_group), - style = TextStyle( - fontSize = 24.sp, - fontWeight = FontWeight.Medium, - fontStyle = FontStyle.Normal - ), - color = Black, - textAlign = TextAlign.Start - ) - - }, - actions = { - IconButton(onClick = { showMenu = showMenu.not() }) { - Icon(imageVector = Icons.Default.MoreVert, contentDescription = null) - } - DropdownMenu( - modifier = Modifier.background(White), - expanded = showMenu, - onDismissRequest = { showMenu = false } - ) { - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_add_loan_account)) { - onMenuClick(MenuItems.ADD_LOAN_ACCOUNT) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_add_savings_account)) { - onMenuClick(MenuItems.ADD_SAVINGS_ACCOUNT) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_documents)) { - onMenuClick(MenuItems.DOCUMENTS) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_group_clients)) { - onMenuClick(MenuItems.GROUP_CLIENTS) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_more_group_info)) { - onMenuClick(MenuItems.MORE_GROUP_INFO) - showMenu = false - } - MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_notes)) { - onMenuClick(MenuItems.NOTES) - showMenu = false - } - } + icon = MifosIcons.arrowBack, + title = stringResource(id = R.string.feature_groups_group), + onBackPressed = onBackPressed, + actions = { + IconButton(onClick = { showMenu = showMenu.not() }) { + Icon(imageVector = Icons.Default.MoreVert, contentDescription = null) + } + DropdownMenu( + modifier = Modifier.background(White), + expanded = showMenu, + onDismissRequest = { showMenu = false } + ) { + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_add_loan_account)) { + onMenuClick(MenuItems.ADD_LOAN_ACCOUNT) + showMenu = false } - ) + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_add_savings_account)) { + onMenuClick(MenuItems.ADD_SAVINGS_ACCOUNT) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_documents)) { + onMenuClick(MenuItems.DOCUMENTS) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_group_clients)) { + onMenuClick(MenuItems.GROUP_CLIENTS) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_more_group_info)) { + onMenuClick(MenuItems.MORE_GROUP_INFO) + showMenu = false + } + MifosMenuDropDownItem(option = stringResource(id = R.string.feature_groups_notes)) { + onMenuClick(MenuItems.NOTES) + showMenu = false + } + } }, snackbarHostState = snackbarHostState, bottomBar = {