diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index 7d86a59..d821269 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.bin and b/.gradle/5.6.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock
index 4b7b088..4baf4a9 100644
Binary files a/.gradle/5.6.4/executionHistory/executionHistory.lock and b/.gradle/5.6.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin
index b5d18db..f1cc59f 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.bin and b/.gradle/5.6.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock
index d28f9d8..6937c01 100644
Binary files a/.gradle/5.6.4/fileHashes/fileHashes.lock and b/.gradle/5.6.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin
index 46840d8..3218b2f 100644
Binary files a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin and b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.6.4/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin
index 8b82671..c3b5f90 100644
Binary files a/.gradle/5.6.4/javaCompile/classAnalysis.bin and b/.gradle/5.6.4/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin
index 2d596f8..1053ae1 100644
Binary files a/.gradle/5.6.4/javaCompile/jarAnalysis.bin and b/.gradle/5.6.4/javaCompile/jarAnalysis.bin differ
diff --git a/.gradle/5.6.4/javaCompile/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock
index 9a113bf..3a30ef6 100644
Binary files a/.gradle/5.6.4/javaCompile/javaCompile.lock and b/.gradle/5.6.4/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.6.4/javaCompile/taskHistory.bin b/.gradle/5.6.4/javaCompile/taskHistory.bin
index e71008f..4689ded 100644
Binary files a/.gradle/5.6.4/javaCompile/taskHistory.bin and b/.gradle/5.6.4/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 5db3246..4b0d95b 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 063ae6f..efa11cf 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/libraries/Gradle__D__A_TaxiApp_taxiApp26Debug_new_1_taxiapp_ktl__26_8debug__app_libs_xixun_card_settings_1_2_4_jar.xml b/.idea/libraries/Gradle__D__A_TaxiApp_26_taxiapp_ktl_app_libs_xixun_card_settings_1_2_4_jar.xml
similarity index 58%
rename from .idea/libraries/Gradle__D__A_TaxiApp_taxiApp26Debug_new_1_taxiapp_ktl__26_8debug__app_libs_xixun_card_settings_1_2_4_jar.xml
rename to .idea/libraries/Gradle__D__A_TaxiApp_26_taxiapp_ktl_app_libs_xixun_card_settings_1_2_4_jar.xml
index ce40adb..8d74aaf 100644
--- a/.idea/libraries/Gradle__D__A_TaxiApp_taxiApp26Debug_new_1_taxiapp_ktl__26_8debug__app_libs_xixun_card_settings_1_2_4_jar.xml
+++ b/.idea/libraries/Gradle__D__A_TaxiApp_26_taxiapp_ktl_app_libs_xixun_card_settings_1_2_4_jar.xml
@@ -1,5 +1,5 @@
 <component name="libraryTable">
-  <library name="Gradle: D./A_TaxiApp/taxiApp26Debug/new/1/taxiapp-ktl (26_8debug)/app/libs/xixun_card_settings_1.2.4.jar">
+  <library name="Gradle: D./A_TaxiApp/26/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/libs/xixun_card_settings_1.2.4.jar!/" />
     </CLASSES>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f2514f..28da36a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,19 +2,19 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/taxiapp-ktl_(26_8debug).iml" filepath="$PROJECT_DIR$/.idea/modules/taxiapp-ktl_(26_8debug).iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl_(26_8debug).app.unitTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.main.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.unitTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.main.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/taxiapp-ktl.iml" filepath="$PROJECT_DIR$/.idea/modules/taxiapp-ktl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/taxiapp-ktl.app.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.androidTest.iml b/.idea/modules/app/taxiapp-ktl.app.androidTest.iml
similarity index 96%
rename from .idea/modules/app/taxiapp-ktl_(26_8debug).app.androidTest.iml
rename to .idea/modules/app/taxiapp-ktl.app.androidTest.iml
index ee1b743..788eac6 100644
--- a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.androidTest.iml
+++ b/.idea/modules/app/taxiapp-ktl.app.androidTest.iml
@@ -39,7 +39,6 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbacc0420eb54d22b11c3ebe49cbfb9d/jetified-hamcrest-library-1.3.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2aff52a3446202851bad44fbb8fd9c7/jetified-core-1.2.0-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a33f8ce3216f44d0b34f8584fe1d4053/material-1.4.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/45ead938a935c9e6e195051654e8f67e/constraintlayout-2.0.1-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5811bc91d2614a9158a1ca655b9ded43/appcompat-1.3.0-api.jar</arg>
@@ -98,7 +97,6 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2e05a7c119c523ef3da3eca735692616/jetified-kotlin-reflect-1.3.61.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
@@ -130,8 +128,8 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9822764d1b6050859a78a0b3ec51c6dc/jetified-permissionx-1.1.1-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/020b480d2bde92043942aeb85ef94e0f/jetified-YJTools-v1.0.5-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debugAndroidTest" />
@@ -183,8 +181,6 @@
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debugAndroidTest" />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/src/androidTest">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/androidTest/java" isTestSource="true" />
@@ -192,7 +188,7 @@
     <content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" />
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="taxiapp-ktl_(26_8debug).kurotool.main" scope="TEST" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurotool.main" scope="TEST" />
     <orderEntry type="module-library" scope="TEST">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
@@ -202,8 +198,8 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="taxiapp-ktl_(26_8debug).kurolibrary.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: D./A_TaxiApp/taxiApp26Debug/new/1/taxiapp-ktl (26_8debug)/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary.main" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Gradle: D./A_TaxiApp/26/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
@@ -302,5 +298,5 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.github.joeyupdo:YJTools:v1.0.5@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: net.zetetic:android-database-sqlcipher:3.5.7@aar" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl_(26_8debug).app.main" />
+  <component name="TestModuleProperties" production-module="taxiapp-ktl.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.iml b/.idea/modules/app/taxiapp-ktl.app.iml
similarity index 92%
rename from .idea/modules/app/taxiapp-ktl_(26_8debug).app.iml
rename to .idea/modules/app/taxiapp-ktl.app.iml
index 1f39019..aa56362 100644
--- a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.iml
+++ b/.idea/modules/app/taxiapp-ktl.app.iml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="taxiapp-ktl (26_8debug)" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="taxiapp-ktl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
         <option name="LAST_KNOWN_AGP_VERSION" value="3.6.2" />
       </configuration>
     </facet>
diff --git a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.main.iml b/.idea/modules/app/taxiapp-ktl.app.main.iml
similarity index 83%
rename from .idea/modules/app/taxiapp-ktl_(26_8debug).app.main.iml
rename to .idea/modules/app/taxiapp-ktl.app.main.iml
index 293d76b..2e91517 100644
--- a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.main.iml
+++ b/.idea/modules/app/taxiapp-ktl.app.main.iml
@@ -30,7 +30,6 @@
           <stringArguments>
             <stringArg name="classpath">
               <args>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd6ee3eb3fc50696fc57eaf7fa81506a/jetified-xixun_card_settings_1.2.4.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar</arg>
@@ -41,8 +40,6 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f608662a75fc89303d1701f5ec50e0/jetified-lifecycle-reactivestreams-ktx-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec781f3119334c7509522ff1bb966868/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/798edd96275281c937a1982cd81c07a3/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
@@ -118,8 +115,8 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9822764d1b6050859a78a0b3ec51c6dc/jetified-permissionx-1.1.1-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/020b480d2bde92043942aeb85ef94e0f/jetified-YJTools-v1.0.5-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug" />
@@ -159,54 +156,20 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debug" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/src/debug" />
     <content url="file://$MODULE_DIR$/../../../app/src/main">
@@ -217,7 +180,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="taxiapp-ktl_(26_8debug).kurolibrary.main" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary.main" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
@@ -227,8 +190,8 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="taxiapp-ktl_(26_8debug).kurotool.main" />
-    <orderEntry type="library" name="Gradle: D./A_TaxiApp/taxiApp26Debug/new/1/taxiapp-ktl (26_8debug)/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurotool.main" />
+    <orderEntry type="library" name="Gradle: D./A_TaxiApp/26/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.71" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.61" level="project" />
diff --git a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.unitTest.iml b/.idea/modules/app/taxiapp-ktl.app.unitTest.iml
similarity index 94%
rename from .idea/modules/app/taxiapp-ktl_(26_8debug).app.unitTest.iml
rename to .idea/modules/app/taxiapp-ktl.app.unitTest.iml
index b94a029..25e96e5 100644
--- a/.idea/modules/app/taxiapp-ktl_(26_8debug).app.unitTest.iml
+++ b/.idea/modules/app/taxiapp-ktl.app.unitTest.iml
@@ -30,7 +30,6 @@
           <stringArguments>
             <stringArg name="classpath">
               <args>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd6ee3eb3fc50696fc57eaf7fa81506a/jetified-xixun_card_settings_1.2.4.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/50c4f3f9cb89c12875b3d8a37bce3ea8/jetified-kotlin-android-extensions-runtime-1.3.71.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eef10497c076c3e0224eef478dfacc95/jetified-kotlin-stdlib-jdk7-1.3.71.jar</arg>
@@ -41,8 +40,6 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f608662a75fc89303d1701f5ec50e0/jetified-lifecycle-reactivestreams-ktx-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ec781f3119334c7509522ff1bb966868/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/798edd96275281c937a1982cd81c07a3/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
@@ -120,11 +117,8 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cb9e9189a7eabc085ddffe7ef81268f3/jetified-android-database-sqlcipher-3.5.7-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../app/build/tmp/kapt3/classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debugUnitTest" />
@@ -175,9 +169,6 @@
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kapt/debugUnitTest" />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app/src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/java" isTestSource="true" />
@@ -185,7 +176,7 @@
     <content url="file://$MODULE_DIR$/../../../app/src/testDebug" />
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="taxiapp-ktl_(26_8debug).kurolibrary.main" scope="TEST" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurolibrary.main" scope="TEST" />
     <orderEntry type="module-library" scope="TEST">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
@@ -195,8 +186,8 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="taxiapp-ktl_(26_8debug).kurotool.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: D./A_TaxiApp/taxiApp26Debug/new/1/taxiapp-ktl (26_8debug)/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
+    <orderEntry type="module" module-name="taxiapp-ktl.kurotool.main" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Gradle: D./A_TaxiApp/26/taxiapp-ktl/app/libs/xixun_card_settings_1.2.4.jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.71" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.3.61" level="project" />
@@ -284,5 +275,5 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.github.joeyupdo:YJTools:v1.0.5@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: net.zetetic:android-database-sqlcipher:3.5.7@aar" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl_(26_8debug).app.main" />
+  <component name="TestModuleProperties" production-module="taxiapp-ktl.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.androidTest.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml
similarity index 98%
rename from .idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.androidTest.iml
rename to .idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml
index 4f38a92..86bc72f 100644
--- a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.androidTest.iml
+++ b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.androidTest.iml
@@ -97,9 +97,8 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debugAndroidTest" />
@@ -143,7 +142,7 @@
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/buildConfig/androidTest/debug" />
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debugAndroidTest" />
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest">
       <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/androidTest/java" isTestSource="true" />
@@ -227,5 +226,5 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.4.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl_(26_8debug).kurolibrary.main" />
+  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurolibrary.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml
similarity index 92%
rename from .idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.iml
rename to .idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml
index b6c8e38..8af5723 100644
--- a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.iml
+++ b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.iml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurolibrary" external.linked.project.path="$MODULE_DIR$/../../../kurolibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="taxiapp-ktl (26_8debug)" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":kurolibrary" external.linked.project.path="$MODULE_DIR$/../../../kurolibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="taxiapp-ktl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":kurolibrary" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
         <option name="LAST_KNOWN_AGP_VERSION" value="3.6.2" />
       </configuration>
     </facet>
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.main.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml
similarity index 98%
rename from .idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.main.iml
rename to .idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml
index 3328bfd..24d8229 100644
--- a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.main.iml
+++ b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.main.iml
@@ -31,7 +31,6 @@
           <stringArguments>
             <stringArg name="classpath">
               <args>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d81251d5927161ec93d9dc99e7da18e3/jetified-retrofit-2.7.1.jar</arg>
@@ -84,8 +83,8 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0fac2df818d5003a70205e494249161d/jetified-annotation-experimental-1.0.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug" />
@@ -129,7 +128,7 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debug" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurolibrary/src/debug" />
     <content url="file://$MODULE_DIR$/../../../kurolibrary/src/main">
diff --git a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.unitTest.iml b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml
similarity index 97%
rename from .idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.unitTest.iml
rename to .idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml
index 99b3187..5186528 100644
--- a/.idea/modules/kurolibrary/taxiapp-ktl_(26_8debug).kurolibrary.unitTest.iml
+++ b/.idea/modules/kurolibrary/taxiapp-ktl.kurolibrary.unitTest.iml
@@ -85,11 +85,8 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/2.0.1/30988fe2d77f3fe3bf7551bb8a8b795fad7e7226/constraintlayout-solver-2.0.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6caef15cbfc6f35ac8669787bd9cfcab/jetified-junit-4.13.2.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurolibrary/build/tmp/kapt3/classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-32/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/28.0.3/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../kurolibrary/build/tmp/kotlin-classes/debugUnitTest" />
@@ -131,7 +128,7 @@
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/ap_generated_sources/debugUnitTest/out" />
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kapt/debugUnitTest" />
     <content url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurolibrary/src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../../kurolibrary/src/test/java" isTestSource="true" />
@@ -203,5 +200,5 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl_(26_8debug).kurolibrary.main" />
+  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurolibrary.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.androidTest.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml
similarity index 98%
rename from .idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.androidTest.iml
rename to .idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml
index 522001c..8c20161 100644
--- a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.androidTest.iml
+++ b/.idea/modules/kurotool/taxiapp-ktl.kurotool.androidTest.iml
@@ -93,9 +93,8 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f2b33d370b6af0362fe1e71cd0de502/jetified-annotations-13.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61969562c26d090cb354becbc427a8b5/jetified-reactive-streams-1.0.3.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/107e22d3375bddc7d1b0a774a0f08ed5/jetified-gson-2.8.5.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_library_classes/debug/classes.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debugAndroidTest" />
@@ -146,7 +145,7 @@
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/buildConfig/androidTest/debug" />
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debugAndroidTest" />
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugAndroidTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurotool/src/androidTest">
       <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/androidTest/java" isTestSource="true" />
@@ -226,5 +225,5 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl_(26_8debug).kurotool.main" />
+  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurotool.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml
similarity index 92%
rename from .idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.iml
rename to .idea/modules/kurotool/taxiapp-ktl.kurotool.iml
index b3ff05c..2751bbc 100644
--- a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.iml
+++ b/.idea/modules/kurotool/taxiapp-ktl.kurotool.iml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":kurotool" external.linked.project.path="$MODULE_DIR$/../../../kurotool" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="taxiapp-ktl (26_8debug)" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":kurotool" external.linked.project.path="$MODULE_DIR$/../../../kurotool" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="taxiapp-ktl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":kurotool" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
         <option name="LAST_KNOWN_AGP_VERSION" value="3.6.2" />
       </configuration>
     </facet>
diff --git a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.main.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml
similarity index 97%
rename from .idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.main.iml
rename to .idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml
index b8606c5..2ca9b36 100644
--- a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.main.iml
+++ b/.idea/modules/kurotool/taxiapp-ktl.kurotool.main.iml
@@ -31,7 +31,6 @@
           <stringArguments>
             <stringArg name="classpath">
               <args>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6176d58c87e449e2b2e5fc94fb6053c8/jetified-converter-scalars-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b7680124ff9b7ea7fb176d7f0c284ad9/jetified-adapter-rxjava2-2.7.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4fbf1ce8d5ae2af5f523851cfbe8b485/jetified-converter-gson-2.7.1.jar</arg>
@@ -80,8 +79,8 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b8406a0417971e7997dafe8b24d4441f/interpolator-1.0.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug" />
@@ -132,7 +131,7 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debug">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debug" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurotool/src/debug" />
     <content url="file://$MODULE_DIR$/../../../kurotool/src/main">
diff --git a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.unitTest.iml b/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml
similarity index 97%
rename from .idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.unitTest.iml
rename to .idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml
index 81fa7b5..f552111 100644
--- a/.idea/modules/kurotool/taxiapp-ktl_(26_8debug).kurotool.unitTest.iml
+++ b/.idea/modules/kurotool/taxiapp-ktl.kurotool.unitTest.iml
@@ -81,11 +81,8 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73288eb0c21a43b54cd0b7ad8c497738/jetified-junit-4.12.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f21aa167e0a0fee8c0d09407d21d417/jetified-hamcrest-core-1.3.jar</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/intermediates/javac/debug/classes</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../kurotool/build/tmp/kapt3/classes/debug</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
-                <arg>$MODULE_DIR$/../../../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/platforms/android-29/android.jar</arg>
+                <arg>$MODULE_DIR$/../../../../../../Android/sdk/build-tools/29.0.2/core-lambda-stubs.jar</arg>
               </args>
             </stringArg>
             <stringArg name="destination" arg="$MODULE_DIR$/../../../kurotool/build/tmp/kotlin-classes/debugUnitTest" />
@@ -134,7 +131,7 @@
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/ap_generated_sources/debugUnitTest/out" />
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kapt/debugUnitTest" />
     <content url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugUnitTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../kurotool/src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../../kurotool/src/test/java" isTestSource="true" />
@@ -202,5 +199,5 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
   </component>
-  <component name="TestModuleProperties" production-module="taxiapp-ktl_(26_8debug).kurotool.main" />
+  <component name="TestModuleProperties" production-module="taxiapp-ktl.kurotool.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/taxiapp-ktl_(26_8debug).iml b/.idea/modules/taxiapp-ktl.iml
similarity index 58%
rename from .idea/modules/taxiapp-ktl_(26_8debug).iml
rename to .idea/modules/taxiapp-ktl.iml
index 5fb852b..11543a1 100644
--- a/.idea/modules/taxiapp-ktl_(26_8debug).iml
+++ b/.idea/modules/taxiapp-ktl.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="taxiapp-ktl (26_8debug)" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="taxiapp-ktl" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">