mirror of
https://github.com/openMF/mobile-wallet.git
synced 2026-02-06 07:56:58 +00:00
Fix: ios build (#1942)
This commit is contained in:
parent
ee2f78bd77
commit
5a84840092
@ -1,4 +1,4 @@
|
||||
package: name='org.mifospay' versionCode='1' versionName='2025.10.5-beta.0.16' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
|
||||
package: name='org.mifospay' versionCode='1' versionName='2025.10.5-beta.0.1' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
|
||||
minSdkVersion:'26'
|
||||
targetSdkVersion:'34'
|
||||
uses-permission: name='android.permission.INTERNET'
|
||||
|
||||
@ -50,5 +50,5 @@ Pod::Spec.new do |spec|
|
||||
SCRIPT
|
||||
}
|
||||
]
|
||||
spec.resources = ['build\compose\cocoapods\compose-resources']
|
||||
spec.resources = ['build/compose/cocoapods/compose-resources']
|
||||
end
|
||||
@ -108,10 +108,6 @@ fun InterbankTransferFlowScreen(
|
||||
viewModel.trySendAction(InterbankTransferAction.UpdateAmount(amount))
|
||||
},
|
||||
date = state.transferDate,
|
||||
initialDate = state.initialDate,
|
||||
onDateChanged = { date ->
|
||||
viewModel.trySendAction(InterbankTransferAction.UpdateDate(date))
|
||||
},
|
||||
description = state.transferDescription,
|
||||
onDescriptionChanged = { desc ->
|
||||
viewModel.trySendAction(InterbankTransferAction.UpdateDescription(desc))
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
*/
|
||||
package org.mifospay.feature.send.interbank.screens
|
||||
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@ -25,17 +23,11 @@ import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.CalendarMonth
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.DatePicker
|
||||
import androidx.compose.material3.DatePickerDialog
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.SelectableDates
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.rememberDatePickerState
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.derivedStateOf
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
@ -47,13 +39,11 @@ import androidx.compose.ui.text.input.ImeAction
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.Res
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_amount
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_available_balance
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_cancel
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_continue
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_date
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_description
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_edit
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_from_account
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_ok
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_to_account
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_to_account_interbank
|
||||
import mobile_wallet.feature.send_interbank.generated.resources.feature_send_interbank_transfer_details
|
||||
@ -73,18 +63,15 @@ import org.mifospay.core.model.savingsaccount.Currency
|
||||
import org.mifospay.core.model.savingsaccount.Status
|
||||
import org.mifospay.core.ui.AmountEditText
|
||||
import template.core.base.designsystem.theme.KptTheme
|
||||
import kotlin.time.ExperimentalTime
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class, ExperimentalTime::class)
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun TransferDetailsScreen(
|
||||
fromAccount: Account?,
|
||||
recipient: InterBankPartyInfoResponse?,
|
||||
amount: String,
|
||||
onAmountChanged: (String) -> Unit,
|
||||
initialDate: Long,
|
||||
date: String,
|
||||
onDateChanged: (Long) -> Unit,
|
||||
description: String,
|
||||
onDescriptionChanged: (String) -> Unit,
|
||||
onContinueClick: () -> Unit,
|
||||
@ -93,8 +80,6 @@ fun TransferDetailsScreen(
|
||||
onEditRecipient: () -> Unit = {},
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
var showDatePicker by remember { mutableStateOf(false) }
|
||||
|
||||
MifosScaffold(
|
||||
modifier = modifier,
|
||||
topBar = {
|
||||
@ -223,12 +208,7 @@ fun TransferDetailsScreen(
|
||||
colors = CardDefaults.cardColors(KptTheme.colorScheme.background),
|
||||
shape = KptTheme.shapes.medium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clickable {
|
||||
// Hide the onclick show transaction date picker for now as
|
||||
// we are not allowing
|
||||
// showDatePicker = true
|
||||
},
|
||||
.fillMaxWidth(),
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
@ -287,44 +267,6 @@ fun TransferDetailsScreen(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val dateState = rememberDatePickerState(
|
||||
initialSelectedDateMillis = initialDate,
|
||||
selectableDates = object : SelectableDates {
|
||||
override fun isSelectableDate(utcTimeMillis: Long): Boolean {
|
||||
return utcTimeMillis <= initialDate
|
||||
}
|
||||
},
|
||||
)
|
||||
|
||||
val confirmEnabled = remember {
|
||||
derivedStateOf { dateState.selectedDateMillis != null }
|
||||
}
|
||||
|
||||
// Date Picker Dialog
|
||||
AnimatedVisibility(showDatePicker) {
|
||||
DatePickerDialog(
|
||||
onDismissRequest = { showDatePicker = false },
|
||||
confirmButton = {
|
||||
TextButton(
|
||||
onClick = {
|
||||
showDatePicker = false
|
||||
onDateChanged(dateState.selectedDateMillis ?: initialDate)
|
||||
},
|
||||
enabled = confirmEnabled.value,
|
||||
) {
|
||||
Text(text = stringResource(Res.string.feature_send_interbank_ok))
|
||||
}
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = { showDatePicker = false }) {
|
||||
Text(text = stringResource(Res.string.feature_send_interbank_cancel))
|
||||
}
|
||||
},
|
||||
) {
|
||||
DatePicker(state = dateState)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
@ -522,12 +464,10 @@ fun TransferDetailsScreenPreview() {
|
||||
amount = "100.00",
|
||||
onAmountChanged = {},
|
||||
date = "11/09/25",
|
||||
onDateChanged = {},
|
||||
description = "Dinner share",
|
||||
onDescriptionChanged = {},
|
||||
onContinueClick = {},
|
||||
onBackClick = {},
|
||||
initialDate = 1,
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -594,12 +534,10 @@ fun TransferDetailsScreenEmptyPreview() {
|
||||
amount = "",
|
||||
onAmountChanged = {},
|
||||
date = "",
|
||||
onDateChanged = {},
|
||||
description = "",
|
||||
onDescriptionChanged = {},
|
||||
onContinueClick = {},
|
||||
onBackClick = {},
|
||||
initialDate = 1,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user