From cdfa662a1dd8594c01d223f8b4981fef9b037df5 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Fri, 5 Nov 2021 22:18:43 -0400
Subject: [PATCH] Migrate to non-transitive R

---
 gradle.properties                                        | 1 +
 mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt | 6 ++++--
 .../be/mygod/vpnhotspot/SettingsPreferenceFragment.kt    | 2 +-
 .../vpnhotspot/widget/AlwaysAutoCompleteEditText.kt      | 9 +++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6fb3e361..de5a2782 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,6 +13,7 @@ android.databinding.incremental=true
 android.enableJetifier=true
 android.enableR8.fullMode=true
 android.enableResourceOptimizations=false
+android.nonTransitiveRClass=true
 android.useAndroidX=true
 kapt.incremental.apt=true
 org.gradle.jvmargs=-Xmx1536m
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt
index 00b57efd..185381e7 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt
@@ -40,13 +40,15 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen
         binding.navigation.setOnItemSelectedListener(this)
         val badge = binding.navigation.getOrCreateBadge(R.id.navigation_clients).apply {
             backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary)
-            badgeTextColor = ContextCompat.getColor(this@MainActivity, R.color.primary_text_default_material_light)
+            badgeTextColor = ContextCompat.getColor(this@MainActivity,
+                androidx.appcompat.R.color.primary_text_default_material_light)
         }
         updateItem = binding.navigation.menu.findItem(R.id.navigation_update)
         updateItem.isCheckable = false
         updateBadge = binding.navigation.getOrCreateBadge(R.id.navigation_update).apply {
             backgroundColor = ContextCompat.getColor(this@MainActivity, R.color.colorSecondary)
-            badgeTextColor = ContextCompat.getColor(this@MainActivity, R.color.primary_text_default_material_light)
+            badgeTextColor = ContextCompat.getColor(this@MainActivity,
+                androidx.appcompat.R.color.primary_text_default_material_light)
         }
         if (savedInstanceState == null) displayFragment(TetheringFragment())
         val model by viewModels<ClientViewModel>()
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
index 3c4a6a80..fbe9e4a5 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
@@ -121,7 +121,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
                         .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                         .putExtra(Intent.EXTRA_STREAM,
                                 FileProvider.getUriForFile(context, "be.mygod.vpnhotspot.log", logFile)),
-                        context.getString(R.string.abc_shareactionprovider_share_with)))
+                        context.getString(androidx.appcompat.R.string.abc_shareactionprovider_share_with)))
             }
             true
         }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/widget/AlwaysAutoCompleteEditText.kt b/mobile/src/main/java/be/mygod/vpnhotspot/widget/AlwaysAutoCompleteEditText.kt
index 1a189581..de3e7cef 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/widget/AlwaysAutoCompleteEditText.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/widget/AlwaysAutoCompleteEditText.kt
@@ -5,14 +5,15 @@ import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.widget.AppCompatAutoCompleteTextView
-import be.mygod.vpnhotspot.R
 
 /**
  * Based on: https://gist.github.com/furycomptuers/4961368
  */
-class AlwaysAutoCompleteEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
-                                                           defStyleAttr: Int = R.attr.autoCompleteTextViewStyle) :
-        AppCompatAutoCompleteTextView(context, attrs, defStyleAttr) {
+class AlwaysAutoCompleteEditText @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = androidx.appcompat.R.attr.autoCompleteTextViewStyle,
+) : AppCompatAutoCompleteTextView(context, attrs, defStyleAttr) {
     override fun enoughToFilter() = true
 
     override fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) {