Refactor

AlanCheen · Jan 3, 2023 · d360f48 · d360f48
1 parent 990f3d5
commit d360f48
Show file tree

Hide file tree

Showing 37 changed files with 12 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,8 +46,8 @@ dependencies {
 
     implementation project(path: ':pandora')
     implementation project(path: ':fantasy')
-    implementation project(path: ':archi-core')
-    implementation project(path: ':func')
+    implementation project(path: ':arch-core')
+    implementation project(path: ':arch-func')
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 //    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13.2'

diff --git a/app/src/main/java/me/yifeiyuan/onepiece/dev/MainActivity.kt b/app/src/main/java/me/yifeiyuan/onepiece/dev/MainActivity.kt
@@ -4,8 +4,8 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import me.yifeiyuan.onepiece.dev.test.TestLiveComponents
-import me.yifeiyuan.onepiece.func.IntFunc
-import me.yifeiyuan.onepiece.func.ValueFunc
+import me.yifeiyuan.onepiece.arch.func.IntFunc
+import me.yifeiyuan.onepiece.arch.func.ValueFunc
 import me.yifeiyuan.onepiece.pandora.ktx.*
 
 class MainActivity : AppCompatActivity() {

diff --git a/archi-core/.gitignore → arch-core/.gitignore b/archi-core/.gitignore → arch-core/.gitignore
diff --git a/archi-core/build.gradle → arch-core/build.gradle b/archi-core/build.gradle → arch-core/build.gradle
diff --git a/archi-core/consumer-rules.pro → arch-core/consumer-rules.pro b/archi-core/consumer-rules.pro → arch-core/consumer-rules.pro
diff --git a/archi-core/proguard-rules.pro → arch-core/proguard-rules.pro b/archi-core/proguard-rules.pro → arch-core/proguard-rules.pro
diff --git a/.../onepiece/arch/ExampleInstrumentedTest.kt → .../onepiece/arch/ExampleInstrumentedTest.kt b/.../onepiece/arch/ExampleInstrumentedTest.kt → .../onepiece/arch/ExampleInstrumentedTest.kt
diff --git a/archi-core/src/main/AndroidManifest.xml → arch-core/src/main/AndroidManifest.xml b/archi-core/src/main/AndroidManifest.xml → arch-core/src/main/AndroidManifest.xml
diff --git a/...eiyuan/onepiece/arch/core/CoreActivity.kt → ...eiyuan/onepiece/arch/core/CoreActivity.kt b/...eiyuan/onepiece/arch/core/CoreActivity.kt → ...eiyuan/onepiece/arch/core/CoreActivity.kt
diff --git a/...eiyuan/onepiece/arch/core/CoreFragment.kt → ...eiyuan/onepiece/arch/core/CoreFragment.kt b/...eiyuan/onepiece/arch/core/CoreFragment.kt → ...eiyuan/onepiece/arch/core/CoreFragment.kt
diff --git a/...an/onepiece/arch/core/LazyLoadFragment.kt → ...an/onepiece/arch/core/LazyLoadFragment.kt b/...an/onepiece/arch/core/LazyLoadFragment.kt → ...an/onepiece/arch/core/LazyLoadFragment.kt
diff --git a/...h/core/LifecycleAwareBroadcastReceiver.kt → ...h/core/LifecycleAwareBroadcastReceiver.kt b/...h/core/LifecycleAwareBroadcastReceiver.kt → ...h/core/LifecycleAwareBroadcastReceiver.kt
diff --git a/...epiece/arch/core/LifecycleAwareHandler.kt → ...epiece/arch/core/LifecycleAwareHandler.kt b/...epiece/arch/core/LifecycleAwareHandler.kt → ...epiece/arch/core/LifecycleAwareHandler.kt
diff --git a/...iece/arch/core/data/DataSourceCallback.kt → ...iece/arch/core/data/DataSourceCallback.kt b/...iece/arch/core/data/DataSourceCallback.kt → ...iece/arch/core/data/DataSourceCallback.kt
diff --git a/...onepiece/arch/core/data/DialogCallback.kt → ...onepiece/arch/core/data/DialogCallback.kt b/...onepiece/arch/core/data/DialogCallback.kt → ...onepiece/arch/core/data/DialogCallback.kt
diff --git a/...yuan/onepiece/arch/core/data/ICallback.kt → ...yuan/onepiece/arch/core/data/ICallback.kt b/...yuan/onepiece/arch/core/data/ICallback.kt → ...yuan/onepiece/arch/core/data/ICallback.kt
diff --git a/...an/onepiece/arch/core/data/IDataSource.kt → ...an/onepiece/arch/core/data/IDataSource.kt b/...an/onepiece/arch/core/data/IDataSource.kt → ...an/onepiece/arch/core/data/IDataSource.kt
diff --git a/...an/onepiece/arch/core/data/IRepository.kt → ...an/onepiece/arch/core/data/IRepository.kt b/...an/onepiece/arch/core/data/IRepository.kt → ...an/onepiece/arch/core/data/IRepository.kt
diff --git a/...feiyuan/onepiece/arch/core/data/Result.kt → ...feiyuan/onepiece/arch/core/data/Result.kt b/...feiyuan/onepiece/arch/core/data/Result.kt → ...feiyuan/onepiece/arch/core/data/Result.kt
diff --git a/...ece/arch/core/ui/BaseBottomPopupWindow.kt → ...ece/arch/core/ui/BaseBottomPopupWindow.kt b/...ece/arch/core/ui/BaseBottomPopupWindow.kt → ...ece/arch/core/ui/BaseBottomPopupWindow.kt
diff --git a/.../core/ui/BaseBottomSheetDialogFragment.kt → .../core/ui/BaseBottomSheetDialogFragment.kt b/.../core/ui/BaseBottomSheetDialogFragment.kt → .../core/ui/BaseBottomSheetDialogFragment.kt
diff --git a/...ece/arch/core/ui/BaseBottomStyleDialog.kt → ...ece/arch/core/ui/BaseBottomStyleDialog.kt b/...ece/arch/core/ui/BaseBottomStyleDialog.kt → ...ece/arch/core/ui/BaseBottomStyleDialog.kt
diff --git a/...epiece/arch/core/ui/BaseDialogFragment.kt → ...epiece/arch/core/ui/BaseDialogFragment.kt b/...epiece/arch/core/ui/BaseDialogFragment.kt → ...epiece/arch/core/ui/BaseDialogFragment.kt
diff --git a/.../onepiece/arch/core/ui/BasePopupWindow.kt → .../onepiece/arch/core/ui/BasePopupWindow.kt b/.../onepiece/arch/core/ui/BasePopupWindow.kt → .../onepiece/arch/core/ui/BasePopupWindow.kt
diff --git a/archi-core/src/main/res/values/styles.xml → arch-core/src/main/res/values/styles.xml b/archi-core/src/main/res/values/styles.xml → arch-core/src/main/res/values/styles.xml
diff --git a/...ifeiyuan/onepiece/arch/ExampleUnitTest.kt → ...ifeiyuan/onepiece/arch/ExampleUnitTest.kt b/...ifeiyuan/onepiece/arch/ExampleUnitTest.kt → ...ifeiyuan/onepiece/arch/ExampleUnitTest.kt
diff --git a/func/.gitignore → arch-func/.gitignore b/func/.gitignore → arch-func/.gitignore
diff --git a/func/build.gradle → arch-func/build.gradle b/func/build.gradle → arch-func/build.gradle
diff --git a/func/consumer-rules.pro → arch-func/consumer-rules.pro b/func/consumer-rules.pro → arch-func/consumer-rules.pro
diff --git a/func/proguard-rules.pro → arch-func/proguard-rules.pro b/func/proguard-rules.pro → arch-func/proguard-rules.pro
diff --git a/.../onepiece/func/ExampleInstrumentedTest.kt → .../onepiece/func/ExampleInstrumentedTest.kt b/.../onepiece/func/ExampleInstrumentedTest.kt → .../onepiece/func/ExampleInstrumentedTest.kt
diff --git a/func/src/main/AndroidManifest.xml → arch-func/src/main/AndroidManifest.xml b/func/src/main/AndroidManifest.xml → arch-func/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.yifeiyuan.onepiece.func">
+    package="me.yifeiyuan.onepiece.arch.func">
 
 </manifest>
diff --git a/.../me/yifeiyuan/onepiece/func/Functional.kt → ...ifeiyuan/onepiece/arch/func/Functional.kt b/.../me/yifeiyuan/onepiece/func/Functional.kt → ...ifeiyuan/onepiece/arch/func/Functional.kt
@@ -1,4 +1,4 @@
-package me.yifeiyuan.onepiece.func
+package me.yifeiyuan.onepiece.arch.func
 
 /**
  * Created by 程序亦非猿 on 2022/9/28.

diff --git a/...a/me/yifeiyuan/onepiece/func/Functions.kt → ...yifeiyuan/onepiece/arch/func/Functions.kt b/...a/me/yifeiyuan/onepiece/func/Functions.kt → ...yifeiyuan/onepiece/arch/func/Functions.kt
@@ -1,4 +1,4 @@
-package me.yifeiyuan.onepiece.func
+package me.yifeiyuan.onepiece.arch.func
 
 /**
  * Created by 程序亦非猿 on 2022/9/28.

diff --git a/...ifeiyuan/onepiece/func/ExampleUnitTest.kt → ...ifeiyuan/onepiece/func/ExampleUnitTest.kt b/...ifeiyuan/onepiece/func/ExampleUnitTest.kt → ...ifeiyuan/onepiece/func/ExampleUnitTest.kt
diff --git a/arch-mvi/src/main/java/me/yifeiyuan/onepiece/arch/mvi/State.kt b/arch-mvi/src/main/java/me/yifeiyuan/onepiece/arch/mvi/State.kt
@@ -3,11 +3,11 @@ package me.yifeiyuan.onepiece.arch.mvi
 /**
  * Created by 程序亦非猿 on 2022/12/2.
  */
-sealed class State{
+sealed class State {
 
-    object Idle :State()
+    object Idle : State()
 
-    object Loading:State()
+    object Loading : State()
 
 
 }
diff --git a/settings.gradle b/settings.gradle
@@ -3,9 +3,9 @@ include ':arch-clean'
 include ':arch-mvvm'
 include ':arch-mvi'
 include ':foundation'
-include ':func'
+include ':arch-func'
 include ':fantasy'
 include ':pandora'
-include ':archi-core'
+include ':arch-core'
 include ':app'
 rootProject.name = "OnePiece"