+ refactoring

TooLazyy · Mar 6, 2021 · 1cc3f08 · 1cc3f08
1 parent 1cf3b7e
commit 1cc3f08
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 76 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,7 +37,7 @@ android {
 
 dependencies {
 
-    implementation project (":base")
+    implementation project (':mad-base')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     implementation 'androidx.core:core-ktx:1.3.2'

diff --git a/app/src/main/java/ru/wearemad/basic/MainActivity.kt b/app/src/main/java/ru/wearemad/basic/MainActivity.kt
@@ -2,6 +2,4 @@ package ru.wearemad.basic
 
 import androidx.appcompat.app.AppCompatActivity
 
-class MainActivity : AppCompatActivity() {
-
-}
+class MainActivity : AppCompatActivity()
diff --git a/base/src/main/AndroidManifest.xml b/base/src/main/AndroidManifest.xml
diff --git a/config.gradle b/config.gradle
@@ -16,50 +16,12 @@ ext {
 
     //kotlin
     kotlinVersion = '1.4.30'
-    kotlixExtVersion = '1.3.2'
     kotlinCoroutinesVersion = '1.3.9'
     kotlinCoroutinesAndroidVersion = '1.4.1'
-    kotlixLifecycleExtVersion = '2.2.0'
-
-    //firebase
-    googleServicesVersion = '4.3.3'
-    gmsVersion = '17.1.0'
-    fbDatabaseVersion = '19.6.0'
-    fbAuthVersion = '20.0.2'
-    firebaseStorageVersion = '19.2.1'
-    firebaseDynamicLinksVersion = '19.1.1'
 
     //android x
     xVersion = '1.2.0'
-    xConstraint = '2.0.4'
-    xRecycler = '1.0.0'
     xMaterial = '1.3.0'
-    xLifecycle = '2.1.0'
-    xMultidex = '2.0.1'
     xExif = '1.3.2'
-    xAnnotationVersion = '1.0.1'
-    ktxLifecycleVersion = '2.2.0'
     xFragment = '1.3.0'
-    xSwipeRefresh = '1.1.0'
-
-    //room
-    roomVersion = '2.2.6'
-
-    //gson
-    gsonVersion = '2.8.6'
-
-    //coil
-    coilVersion = '1.1.0'
-
-    //koin
-    koinVersion = '2.1.6'
-
-    //lifecyle
-    lifecycleVersion = '2.2.0'
-
-    //cicerone
-    ciceroneVersion = '6.6'
-
-    //rv adapter
-    easyAdapterVersion = '2.0.0'
 }
diff --git a/base/.gitignore → mad-base/.gitignore b/base/.gitignore → mad-base/.gitignore
diff --git a/base/build.gradle → mad-base/build.gradle b/base/build.gradle → mad-base/build.gradle
@@ -40,12 +40,12 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesAndroidVersion"
 
+    implementation "androidx.exifinterface:exifinterface:$xExif"
+
     api "androidx.appcompat:appcompat:$xVersion"
     api "androidx.fragment:fragment-ktx:$xFragment"
     api "com.google.android.material:material:$xMaterial"
 
-    implementation "androidx.exifinterface:exifinterface:$xExif"
-
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

diff --git a/base/consumer-rules.pro → mad-base/consumer-rules.pro b/base/consumer-rules.pro → mad-base/consumer-rules.pro
diff --git a/base/proguard-rules.pro → mad-base/proguard-rules.pro b/base/proguard-rules.pro → mad-base/proguard-rules.pro
diff --git a/.../wearemad/base/ExampleInstrumentedTest.kt → ...remad/mad_base/ExampleInstrumentedTest.kt b/.../wearemad/base/ExampleInstrumentedTest.kt → ...remad/mad_base/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base
+package ru.wearemad.mad_base
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/mad-base/src/main/AndroidManifest.xml b/mad-base/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="ru.wearemad.mad_base" />
diff --git a/...ad/base/activity/CurrentActivityHolder.kt → ...ad_base/activity/CurrentActivityHolder.kt b/...ad/base/activity/CurrentActivityHolder.kt → ...ad_base/activity/CurrentActivityHolder.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.activity
+package ru.wearemad.mad_base.activity
 
 import android.app.Activity
 

diff --git a/.../CurrentActivityHolderActivityCallback.kt → .../CurrentActivityHolderActivityCallback.kt b/.../CurrentActivityHolderActivityCallback.kt → .../CurrentActivityHolderActivityCallback.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.activity
+package ru.wearemad.mad_base.activity
 
 import android.app.Activity
 import android.os.Bundle

diff --git a/...tivity/EmptyActivityLifecycleCallbacks.kt → ...tivity/EmptyActivityLifecycleCallbacks.kt b/...tivity/EmptyActivityLifecycleCallbacks.kt → ...tivity/EmptyActivityLifecycleCallbacks.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.activity
+package ru.wearemad.mad_base.activity
 
 import android.app.Activity
 import android.app.Application

diff --git a/...ctivity/contracts/ContractSelectResult.kt → ...ctivity/contracts/ContractSelectResult.kt b/...ctivity/contracts/ContractSelectResult.kt → ...ctivity/contracts/ContractSelectResult.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.activity.contracts
+package ru.wearemad.mad_base.activity.contracts
 
 import android.net.Uri
 

diff --git a/...ntracts/SelectImageFromGalleryContract.kt → ...ntracts/SelectImageFromGalleryContract.kt b/...ntracts/SelectImageFromGalleryContract.kt → ...ntracts/SelectImageFromGalleryContract.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.activity.contracts
+package ru.wearemad.mad_base.activity.contracts
 
 import android.app.Activity
 import android.content.Context

diff --git a/...ru/wearemad/base/coroutines/CombineExt.kt → ...earemad/mad_base/coroutines/CombineExt.kt b/...ru/wearemad/base/coroutines/CombineExt.kt → ...earemad/mad_base/coroutines/CombineExt.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.coroutines
+package ru.wearemad.mad_base.coroutines
 
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll

diff --git a/...wearemad/base/coroutines/CoroutinesExt.kt → ...emad/mad_base/coroutines/CoroutinesExt.kt b/...wearemad/base/coroutines/CoroutinesExt.kt → ...emad/mad_base/coroutines/CoroutinesExt.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.coroutines
+package ru.wearemad.mad_base.coroutines
 
 import kotlinx.coroutines.channels.SendChannel
 import kotlin.coroutines.Continuation

diff --git a/...ad/base/coroutines/DispatchersProvider.kt → ...ad_base/coroutines/DispatchersProvider.kt b/...ad/base/coroutines/DispatchersProvider.kt → ...ad_base/coroutines/DispatchersProvider.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.coroutines
+package ru.wearemad.mad_base.coroutines
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers

diff --git a/...va/ru/wearemad/base/coroutines/FlowExt.kt → ...u/wearemad/mad_base/coroutines/FlowExt.kt b/...va/ru/wearemad/base/coroutines/FlowExt.kt → ...u/wearemad/mad_base/coroutines/FlowExt.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.coroutines
+package ru.wearemad.mad_base.coroutines
 
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.coroutineScope

diff --git a/...wearemad/base/coroutines/RequestResult.kt → ...emad/mad_base/coroutines/RequestResult.kt b/...wearemad/base/coroutines/RequestResult.kt → ...emad/mad_base/coroutines/RequestResult.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.coroutines
+package ru.wearemad.mad_base.coroutines
 
 sealed class RequestResult<out T : Any?> {
 

diff --git a/...java/ru/wearemad/base/files/FileHelper.kt → .../ru/wearemad/mad_base/files/FileHelper.kt b/...java/ru/wearemad/base/files/FileHelper.kt → .../ru/wearemad/mad_base/files/FileHelper.kt
@@ -1,7 +1,6 @@
-package ru.wearemad.base.files
+package ru.wearemad.mad_base.files
 
 import android.content.Context
-import ru.wearemad.base.files.FileUtils
 import java.io.File
 
 class FileHelper(

diff --git a/.../java/ru/wearemad/base/files/FileUtils.kt → ...a/ru/wearemad/mad_base/files/FileUtils.kt b/.../java/ru/wearemad/base/files/FileUtils.kt → ...a/ru/wearemad/mad_base/files/FileUtils.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.files
+package ru.wearemad.mad_base.files
 
 import android.content.Context
 import java.io.File

diff --git a/...ru/wearemad/base/files/ImageNormalizer.kt → ...earemad/mad_base/files/ImageNormalizer.kt b/...ru/wearemad/base/files/ImageNormalizer.kt → ...earemad/mad_base/files/ImageNormalizer.kt
@@ -1,13 +1,13 @@
-package ru.wearemad.base.files
+package ru.wearemad.mad_base.files
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Matrix
 import androidx.exifinterface.media.ExifInterface
 import kotlinx.coroutines.withContext
-import ru.wearemad.base.coroutines.DispatchersProvider
-import ru.wearemad.base.coroutines.RequestResult
-import ru.wearemad.base.coroutines.wrapResult
+import ru.wearemad.mad_base.coroutines.DispatchersProvider
+import ru.wearemad.mad_base.coroutines.RequestResult
+import ru.wearemad.mad_base.coroutines.wrapResult
 import java.io.File
 import java.io.FileOutputStream
 

diff --git a/...ru/wearemad/base/files/PictureProvider.kt → ...earemad/mad_base/files/PictureProvider.kt b/...ru/wearemad/base/files/PictureProvider.kt → ...earemad/mad_base/files/PictureProvider.kt
@@ -1,12 +1,12 @@
-package ru.wearemad.base.files
+package ru.wearemad.mad_base.files
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
 import kotlinx.coroutines.withContext
-import ru.wearemad.base.coroutines.DispatchersProvider
-import ru.wearemad.base.coroutines.RequestResult
-import ru.wearemad.base.coroutines.wrapResult
+import ru.wearemad.mad_base.coroutines.DispatchersProvider
+import ru.wearemad.mad_base.coroutines.RequestResult
+import ru.wearemad.mad_base.coroutines.wrapResult
 import java.io.File
 import java.io.FileOutputStream
 

diff --git a/.../base/message/DefaultMessageController.kt → ..._base/message/DefaultMessageController.kt b/.../base/message/DefaultMessageController.kt → ..._base/message/DefaultMessageController.kt
@@ -1,10 +1,10 @@
-package ru.wearemad.base.message
+package ru.wearemad.mad_base.message
 
 import android.view.View
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import com.google.android.material.snackbar.Snackbar
-import ru.wearemad.base.activity.CurrentActivityHolder
+import ru.wearemad.mad_base.activity.CurrentActivityHolder
 
 class DefaultMessageController(
     private val activityHolder: CurrentActivityHolder

diff --git a/...earemad/base/message/MessageController.kt → ...mad/mad_base/message/MessageController.kt b/...earemad/base/message/MessageController.kt → ...mad/mad_base/message/MessageController.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.message
+package ru.wearemad.mad_base.message
 
 import android.view.View
 import android.widget.Toast

diff --git a/...sage/MessageControllerActivityCallback.kt → ...sage/MessageControllerActivityCallback.kt b/...sage/MessageControllerActivityCallback.kt → ...sage/MessageControllerActivityCallback.kt
@@ -1,7 +1,7 @@
-package ru.wearemad.base.message
+package ru.wearemad.mad_base.message
 
 import android.app.Activity
-import ru.wearemad.base.activity.EmptyActivityLifecycleCallbacks
+import ru.wearemad.mad_base.activity.EmptyActivityLifecycleCallbacks
 
 class MessageControllerActivityCallback(
     private val messageController: MessageController

diff --git a/.../ru/wearemad/base/validation/Validator.kt → ...wearemad/mad_base/validation/Validator.kt b/.../ru/wearemad/base/validation/Validator.kt → ...wearemad/mad_base/validation/Validator.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base.validation
+package ru.wearemad.mad_base.validation
 
 interface Validator<in P : Any?> {
 

diff --git a/.../java/ru/wearemad/base/ExampleUnitTest.kt → ...a/ru/wearemad/mad_base/ExampleUnitTest.kt b/.../java/ru/wearemad/base/ExampleUnitTest.kt → ...a/ru/wearemad/mad_base/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package ru.wearemad.base
+package ru.wearemad.mad_base
 
 import org.junit.Test
 

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = "Basic"
 include ':app',
-        ':base'
+        ':mad-base'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<manifest package="ru.wearemad.mad_base" />