refactor: migrate to non-transitive R classes

Lennoard · Jul 16, 2024 · 0e19ca7 · 0e19ca7
1 parent 6afae38
commit 0e19ca7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt
@@ -16,17 +16,17 @@ import com.androidvip.sysctlgui.receivers.TaskerReceiver
 import com.google.android.material.color.ColorRoles
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.io.InputStream
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 fun View.goAway() { this.visibility = View.GONE }
 fun View.hide() { this.visibility = View.INVISIBLE }
 fun View.show() { this.visibility = View.VISIBLE }
 
-fun View.getColorRoles(@AttrRes colorAttrRes: Int = R.attr.colorPrimary): ColorRoles {
+fun View.getColorRoles(@AttrRes colorAttrRes: Int = androidx.appcompat.R.attr.colorPrimary): ColorRoles {
     val color = MaterialColors.getColor(this, colorAttrRes)
     return MaterialColors.getColorRoles(context, color)
 }

diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt
@@ -3,7 +3,7 @@ package com.androidvip.sysctlgui.ui.base
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
-import com.androidvip.sysctlgui.R
+import com.androidvip.sysctlgui.design.DesignStyles
 import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import org.koin.android.ext.android.inject
 
@@ -19,7 +19,7 @@ abstract class BaseAppCompatActivity : AppCompatActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         if (prefs.forceDark) {
-            setTheme(R.style.AppTheme_ForceDark)
+            setTheme(DesignStyles.AppTheme_ForceDark)
         }
     }
 }
diff --git a/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt b/app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt
@@ -23,7 +23,7 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
@@ -38,6 +38,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.data.models.KernelParam
+import com.androidvip.sysctlgui.design.DesignIds
+import com.androidvip.sysctlgui.design.DesignLayouts
 import com.androidvip.sysctlgui.getColorRoles
 import com.androidvip.sysctlgui.goAway
 import com.androidvip.sysctlgui.show
@@ -185,14 +187,14 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
 
         val dialog = Dialog(requireContext()).apply {
             requestWindowFeature(Window.FEATURE_NO_TITLE)
-            setContentView(R.layout.dialog_web)
+            setContentView(DesignLayouts.dialog_web)
             setCancelable(true)
         }
 
-        val progressBar: ProgressBar = dialog.findViewById(R.id.webDialogProgress)
-        val swipeLayout: SwipeRefreshLayout = dialog.findViewById(R.id.webDialogSwipeLayout)
+        val progressBar: ProgressBar = dialog.findViewById(DesignIds.webDialogProgress)
+        val swipeLayout: SwipeRefreshLayout = dialog.findViewById(DesignIds.webDialogSwipeLayout)
 
-        val webView = dialog.findViewById<WebView>(R.id.webDialogWebView).apply {
+        val webView = dialog.findViewById<WebView>(DesignIds.webDialogWebView).apply {
             val colorRoles = getColorRoles()
             settings.apply {
                 javaScriptEnabled = true
@@ -264,7 +266,10 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
                     paramFile = File(param.path)
                 )
                 if (index < params.lastIndex) {
-                    Divider(color = MaterialTheme.colorScheme.outlineVariant, thickness = 1.dp)
+                    HorizontalDivider(
+                        thickness = 1.dp,
+                        color = MaterialTheme.colorScheme.outlineVariant
+                    )
                 }
             }
         }

diff --git a/common/design/src/main/java/com/androidvip/sysctlgui/design/DesignResources.kt b/common/design/src/main/java/com/androidvip/sysctlgui/design/DesignResources.kt
@@ -0,0 +1,5 @@
+package com.androidvip.sysctlgui.design
+
+typealias DesignIds = com.androidvip.sysctlgui.design.R.id
+typealias DesignLayouts = com.androidvip.sysctlgui.design.R.layout
+typealias DesignStyles = com.androidvip.sysctlgui.design.R.style
diff --git a/gradle.properties b/gradle.properties
@@ -22,5 +22,5 @@ kotlin.code.style=official
 
 # Configuration cache
 org.gradle.configuration-cache=true
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.nonFinalResIds=false