Skip to content

Commit a283836

Browse files
committed
Directory restructure :core:designsystem and move files
1 parent 4b60246 commit a283836

File tree

23 files changed

+293
-38
lines changed

23 files changed

+293
-38
lines changed

androidApp/dependencies/demoDebugRuntimeClasspath.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0
127127
androidx.vectordrawable:vectordrawable:1.1.0
128128
androidx.versionedparcelable:versionedparcelable:1.1.1
129129
androidx.viewpager:viewpager:1.0.0
130+
androidx.window.extensions.core:core:1.0.0
131+
androidx.window:window:1.2.0
130132
app.cash.turbine:turbine-jvm:1.1.0
131133
app.cash.turbine:turbine:1.1.0
132134
co.touchlab:kermit-android-debug:2.0.4
@@ -139,7 +141,12 @@ co.touchlab:stately-concurrent-collections-jvm:2.1.0
139141
co.touchlab:stately-concurrent-collections:2.1.0
140142
co.touchlab:stately-strict-jvm:2.1.0
141143
co.touchlab:stately-strict:2.1.0
144+
com.arkivanov.essenty:back-handler-android:2.1.0
145+
com.arkivanov.essenty:back-handler:2.1.0
146+
com.arkivanov.essenty:utils-internal-android:2.1.0
147+
com.arkivanov.essenty:utils-internal:2.1.0
142148
com.caverock:androidsvg-aar:1.4
149+
com.google.accompanist:accompanist-drawablepainter:0.36.0
143150
com.google.accompanist:accompanist-pager:0.34.0
144151
com.google.accompanist:accompanist-permissions:0.34.0
145152
com.google.android.gms:play-services-ads-identifier:18.0.0
@@ -193,8 +200,12 @@ com.squareup.okio:okio-jvm:3.9.1
193200
com.squareup.okio:okio:3.9.1
194201
com.squareup.retrofit2:converter-gson:2.11.0
195202
com.squareup.retrofit2:retrofit:2.11.0
203+
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
204+
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
196205
dev.chrisbanes.snapper:snapper:0.2.2
197206
io.coil-kt.coil3:coil-android:3.0.4
207+
io.coil-kt.coil3:coil-compose-core-android:3.0.4
208+
io.coil-kt.coil3:coil-compose-core:3.0.4
198209
io.coil-kt.coil3:coil-core-android:3.0.4
199210
io.coil-kt.coil3:coil-core:3.0.4
200211
io.coil-kt.coil3:coil-network-core-android:3.0.4
@@ -255,10 +266,15 @@ org.jetbrains.compose.animation:animation-core:1.7.0-rc01
255266
org.jetbrains.compose.animation:animation:1.7.0-rc01
256267
org.jetbrains.compose.annotation-internal:annotation:1.7.3
257268
org.jetbrains.compose.collection-internal:collection:1.7.3
269+
org.jetbrains.compose.components:components-resources-android:1.7.0-rc01
270+
org.jetbrains.compose.components:components-resources:1.7.0-rc01
271+
org.jetbrains.compose.components:components-ui-tooling-preview-android:1.7.0-rc01
272+
org.jetbrains.compose.components:components-ui-tooling-preview:1.7.0-rc01
258273
org.jetbrains.compose.foundation:foundation-layout:1.7.0-rc01
259274
org.jetbrains.compose.foundation:foundation:1.7.0-rc01
260275
org.jetbrains.compose.material3:material3:1.7.0-rc01
261276
org.jetbrains.compose.material:material-icons-core:1.7.0-rc01
277+
org.jetbrains.compose.material:material-icons-extended:1.7.0-rc01
262278
org.jetbrains.compose.material:material-ripple:1.7.0-rc01
263279
org.jetbrains.compose.material:material:1.7.0-rc01
264280
org.jetbrains.compose.runtime:runtime-saveable:1.7.0-rc01
@@ -272,7 +288,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
272288
org.jetbrains.compose.ui:ui:1.7.0-rc01
273289
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
274290
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
275-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
276291
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
277292
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
278293
org.jetbrains.kotlin:kotlin-stdlib:2.1.0

androidApp/dependencies/demoReleaseRuntimeClasspath.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0
122122
androidx.vectordrawable:vectordrawable:1.1.0
123123
androidx.versionedparcelable:versionedparcelable:1.1.1
124124
androidx.viewpager:viewpager:1.0.0
125+
androidx.window.extensions.core:core:1.0.0
126+
androidx.window:window:1.2.0
125127
app.cash.turbine:turbine-jvm:1.1.0
126128
app.cash.turbine:turbine:1.1.0
127129
co.touchlab:kermit-android:2.0.4
@@ -134,7 +136,12 @@ co.touchlab:stately-concurrent-collections-jvm:2.1.0
134136
co.touchlab:stately-concurrent-collections:2.1.0
135137
co.touchlab:stately-strict-jvm:2.1.0
136138
co.touchlab:stately-strict:2.1.0
139+
com.arkivanov.essenty:back-handler-android:2.1.0
140+
com.arkivanov.essenty:back-handler:2.1.0
141+
com.arkivanov.essenty:utils-internal-android:2.1.0
142+
com.arkivanov.essenty:utils-internal:2.1.0
137143
com.caverock:androidsvg-aar:1.4
144+
com.google.accompanist:accompanist-drawablepainter:0.36.0
138145
com.google.accompanist:accompanist-pager:0.34.0
139146
com.google.accompanist:accompanist-permissions:0.34.0
140147
com.google.android.gms:play-services-ads-identifier:18.0.0
@@ -188,8 +195,12 @@ com.squareup.okio:okio-jvm:3.9.1
188195
com.squareup.okio:okio:3.9.1
189196
com.squareup.retrofit2:converter-gson:2.11.0
190197
com.squareup.retrofit2:retrofit:2.11.0
198+
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
199+
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
191200
dev.chrisbanes.snapper:snapper:0.2.2
192201
io.coil-kt.coil3:coil-android:3.0.4
202+
io.coil-kt.coil3:coil-compose-core-android:3.0.4
203+
io.coil-kt.coil3:coil-compose-core:3.0.4
193204
io.coil-kt.coil3:coil-core-android:3.0.4
194205
io.coil-kt.coil3:coil-core:3.0.4
195206
io.coil-kt.coil3:coil-network-core-android:3.0.4
@@ -250,10 +261,15 @@ org.jetbrains.compose.animation:animation-core:1.7.0-rc01
250261
org.jetbrains.compose.animation:animation:1.7.0-rc01
251262
org.jetbrains.compose.annotation-internal:annotation:1.7.3
252263
org.jetbrains.compose.collection-internal:collection:1.7.3
264+
org.jetbrains.compose.components:components-resources-android:1.7.0-rc01
265+
org.jetbrains.compose.components:components-resources:1.7.0-rc01
266+
org.jetbrains.compose.components:components-ui-tooling-preview-android:1.7.0-rc01
267+
org.jetbrains.compose.components:components-ui-tooling-preview:1.7.0-rc01
253268
org.jetbrains.compose.foundation:foundation-layout:1.7.0-rc01
254269
org.jetbrains.compose.foundation:foundation:1.7.0-rc01
255270
org.jetbrains.compose.material3:material3:1.7.0-rc01
256271
org.jetbrains.compose.material:material-icons-core:1.7.0-rc01
272+
org.jetbrains.compose.material:material-icons-extended:1.7.0-rc01
257273
org.jetbrains.compose.material:material-ripple:1.7.0-rc01
258274
org.jetbrains.compose.material:material:1.7.0-rc01
259275
org.jetbrains.compose.runtime:runtime-saveable:1.7.0-rc01
@@ -267,7 +283,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
267283
org.jetbrains.compose.ui:ui:1.7.0-rc01
268284
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
269285
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
270-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
271286
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
272287
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
273288
org.jetbrains.kotlin:kotlin-stdlib:2.1.0

androidApp/dependencies/prodDebugRuntimeClasspath.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0
127127
androidx.vectordrawable:vectordrawable:1.1.0
128128
androidx.versionedparcelable:versionedparcelable:1.1.1
129129
androidx.viewpager:viewpager:1.0.0
130+
androidx.window.extensions.core:core:1.0.0
131+
androidx.window:window:1.2.0
130132
app.cash.turbine:turbine-jvm:1.1.0
131133
app.cash.turbine:turbine:1.1.0
132134
co.touchlab:kermit-android-debug:2.0.4
@@ -139,7 +141,12 @@ co.touchlab:stately-concurrent-collections-jvm:2.1.0
139141
co.touchlab:stately-concurrent-collections:2.1.0
140142
co.touchlab:stately-strict-jvm:2.1.0
141143
co.touchlab:stately-strict:2.1.0
144+
com.arkivanov.essenty:back-handler-android:2.1.0
145+
com.arkivanov.essenty:back-handler:2.1.0
146+
com.arkivanov.essenty:utils-internal-android:2.1.0
147+
com.arkivanov.essenty:utils-internal:2.1.0
142148
com.caverock:androidsvg-aar:1.4
149+
com.google.accompanist:accompanist-drawablepainter:0.36.0
143150
com.google.accompanist:accompanist-pager:0.34.0
144151
com.google.accompanist:accompanist-permissions:0.34.0
145152
com.google.android.gms:play-services-ads-identifier:18.0.0
@@ -193,8 +200,12 @@ com.squareup.okio:okio-jvm:3.9.1
193200
com.squareup.okio:okio:3.9.1
194201
com.squareup.retrofit2:converter-gson:2.11.0
195202
com.squareup.retrofit2:retrofit:2.11.0
203+
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
204+
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
196205
dev.chrisbanes.snapper:snapper:0.2.2
197206
io.coil-kt.coil3:coil-android:3.0.4
207+
io.coil-kt.coil3:coil-compose-core-android:3.0.4
208+
io.coil-kt.coil3:coil-compose-core:3.0.4
198209
io.coil-kt.coil3:coil-core-android:3.0.4
199210
io.coil-kt.coil3:coil-core:3.0.4
200211
io.coil-kt.coil3:coil-network-core-android:3.0.4
@@ -255,10 +266,15 @@ org.jetbrains.compose.animation:animation-core:1.7.0-rc01
255266
org.jetbrains.compose.animation:animation:1.7.0-rc01
256267
org.jetbrains.compose.annotation-internal:annotation:1.7.3
257268
org.jetbrains.compose.collection-internal:collection:1.7.3
269+
org.jetbrains.compose.components:components-resources-android:1.7.0-rc01
270+
org.jetbrains.compose.components:components-resources:1.7.0-rc01
271+
org.jetbrains.compose.components:components-ui-tooling-preview-android:1.7.0-rc01
272+
org.jetbrains.compose.components:components-ui-tooling-preview:1.7.0-rc01
258273
org.jetbrains.compose.foundation:foundation-layout:1.7.0-rc01
259274
org.jetbrains.compose.foundation:foundation:1.7.0-rc01
260275
org.jetbrains.compose.material3:material3:1.7.0-rc01
261276
org.jetbrains.compose.material:material-icons-core:1.7.0-rc01
277+
org.jetbrains.compose.material:material-icons-extended:1.7.0-rc01
262278
org.jetbrains.compose.material:material-ripple:1.7.0-rc01
263279
org.jetbrains.compose.material:material:1.7.0-rc01
264280
org.jetbrains.compose.runtime:runtime-saveable:1.7.0-rc01
@@ -272,7 +288,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
272288
org.jetbrains.compose.ui:ui:1.7.0-rc01
273289
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
274290
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
275-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
276291
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
277292
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
278293
org.jetbrains.kotlin:kotlin-stdlib:2.1.0

androidApp/dependencies/prodReleaseRuntimeClasspath.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0
122122
androidx.vectordrawable:vectordrawable:1.1.0
123123
androidx.versionedparcelable:versionedparcelable:1.1.1
124124
androidx.viewpager:viewpager:1.0.0
125+
androidx.window.extensions.core:core:1.0.0
126+
androidx.window:window:1.2.0
125127
app.cash.turbine:turbine-jvm:1.1.0
126128
app.cash.turbine:turbine:1.1.0
127129
co.touchlab:kermit-android:2.0.4
@@ -134,7 +136,12 @@ co.touchlab:stately-concurrent-collections-jvm:2.1.0
134136
co.touchlab:stately-concurrent-collections:2.1.0
135137
co.touchlab:stately-strict-jvm:2.1.0
136138
co.touchlab:stately-strict:2.1.0
139+
com.arkivanov.essenty:back-handler-android:2.1.0
140+
com.arkivanov.essenty:back-handler:2.1.0
141+
com.arkivanov.essenty:utils-internal-android:2.1.0
142+
com.arkivanov.essenty:utils-internal:2.1.0
137143
com.caverock:androidsvg-aar:1.4
144+
com.google.accompanist:accompanist-drawablepainter:0.36.0
138145
com.google.accompanist:accompanist-pager:0.34.0
139146
com.google.accompanist:accompanist-permissions:0.34.0
140147
com.google.android.gms:play-services-ads-identifier:18.0.0
@@ -188,8 +195,12 @@ com.squareup.okio:okio-jvm:3.9.1
188195
com.squareup.okio:okio:3.9.1
189196
com.squareup.retrofit2:converter-gson:2.11.0
190197
com.squareup.retrofit2:retrofit:2.11.0
198+
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
199+
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
191200
dev.chrisbanes.snapper:snapper:0.2.2
192201
io.coil-kt.coil3:coil-android:3.0.4
202+
io.coil-kt.coil3:coil-compose-core-android:3.0.4
203+
io.coil-kt.coil3:coil-compose-core:3.0.4
193204
io.coil-kt.coil3:coil-core-android:3.0.4
194205
io.coil-kt.coil3:coil-core:3.0.4
195206
io.coil-kt.coil3:coil-network-core-android:3.0.4
@@ -250,10 +261,15 @@ org.jetbrains.compose.animation:animation-core:1.7.0-rc01
250261
org.jetbrains.compose.animation:animation:1.7.0-rc01
251262
org.jetbrains.compose.annotation-internal:annotation:1.7.3
252263
org.jetbrains.compose.collection-internal:collection:1.7.3
264+
org.jetbrains.compose.components:components-resources-android:1.7.0-rc01
265+
org.jetbrains.compose.components:components-resources:1.7.0-rc01
266+
org.jetbrains.compose.components:components-ui-tooling-preview-android:1.7.0-rc01
267+
org.jetbrains.compose.components:components-ui-tooling-preview:1.7.0-rc01
253268
org.jetbrains.compose.foundation:foundation-layout:1.7.0-rc01
254269
org.jetbrains.compose.foundation:foundation:1.7.0-rc01
255270
org.jetbrains.compose.material3:material3:1.7.0-rc01
256271
org.jetbrains.compose.material:material-icons-core:1.7.0-rc01
272+
org.jetbrains.compose.material:material-icons-extended:1.7.0-rc01
257273
org.jetbrains.compose.material:material-ripple:1.7.0-rc01
258274
org.jetbrains.compose.material:material:1.7.0-rc01
259275
org.jetbrains.compose.runtime:runtime-saveable:1.7.0-rc01
@@ -267,7 +283,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
267283
org.jetbrains.compose.ui:ui:1.7.0-rc01
268284
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
269285
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
270-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
271286
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
272287
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
273288
org.jetbrains.kotlin:kotlin-stdlib:2.1.0

androidApp/src/main/kotlin/org/mifos/mobile/HomeActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import kotlinx.coroutines.flow.onEach
3232
import kotlinx.coroutines.launch
3333
import org.mifos.mobile.HomeActivityUiState.Success
3434
import org.mifos.mobile.core.data.utils.NetworkMonitor
35-
import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
36-
import org.mifos.mobile.core.designsystem.theme.darkScrim
37-
import org.mifos.mobile.core.designsystem.theme.lightScrim
35+
import org.mifos.mobile.designsystem.theme.MifosMobileTheme
36+
import org.mifos.mobile.designsystem.theme.darkScrim
37+
import org.mifos.mobile.designsystem.theme.lightScrim
3838
import org.mifos.mobile.navigation.MifosNavGraph.AUTH_GRAPH
3939
import org.mifos.mobile.navigation.MifosNavGraph.PASSCODE_GRAPH
4040
import org.mifos.mobile.navigation.RootNavGraph

androidApp/src/main/kotlin/org/mifos/mobile/ui/MifosApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import androidx.compose.ui.semantics.semantics
3535
import androidx.compose.ui.semantics.testTagsAsResourceId
3636
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3737
import org.mifos.mobile.R
38-
import org.mifos.mobile.core.designsystem.theme.MifosBackground
38+
import org.mifos.mobile.designsystem.theme.MifosBackground
3939
import org.mifos.mobile.navigation.MifosNavHost
4040

4141
@OptIn(ExperimentalComposeUiApi::class)

core/designsystem/build.gradle.kts

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
* See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
99
*/
1010
plugins {
11-
alias(libs.plugins.mifos.android.library)
12-
alias(libs.plugins.mifos.android.library.compose)
11+
alias(libs.plugins.mifos.kmp.library)
12+
alias(libs.plugins.jetbrainsCompose)
13+
alias(libs.plugins.compose.compiler)
14+
alias(libs.plugins.roborazzi)
1315
}
1416

1517
android {
@@ -19,19 +21,39 @@ android {
1921
namespace = "org.mifos.mobile.core.designsystem"
2022
}
2123

24+
kotlin {
25+
sourceSets {
26+
androidMain.dependencies {
27+
implementation(libs.androidx.compose.ui.tooling.preview)
28+
implementation(libs.androidx.activity.compose)
29+
implementation(projects.core.model)
30+
}
31+
androidInstrumentedTest.dependencies {
32+
implementation(libs.androidx.compose.ui.test)
33+
}
34+
androidUnitTest.dependencies {
35+
implementation(libs.androidx.compose.ui.test)
36+
}
37+
commonMain.dependencies {
38+
implementation(libs.coil.kt.compose)
39+
implementation(compose.runtime)
40+
implementation(compose.foundation)
41+
implementation(compose.material3)
42+
implementation(compose.materialIconsExtended)
43+
implementation(compose.ui)
44+
implementation(compose.uiUtil)
45+
implementation(compose.components.resources)
46+
implementation(compose.components.uiToolingPreview)
47+
api(libs.back.handler)
48+
api(libs.window.size)
49+
}
50+
}
51+
}
2252
dependencies {
23-
api(libs.androidx.compose.ui)
24-
api(libs.androidx.compose.foundation)
25-
api(libs.androidx.compose.foundation.layout)
26-
api(libs.androidx.compose.material.iconsExtended)
27-
api(libs.androidx.compose.material3)
28-
api(libs.androidx.compose.runtime)
29-
api(libs.androidx.compose.ui.util)
30-
api(libs.androidx.activity.compose)
31-
32-
// Accompanist Pager Library
33-
implementation(libs.accompanist.pager)
53+
implementation(libs.androidx.ui.android)
54+
}
3455

35-
testImplementation(libs.androidx.compose.ui.test)
36-
androidTestImplementation(libs.androidx.compose.ui.test)
56+
compose.resources {
57+
publicResClass = true
58+
generateResClass = always
3759
}

0 commit comments

Comments
 (0)