bugfix[#35]: browse variables under net

Author: Lennoard

app/build.gradle.kts

@@ -129,6 +129,7 @@ dependencies {
 
     implementation(Dependencies.koinAndroid)
     implementation(Dependencies.libSuCore)
+    implementation(Dependencies.libSuIo)
     implementation(Dependencies.liveEvent)
     implementation(Dependencies.tapTargetView)
 }

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/BrowseParamsViewModel.kt

@@ -7,6 +7,7 @@ import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.androidvip.sysctlgui.domain.usecase.GetParamsFromFilesUseCase
 import com.androidvip.sysctlgui.utils.BaseViewModel
 import com.androidvip.sysctlgui.utils.Consts
+import com.topjohnwu.superuser.io.SuFile
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -103,7 +104,7 @@ class BrowseParamsViewModel(
 
     private suspend fun getCurrentPathFiles(path: String) = withContext(dispatcher) {
         runCatching {
-            File(path).listFiles()?.toList()
+            SuFile.open(path).listFiles()?.toList()
         }.getOrDefault(emptyList())
     }
 

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowseFragment.kt

@@ -48,10 +48,9 @@ import com.androidvip.sysctlgui.ui.params.OnParamItemClickedListener
 import com.androidvip.sysctlgui.ui.params.edit.EditKernelParamActivity
 import com.androidvip.sysctlgui.utils.ComposeTheme
 import com.androidvip.sysctlgui.utils.Consts
-import com.google.android.material.color.MaterialColors
-import java.io.File
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
+import java.io.File
 
 class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListener {
     private var actionBarMenu: Menu? = null
@@ -194,6 +193,7 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
         val swipeLayout: SwipeRefreshLayout = dialog.findViewById(R.id.webDialogSwipeLayout)
 
         val webView = dialog.findViewById<WebView>(R.id.webDialogWebView).apply {
+            val colorRoles = getColorRoles()
             settings.apply {
                 javaScriptEnabled = true
                 cacheMode = WebSettings.LOAD_CACHE_ELSE_NETWORK
@@ -206,14 +206,8 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
                     super.onPageFinished(view, url)
                     swipeLayout.isRefreshing = false
 
-                    val containerColorInt = MaterialColors.getColor(
-                        swipeLayout,
-                        R.attr.colorPrimaryContainer
-                    )
-                    val colorInt = MaterialColors.getColor(
-                        swipeLayout,
-                        R.attr.colorOnPrimaryContainer
-                    )
+                    val containerColorInt = colorRoles.accentContainer
+                    val colorInt = colorRoles.onAccentContainer
 
                     val containerColorHex = "#%06X".format(0xFFFFFF and containerColorInt)
                     val colorHex = "#%06X".format(0xFFFFFF and colorInt)
@@ -222,8 +216,8 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
                         """
                         |javascript:(
                             |function() { 
-                                |document.querySelector('body').style.color='$containerColorHex'; 
-                                |document.querySelector('body').style.background='$colorHex';
+                                |document.querySelector('body').style.color='$colorHex'; 
+                                |document.querySelector('body').style.background='$containerColorHex';
                             |}
                         |)()
                         """.trimMargin()

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt

@@ -1,6 +1,7 @@
 package com.androidvip.sysctlgui.ui.params.edit
 
 import androidx.annotation.DrawableRes
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -162,7 +163,7 @@ private fun FloatingActionButtonColumn(
         horizontalAlignment = Alignment.End,
         modifier = Modifier.padding(bottom = 8.dp)
     ) {
-        if (hasApplied) {
+        AnimatedVisibility(hasApplied) {
             SmallFloatingActionButton(
                 onClick = onReset,
                 containerColor = MaterialTheme.colorScheme.tertiaryContainer,
@@ -180,7 +181,8 @@ private fun FloatingActionButtonColumn(
             text = {
                 Text(
                     text = stringResource(id = R.string.apply_param),
-                    color = MaterialTheme.colorScheme.onSecondaryContainer
+                    color = MaterialTheme.colorScheme.onSecondaryContainer,
+                    fontWeight = FontWeight.Medium
                 )
             },
             icon = {

buildSrc/src/main/kotlin/Dependencies.kt

@@ -7,5 +7,6 @@ object Dependencies {
     const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
     const val tapTargetView = "com.getkeepsafe.taptargetview:taptargetview:1.13.3"
     const val libSuCore = "com.github.topjohnwu.libsu:core:2.5.1"
+    const val libSuIo = "com.github.topjohnwu.libsu:io:2.5.1"
     const val liveEvent = "com.github.hadilq:live-event:1.3.0"
 }