From 269a01ed42916153e5c5e777e07724c08774c40f Mon Sep 17 00:00:00 2001
From: sal0max <msal.coding@gmail.com>
Date: Wed, 21 Sep 2022 06:57:42 +0200
Subject: [PATCH] Allow parallel installation of debug and release versions
 (#636)

* Allow parallel installation of debug and release versions
...by adding '.debug' suffix to application id

* add separate app name resource for debug build
---
 app/build.gradle                            | 4 ++++
 app/src/debug/res/values/strings.xml        | 3 +++
 app/src/main/AndroidManifest.xml            | 2 +-
 app/src/main/res/layout/activity_search.xml | 4 ++--
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 app/src/debug/res/values/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 89c6e95d..95131470 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,10 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix ' (DEBUG)'
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
new file mode 100644
index 00000000..e852a950
--- /dev/null
+++ b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+   <string name="application_name" translatable="false">Infinity (Debug)</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5bd8ebf..4b97efb8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -419,7 +419,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="ml.docilealligator.infinityforreddit.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 3e68d158..f6269887 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_search_activity"
-    tools:application=".SearchActivity">
+    tools:application="ml.docilealligator.infinityforreddit.activities.SearchActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_search_activity"
@@ -119,7 +119,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />
+                app:layoutManager="ml.docilealligator.infinityforreddit.customviews.LinearLayoutManagerBugFixed" />
 
         </LinearLayout>