Merge pull request #35 from Arinyadav1/Implement-Create-Group-Add-Members-Form

feat(group): implement add member feature in create group module.

Author: revanthkumarJ

cmp-android/src/main/kotlin/cmp/android/app/ComponentActivityExtensions.kt

@@ -54,12 +54,17 @@ fun ComponentActivity.setupEdgeToEdge(appThemeFlow: Flow<org.mifos.core.model.us
                     // This handles all the settings to go edge-to-edge. We are using a transparent
                     // scrim for system bars and switching between "light" and "dark" based on the
                     // system and internal app theme settings.
-                    val style = SystemBarStyle.auto(
-                        darkScrim = SCRIM_COLOR,
-                        lightScrim = SCRIM_COLOR,
-                        detectDarkMode = { isDarkMode },
-                    )
-                    enableEdgeToEdge(statusBarStyle = style, navigationBarStyle = style)
+                    val statusBarStyle = if (isDarkMode) {
+                        SystemBarStyle.dark(SCRIM_COLOR)
+                    } else {
+                        SystemBarStyle.light(SCRIM_COLOR, SCRIM_COLOR)
+                    }
+                    val navigationBarStyle = if (isDarkMode) {
+                        SystemBarStyle.dark(SCRIM_COLOR)
+                    } else {
+                        SystemBarStyle.light(SCRIM_COLOR, SCRIM_COLOR)
+                    }
+                    enableEdgeToEdge(statusBarStyle = statusBarStyle, navigationBarStyle = navigationBarStyle)
                 }
         }
     }

core-base/ui/src/commonMain/kotlin/org/mifos/core/base/ui/screen/ScreenContent.kt

@@ -178,7 +178,7 @@ private fun SkeletonLoadingContent(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .padding(spacing.md)
+            .padding(vertical = spacing.md)
             .semantics {
                 contentDescription = "Loading"
                 liveRegion = LiveRegionMode.Polite

core/common/src/commonMain/kotlin/org/mifos/core/common/Constants.kt

@@ -12,6 +12,7 @@ package org.mifos.core.common
 object Constants {
     const val SELF_SERVICE_USER = "Self Service User"
     const val MEMBER_SAVINGS_ACCOUNTS = "memberSavingsAccounts"
+    const val SAVINGS_ACCOUNTS = "savingsAccounts"
     const val DATE_FORMAT_SHORT_MONTH = "dd/MM/yyyy"
     const val LOCALE_EN = "en"
 }

core/designsystem/src/commonMain/kotlin/org/mifos/core/designsystem/component/KptSelectableItemCard.kt

@@ -53,7 +53,6 @@ fun KptSelectableItemCard(
         modifier = modifier
             .fillMaxWidth()
             .padding(
-                horizontal = KptTheme.spacing.md,
                 vertical = KptTheme.spacing.xs,
             )
             .clip(KptTheme.shapes.medium)

core/model/src/commonMain/kotlin/org/mifos/core/model/group/CreateGroupRequest.kt

@@ -10,10 +10,10 @@
 package org.mifos.core.model.group
 
 data class CreateGroupRequest(
-    val officeId: String,
+    val officeId: Long,
     val name: String,
     val externalId: String,
-    val clientMembers: List<String>? = null,
+    val clientMembers: List<Long>? = null,
     val dateFormat: String,
     val locale: String,
     val active: Boolean? = null,

core/network/src/commonMain/kotlin/org/mifos/core/network/fineract/group/dto/CreateGroupRequestDto.kt

@@ -13,10 +13,10 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class CreateGroupRequestDto(
-    val officeId: String,
+    val officeId: Long,
     val name: String,
     val externalId: String,
-    val clientMembers: List<String>? = null,
+    val clientMembers: List<Long>? = null,
     val dateFormat: String,
     val locale: String,
     val active: Boolean? = null,

core/ui/src/commonMain/kotlin/org/mifos/core/ui/component/KptItemCard.kt

@@ -62,7 +62,6 @@ fun KptItemCard(
         modifier = modifier
             .fillMaxWidth()
             .padding(
-                horizontal = MaterialTheme.spacing.lg,
                 vertical = MaterialTheme.spacing.xs,
             )
             .clickable(onClick = onClick),

core/ui/src/commonMain/kotlin/org/mifos/core/ui/input/KptDropdownSearchBar.kt

@@ -51,7 +51,7 @@ data class KptDropdownSearchBarItem(
 )
 
 /**
- * Defaults for the dropdown search bar.
+ * Default configurations for the Dropdown Search Bar.
  */
 object KptDropdownSearchBarDefaults
 
@@ -68,6 +68,7 @@ fun KptDropdownSearchBar(
     onDismissRequest: () -> Unit,
     isSearching: Boolean,
     modifier: Modifier = Modifier,
+    label: String? = null,
 ) {
     val density = LocalDensity.current
     var searchBarWidth by remember { mutableStateOf(0) }
@@ -98,6 +99,7 @@ fun KptDropdownSearchBar(
         contentAlignment = Alignment.TopStart,
     ) {
         KptSearchBar(
+            label = label,
             query = query,
             onQueryChange = onQueryChange,
             placeholder = placeholder,
@@ -114,8 +116,7 @@ fun KptDropdownSearchBar(
         )
 
         if (showMenu && searchBarWidth > 0) {
-            val horizontalPaddingPx =
-                with(density) { MaterialTheme.spacing.lg.roundToPx() }
+            val horizontalPaddingPx = 0
             val verticalPaddingPx = with(density) { MaterialTheme.spacing.md.roundToPx() }
             val cardWidthDp = with(density) { (searchBarWidth - horizontalPaddingPx * 2).toDp() }
 
@@ -127,14 +128,14 @@ fun KptDropdownSearchBar(
                 Surface(
                     modifier = Modifier
                         .width(cardWidthDp)
-                        .heightIn(max = 200.dp),
+                        .heightIn(max = 300.dp),
                     shape = RoundedCornerShape(
                         topStart = 0.dp,
                         topEnd = 0.dp,
                         bottomStart = KptTheme.spacing.md,
                         bottomEnd = KptTheme.spacing.md,
                     ),
-                    color = KptTheme.colorScheme.inverseOnSurface,
+                    color = KptTheme.colorScheme.surfaceContainer,
                     tonalElevation = 0.dp,
                     shadowElevation = KptTheme.elevation.level2,
                 ) {

core/ui/src/commonMain/kotlin/org/mifos/core/ui/input/KptSearchBar.kt

@@ -15,7 +15,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import org.mifos.core.base.designsystem.theme.KptTheme
 import org.mifos.core.designsystem.icon.AppIcons
@@ -27,17 +26,19 @@ fun KptSearchBar(
     onQueryChange: (String) -> Unit,
     placeholder: String,
     modifier: Modifier = Modifier,
-    containerColor: Color = KptTheme.colorScheme.inverseOnSurface,
+    label: String? = null,
     shape: Shape = KptTheme.shapes.large,
+    enabled: Boolean = true,
     trailingIcon: (@Composable () -> Unit)? = null,
 ) {
     KptTextField(
+        enabled = enabled,
         value = query,
+        label = label,
         onValueChange = onQueryChange,
         modifier = modifier
             .fillMaxWidth()
             .padding(
-                horizontal = MaterialTheme.spacing.lg,
                 vertical = MaterialTheme.spacing.md,
             ),
         placeholder = placeholder,
@@ -50,10 +51,6 @@ fun KptSearchBar(
         },
         trailingIcon = trailingIcon,
         shape = shape,
-        colors = KptTextFieldDefaults.textFieldColors(
-            focusedContainerColor = containerColor,
-            unfocusedContainerColor = containerColor,
-        ),
         singleLine = true,
     )
 }

feature/groups/src/commonMain/composeResources/values/strings.xml

@@ -78,7 +78,7 @@
     <string name="feature_groups_create_group_subtitle">Fill the details to get started</string>
     <string name="feature_groups_group_name_label">Group Name *</string>
     <string name="feature_groups_group_name_placeholder">Enter group name</string>
-    <string name="feature_groups_external_id_label">External Id *</string>
+    <string name="feature_groups_external_id_label">External Id</string>
     <string name="feature_groups_external_id_placeholder">Enter external ID</string>
     <string name="feature_groups_office_label">Office *</string>
     <string name="feature_groups_select_office_placeholder">Select office</string>
@@ -90,4 +90,5 @@
     <string name="feature_groups_create_group_success_message">Group created successfully.</string>
     <string name="feature_groups_activate_group_success_title">Success</string>
     <string name="feature_groups_activate_group_success_message">Group activated successfully.</string>
+    <string name="feature_groups_activate_add_members">Add Members</string>
 </resources>