Skip to content

Commit 0efa304

Browse files
Rahul93102Rahul93102
authored
Merge branch 'openMF:development' into development
2 parents abc3d09 + cfa79b9 commit 0efa304

File tree

71 files changed

+1076
-584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1076
-584
lines changed

‎.github/workflows/build-and-deploy-site.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# 5. Upload built artifacts
3333
# 6. Deploy to GitHub Pages
3434

35-
# https://github.com/openMF/mifos-mobile-github-actions/blob/main/.github/workflows/build-and-deploy-site.yaml
35+
# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/build-and-deploy-site.yaml
3636

3737
# ##############################################################################
3838
# DON'T EDIT THIS FILE UNLESS NECESSARY #
@@ -59,7 +59,7 @@ permissions:
5959
jobs:
6060
build_and_deploy_web:
6161
name: Build And Deploy Web App
62-
uses: openMF/mifos-mobile-github-actions/.github/workflows/build-and-deploy-site.yaml@main
62+
uses: openMF/mifos-x-actionhub/.github/workflows/build-and-deploy-site.yaml@v1.0.0
6363
secrets: inherit
6464
with:
6565
web_package_name: 'mifospay-web' # <-- Change with your web package name

‎.github/workflows/monthly-version-tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# - 2024.02.0 (February 2024 initial release)
3939
# - 2024.02.1 (Potential patch for February 2024)
4040

41-
# https://github.com/openMF/mifos-mobile-github-actions/blob/main/.github/workflows/monthly-version-tag.yaml
41+
# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/monthly-version-tag.yaml
4242

4343
# ##############################################################################
4444
# DON'T EDIT THIS FILE UNLESS NECESSARY #
@@ -62,5 +62,5 @@ concurrency:
6262
jobs:
6363
monthly_release:
6464
name: Tag Monthly Release
65-
uses: openMF/mifos-mobile-github-actions/.github/workflows/monthly-version-tag.yaml@main
65+
uses: openMF/mifos-x-actionhub/.github/workflows/monthly-version-tag.yaml@v1.0.0
6666
secrets: inherit

‎.github/workflows/multi-platform-build-and-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# 3. Toggle platform-specific publishing flags
5252
# 4. Trigger workflow manually or via GitHub Actions UI
5353

54-
# https://github.com/openMF/mifos-mobile-github-actions/blob/main/.github/workflows/multi-platform-build-and-publish.yaml
54+
# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/multi-platform-build-and-publish.yaml
5555

5656
# ##############################################################################
5757
# DON'T EDIT THIS FILE UNLESS NECESSARY #
@@ -96,7 +96,7 @@ concurrency:
9696
jobs:
9797
multi_platform_build_and_publish:
9898
name: Multi-Platform Build and Publish
99-
uses: openMF/mifos-mobile-github-actions/.github/workflows/multi-platform-build-and-publish.yaml@main
99+
uses: openMF/mifos-x-actionhub/.github/workflows/multi-platform-build-and-publish.yaml@v1.0.0
100100
with:
101101
release_type: ${{ inputs.release_type }}
102102
target_branch: ${{ inputs.target_branch }}

‎.github/workflows/pr-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# | `desktop_package_name` | Name of the Desktop project module | String | Yes |
5656
#
5757

58-
# https://github.com/openMF/mifos-mobile-github-actions/blob/main/.github/workflows/pr-check.yaml
58+
# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/pr-check.yaml
5959

6060
# ##############################################################################
6161
# DON'T EDIT THIS FILE UNLESS NECESSARY #
@@ -81,7 +81,7 @@ permissions:
8181
jobs:
8282
pr_checks:
8383
name: PR Checks
84-
uses: openMF/mifos-mobile-github-actions/.github/workflows/pr-check.yaml@main
84+
uses: openMF/mifos-x-actionhub/.github/workflows/pr-check.yaml@v1.0.0
8585
secrets: inherit
8686
with:
8787
android_package_name: 'mifospay-android' # <-- Change Your Android Package Name

‎.github/workflows/promote-to-production.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
# end
4444
# ```
4545

46-
# https://github.com/openMF/mifos-mobile-github-actions/blob/main/.github/workflows/promote-to-production.yaml
46+
# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/promote-to-production.yaml
4747

4848
# ##############################################################################
4949
# DON'T EDIT THIS FILE UNLESS NECESSARY #
@@ -70,6 +70,6 @@ jobs:
7070
# Job to promote app from beta to production in Play Store
7171
play_promote_production:
7272
name: Promote Beta to Production Play Store
73-
uses: openMF/mifos-mobile-github-actions/.github/workflows/promote-to-production.yaml@main
73+
uses: openMF/mifos-x-actionhub/.github/workflows/promote-to-production.yaml@v1.0.0
7474
secrets:
7575
playstore_creds: ${{ secrets.PLAYSTORECREDS }}

‎.run/mifospay-android.run.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="mifospay-android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
3+
<module name="mobile-wallet.mifospay-android" />
4+
<option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
35
<option name="DEPLOY" value="true" />
46
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
57
<option name="DEPLOY_AS_INSTANT" value="false" />
68
<option name="ARTIFACT_NAME" value="" />
79
<option name="PM_INSTALL_OPTIONS" value="" />
810
<option name="ALL_USERS" value="false" />
911
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
12+
<option name="ALLOW_ASSUME_VERIFIED" value="false" />
1013
<option name="CLEAR_APP_STORAGE" value="false" />
1114
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
1215
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
1316
<option name="MODE" value="default_activity" />
17+
<option name="RESTORE_ENABLED" value="false" />
18+
<option name="RESTORE_FILE" value="" />
19+
<option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
1420
<option name="CLEAR_LOGCAT" value="false" />
1521
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
1622
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
@@ -57,6 +63,7 @@
5763
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
5864
</Profilers>
5965
<option name="DEEP_LINK" value="" />
66+
<option name="ACTIVITY" value="" />
6067
<option name="ACTIVITY_CLASS" value="" />
6168
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
6269
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />

‎core/data/src/commonMain/kotlin/org/mifospay/core/data/repositoryImp/StandingInstructionRepositoryImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class StandingInstructionRepositoryImpl(
5454
): Flow<DataState<StandingInstruction>> {
5555
return apiManager.standingInstructionApi
5656
.getStandingInstruction(instructionId)
57+
.catch { DataState.Error(it, null) }
5758
.asDataStateFlow().flowOn(ioDispatcher)
5859
}
5960

‎core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/component/Button.kt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,17 @@ fun MifosButton(
5353
modifier: Modifier = Modifier,
5454
enabled: Boolean = true,
5555
contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
56-
color: Color = MaterialTheme.colorScheme.primary,
56+
disabledColor: Color = MaterialTheme.colorScheme.surfaceContainerHighest,
5757
content: @Composable RowScope.() -> Unit = {},
5858
) {
5959
Button(
6060
onClick = onClick,
6161
modifier = modifier
6262
.height(48.dp),
6363
enabled = enabled,
64-
colors = ButtonDefaults.buttonColors(containerColor = color),
64+
colors = ButtonDefaults.buttonColors(
65+
disabledContainerColor = disabledColor,
66+
),
6567
contentPadding = contentPadding,
6668
content = content,
6769
)
@@ -106,14 +108,12 @@ fun MifosButton(
106108
onClick: () -> Unit,
107109
modifier: Modifier = Modifier,
108110
enabled: Boolean = true,
109-
color: Color = MaterialTheme.colorScheme.primary,
110111
leadingIcon: @Composable (() -> Unit)? = null,
111112
) {
112113
MifosButton(
113114
onClick = onClick,
114115
modifier = modifier,
115116
enabled = enabled,
116-
color = color,
117117
contentPadding = if (leadingIcon != null) {
118118
ButtonDefaults.ButtonWithIconContentPadding
119119
} else {
@@ -179,6 +179,7 @@ fun MifosOutlinedButton(
179179
modifier: Modifier = Modifier,
180180
enabled: Boolean = true,
181181
leadingIcon: @Composable (() -> Unit)? = null,
182+
colors: ButtonColors = ButtonDefaults.outlinedButtonColors(),
182183
) {
183184
MifosOutlinedButton(
184185
onClick = onClick,
@@ -189,6 +190,7 @@ fun MifosOutlinedButton(
189190
} else {
190191
ButtonDefaults.ContentPadding
191192
},
193+
colors = colors,
192194
) {
193195
MifosButtonContent(
194196
text = text,
@@ -211,15 +213,16 @@ fun MifosTextButton(
211213
onClick: () -> Unit,
212214
modifier: Modifier = Modifier,
213215
enabled: Boolean = true,
216+
colors: ButtonColors = ButtonDefaults.textButtonColors(
217+
contentColor = MaterialTheme.colorScheme.onBackground,
218+
),
214219
content: @Composable RowScope.() -> Unit = {},
215220
) {
216221
TextButton(
217222
onClick = onClick,
218223
modifier = modifier,
219224
enabled = enabled,
220-
colors = ButtonDefaults.textButtonColors(
221-
contentColor = MaterialTheme.colorScheme.onBackground,
222-
),
225+
colors = colors,
223226
content = content,
224227
)
225228
}

‎core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/component/IconBox.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
*/
1010
package org.mifospay.core.designsystem.component
1111

12-
import androidx.compose.foundation.BorderStroke
1312
import androidx.compose.foundation.shape.RoundedCornerShape
1413
import androidx.compose.material3.Icon
15-
import androidx.compose.material3.MaterialTheme
1614
import androidx.compose.material3.OutlinedIconButton
1715
import androidx.compose.material3.Surface
1816
import androidx.compose.runtime.Composable
@@ -33,7 +31,6 @@ fun IconBox(
3331
onClick = onClick,
3432
modifier = modifier,
3533
shape = RoundedCornerShape(12.dp),
36-
border = BorderStroke(2.dp, MaterialTheme.colorScheme.onSurface.copy(alpha = 0.1f)),
3734
) {
3835
Icon(
3936
imageVector = icon,

‎core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/component/MifosBasicDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fun MifosBasicDialog(
106106
modifier = Modifier.testTag("AlertContentText"),
107107
)
108108
},
109-
containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
109+
containerColor = MaterialTheme.colorScheme.surface,
110110
modifier = Modifier.semantics {
111111
testTag = "AlertPopup"
112112
},

‎core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/component/MifosScaffold.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ fun MifosScaffold(
4040
backPress: () -> Unit,
4141
modifier: Modifier = Modifier,
4242
topBarTitle: String? = null,
43+
containerColor: Color = Color.Transparent,
4344
floatingActionButtonContent: FloatingActionButtonContent? = null,
4445
pullToRefreshState: MifosPullToRefreshState = rememberMifosPullToRefreshState(),
4546
snackbarHost: @Composable () -> Unit = {},
@@ -66,7 +67,7 @@ fun MifosScaffold(
6667
}
6768
},
6869
snackbarHost = snackbarHost,
69-
containerColor = Color.Transparent,
70+
containerColor = containerColor,
7071
content = { paddingValues ->
7172
val internalPullToRefreshState = rememberPullToRefreshState()
7273
Box(
@@ -106,7 +107,7 @@ fun MifosScaffold(
106107
pullToRefreshState: MifosPullToRefreshState = rememberMifosPullToRefreshState(),
107108
floatingActionButtonPosition: FabPosition = FabPosition.End,
108109
containerColor: Color = Color.Transparent,
109-
contentColor: Color = MaterialTheme.colorScheme.onSurface,
110+
contentColor: Color = MaterialTheme.colorScheme.onBackground,
110111
contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
111112
content: @Composable (PaddingValues) -> Unit,
112113
) {

‎core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/component/MifosTab.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
package org.mifospay.core.designsystem.component
1111

1212
import androidx.compose.foundation.background
13+
import androidx.compose.foundation.border
14+
import androidx.compose.foundation.layout.height
1315
import androidx.compose.foundation.layout.padding
16+
import androidx.compose.foundation.layout.width
1417
import androidx.compose.foundation.shape.RoundedCornerShape
1518
import androidx.compose.material3.MaterialTheme
1619
import androidx.compose.material3.Tab
@@ -30,6 +33,7 @@ fun MifosTab(
3033
modifier: Modifier = Modifier,
3134
selectedColor: Color = MaterialTheme.colorScheme.primary,
3235
unselectedColor: Color = MaterialTheme.colorScheme.primaryContainer,
36+
unselectedBorderColor: Color = Color.Unspecified,
3337
) {
3438
Tab(
3539
text = {
@@ -40,8 +44,14 @@ fun MifosTab(
4044
selectedContentColor = contentColorFor(selectedColor),
4145
unselectedContentColor = contentColorFor(unselectedColor),
4246
modifier = modifier
47+
.height(40.dp)
48+
.padding(horizontal = 4.dp)
4349
.clip(RoundedCornerShape(25.dp))
4450
.background(if (selected) selectedColor else unselectedColor)
45-
.padding(horizontal = 20.dp),
51+
.border(
52+
width = 1.dp,
53+
color = if (!selected) unselectedBorderColor else Color.Transparent,
54+
shape = RoundedCornerShape(25.dp),
55+
),
4656
)
4757
}

‎core/designsystem/src/commonMain/kotlin/org/mifospay/core/designsystem/component/Navigation.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.compose.material3.NavigationRailItemDefaults
2222
import androidx.compose.material3.Text
2323
import androidx.compose.runtime.Composable
2424
import androidx.compose.ui.Modifier
25-
import androidx.compose.ui.graphics.Color
2625
import androidx.compose.ui.unit.dp
2726
import org.jetbrains.compose.ui.tooling.preview.Preview
2827
import org.mifospay.core.designsystem.icon.MifosIcons
@@ -86,7 +85,7 @@ fun MifosNavigationBar(
8685
) {
8786
NavigationBar(
8887
modifier = modifier,
89-
containerColor = MaterialTheme.colorScheme.background,
88+
containerColor = MaterialTheme.colorScheme.surface,
9089
contentColor = MifosNavigationDefaults.navigationContentColor(),
9190
tonalElevation = 0.dp,
9291
content = content,
@@ -153,7 +152,7 @@ fun MifosNavigationRail(
153152
) {
154153
NavigationRail(
155154
modifier = modifier,
156-
containerColor = Color.Transparent,
155+
containerColor = MaterialTheme.colorScheme.surface,
157156
contentColor = MifosNavigationDefaults.navigationContentColor(),
158157
header = header,
159158
content = content,

0 commit comments

Comments
 (0)