From f94694fff309f6a66f1b9f68bf0370269d9fa339 Mon Sep 17 00:00:00 2001
From: Ammar Githam <ammargitham786@gmail.com>
Date: Sun, 6 Dec 2020 05:17:46 +0900
Subject: [PATCH] Update/add dependencies and enable proguard (no obfuscation).

---
 app/build.gradle                              | 21 ++++++++++++++-----
 app/proguard-rules.pro                        |  7 +++++++
 .../res/layout/layout_profile_details.xml     |  2 +-
 build.gradle                                  |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a803818e..ccc82cfb 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,13 @@ android {
     aaptOptions { additionalParameters '--no-version-vectors' }
 
     buildTypes {
+        debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -45,19 +50,19 @@ configurations.all {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 
     def appcompat_version = "1.2.0"
-    def nav_version = '2.3.1'
+    def nav_version = '2.3.2'
 
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'com.google.android.material:material:1.3.0-alpha04'
 
     implementation 'com.google.android.exoplayer:exoplayer-core:2.12.0'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.0'
 
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha06"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation "androidx.navigation:navigation-fragment:$nav_version"
@@ -69,6 +74,12 @@ dependencies {
 
     implementation 'com.google.guava:guava:27.0.1-android'
 
+    // Room
+    def room_version = "2.2.5"
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-guava:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+
     // implementation 'com.github.hendrawd:StorageUtil:1.1.0'
     implementation 'com.github.ammargitham:AutoLinkTextViewV2:master-SNAPSHOT'
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b42451..aeb70430 100755
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,10 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#noinspection ShrinkerUnresolvedReference
+#-keep class !com.google.android.exoplayer2.**, ** { *; }
+
+#-keep class !awais.instagrabber.** { *; }
+
+-dontobfuscate
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_profile_details.xml b/app/src/main/res/layout/layout_profile_details.xml
index 0c46eab4..41abd3b3 100644
--- a/app/src/main/res/layout/layout_profile_details.xml
+++ b/app/src/main/res/layout/layout_profile_details.xml
@@ -101,7 +101,7 @@
 
     <ProgressBar
         android:id="@+id/fav_progress"
-        style="@style/Widget.MaterialComponents.ProgressIndicator.Circular.Indeterminate"
+        style="@style/Widget.MaterialComponents.CircularProgressIndicator"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:visibility="gone"
diff --git a/build.gradle b/build.gradle
index 496ace8e..cdffced1 100755
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.1'
-        def nav_version = "2.3.0"
+        def nav_version = "2.3.2"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }
 }