Merge branch 'develop'

delacrixmorgan · Jun 10, 2019 · fe8f3f3 · fe8f3f3
2 parents f46afea + 12d83f6
commit fe8f3f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,8 +21,9 @@ android {
         applicationId "com.delacrixmorgan.kingscup"
         minSdkVersion 19
         targetSdkVersion rootProject.ext.compileSdkVersion
-        versionCode 25
-        versionName "2.4.0"
+        multiDexEnabled true
+        versionCode 26
+        versionName "2.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -52,6 +53,7 @@ dependencies {
     implementation "androidx.core:core-ktx:$androidx_ktx_core_version"
     implementation "androidx.fragment:fragment-ktx:$androidx_ktx_fragment_version"
 
+    implementation "androidx.multidex:multidex:$androidx_multidex_version"
     implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
     implementation "com.google.android.material:material:$material_components_version"
     implementation "androidx.recyclerview:recyclerview:$androidx_recyclerview_version"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="${appLabel}"

diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -12,6 +12,8 @@
         tools:layout="@layout/fragment_launch">
         <action
             android:id="@+id/action_launchFragment_to_menuFragment"
+            app:popUpTo="@+id/launchFragment"
+            app:popUpToInclusive="true"
             app:destination="@id/navigationMenuFragment" />
         <action
             android:id="@+id/action_launchFragment_to_menuLanguageFragment"

diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,7 @@ buildscript {
         androidx_ktx_core_version = '1.0.2'
         androidx_ktx_fragment_version = '1.0.0'
 
+        androidx_multidex_version = '2.0.1'
         androidx_navigation_version = '1.0.0'
         androidx_recyclerview_version = '1.0.0'
         androidx_appcompat_version = '1.1.0-alpha05'