Skip to content
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

refactor: Migrate savings account transaction fragment to compose #2171

Merged
merged 1 commit into from
Jul 26, 2024
Merged

refactor: Migrate savings account transaction fragment to compose #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosEditTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion core/designsystem/src/main/java/com/mifos/core/designsystem/component/MifosScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?,
Expand Down Expand Up @@ -67,7 +68,7 @@ fun MifosScaffold(
Text(
text = it,
style = TextStyle(
fontSize = 24.sp,
fontSize = fontsizeInSp.sp,
fontWeight = FontWeight.Medium,
fontStyle = FontStyle.Normal
),
Expand Down
2 changes: 1 addition & 1 deletion ...g-android/src/main/java/com/mifos/mifosxdroid/online/loanrepayment/LoanRepaymentScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions ...in/java/com/mifos/mifosxdroid/online/loanrepaymentschedule/LoanRepaymentScheduleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,4 @@ fun PreviewLoanRepaymentSchedule(
navigateBack = { },
onRetry = {}
)
}



}
8 changes: 1 addition & 7 deletions ...ain/java/com/mifos/mifosxdroid/online/savingaccountsummary/SavingsAccountSummaryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

/**
Expand Down Expand Up @@ -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 = "")
Expand Down
Loading
Loading