[GRADLE] Create shared gradle file for feature modules

peterkrauz · Sep 28, 2020 · 7b8edab · 7b8edab
1 parent a96c44b
commit 7b8edab
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 129 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,7 +39,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             resValue "string", "app_name", "Grimoire"
             firebaseAppDistribution {
-                releaseNotesFile="releasenotes.txt"
+                releaseNotesFile = "releasenotes.txt"
             }
         }
         beta {
@@ -48,9 +48,9 @@ android {
             versionNameSuffix "-beta"
             resValue "string", "app_name", "Grimoire Beta"
             firebaseAppDistribution {
-                releaseNotesFile="releasenotes.txt"
-                testers=firebaseBetaTesters
-                groups=firebaseBetaGroups
+                releaseNotesFile = "releasenotes.txt"
+                testers = firebaseBetaTesters
+                groups = firebaseBetaGroups
             }
         }
     }

diff --git a/buildSrc/src/main/java/Deps.kt b/buildSrc/src/main/java/Deps.kt
@@ -15,6 +15,8 @@ object Android {
     const val appCompat = "androidx.appcompat:appcompat:${Versions.appCompat}"
     const val constraintLayout = "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
     const val lifeCycleExtensions = "androidx.lifecycle:lifecycle-extensions:${Versions.lifecycle}"
+    const val lifeCycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycle}"
+    const val lifeCycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:${Versions.lifecycle}"
 }
 
 object Jetpack {

diff --git a/common/src/main/res/navigation/app_nav_graph.xml b/common/src/main/res/navigation/app_nav_graph.xml
@@ -6,18 +6,33 @@
 
     <fragment
         android:id="@+id/arcsFragment"
-        android:name="com.peterkrauz.grimoire.presentation.home.ArcsFragment" />
+        android:label="ArcsFragment"
+        android:name="com.peterkrauz.grimoire.presentation.home.ArcsFragment">
+
+        <action
+            android:id="@+id/addArc"
+            app:enterAnim="@android:anim/slide_out_right"
+            app:destination="@id/addArcFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/addArcFragment"
+        android:label="AddArcsFragment"
+        android:name="com.peterkrauz.grimoire.presentation.home.add.AddArcFragment" />
 
     <fragment
         android:id="@+id/charactersFragment"
+        android:label="CharactersFragment"
         android:name="com.peterkrauz.grimoire.presentation.characters.CharactersFragment" />
 
     <fragment
         android:id="@+id/notesFragment"
+        android:label="NotesFragment"
         android:name="com.peterkrauz.grimoire.presentation.notes.NotesFragment" />
 
     <fragment
         android:id="@+id/tagsFragment"
+        android:label="TagsFragment"
         android:name="com.peterkrauz.grimoire.presentation.tags.TagsFragment" />
 
 </navigation>
diff --git a/feature-config.gradle b/feature-config.gradle
@@ -0,0 +1,31 @@
+android {
+    compileSdkVersion AndroidConfig.compileSdkVersion
+    buildToolsVersion AndroidConfig.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion AndroidConfig.minSdkVersion
+        targetSdkVersion AndroidConfig.targetSdkVersion
+        versionCode AndroidConfig.versionCode
+        versionName AndroidConfig.versionName
+
+        testInstrumentationRunner AndroidConfig.testInstrumentationRunner
+        consumerProguardFiles AndroidConfig.consumerProguardFile
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        beta {
+            initWith debug
+        }
+    }
+    compileOptions {
+        sourceCompatibility = AndroidConfig.javaVersion
+        targetCompatibility = AndroidConfig.javaVersion
+    }
+    kotlinOptions {
+        jvmTarget = AndroidConfig.jvmTarget
+    }
+}
diff --git a/presentation/characters/build.gradle b/presentation/characters/build.gradle
@@ -6,42 +6,13 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
-android {
-    compileSdkVersion AndroidConfig.compileSdkVersion
-    buildToolsVersion AndroidConfig.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion AndroidConfig.minSdkVersion
-        targetSdkVersion AndroidConfig.targetSdkVersion
-        versionCode AndroidConfig.versionCode
-        versionName AndroidConfig.versionName
-
-        testInstrumentationRunner AndroidConfig.testInstrumentationRunner
-        consumerProguardFiles AndroidConfig.consumerProguardFile
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        beta {
-            initWith debug
-        }
-    }
-    compileOptions {
-        sourceCompatibility = AndroidConfig.javaVersion
-        targetCompatibility = AndroidConfig.javaVersion
-    }
-    kotlinOptions {
-        jvmTarget = AndroidConfig.jvmTarget
-    }
-}
+apply from: "$rootProject.projectDir/feature-config.gradle"
 
 dependencies {
     implementation Kotlin.standardLibrary
     implementation Android.coreKtx
     implementation Android.constraintLayout
+    implementation Navigation.navigationFragment
     implementation Hilt.android
     implementation Hilt.viewModel
     kapt Hilt.compiler

diff --git a/presentation/home/build.gradle b/presentation/home/build.gradle
@@ -6,42 +6,13 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
-android {
-    compileSdkVersion AndroidConfig.compileSdkVersion
-    buildToolsVersion AndroidConfig.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion AndroidConfig.minSdkVersion
-        targetSdkVersion AndroidConfig.targetSdkVersion
-        versionCode AndroidConfig.versionCode
-        versionName AndroidConfig.versionName
-
-        testInstrumentationRunner AndroidConfig.testInstrumentationRunner
-        consumerProguardFiles AndroidConfig.consumerProguardFile
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        beta {
-            initWith debug
-        }
-    }
-    compileOptions {
-        sourceCompatibility = AndroidConfig.javaVersion
-        targetCompatibility = AndroidConfig.javaVersion
-    }
-    kotlinOptions {
-        jvmTarget = AndroidConfig.jvmTarget
-    }
-}
+apply from: "$rootProject.projectDir/feature-config.gradle"
 
 dependencies {
     implementation Kotlin.standardLibrary
     implementation Android.coreKtx
     implementation Android.constraintLayout
+    implementation Navigation.navigationFragment
     implementation Hilt.android
     implementation Hilt.viewModel
     kapt Hilt.compiler

diff --git a/presentation/home/src/main/java/com/peterkrauz/grimoire/presentation/home/ArcsFragment.kt b/presentation/home/src/main/java/com/peterkrauz/grimoire/presentation/home/ArcsFragment.kt
@@ -2,11 +2,14 @@ package com.peterkrauz.grimoire.presentation.home
 
 import android.media.MediaPlayer
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class ArcsFragment : Fragment(R.layout.fragment_arcs) {
 
+    private val viewModel: ArcsViewModel by viewModels()
+
     private var mediaPlayer: MediaPlayer? = null
 
     override fun onResume() {

diff --git a/presentation/home/src/main/java/com/peterkrauz/grimoire/presentation/home/ArcsViewModel.kt b/presentation/home/src/main/java/com/peterkrauz/grimoire/presentation/home/ArcsViewModel.kt
@@ -0,0 +1,12 @@
+package com.peterkrauz.grimoire.presentation.home
+
+import androidx.hilt.Assisted
+import androidx.hilt.lifecycle.ViewModelInject
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+
+class ArcsViewModel @ViewModelInject constructor(
+    @Assisted private val savedStateHandle: SavedStateHandle
+) : ViewModel() {
+
+}
diff --git a/...tation/home/src/main/java/com/peterkrauz/grimoire/presentation/home/add/AddArcFragment.kt b/...tation/home/src/main/java/com/peterkrauz/grimoire/presentation/home/add/AddArcFragment.kt
@@ -0,0 +1,3 @@
+package com.peterkrauz.grimoire.presentation.home.add
+
+class AddArcFragment
diff --git a/presentation/notes/build.gradle b/presentation/notes/build.gradle
@@ -6,42 +6,13 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
-android {
-    compileSdkVersion AndroidConfig.compileSdkVersion
-    buildToolsVersion AndroidConfig.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion AndroidConfig.minSdkVersion
-        targetSdkVersion AndroidConfig.targetSdkVersion
-        versionCode AndroidConfig.versionCode
-        versionName AndroidConfig.versionName
-
-        testInstrumentationRunner AndroidConfig.testInstrumentationRunner
-        consumerProguardFiles AndroidConfig.consumerProguardFile
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        beta {
-            initWith debug
-        }
-    }
-    compileOptions {
-        sourceCompatibility = AndroidConfig.javaVersion
-        targetCompatibility = AndroidConfig.javaVersion
-    }
-    kotlinOptions {
-        jvmTarget = AndroidConfig.jvmTarget
-    }
-}
+apply from: "$rootProject.projectDir/feature-config.gradle"
 
 dependencies {
     implementation Kotlin.standardLibrary
     implementation Android.coreKtx
     implementation Android.constraintLayout
+    implementation Navigation.navigationFragment
     implementation Hilt.android
     implementation Hilt.viewModel
     kapt Hilt.compiler

diff --git a/presentation/tags/build.gradle b/presentation/tags/build.gradle
@@ -6,42 +6,13 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
-android {
-    compileSdkVersion AndroidConfig.compileSdkVersion
-    buildToolsVersion AndroidConfig.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion AndroidConfig.minSdkVersion
-        targetSdkVersion AndroidConfig.targetSdkVersion
-        versionCode AndroidConfig.versionCode
-        versionName AndroidConfig.versionName
-
-        testInstrumentationRunner AndroidConfig.testInstrumentationRunner
-        consumerProguardFiles AndroidConfig.consumerProguardFile
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        beta {
-            initWith debug
-        }
-    }
-    compileOptions {
-        sourceCompatibility = AndroidConfig.javaVersion
-        targetCompatibility = AndroidConfig.javaVersion
-    }
-    kotlinOptions {
-        jvmTarget = AndroidConfig.jvmTarget
-    }
-}
+apply from: "$rootProject.projectDir/feature-config.gradle"
 
 dependencies {
     implementation Kotlin.standardLibrary
     implementation Android.coreKtx
     implementation Android.constraintLayout
+    implementation Navigation.navigationFragment
     implementation Hilt.android
     implementation Hilt.viewModel
     kapt Hilt.compiler

diff --git a/presentation/tags/src/main/java/com/peterkrauz/grimoire/presentation/tags/TagsFragment.kt b/presentation/tags/src/main/java/com/peterkrauz/grimoire/presentation/tags/TagsFragment.kt
@@ -1,5 +1,7 @@
 package com.peterkrauz.grimoire.presentation.tags
 
 import androidx.fragment.app.Fragment
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class TagsFragment : Fragment(R.layout.fragment_tags)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.peterkrauz.grimoire.presentation.home.add

		class AddArcFragment