Merge branch 'feature/single-component'

# Conflicts:
#	common/.gitignore
#	common/build.gradle
#	common/proguard-rules.pro
#	common/src/main/AndroidManifest.xml

Author: skywall

app/build.gradle

@@ -50,6 +50,7 @@ android {
 
 dependencies {
     api project(":core")
+    api project(":dummy_service")
 
     kapt 'com.google.dagger:dagger-compiler:2.27'
 }

app/src/main/java/cz/skywall/multimoduleexample/App.kt

@@ -2,8 +2,7 @@ package cz.skywall.multimoduleexample
 
 import android.app.Application
 import android.content.SharedPreferences
-import cz.skywall.multimoduleexample.core.injection.CoreSubcomponent
-import cz.skywall.multimoduleexample.core.injection.DaggerModulesComponent
+import cz.skywall.multimoduleexample.core.injection.CoreComponentHolder
 import cz.skywall.multimoduleexample.core.mapper.toDB
 import cz.skywall.multimoduleexample.database.UserDao
 import cz.skywall.multimoduleexample.injection.DaggerApplicationComponent
@@ -13,21 +12,15 @@ import javax.inject.Inject
 
 class App : Application() {
 
-    @Inject lateinit var sharedPreferences: SharedPreferences
-    @Inject lateinit var apiService: ApiService
-    @Inject lateinit var userDao: UserDao
-
-    private val modulesComponent by lazy {
-        DaggerModulesComponent.factory().create()
-    }
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
+    @Inject
+    lateinit var apiService: ApiService
+    @Inject
+    lateinit var userDao: UserDao
 
     private val applicationComponent by lazy {
-        DaggerApplicationComponent.factory()
-            .create(this, coreSubcomponent)
-    }
-
-    val coreSubcomponent: CoreSubcomponent by lazy {
-        modulesComponent.coreSubcomponentFactory().create(this)
+        DaggerApplicationComponent.factory().create(this, CoreComponentHolder.getInstance(this))
     }
 
     override fun onCreate() {

app/src/main/java/cz/skywall/multimoduleexample/injection/ApplicationComponent.kt

@@ -1,23 +1,22 @@
 package cz.skywall.multimoduleexample.injection
 
+import android.app.Application
 import cz.skywall.multimoduleexample.App
-import cz.skywall.multimoduleexample.core.injection.CoreSubcomponent
+import cz.skywall.multimoduleexample.core.injection.CoreComponent
 import dagger.BindsInstance
 import dagger.Component
 
+@ApplicationScope
 @Component(
-    modules = [
-        ApplicationModule::class
-    ],
     dependencies = [
-        CoreSubcomponent::class
+        CoreComponent::class
     ]
 )
-interface ApplicationComponent {
+internal interface ApplicationComponent {
 
     @Component.Factory
     interface Factory {
-        fun create(@BindsInstance app: App, coreSubcomponent: CoreSubcomponent): ApplicationComponent
+        fun create(@BindsInstance application: Application, coreComponent: CoreComponent): ApplicationComponent
     }
 
     fun inject(app: App)

app/src/main/java/cz/skywall/multimoduleexample/injection/ApplicationModule.kt

@@ -0,0 +1,7 @@
+package cz.skywall.multimoduleexample.injection
+
+import javax.inject.Scope
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ApplicationScope

app/src/main/java/cz/skywall/multimoduleexample/injection/ApplicationScope.kt

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/nav_graph"
-    app:startDestination="@id/splashFragment">
-
-    <fragment
-        android:id="@+id/splashFragment"
-        android:name="cz.skywall.multimoduleexample.SplashFragment"
-        android:label="Splash fragment" />
+    android:id="@+id/nav_graph">
 
     <include-dynamic
         android:id="@+id/home_navigation_graph"

app/src/main/res/navigation/main_nav_graph.xml

@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">MultimoduleExample</string>
+    <string name="title_dummy_service">dummy service</string>
 
+    <string name="string_from_app">String from :app</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -0,0 +1 @@
+/build

common/.gitignore

@@ -0,0 +1,38 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+}
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}