refactor

app/build.gradle

@@ -1,16 +1,15 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-kapt'
 }
 
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        applicationId "studio.kio.ruater.demo"
-        minSdkVersion 16
+        applicationId "studio.kio.android.routeurdemo"
+        minSdkVersion 22
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -33,19 +32,16 @@ android {
     }
 }
 
-kapt{
-    useBuildCache = false
-}
-
 dependencies {
-    implementation project(":ruater-api")
-    kapt project(":ruater-processor")
+    implementation project(":module_a")
+    implementation project(":module_b")
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    testImplementation 'junit:junit:4.+'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

ruater-api/src/androidTest/java/studio/kio/ruater/ruater/api/ExampleInstrumentedTest.kt → app/src/androidTest/java/studio/kio/android/routeurdemo/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package studio.kio.ruater.ruater.api
+package studio.kio.android.routeurdemo
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("studio.kio.ruater.ruater.api.test", appContext.packageName)
+        assertEquals("studio.kio.android.routeurdemo", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="studio.kio.demo">
+    package="studio.kio.android.routeurdemo">
 
     <application
-        android:name=".RuaterApplication"
-        android:allowBackup="false"
+        android:name=".RouteurApp"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.RuaterApplication"
-        tools:ignore="AllowBackup">
-        <activity android:name="studio.kio.ruater.demo.c.DemoActivity" />
-        <activity android:name="studio.kio.ruater.demo.b.ListActivity" />
-        <activity android:name="studio.kio.ruater.demo.a.MainActivity">
+        android:theme="@style/Theme.RouteurDemo">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/studio/kio/android/routeurdemo/MainActivity.kt

@@ -0,0 +1,34 @@
+package studio.kio.android.routeurdemo
+
+import android.os.Bundle
+import android.widget.Button
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import studio.kio.android.common.DemoRoute
+import studio.kio.android.common.ListRoute
+import studio.kio.android.routeur.api.Routeur
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        var index = 0
+        findViewById<Button>(R.id.to_list).setOnClickListener {
+            Routeur.navigateTo(this@MainActivity, ListRoute, index)
+                .onReturn {
+                    Toast.makeText(
+                        this@MainActivity,
+                        "Back from list $it",
+                        Toast.LENGTH_LONG
+                    ).show()
+                    index = it
+                }
+        }
+
+        findViewById<Button>(R.id.to_demo).setOnClickListener {
+            Routeur.navigateTo(this@MainActivity, DemoRoute)
+        }
+    }
+
+}

app/src/main/java/studio/kio/android/routeurdemo/RouteurApp.kt

@@ -0,0 +1,17 @@
+package studio.kio.android.routeurdemo
+
+import android.app.Application
+import studio.kio.android.routeur.api.Routeur
+
+/**
+ * created by KIO on 2021/1/20
+ */
+@Suppress("unused")
+class RouteurApp : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        Routeur.init(this)
+    }
+
+}