Migrate to non-transitive R classes (#1469)

Author: Luna712

app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt

@@ -77,7 +77,7 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setColor(context.colorFromAttribute(R.attr.colorPrimary))
             .setContentTitle(context.getString(R.string.subscription_in_progress_notification))
-            .setSmallIcon(R.drawable.quantum_ic_refresh_white_24)
+            .setSmallIcon(com.google.android.gms.cast.framework.R.drawable.quantum_ic_refresh_white_24)
             .setProgress(0, 0, true)
 
     private val updateNotificationBuilder =

app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt

@@ -53,8 +53,8 @@ class MyMiniControllerFragment : MiniControllerFragment() {
         // SEE https://github.com/dandar3/android-google-play-services-cast-framework/blob/master/res/layout/cast_mini_controller.xml
         try {
             val progressBar: ProgressBar? = view.findViewById(R.id.progressBar)
-            val containerAll: LinearLayout? = view.findViewById(R.id.container_all)
-            val containerCurrent: RelativeLayout? = view.findViewById(R.id.container_current)
+            val containerAll: LinearLayout? = view.findViewById(com.google.android.gms.cast.framework.R.id.container_all)
+            val containerCurrent: RelativeLayout? = view.findViewById(com.google.android.gms.cast.framework.R.id.container_current)
 
             context?.let { ctx ->
                 progressBar?.setBackgroundColor(
@@ -79,4 +79,4 @@ class MyMiniControllerFragment : MiniControllerFragment() {
             // JUST IN CASE
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt

@@ -155,7 +155,7 @@ class LibraryFragment : Fragment() {
         binding?.sortFab?.setOnClickListener(sortChangeClickListener)
         binding?.librarySort?.setOnClickListener(sortChangeClickListener)
 
-        binding?.libraryRoot?.findViewById<TextView>(R.id.search_src_text)?.apply {
+        binding?.libraryRoot?.findViewById<TextView>(androidx.appcompat.R.id.search_src_text)?.apply {
             tag = "tv_no_focus_tag"
             //Expand the Appbar when search bar is focused, fixing scroll up issue
             setOnFocusChangeListener { _, _ ->

app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt

@@ -561,7 +561,7 @@ abstract class AbstractPlayerFragment(
                 }
             }
 
-            subView = playerView?.findViewById(R.id.exo_subtitles)
+            subView = playerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
             subStyle = SubtitlesFragment.getCurrentSavedStyle()
             player.initSubtitles(subView, subtitleHolder, subStyle)
             (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth)

app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt

@@ -470,7 +470,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         val currentTempMeta = getMetaData()
 
         // bruh idk why it is not correct
-        val color = ColorStateList.valueOf(context.colorFromAttribute(R.attr.colorAccent))
+        val color = ColorStateList.valueOf(context.colorFromAttribute(androidx.appcompat.R.attr.colorAccent))
         binding.searchLoadingBar.progressTintList = color
         binding.searchLoadingBar.indeterminateTintList = color
 

app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt

@@ -229,7 +229,7 @@ class SearchFragment : Fragment() {
                     SearchHelper.handleSearchClickCallback(callback)
                 }
 
-            searchRoot.findViewById<TextView>(R.id.search_src_text)?.tag = "tv_no_focus_tag"
+            searchRoot.findViewById<TextView>(androidx.appcompat.R.id.search_src_text)?.tag = "tv_no_focus_tag"
             searchAutofitResults.adapter = adapter
             searchLoadingBar.alpha = 0f
         }
@@ -576,4 +576,4 @@ class SearchFragment : Fragment() {
             .commit()*/
     }
 
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt

@@ -150,7 +150,7 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
                 )
             } else {
                 upvote.imageTintList = ColorStateList.valueOf(
-                    context?.colorFromAttribute(R.attr.colorOnSurface) ?: R.color.white
+                    context?.colorFromAttribute(com.google.android.material.R.attr.colorOnSurface) ?: R.color.white
                 )
             }
         }

app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt

@@ -105,7 +105,7 @@ object AppContextUtils {
         this?.window?.setWindowAnimations(-1)
         this?.show()
         Handler(Looper.getMainLooper()).postDelayed({
-            this?.window?.setWindowAnimations(R.style.Animation_Design_BottomSheetDialog)
+            this?.window?.setWindowAnimations(com.google.android.material.R.style.Animation_Design_BottomSheetDialog)
         }, 200)
     }
 

app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt

@@ -486,7 +486,7 @@ object UIHelper {
         onMenuItemClick: MenuItem.() -> Unit,
     ): PopupMenu {
         val ctw = ContextThemeWrapper(context, R.style.PopupMenu)
-        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0)
+        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, androidx.appcompat.R.attr.actionOverflowMenuStyle, 0)
 
         items.forEach { (id, stringRes) ->
             popup.menu.add(0, id, 0, stringRes)
@@ -510,7 +510,7 @@ object UIHelper {
         onMenuItemClick: MenuItem.() -> Unit,
     ): PopupMenu {
         val ctw = ContextThemeWrapper(context, R.style.PopupMenu)
-        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0)
+        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, androidx.appcompat.R.attr.actionOverflowMenuStyle, 0)
 
         items.forEach { (id, string) ->
             popup.menu.add(0, id, 0, string)

gradle.properties

@@ -19,5 +19,4 @@ android.useAndroidX=true
 # android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonTransitiveRClass=true