MIFOSAC-217 Migrate savings account transaction fragment to compose

add scrollstate b
openMF · Jul 26, 2024 · e65df6a · e65df6a
1 parent 8dcd5dd
commit e65df6a
Show file tree

Hide file tree

Showing 14 changed files with 986 additions and 357 deletions.
diff --git a/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosEditTextField.kt b/core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosEditTextField.kt
@@ -242,7 +242,8 @@ fun MifosOutlinedTextField(
         singleLine = singleLine,
         colors = OutlinedTextFieldDefaults.colors(
             focusedBorderColor = if (isSystemInDarkTheme()) BluePrimaryDark else BluePrimary,
-            focusedLabelColor = if (isSystemInDarkTheme()) BluePrimaryDark else BluePrimary
+            focusedLabelColor = if (isSystemInDarkTheme()) BluePrimaryDark else BluePrimary,
+            cursorColor = if (isSystemInDarkTheme()) BluePrimaryDark else BluePrimary,
         ),
         textStyle = LocalDensity.current.run {
             TextStyle(fontSize = 18.sp)

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
@@ -35,6 +35,7 @@ fun MifosScaffold(
     isAppBarPresent: Boolean = true,
     icon: ImageVector? = null,
     title: String? = null,
+    fontsizeInSp : Int = 24,
     onBackPressed: () -> Unit = {},
     actions: @Composable () -> Unit = {},
     snackbarHostState: SnackbarHostState?,
@@ -67,7 +68,7 @@ fun MifosScaffold(
                             Text(
                                 text = it,
                                 style = TextStyle(
-                                    fontSize = 24.sp,
+                                    fontSize = fontsizeInSp.sp,
                                     fontWeight = FontWeight.Medium,
                                     fontStyle = FontStyle.Normal
                                 ),

diff --git a/...g-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentScreen.kt b/...g-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentScreen.kt
@@ -16,7 +16,7 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.AlertDialog
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DatePicker

diff --git a/...in/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleScreen.kt b/...in/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleScreen.kt
@@ -351,7 +351,4 @@ fun PreviewLoanRepaymentSchedule(
         navigateBack = { },
         onRetry = {}
     )
-}
-
-
-
+}
diff --git a/...ain/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryScreen.kt b/...ain/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryScreen.kt
@@ -1,7 +1,6 @@
 package com.mifos.mifosxdroid.online.savingaccountsummary
 
 import android.content.Context
-import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -25,12 +24,10 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 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.MaterialTheme
-import androidx.compose.material3.MultiChoiceSegmentedButtonRow
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -68,12 +65,8 @@ import com.mifos.core.objects.accounts.savings.Status
 import com.mifos.core.objects.accounts.savings.Summary
 import com.mifos.core.objects.accounts.savings.Transaction
 import com.mifos.core.objects.accounts.savings.TransactionType
-import com.mifos.core.objects.response.SaveResponse
 import com.mifos.core.ui.components.MifosEmptyUi
 import com.mifos.mifosxdroid.R
-import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupScreen
-import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupScreenPreviewProvider
-import com.mifos.mifosxdroid.online.createnewgroup.CreateNewGroupUiState
 import com.mifos.utils.DateHelper
 
 /**
@@ -145,6 +138,7 @@ fun SavingsAccountSummaryScreen(
         onBackPressed = navigateBack,
         title = stringResource(id = R.string.savingsAccountSummary),
         icon = MifosIcons.arrowBack,
+        fontsizeInSp = 22,
         actions = {
             IconButton(onClick = { showDropdown = !showDropdown }) {
                 Icon(imageVector = MifosIcons.moreVert, contentDescription = "")
-Original file line number
+Diff line change
@@ Expand Up / @@ -351,7 +351,4 @@ fun PreviewLoanRepaymentSchedule( @@
             navigateBack = { },
             onRetry = {}
         )
-    }
+    }