Skip to content

Commit 1e5855c

Browse files
fix: desktop platform startup issue (#2964)
1 parent 43a0a74 commit 1e5855c

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationBarItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fun RowScope.MifosNavigationBarItem(
4747
modifier = Modifier.padding(DesignToken.padding.extraSmall),
4848
text = stringResource(label),
4949
style = MifosTypography.labelMedium,
50-
color = MaterialTheme.colorScheme.secondary,
50+
color = MaterialTheme.colorScheme.onSurface,
5151
)
5252
},
5353
selected = isSelected,

core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRail.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import androidx.compose.foundation.layout.windowInsetsPadding
1919
import androidx.compose.foundation.rememberScrollState
2020
import androidx.compose.foundation.selection.selectableGroup
2121
import androidx.compose.foundation.verticalScroll
22+
import androidx.compose.material3.MaterialTheme
2223
import androidx.compose.material3.NavigationRailDefaults
2324
import androidx.compose.material3.Surface
2425
import androidx.compose.runtime.Composable
2526
import androidx.compose.ui.Alignment
2627
import androidx.compose.ui.Modifier
27-
import androidx.compose.ui.graphics.Color
2828
import androidx.compose.ui.platform.testTag
2929
import androidx.compose.ui.unit.dp
3030
import org.mifos.mobile.core.designsystem.theme.DesignToken
@@ -38,8 +38,8 @@ fun MifosNavigationRail(
3838
windowInsets: WindowInsets = NavigationRailDefaults.windowInsets,
3939
) {
4040
Surface(
41-
color = Color.White,
42-
contentColor = Color.Unspecified,
41+
color = MaterialTheme.colorScheme.surface,
42+
contentColor = MaterialTheme.colorScheme.onSurface,
4343
modifier = modifier,
4444
) {
4545
Column(

core/ui/src/commonMain/kotlin/org/mifos/mobile/core/ui/navigation/MifosNavigationRailItem.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import androidx.compose.material3.NavigationRailItemDefaults
1818
import androidx.compose.material3.Text
1919
import androidx.compose.runtime.Composable
2020
import androidx.compose.ui.Modifier
21-
import androidx.compose.ui.graphics.Color
2221
import androidx.compose.ui.graphics.vector.ImageVector
2322
import org.jetbrains.compose.resources.StringResource
2423
import org.jetbrains.compose.resources.stringResource
@@ -40,15 +39,14 @@ fun ColumnScope.MifosNavigationRailItem(
4039
Icon(
4140
imageVector = if (isSelected) selectedIconRes else unselectedIconRes,
4241
contentDescription = stringResource(contentDescriptionRes),
43-
tint = Color.Unspecified,
4442
)
4543
},
4644
label = {
4745
Text(
4846
modifier = Modifier.padding(DesignToken.padding.extraSmall),
4947
text = stringResource(label),
5048
style = MifosTypography.labelMedium,
51-
color = MaterialTheme.colorScheme.secondary,
49+
color = MaterialTheme.colorScheme.onSurface,
5250
)
5351
},
5452
selected = isSelected,
@@ -57,7 +55,9 @@ fun ColumnScope.MifosNavigationRailItem(
5755
colors = NavigationRailItemDefaults.colors(
5856
selectedIconColor = MaterialTheme.colorScheme.primary,
5957
unselectedIconColor = MaterialTheme.colorScheme.primary,
58+
indicatorColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.3f),
6059
),
60+
6161
modifier = modifier,
6262
)
6363
}

feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferNavigation.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import org.mifos.mobile.core.ui.composableWithSlideTransitions
2424
data class MakeTransferRoute(
2525
val accountId: Long = -1L,
2626
val accountNo: String? = null,
27-
val amount: Double? = null,
28-
val outstandingBalance: Double? = null,
27+
val amount: String? = null,
28+
val outstandingBalance: String? = null,
2929
val transferType: String? = null,
3030
val transferTarget: String? = null,
3131
val transferSuccessDestination: String? = null,
@@ -36,7 +36,7 @@ fun NavController.navigateToMakeTransferScreen(transferPayload: AccountDetails,
3636
MakeTransferRoute(
3737
accountId = transferPayload.accountId,
3838
accountNo = transferPayload.accountNo,
39-
outstandingBalance = transferPayload.outstandingBalance,
39+
outstandingBalance = transferPayload.outstandingBalance.toString(),
4040
transferType = transferPayload.transferType,
4141
transferTarget = transferPayload.transferTarget.name,
4242
transferSuccessDestination = transferPayload.transferSuccessDestination,

feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/makeTransfer/MakeTransferViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ internal class MakeTransferViewModel(
6464
MakeTransferState(
6565
clientId = requireNotNull(userPreferencesRepositoryImpl.clientId.value),
6666
accountId = route.accountId,
67-
outstandingBalance = route.outstandingBalance,
67+
outstandingBalance = route.outstandingBalance?.toDouble(),
6868
transferTarget = if (route.transferTarget != null) {
6969
enumValueOf<TransferType>(route.transferTarget)
7070
} else {

feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessNavGraph.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ data class TransferProcessRoute(
2828
val toClientId: Long? = null,
2929
val toAccountType: Int? = null,
3030
val toAccountId: String? = null,
31-
val transferAmount: Double? = null,
31+
val transferAmount: String? = null,
3232
val transferDescription: String? = null,
3333
val transferType: String = TransferType.SELF.name,
3434
val transferSuccessDestination: String = "",
@@ -63,7 +63,7 @@ fun NavController.navigateToTransferProcessScreen(
6363
toAccountId = transferPayload.payToAccount?.accountNo,
6464
toClientId = transferPayload.payToAccount?.clientId,
6565
toAccountType = transferPayload.payToAccount?.accountType?.id,
66-
transferAmount = transferPayload.amount.toDoubleOrNull(),
66+
transferAmount = transferPayload.amount,
6767
transferDescription = transferPayload.review,
6868
transferType = transferType.name,
6969
transferSuccessDestination = transferSuccessDestination,

feature/transfer-process/src/commonMain/kotlin/org/mifos/mobile/feature/transfer/process/transferProcess/TransferProcessViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ internal class TransferProcessViewModel(
8080
toClientId = route.toClientId,
8181
toAccountType = route.toAccountType,
8282
transferDate = DateHelper.getDateMonthYearString(transferDate),
83-
transferAmount = route.transferAmount,
83+
transferAmount = route.transferAmount?.toDouble(),
8484
transferDescription = route.transferDescription,
8585
dateFormat = "dd MMMM yyyy",
8686
locale = "en",

0 commit comments

Comments
 (0)