update

MrFishC · Oct 14, 2022 · 08c2d6b · 08c2d6b
1 parent 3ecb1a9
commit 08c2d6b
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 24 deletions.
diff --git a/app/src/androidTest/java/com/jack/ycrmvvmbase/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/jack/ycrmvvmbase/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package it.jack.ycrmvvmbase
+package com.jack.ycrmvvmbase
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:theme="@style/Theme.YcrMvvmBase"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="com.jack.ycrmvvmbase.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/jack/ycrmvvmbase/MainActivity.kt b/app/src/main/java/com/jack/ycrmvvmbase/MainActivity.kt
@@ -1,7 +1,8 @@
-package it.jack.ycrmvvmbase
+package com.jack.ycrmvvmbase
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import it.jack.ycrmvvmbase.R
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="com.jack.ycrmvvmbase.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"

diff --git a/app/src/test/java/com/jack/ycrmvvmbase/ExampleUnitTest.kt b/app/src/test/java/com/jack/ycrmvvmbase/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package it.jack.ycrmvvmbase
+package com.jack.ycrmvvmbase
 
 import org.junit.Test
 

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/interfa/IBaseView.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/interfa/IBaseView.kt
@@ -1,4 +1,4 @@
-package it.jack.lib_wrapper_mvvm.interfa
+package com.jack.lib_wrapper_mvvm.interfa
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/interfa/IModel.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/interfa/IModel.kt
@@ -1,4 +1,4 @@
-package it.jack.lib_wrapper_mvvm.interfa
+package com.jack.lib_wrapper_mvvm.interfa
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/model/BaseWrapperModel.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/model/BaseWrapperModel.kt
@@ -1,5 +1,5 @@
-package it.jack.lib_wrapper_mvvm.base.model
-import it.jack.lib_wrapper_mvvm.interfa.IModel
+package com.jack.lib_wrapper_mvvm.mvvm.model
+import com.jack.lib_wrapper_mvvm.interfa.IModel
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseMvvmActivity.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseMvvmActivity.kt
@@ -1,10 +1,10 @@
-package it.jack.lib_wrapper_mvvm.base.view
+package com.jack.lib_wrapper_mvvm.mvvm.view
 
 import android.view.LayoutInflater
 import androidx.databinding.ViewDataBinding
-import it.jack.lib_wrapper_mvvm.base.viewmodel.BaseWrapperViewModel
-import it.jack.lib_wrapper_mvvm.interfa.IBaseView
-import it.jack.lib_wrapper_mvvm.uistate.DialogState
+import com.jack.lib_wrapper_mvvm.mvvm.viewmodel.BaseWrapperViewModel
+import com.jack.lib_wrapper_mvvm.interfa.IBaseView
+import com.jack.lib_wrapper_mvvm.uistate.DialogState
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseMvvmFragment.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseMvvmFragment.kt
@@ -1,9 +1,9 @@
-package it.jack.lib_wrapper_mvvm.base.view
+package com.jack.lib_wrapper_mvvm.mvvm.view
 
 import android.view.LayoutInflater
 import androidx.databinding.ViewDataBinding
-import it.jack.lib_wrapper_mvvm.base.viewmodel.BaseWrapperViewModel
-import it.jack.lib_wrapper_mvvm.uistate.DialogState
+import com.jack.lib_wrapper_mvvm.mvvm.viewmodel.BaseWrapperViewModel
+import com.jack.lib_wrapper_mvvm.uistate.DialogState
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseWrapperActivity.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseWrapperActivity.kt
@@ -1,10 +1,10 @@
-package it.jack.lib_wrapper_mvvm.base.view
+package com.jack.lib_wrapper_mvvm.mvvm.view
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.ViewDataBinding
-import it.jack.lib_wrapper_mvvm.interfa.IBaseView
+import com.jack.lib_wrapper_mvvm.interfa.IBaseView
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseWrapperFragment.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/view/BaseWrapperFragment.kt
@@ -1,12 +1,12 @@
-package it.jack.lib_wrapper_mvvm.base.view
+package com.jack.lib_wrapper_mvvm.mvvm.view
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
-import it.jack.lib_wrapper_mvvm.interfa.IBaseView
+import com.jack.lib_wrapper_mvvm.interfa.IBaseView
 
 /**
  * @创建者 Jack

diff --git a/...apper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/viewmodel/BaseWrapperViewModel.kt b/...apper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/mvvm/viewmodel/BaseWrapperViewModel.kt
@@ -1,10 +1,10 @@
-package it.jack.lib_wrapper_mvvm.base.viewmodel
+package com.jack.lib_wrapper_mvvm.mvvm.viewmodel
 
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import it.jack.lib_wrapper_mvvm.base.model.BaseWrapperModel
-import it.jack.lib_wrapper_mvvm.uistate.DialogState
+import com.jack.lib_wrapper_mvvm.mvvm.model.BaseWrapperModel
+import com.jack.lib_wrapper_mvvm.uistate.DialogState
 
 /**
  * @创建者 Jack

diff --git a/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/uistate/DialogState.kt b/lib_wrapper_mvvm/src/main/java/com/jack/lib_wrapper_mvvm/uistate/DialogState.kt
@@ -1,4 +1,4 @@
-package it.jack.lib_wrapper_mvvm.uistate
+package com.jack.lib_wrapper_mvvm.uistate
 
 /**
  * @创建者 Jack