enable and fix non-transitive R Classes (nonTransitiveRClass)

Author: grote

app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt

@@ -27,10 +27,10 @@ internal class FilesSelectionFragment : FileSelectionFragment() {
         savedInstanceState: Bundle?,
     ): View {
         val v = super.onCreateView(inflater, container, savedInstanceState)
-        val topStub: ViewStub = v.requireViewById(R.id.topStub)
+        val topStub: ViewStub = v.requireViewById(org.calyxos.backup.storage.R.id.topStub)
         topStub.layoutResource = R.layout.header_files_selection
         topStub.inflate()
-        val bottomStub: ViewStub = v.requireViewById(R.id.bottomStub)
+        val bottomStub: ViewStub = v.requireViewById(org.calyxos.backup.storage.R.id.bottomStub)
         bottomStub.layoutResource = R.layout.footer_files_selection
         button = bottomStub.inflate() as Button
         button.setOnClickListener {

app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt

@@ -29,11 +29,11 @@ internal class RestoreFilesFragment : SnapshotFragment() {
     ): View {
         val v = super.onCreateView(inflater, container, savedInstanceState)
 
-        val topStub: ViewStub = v.requireViewById(R.id.topStub)
+        val topStub: ViewStub = v.requireViewById(org.calyxos.backup.storage.R.id.topStub)
         topStub.layoutResource = R.layout.header_snapshots
         topStub.inflate()
 
-        val bottomStub: ViewStub = v.requireViewById(R.id.bottomStub)
+        val bottomStub: ViewStub = v.requireViewById(org.calyxos.backup.storage.R.id.bottomStub)
         bottomStub.layoutResource = R.layout.footer_snapshots
         val footer = bottomStub.inflate()
         val skipView: TextView = footer.requireViewById(R.id.skipView)

app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt

@@ -84,7 +84,7 @@ internal class RestoreSetAdapter(
             val apkTextColor = if (item.canBeRestored) {
                 appView.currentTextColor
             } else {
-                MaterialColors.getColor(apkView, R.attr.colorError)
+                MaterialColors.getColor(apkView, com.google.android.material.R.attr.colorError)
             }
             apkView.setTextColor(apkTextColor)
             timeView.text = getRelativeTime(item.time)

app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt

@@ -301,7 +301,7 @@ internal class BackupNotificationManager(private val context: Context) {
         val intent = Intent(context, RestoreActivity::class.java)
         val pendingIntent = getActivity(context, 0, intent, FLAG_IMMUTABLE)
         setContentIntent(pendingIntent)
-        setSmallIcon(R.drawable.ic_cloud_restore)
+        setSmallIcon(org.calyxos.backup.storage.R.drawable.ic_cloud_restore)
         setContentTitle(context.getString(R.string.notification_restore_title))
         setOngoing(true)
         setShowWhen(false)
@@ -347,7 +347,7 @@ internal class BackupNotificationManager(private val context: Context) {
 
     fun getPruningNotification(): Notification {
         return Builder(context, CHANNEL_ID_PRUNING).apply {
-            setSmallIcon(R.drawable.ic_auto_delete)
+            setSmallIcon(org.calyxos.backup.storage.R.drawable.ic_auto_delete)
             setContentTitle(context.getString(R.string.notification_pruning_title))
             setOngoing(true)
             setShowWhen(false)

gradle.properties

@@ -9,6 +9,6 @@ org.gradle.daemon=true
 android.useAndroidX=true
 android.enableJetifier=false
 kotlin.code.style=official
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.enableR8.fullMode=false
 android.injected.androidTest.leaveApksInstalledAfterRun = true

storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoFileSelectionFragment.kt

@@ -28,11 +28,11 @@ class DemoFileSelectionFragment : FileSelectionFragment() {
         savedInstanceState: Bundle?,
     ): View {
         val v = super.onCreateView(inflater, container, savedInstanceState)
-        val topStub: ViewStub = v.findViewById(R.id.topStub)
+        val topStub: ViewStub = v.findViewById(org.calyxos.backup.storage.R.id.topStub)
         topStub.layoutResource = R.layout.header_file_select
         topStub.inflate()
 
-        val bottomStub: ViewStub = v.findViewById(R.id.bottomStub)
+        val bottomStub: ViewStub = v.findViewById(org.calyxos.backup.storage.R.id.bottomStub)
         bottomStub.layoutResource = R.layout.footer_files
         val footer = bottomStub.inflate() as ExtendedFloatingActionButton
         fab = footer

storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt

@@ -27,7 +27,7 @@ class DemoSnapshotFragment : SnapshotFragment() {
         savedInstanceState: Bundle?,
     ): View {
         val v = super.onCreateView(inflater, container, savedInstanceState)
-        val bottomStub: ViewStub = v.findViewById(R.id.bottomStub)
+        val bottomStub: ViewStub = v.findViewById(org.calyxos.backup.storage.R.id.bottomStub)
         bottomStub.layoutResource = R.layout.footer_snapshot
         val footer = bottomStub.inflate()
         footer.findViewById<Button>(R.id.button).setOnClickListener {