Skip to content

Commit e2c1aeb

Browse files
authored
refactor: move mvi to ui contract module (#10611)
2 parents 436f211 + 157474e commit e2c1aeb

104 files changed

Lines changed: 156 additions & 118 deletions

File tree

Some content is hidden

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

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/CatalogContract.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.thunderbird.ui.catalog.ui
22

3-
import app.k9mail.core.ui.compose.common.mvi.UnidirectionalViewModel
3+
import net.thunderbird.core.ui.contract.mvi.UnidirectionalViewModel
44

55
interface CatalogContract {
66

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/CatalogScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import androidx.compose.runtime.LaunchedEffect
88
import androidx.compose.ui.Modifier
99
import androidx.core.view.WindowCompat
1010
import androidx.navigation.compose.rememberNavController
11-
import app.k9mail.core.ui.compose.common.mvi.observe
1211
import app.k9mail.core.ui.compose.designsystem.atom.Surface
12+
import net.thunderbird.core.ui.contract.mvi.observe
1313
import net.thunderbird.ui.catalog.ui.CatalogContract.Event.OnThemeChanged
1414
import net.thunderbird.ui.catalog.ui.CatalogContract.Event.OnThemeVariantChanged
1515
import net.thunderbird.ui.catalog.ui.CatalogContract.ViewModel

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/CatalogViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.thunderbird.ui.catalog.ui
22

3-
import app.k9mail.core.ui.compose.common.mvi.BaseViewModel
3+
import net.thunderbird.core.ui.contract.mvi.BaseViewModel
44
import net.thunderbird.ui.catalog.ui.CatalogContract.Event
55
import net.thunderbird.ui.catalog.ui.CatalogContract.Event.OnThemeChanged
66
import net.thunderbird.ui.catalog.ui.CatalogContract.Event.OnThemeVariantChanged

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/CatalogPageContract.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.thunderbird.ui.catalog.ui.page
22

3-
import app.k9mail.core.ui.compose.common.mvi.UnidirectionalViewModel
3+
import net.thunderbird.core.ui.contract.mvi.UnidirectionalViewModel
44
import net.thunderbird.ui.catalog.ui.page.atom.CatalogAtomPage
55

66
interface CatalogPageContract {

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/CatalogPageViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.thunderbird.ui.catalog.ui.page
22

3-
import app.k9mail.core.ui.compose.common.mvi.BaseViewModel
3+
import net.thunderbird.core.ui.contract.mvi.BaseViewModel
44
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.Event
55
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.State
66
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/atom/CatalogAtomScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package net.thunderbird.ui.catalog.ui.page.atom
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.Modifier
5-
import app.k9mail.core.ui.compose.common.mvi.observe
5+
import net.thunderbird.core.ui.contract.mvi.observe
66
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
77
import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
88
import org.koin.androidx.compose.koinViewModel

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/molecule/CatalogMoleculeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package net.thunderbird.ui.catalog.ui.page.molecule
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.Modifier
5-
import app.k9mail.core.ui.compose.common.mvi.observe
5+
import net.thunderbird.core.ui.contract.mvi.observe
66
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
77
import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
88
import org.koin.androidx.compose.koinViewModel

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/organism/CatalogOrganismScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package net.thunderbird.ui.catalog.ui.page.organism
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.Modifier
5-
import app.k9mail.core.ui.compose.common.mvi.observe
5+
import net.thunderbird.core.ui.contract.mvi.observe
66
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
77
import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
88
import org.koin.androidx.compose.koinViewModel

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/template/CatalogTemplateScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package net.thunderbird.ui.catalog.ui.page.template
22

33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.Modifier
5-
import app.k9mail.core.ui.compose.common.mvi.observe
5+
import net.thunderbird.core.ui.contract.mvi.observe
66
import net.thunderbird.ui.catalog.ui.page.CatalogPageContract.ViewModel
77
import net.thunderbird.ui.catalog.ui.page.CatalogPageViewModel
88
import org.koin.androidx.compose.koinViewModel

build-plugin/src/main/kotlin/thunderbird.library.kmp.compose.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ kotlin {
3030
implementation(project.dependencies.platform(libs.kotlin.bom))
3131
implementation(project.dependencies.platform(libs.koin.bom))
3232
implementation(libs.bundles.shared.kmp.common)
33-
implementation(libs.bundles.shared.kmp.compose)
33+
implementation(libs.bundles.shared.kmp.compose.common)
3434

3535
implementation(libs.jetbrains.compose.runtime)
3636
implementation(libs.jetbrains.compose.foundation)
@@ -41,6 +41,7 @@ kotlin {
4141

4242
commonTest.dependencies {
4343
implementation(libs.bundles.shared.kmp.common.test)
44+
implementation(libs.bundles.shared.kmp.compose.common.test)
4445
}
4546

4647
androidMain.dependencies {

0 commit comments

Comments
 (0)