diff --git a/mvvm/sample/src/main/AndroidManifest.xml b/mvvm/sample/src/main/AndroidManifest.xml deleted file mode 100644 index a2103e4f..00000000 --- a/mvvm/sample/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/mvvm/sample/android/build.gradle b/sample/android/build.gradle similarity index 96% rename from mvvm/sample/android/build.gradle rename to sample/android/build.gradle index 8efca1f1..776e9db4 100644 --- a/mvvm/sample/android/build.gradle +++ b/sample/android/build.gradle @@ -42,5 +42,5 @@ dependencies { implementation libs.android.material implementation libs.microutils.common - implementation project(":navigation.mvvm.sample") + implementation project(":navigation.sample") } diff --git a/mvvm/sample/android/proguard-rules.pro b/sample/android/proguard-rules.pro similarity index 100% rename from mvvm/sample/android/proguard-rules.pro rename to sample/android/proguard-rules.pro diff --git a/mvvm/sample/android/src/main/AndroidManifest.xml b/sample/android/src/main/AndroidManifest.xml similarity index 91% rename from mvvm/sample/android/src/main/AndroidManifest.xml rename to sample/android/src/main/AndroidManifest.xml index eeefe49b..97b4c56a 100644 --- a/mvvm/sample/android/src/main/AndroidManifest.xml +++ b/sample/android/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="dev.inmo.navigation.sample.android"> : NodeFragment() { } diff --git a/mvvm/sample/android/src/main/java/fragments/TextFragment.kt b/sample/android/src/main/java/fragments/TextFragment.kt similarity index 96% rename from mvvm/sample/android/src/main/java/fragments/TextFragment.kt rename to sample/android/src/main/java/fragments/TextFragment.kt index a13ca56c..1060f345 100644 --- a/mvvm/sample/android/src/main/java/fragments/TextFragment.kt +++ b/sample/android/src/main/java/fragments/TextFragment.kt @@ -1,4 +1,4 @@ -package dev.inmo.navigation.mvvm.sample.android.fragments +package dev.inmo.navigation.sample.android.fragments import android.os.Bundle import android.view.* @@ -10,8 +10,8 @@ import dev.inmo.micro_utils.coroutines.* import dev.inmo.navigation.core.* import dev.inmo.navigation.core.extensions.* import dev.inmo.navigation.core.fragments.view.NavigationFragmentContainerView -import dev.inmo.navigation.mvvm.sample.android.SampleConfig -import dev.inmo.navigation.mvvm.sample.android.R +import dev.inmo.navigation.sample.android.SampleConfig +import dev.inmo.navigation.sample.android.R import kotlinx.coroutines.* import kotlinx.coroutines.flow.* diff --git a/mvvm/sample/android/src/main/res/drawable/ic_launcher_background.xml b/sample/android/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from mvvm/sample/android/src/main/res/drawable/ic_launcher_background.xml rename to sample/android/src/main/res/drawable/ic_launcher_background.xml diff --git a/mvvm/sample/android/src/main/res/layout/activity_main.xml b/sample/android/src/main/res/layout/activity_main.xml similarity index 100% rename from mvvm/sample/android/src/main/res/layout/activity_main.xml rename to sample/android/src/main/res/layout/activity_main.xml diff --git a/mvvm/sample/android/src/main/res/layout/fragment_text.xml b/sample/android/src/main/res/layout/fragment_text.xml similarity index 100% rename from mvvm/sample/android/src/main/res/layout/fragment_text.xml rename to sample/android/src/main/res/layout/fragment_text.xml diff --git a/mvvm/sample/android/src/main/res/values-night/themes.xml b/sample/android/src/main/res/values-night/themes.xml similarity index 100% rename from mvvm/sample/android/src/main/res/values-night/themes.xml rename to sample/android/src/main/res/values-night/themes.xml diff --git a/mvvm/sample/android/src/main/res/values/colors.xml b/sample/android/src/main/res/values/colors.xml similarity index 100% rename from mvvm/sample/android/src/main/res/values/colors.xml rename to sample/android/src/main/res/values/colors.xml diff --git a/mvvm/sample/android/src/main/res/values/strings.xml b/sample/android/src/main/res/values/strings.xml similarity index 100% rename from mvvm/sample/android/src/main/res/values/strings.xml rename to sample/android/src/main/res/values/strings.xml diff --git a/mvvm/sample/android/src/main/res/values/themes.xml b/sample/android/src/main/res/values/themes.xml similarity index 100% rename from mvvm/sample/android/src/main/res/values/themes.xml rename to sample/android/src/main/res/values/themes.xml diff --git a/mvvm/sample/build.gradle b/sample/build.gradle similarity index 86% rename from mvvm/sample/build.gradle rename to sample/build.gradle index 9745872b..61c7aba9 100644 --- a/mvvm/sample/build.gradle +++ b/sample/build.gradle @@ -10,7 +10,7 @@ kotlin { sourceSets { commonMain { dependencies { - api project(":navigation.mvvm") + api project(":navigation.core") } } } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml new file mode 100644 index 00000000..d58ae664 --- /dev/null +++ b/sample/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/settings.gradle b/settings.gradle index 9f47ed59..7d5fa214 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,9 +2,8 @@ rootProject.name = 'navigation' String[] includes = [ ":core", - ":mvvm", - ":mvvm:sample", - ":mvvm:sample:android", + ":sample", + ":sample:android", ]