Skip to content

Commit be289f0

Browse files
Refactored LazyColumn implementation
1 parent 6aa7d84 commit be289f0

File tree

7 files changed

+29
-54
lines changed

7 files changed

+29
-54
lines changed

feature/about/src/androidMain/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,4 @@
1010
-->
1111
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1212

13-
<!-- <application-->
14-
<!-- android:name=".AndroidApp">-->
15-
<!-- </application>-->
16-
1713
</manifest>

feature/about/src/androidMain/kotlin/org/mifos/mobile/feature/about/AndroidApp.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

feature/about/src/commonMain/kotlin/org/mifos/mobile/feature/about/ui/AboutUsHeader.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import mifos_mobile.feature.about.generated.resources.feature_about_description
2727
import mifos_mobile.feature.about.generated.resources.mifos_logo
2828
import org.jetbrains.compose.resources.painterResource
2929
import org.jetbrains.compose.resources.stringResource
30-
import org.mifos.mobile.core.ui.utils.DevicePreviews
30+
import org.mifos.mobile.core.ui.utils.DevicePreview
3131

32-
@DevicePreviews
32+
@DevicePreview
3333
@Composable
3434
internal fun AboutUsHeader(
3535
modifier: Modifier = Modifier,

feature/about/src/commonMain/kotlin/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.padding
1616
import androidx.compose.foundation.lazy.LazyColumn
1717
import androidx.compose.foundation.lazy.items
1818
import androidx.compose.runtime.Composable
19+
import androidx.compose.runtime.remember
1920
import androidx.compose.ui.Modifier
2021
import androidx.compose.ui.unit.dp
2122
import mifos_mobile.feature.about.generated.resources.Res
@@ -35,15 +36,16 @@ import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
3536
import org.mifos.mobile.core.model.enums.AboutUsListItemId
3637
import org.mifos.mobile.core.ui.component.AboutUsItemCard
3738
import org.mifos.mobile.core.ui.component.MifosItemCard
38-
import org.mifos.mobile.core.ui.utils.DevicePreviews
39+
import org.mifos.mobile.core.ui.utils.DevicePreview
3940
import org.mifos.mobile.feature.about.AboutUsItem
4041

4142
@Composable
4243
internal fun AboutUsScreen(
4344
navigateToItem: (AboutUsItem) -> Unit,
4445
modifier: Modifier = Modifier,
4546
) {
46-
val currentYear = DateHelper.currentDate.year
47+
val currentYear = remember { DateHelper.currentDate.year }
48+
val aboutUsItems = remember { getAboutUsItems() }
4749

4850
LazyColumn(
4951
modifier = modifier
@@ -55,7 +57,7 @@ internal fun AboutUsScreen(
5557
AboutUsHeader()
5658
}
5759

58-
items(getAboutUsItem()) { item ->
60+
items(items = aboutUsItems, key = { item -> item.itemId }) { item ->
5961
MifosItemCard(
6062
modifier = Modifier.padding(bottom = 8.dp),
6163
onClick = { navigateToItem(item) },
@@ -74,7 +76,7 @@ internal fun AboutUsScreen(
7476
}
7577
}
7678

77-
private fun getAboutUsItem(): List<AboutUsItem> {
79+
private fun getAboutUsItems(): List<AboutUsItem> {
7880
return listOf(
7981
AboutUsItem(
8082
title = Res.string.feature_about_app_version,
@@ -108,7 +110,7 @@ private fun getAboutUsItem(): List<AboutUsItem> {
108110
)
109111
}
110112

111-
@DevicePreviews
113+
@DevicePreview
112114
@Composable
113115
fun AboutScreenPreview() {
114116
MifosMobileTheme {

feature/about/src/commonMain/kotlin/org/mifos/mobile/feature/about/ui/PrivacyPolicyScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private fun WebView(
5656
onLoadingChange: (isLoading: Boolean) -> Unit,
5757
modifier: Modifier = Modifier,
5858
) {
59-
Column(modifier) {
59+
Column(modifier = modifier) {
6060
Spacer(modifier = Modifier.height(20.dp))
6161
MifosWebView(
6262
htmlContent = url,

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ private fun RegistrationScreenContent(
279279
PasswordStrengthState.STRONG,
280280
PasswordStrengthState.GOOD,
281281
PasswordStrengthState.VERY_STRONG,
282-
-> 1f
282+
-> 1f
283283
}
284284
LinearProgressIndicator(
285285
progress = { progress },

settings.gradle.kts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,25 @@ include(":core:qrcode")
5757
//include(":core:testing")
5858

5959
// Feature Modules
60-
//include(":feature:loan")
61-
//include(":feature:beneficiary")
62-
//include(":feature:savings")
63-
//include(":feature:guarantor")
64-
//include(":feature:qr")
65-
//include(":feature:transfer-process")
66-
//include(":feature:account")
67-
//include(":feature:recent-transaction")
68-
//include(":feature:client-charge")
69-
//include(":feature:third-party-transfer")
70-
//include(":feature:help")
71-
//include(":feature:notification")
72-
//include(":feature:location")
60+
include(":feature:loan")
61+
include(":feature:beneficiary")
62+
include(":feature:savings")
63+
include(":feature:guarantor")
64+
include(":feature:qr")
65+
include(":feature:transfer-process")
66+
include(":feature:account")
67+
include(":feature:recent-transaction")
68+
include(":feature:client-charge")
69+
include(":feature:third-party-transfer")
70+
include(":feature:help")
71+
include(":feature:notification")
72+
include(":feature:location")
7373
include(":feature:about")
74-
//include(":feature:settings")
75-
//include(":feature:auth")
76-
//include(":feature:update-password")
77-
//include(":feature:home")
78-
//include(":feature:user-profile")
74+
include(":feature:settings")
75+
include(":feature:auth")
76+
include(":feature:update-password")
77+
include(":feature:home")
78+
include(":feature:user-profile")
7979

8080
// Lint Modules
8181
//include(":lint")

0 commit comments

Comments
 (0)