feature[#40]: force dark theme option

Author: Lennoard

app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt

@@ -4,19 +4,25 @@ import android.app.Application
 import com.androidvip.sysctlgui.data.di.dataModules
 import com.androidvip.sysctlgui.di.presentationModules
 import com.androidvip.sysctlgui.domain.di.domainModule
+import com.androidvip.sysctlgui.domain.repository.AppPrefs
 import com.google.android.material.color.DynamicColors
+import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
 class SysctlGuiApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        DynamicColors.applyToActivitiesIfAvailable(this)
 
         startKoin {
             androidContext(this@SysctlGuiApp)
             modules(dataModules + presentationModules + domainModule)
         }
+
+        val prefs: AppPrefs = get()
+        if (prefs.dynamicColors) {
+            DynamicColors.applyToActivitiesIfAvailable(this)
+        }
     }
 }

app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseActivity.kt

@@ -0,0 +1,25 @@
+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.domain.repository.AppPrefs
+import org.koin.android.ext.android.inject
+
+/**
+ * Base activity that uses AppCompat for theming
+ * TODO: Temporary until 100% compose
+ */
+abstract class BaseAppCompatActivity : AppCompatActivity() {
+    private val prefs by inject<AppPrefs>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        if (prefs.forceDark) {
+            setTheme(R.style.AppTheme_ForceDark)
+        }
+    }
+}

app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseAppCompatActivity.kt

@@ -2,16 +2,16 @@ package com.androidvip.sysctlgui.ui.main
 
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
 import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.databinding.ActivityMain2Binding
 import com.androidvip.sysctlgui.helpers.Actions
+import com.androidvip.sysctlgui.ui.base.BaseAppCompatActivity
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : BaseAppCompatActivity() {
     private lateinit var binding: ActivityMain2Binding
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseFragment.kt

@@ -37,7 +37,6 @@ 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.theme.SysctlGuiTheme
 import com.androidvip.sysctlgui.getColorRoles
 import com.androidvip.sysctlgui.goAway
 import com.androidvip.sysctlgui.show
@@ -46,6 +45,7 @@ import com.androidvip.sysctlgui.ui.base.BaseSearchFragment
 import com.androidvip.sysctlgui.ui.params.EmptyParamsWarning
 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
@@ -64,7 +64,7 @@ class KernelParamBrowseFragment : BaseSearchFragment(), OnParamItemClickedListen
     ): View {
         return ComposeView(requireContext()).apply {
             setContent {
-                SysctlGuiTheme {
+                ComposeTheme {
                     val state by viewModel.uiState.collectAsStateWithLifecycle()
                     val refreshing = state.isLoading
                     val refreshState = rememberPullRefreshState(

app/src/main/kotlin/com/androidvip/sysctlgui/ui/base/BaseSearchActivity.kt

@@ -11,8 +11,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import com.androidvip.sysctlgui.R
 import com.androidvip.sysctlgui.data.models.KernelParam
-import com.androidvip.sysctlgui.design.theme.SysctlGuiTheme
 import com.androidvip.sysctlgui.toast
+import com.androidvip.sysctlgui.utils.ComposeTheme
 import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -25,7 +25,7 @@ class EditKernelParamActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            SysctlGuiTheme {
+            ComposeTheme {
                 EditParamScreen(viewModel = viewModel)
             }
         }

app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainActivity.kt

@@ -405,12 +405,14 @@ private fun ParamDocs(info: String?) {
     )
 
     if (info != null) {
-        Text(
-            modifier = Modifier.padding(top = 4.dp, bottom = 16.dp, start = 16.dp, end = 16.dp),
-            text = info,
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onBackground
-        )
+        SelectionContainer {
+            Text(
+                modifier = Modifier.padding(top = 4.dp, bottom = 16.dp, start = 16.dp, end = 16.dp),
+                text = info,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onBackground
+            )
+        }
     } else {
         Card(
             modifier = Modifier

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

@@ -36,7 +36,7 @@ class EditParamViewModel(
                 updateParam(currentState.param.copy(favorite = !currentState.param.favorite))
             }
             is EditParamViewEvent.TaskerListSelected -> {
-                updateParam(currentState.param.copy(taskerList = event.listId))
+                updateParam(currentState.param.copy(taskerList = event.listId, taskerParam = true))
             }
             is EditParamViewEvent.ParamValueInputChanged -> {
                 setState { copy(typedValue = event.newValue) }