Skip to content

Commit

Permalink
refactor samples
Browse files Browse the repository at this point in the history
  • Loading branch information
InsanusMokrassar committed Mar 5, 2023
1 parent ab66753 commit 1114b1e
Show file tree
Hide file tree
Showing 18 changed files with 14 additions and 15 deletions.
1 change: 0 additions & 1 deletion mvvm/sample/src/main/AndroidManifest.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ dependencies {
implementation libs.android.material
implementation libs.microutils.common

implementation project(":navigation.mvvm.sample")
implementation project(":navigation.sample")
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dev.inmo.navigation.mvvm.sample.android">
package="dev.inmo.navigation.sample.android">

<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.inmo.navigation.mvvm.sample.android
package dev.inmo.navigation.sample.android

import dev.inmo.navigation.core.configs.NavigationNodeDefaultConfig
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.inmo.navigation.mvvm.sample.android
package dev.inmo.navigation.sample.android

import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import dev.inmo.navigation.core.*
import dev.inmo.navigation.core.repo.*
import dev.inmo.navigation.mvvm.sample.android.fragments.TextFragment
import dev.inmo.navigation.sample.android.fragments.TextFragment

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.inmo.navigation.mvvm.sample.android.fragments
package dev.inmo.navigation.sample.android.fragments

import dev.inmo.navigation.core.fragments.NodeFragment
import dev.inmo.navigation.mvvm.sample.android.SampleConfig
import dev.inmo.navigation.sample.android.SampleConfig

abstract class BaseFragment<Config : SampleConfig> : NodeFragment<Config, SampleConfig>() {
}
Original file line number Diff line number Diff line change
@@ -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.*
Expand All @@ -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.*

Expand Down
2 changes: 1 addition & 1 deletion mvvm/sample/build.gradle → sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kotlin {
sourceSets {
commonMain {
dependencies {
api project(":navigation.mvvm")
api project(":navigation.core")
}
}
}
Expand Down
1 change: 1 addition & 0 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<manifest package="dev.inmo.navigation.sample"/>
5 changes: 2 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ rootProject.name = 'navigation'

String[] includes = [
":core",
":mvvm",
":mvvm:sample",
":mvvm:sample:android",
":sample",
":sample:android",
]


Expand Down

0 comments on commit 1114b1e

Please sign in to comment.