Skip to content

Commit 941ec6a

Browse files
softartdevsoftartdev
committed
split shared to core modules
1 parent 20f3db1 commit 941ec6a

File tree

208 files changed

+1283
-1291
lines changed

Some content is hidden

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

208 files changed

+1283
-1291
lines changed

‎.github/workflows/kmp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- '**'
77
tags-ignore:
88
- '**'
9+
pull_request:
910

1011
jobs:
1112
build_job:

‎android-compose-app/build.gradle.kts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ android {
6565
}
6666

6767
dependencies {
68+
implementation(project(":core:domain"))
69+
implementation(project(":core:data"))
70+
implementation(project(":core:presentation"))
6871
implementation(project(":shared"))
69-
implementation(project(":shared-compose-ui"))
7072
implementation(kotlin("reflect"))
7173
implementation(libs.androidx.activity.compose)
7274
implementation(compose.ui)
@@ -75,6 +77,8 @@ dependencies {
7577
debugImplementation(compose.uiTooling)
7678
debugImplementation(libs.androidx.compose.test.manifest)
7779
implementation(libs.androidx.navigation.compose)
80+
implementation(libs.material.theme.prefs)
81+
implementation(libs.napier)
7882
implementation(platform(libs.koin.bom))
7983
implementation(libs.koin.android)
8084
implementation(libs.koin.androidx.compose)
@@ -89,6 +93,8 @@ dependencies {
8993
testImplementation(libs.junit)
9094
testImplementation(libs.bundles.mockito)
9195
androidTestImplementation(project(":jvm-compose-test"))
96+
androidTestImplementation(libs.commonsware.saferoom)
97+
androidTestImplementation(libs.sqlDelight.android)
9298
androidTestImplementation(libs.androidx.test.ext.junit)
9399
androidTestImplementation(libs.androidx.test.runner)
94100
androidTestUtil(libs.androidx.test.orchestrator)

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/CryptInstrumentedTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.softartdev.notedelight
33
import android.text.SpannableStringBuilder
44
import androidx.test.ext.junit.runners.AndroidJUnit4
55
import androidx.test.filters.MediumTest
6-
import com.softartdev.notedelight.shared.PlatformSQLiteState
7-
import com.softartdev.notedelight.shared.db.SafeRepo
6+
import com.softartdev.notedelight.model.PlatformSQLiteState
7+
import com.softartdev.notedelight.repository.SafeRepo
88
import org.junit.Assert.assertEquals
99
import org.junit.Test
1010
import org.junit.runner.RunWith

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/CryptUseCaseInstrumentedTest.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ package com.softartdev.notedelight
22

33
import androidx.test.ext.junit.runners.AndroidJUnit4
44
import androidx.test.filters.MediumTest
5-
import com.softartdev.notedelight.shared.PlatformSQLiteState
6-
import com.softartdev.notedelight.shared.db.SafeRepo
7-
import com.softartdev.notedelight.shared.usecase.crypt.ChangePasswordUseCase
8-
import com.softartdev.notedelight.shared.usecase.crypt.CheckPasswordUseCase
5+
import com.softartdev.notedelight.model.PlatformSQLiteState
6+
import com.softartdev.notedelight.repository.SafeRepo
7+
import com.softartdev.notedelight.usecase.crypt.*
98
import kotlinx.coroutines.runBlocking
109
import org.junit.Assert.assertFalse
1110
import org.junit.Assert.assertTrue

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/SqlDelightCipherInstrumentedTest.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import app.cash.sqldelight.db.SqlDriver
1212
import app.cash.sqldelight.driver.android.AndroidSqliteDriver
1313
import com.commonsware.cwac.saferoom.SQLCipherUtils
1414
import com.commonsware.cwac.saferoom.SafeHelperFactory
15-
import com.softartdev.notedelight.shared.db.SafeRepo.Companion.DB_NAME
16-
import com.softartdev.notedelight.shared.db.TestSchema
17-
import com.softartdev.notedelight.shared.db.TestSchema.firstNote
18-
import com.softartdev.notedelight.shared.db.TestSchema.secondNote
19-
import com.softartdev.notedelight.shared.db.TestSchema.thirdNote
20-
import com.softartdev.notedelight.shared.db.createQueryWrapper
15+
import com.softartdev.notedelight.db.NoteDb
16+
import com.softartdev.notedelight.db.TestSchema
17+
import com.softartdev.notedelight.db.TestSchema.firstNote
18+
import com.softartdev.notedelight.db.TestSchema.secondNote
19+
import com.softartdev.notedelight.db.TestSchema.thirdNote
20+
import com.softartdev.notedelight.db.createQueryWrapper
21+
import com.softartdev.notedelight.repository.SafeRepo.Companion.DB_NAME
2122
import com.softartdev.notedelight.shared.db.Note
22-
import com.softartdev.notedelight.shared.db.NoteDb
2323
import org.junit.Assert.assertEquals
2424
import org.junit.Test
2525
import org.junit.runner.RunWith

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/ui/AndroidUiTests.kt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package com.softartdev.notedelight.ui
22

33
import androidx.compose.ui.test.junit4.createAndroidComposeRule
44
import androidx.test.espresso.Espresso
5-
import androidx.test.espresso.IdlingRegistry
65
import androidx.test.ext.junit.runners.AndroidJUnit4
76
import androidx.test.filters.LargeTest
87
import com.softartdev.notedelight.MainActivity
9-
import com.softartdev.notedelight.shared.base.IdlingRes
108
import leakcanary.DetectLeaksAfterTestSuccess
119
import leakcanary.TestDescriptionHolder
1210
import org.junit.Rule
@@ -25,16 +23,6 @@ class AndroidUiTests : AbstractUiTests() {
2523
.around(DetectLeaksAfterTestSuccess())
2624
.around(composeTestRule)
2725

28-
override fun setUp() {
29-
super.setUp()
30-
IdlingRegistry.getInstance().register(IdlingRes.countingIdlingResource)
31-
}
32-
33-
override fun tearDown() {
34-
super.tearDown()
35-
IdlingRegistry.getInstance().unregister(IdlingRes.countingIdlingResource)
36-
}
37-
3826
@Test
3927
override fun crudNoteTest() = super.crudNoteTest()
4028

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/ui/RotationTest.kt‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,19 @@ package com.softartdev.notedelight.ui
33
import androidx.compose.ui.test.assertIsDisplayed
44
import androidx.compose.ui.test.junit4.createAndroidComposeRule
55
import androidx.compose.ui.test.onNodeWithContentDescription
6-
import androidx.test.espresso.IdlingRegistry
76
import androidx.test.espresso.device.DeviceInteraction.Companion.setScreenOrientation
87
import androidx.test.espresso.device.EspressoDevice.Companion.onDevice
98
import androidx.test.espresso.device.action.ScreenOrientation
109
import androidx.test.espresso.device.rules.ScreenOrientationRule
1110
import androidx.test.ext.junit.runners.AndroidJUnit4
1211
import androidx.test.filters.LargeTest
13-
import com.softartdev.notedelight.ComposeIdlingRes
1412
import com.softartdev.notedelight.MainActivity
15-
import com.softartdev.notedelight.shared.base.IdlingRes
1613
import kotlinx.coroutines.test.runTest
1714
import leakcanary.DetectLeaksAfterTestSuccess
1815
import leakcanary.TestDescriptionHolder
19-
import notedelight.shared_compose_ui.generated.resources.Res
20-
import notedelight.shared_compose_ui.generated.resources.create_note
16+
import notedelight.shared.generated.resources.Res
17+
import notedelight.shared.generated.resources.create_note
2118
import org.jetbrains.compose.resources.getString
22-
import org.junit.After
23-
import org.junit.Before
2419
import org.junit.Ignore
2520
import org.junit.Rule
2621
import org.junit.Test
@@ -39,18 +34,6 @@ class RotationTest {
3934
.around(ScreenOrientationRule(ScreenOrientation.PORTRAIT))
4035
.around(composeTestRule)
4136

42-
@Before
43-
fun registerIdlingResource() {
44-
IdlingRegistry.getInstance().register(IdlingRes.countingIdlingResource)
45-
composeTestRule.registerIdlingResource(ComposeIdlingRes)
46-
}
47-
48-
@After
49-
fun unregisterIdlingResource() {
50-
composeTestRule.unregisterIdlingResource(ComposeIdlingRes)
51-
IdlingRegistry.getInstance().unregister(IdlingRes.countingIdlingResource)
52-
}
53-
5437
@Ignore("Unable to connect to Emulator gRPC port on CI")
5538
@Test
5639
fun rotationTest() = runTest {

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/ui/SignInTest.kt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
package com.softartdev.notedelight.ui
22

33
import androidx.test.espresso.Espresso
4-
import androidx.test.espresso.IdlingRegistry
54
import androidx.test.ext.junit.runners.AndroidJUnit4
65
import androidx.test.filters.FlakyTest
7-
import com.softartdev.notedelight.ComposeIdlingRes
86
import com.softartdev.notedelight.DbTestEncryptor
97
import com.softartdev.notedelight.MainActivity
10-
import com.softartdev.notedelight.shared.base.IdlingRes
118
import com.softartdev.notedelight.ui.cases.SignInTestCase
129
import leakcanary.DetectLeaksAfterTestSuccess
1310
import leakcanary.TestDescriptionHolder
14-
import org.junit.After
15-
import org.junit.Before
1611
import org.junit.Rule
1712
import org.junit.Test
1813
import org.junit.rules.RuleChain
@@ -31,18 +26,6 @@ class SignInTest {
3126
.around(DetectLeaksAfterTestSuccess())
3227
.around(composeTestRule)
3328

34-
@Before
35-
fun registerIdlingResource() {
36-
IdlingRegistry.getInstance().register(IdlingRes.countingIdlingResource)
37-
composeTestRule.registerIdlingResource(ComposeIdlingRes)
38-
}
39-
40-
@After
41-
fun unregisterIdlingResource() {
42-
composeTestRule.unregisterIdlingResource(ComposeIdlingRes)
43-
IdlingRegistry.getInstance().unregister(IdlingRes.countingIdlingResource)
44-
}
45-
4629
@Test
4730
fun signInTest() = SignInTestCase(composeTestRule, Espresso::closeSoftKeyboard).invoke()
4831
}

‎android-compose-app/src/androidTest/java/com/softartdev/notedelight/ui/SignOutTest.kt‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,16 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
55
import androidx.compose.ui.test.onNodeWithContentDescription
66
import androidx.lifecycle.Lifecycle.State.DESTROYED
77
import androidx.test.espresso.Espresso
8-
import androidx.test.espresso.IdlingRegistry
98
import androidx.test.ext.junit.runners.AndroidJUnit4
109
import androidx.test.filters.LargeTest
11-
import com.softartdev.notedelight.ComposeIdlingRes
1210
import com.softartdev.notedelight.MainActivity
13-
import com.softartdev.notedelight.shared.base.IdlingRes
1411
import kotlinx.coroutines.test.runTest
1512
import leakcanary.DetectLeaksAfterTestSuccess
1613
import leakcanary.TestDescriptionHolder
17-
import notedelight.shared_compose_ui.generated.resources.Res
18-
import notedelight.shared_compose_ui.generated.resources.create_note
14+
import notedelight.shared.generated.resources.Res
15+
import notedelight.shared.generated.resources.create_note
1916
import org.jetbrains.compose.resources.getString
20-
import org.junit.After
2117
import org.junit.Assert.assertTrue
22-
import org.junit.Before
2318
import org.junit.Rule
2419
import org.junit.Test
2520
import org.junit.rules.RuleChain
@@ -36,18 +31,6 @@ class SignOutTest {
3631
.around(DetectLeaksAfterTestSuccess())
3732
.around(composeTestRule)
3833

39-
@Before
40-
fun registerIdlingResource() {
41-
IdlingRegistry.getInstance().register(IdlingRes.countingIdlingResource)
42-
composeTestRule.registerIdlingResource(ComposeIdlingRes)
43-
}
44-
45-
@After
46-
fun unregisterIdlingResource() {
47-
composeTestRule.unregisterIdlingResource(ComposeIdlingRes)
48-
IdlingRegistry.getInstance().unregister(IdlingRes.countingIdlingResource)
49-
}
50-
5134
@Test
5235
fun signOutTest() = runTest {
5336
composeTestRule

‎android-compose-app/src/main/java/com/softartdev/notedelight/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.softartdev.notedelight
33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
6-
import com.softartdev.notedelight.shared.navigation.Router
6+
import com.softartdev.notedelight.navigation.Router
77
import org.koin.android.ext.android.inject
88

99
class MainActivity : ComponentActivity() {

0 commit comments

Comments
 (0)