Разбиение кода на core модули

Author: EpicDima

Diff for: LICENSE

@@ -139,7 +139,7 @@ System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
+the work, and the source code for core libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.

Diff for: app/build.gradle.kts

@@ -2,42 +2,30 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
-    id("kotlin-kapt")
+    id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.kapt")
     id("dagger.hilt.android.plugin")
 }
 
 android {
     compileSdk = Android.compileSdk
-    buildToolsVersion = Android.buildTools
 
     defaultConfig {
         applicationId = "com.epicdima.stockfly"
         minSdk = Android.minSdk
         targetSdk = Android.targetSdk
-        versionCode = 3
-        versionName = "0.3"
-
-        vectorDrawables.useSupportLibrary = true
+        versionCode = 4
+        versionName = "0.3.1"
 
         buildConfigField(
             "String",
             "API_KEY",
             gradleLocalProperties(rootDir).getProperty("API_KEY").toString()
         )
-
-        kapt {
-            useBuildCache = true
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-                arg("dagger.fastInit", "enabled")
-                arg("dagger.formatGeneratedSource", "disabled")
-            }
-        }
     }
 
     buildTypes {
-        getByName("release") {
+        release {
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(
@@ -46,17 +34,28 @@ android {
             )
             signingConfig = signingConfigs.getByName("debug")
         }
+        debug {
+            signingConfig = signingConfigs.getByName("debug")
+        }
     }
-
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
-
     kotlinOptions {
-        jvmTarget = "11"
-    }
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
 
+        freeCompilerArgs = freeCompilerArgs + listOf(
+            "-opt-in=kotlin.RequiresOptIn"
+        )
+    }
+    kapt {
+        useBuildCache = true
+        arguments {
+            arg("dagger.fastInit", "enabled")
+            arg("dagger.formatGeneratedSource", "disabled")
+        }
+    }
     buildFeatures {
         buildConfig = true
         viewBinding = true
@@ -77,6 +76,19 @@ android {
 }
 
 dependencies {
+    implementation(project(":core-buildconfig"))
+    implementation(project(":core-utils"))
+    implementation(project(":core-common"))
+    implementation(project(":core-navigation"))
+    implementation(project(":core-ui"))
+    implementation(project(":core-model"))
+    implementation(project(":core-data"))
+    implementation(project(":core-preferences"))
+    implementation(project(":core-customtabs"))
+    implementation(project(":core-shortcuts"))
+    implementation(project(":core-work"))
+    implementation(project(":core-formatter"))
+
     Dependencies.main.apply {
         implementation(kotlinStd)
         implementation(coreKtx)
@@ -126,9 +138,7 @@ dependencies {
         implementation(fragmentKtx)
         implementation(coil)
         implementation(timber)
-        implementation(asynclayoutinflater)
         implementation(browser)
-        implementation(workManager)
     }
 
     Dependencies.debug.apply {

Diff for: app/proguard-rules.pro

@@ -42,8 +42,6 @@
     public static int wtf(...);
 }
 
--keepclasseswithmembers class * { @retrofit2.http.* <methods>; }
-
 -dontwarn org.bouncycastle.jsse.BCSSLParameters
 -dontwarn org.bouncycastle.jsse.BCSSLSocket
 -dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider

Diff for: app/src/main/AndroidManifest.xml

@@ -4,16 +4,6 @@
     package="com.epicdima.stockfly">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data
-                android:host="www.example.com"
-                android:scheme="http" />
-        </intent>
-    </queries>
 
     <application
         android:name=".StockFlyApplication"

Diff for: app/src/main/kotlin/com/epicdima/stockfly/StockFlyApplication.kt

@@ -9,8 +9,7 @@ import androidx.hilt.work.HiltWorkerFactory
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.util.DebugLogger
-import com.epicdima.stockfly.other.Formatter
-import com.epicdima.stockfly.other.RefreshWorker
+import com.epicdima.stockfly.core.work.RefreshWorker
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 import javax.inject.Inject
@@ -22,7 +21,7 @@ class StockFlyApplication : Application(), ImageLoaderFactory,
     private lateinit var configuration: Configuration
 
     @Inject
-    lateinit var formatter: Formatter
+    lateinit var formatter: com.epicdima.stockfly.core.formatter.Formatter
 
     @Inject
     lateinit var workerFactory: HiltWorkerFactory

Diff for: app/src/main/kotlin/com/epicdima/stockfly/db/Database.kt

@@ -0,0 +1,25 @@
+package com.epicdima.stockfly.di
+
+import com.epicdima.stockfly.BuildConfig
+import com.epicdima.stockfly.core.buildconfig.BuildConfigContainer
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object BuildConfigModule {
+
+    @Singleton
+    @Provides
+    fun provideBuildConfigContainer(): BuildConfigContainer {
+        return BuildConfigContainer(
+            BuildConfig.DEBUG,
+            BuildConfig.VERSION_NAME,
+            BuildConfig.VERSION_CODE,
+            BuildConfig.API_KEY
+        )
+    }
+}

Diff for: app/src/main/kotlin/com/epicdima/stockfly/di/BuildConfigModule.kt

@@ -1,7 +1,8 @@
 package com.epicdima.stockfly.di
 
 import android.content.Context
-import com.epicdima.stockfly.shortcut.ShortcutConfigurator
+import com.epicdima.stockfly.core.shortcuts.ShortcutsConfigurator
+import com.epicdima.stockfly.shortcut.RealShortcutsConfigurator
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -11,11 +12,11 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object ShortcutModule {
+object ShortcutsModule {
 
     @Singleton
     @Provides
-    fun provideShortcutConfigurator(@ApplicationContext context: Context): ShortcutConfigurator {
-        return ShortcutConfigurator(context)
+    fun provideShortcutConfigurator(@ApplicationContext context: Context): ShortcutsConfigurator {
+        return RealShortcutsConfigurator(context)
     }
 }

Diff for: app/src/main/kotlin/com/epicdima/stockfly/di/ShortcutModule.kt renamed to app/src/main/kotlin/com/epicdima/stockfly/di/ShortcutsModule.kt

@@ -1,33 +1,17 @@
 package com.epicdima.stockfly.di
 
-import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
-import com.epicdima.stockfly.customtabs.CustomTabsProvider
-import com.epicdima.stockfly.other.LayoutPool
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.qualifiers.ActivityContext
 import dagger.hilt.android.scopes.ActivityScoped
 import javax.inject.Qualifier
 
 @Module
 @InstallIn(ActivityComponent::class)
 object SingleActivityModule {
 
-    @ActivityScoped
-    @Provides
-    fun provideLayoutPool(@ActivityContext context: Context): LayoutPool {
-        return LayoutPool(context)
-    }
-
-    @ActivityScoped
-    @Provides
-    fun provideCustomTabsProvider(@ActivityContext context: Context): CustomTabsProvider {
-        return CustomTabsProvider(context)
-    }
-
     @ActivityScoped
     @Provides
     @CompanyList