Add SettingsRepo, refactoring & setting for battery limit

app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         <service
                 android:name=".tiles.ControllerTileService"
                 android:exported="true"
-                android:icon="@drawable/ic_controllerstyle"
+                android:icon="@drawable/ic_face_buttons"
                 android:label="@string/controllerStyle"
                 android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>

app/src/main/java/de/langerhans/odintools/main/MainActivity.kt

@@ -25,6 +25,7 @@ import de.langerhans.odintools.R
 import de.langerhans.odintools.appsettings.AppOverrideListScreen
 import de.langerhans.odintools.appsettings.AppOverridesScreen
 import de.langerhans.odintools.tools.DeviceType.ODIN2
+import de.langerhans.odintools.tools.SettingsRepo
 import de.langerhans.odintools.ui.composables.*
 import de.langerhans.odintools.ui.theme.OdinToolsTheme
 
@@ -62,13 +63,14 @@ fun SettingsScreen(viewModel: MainViewModel = hiltViewModel(), navigateToOverrid
 
     if (uiState.showPServerNotAvailableDialog) {
         PServerNotAvailableDialog()
-    } else if (uiState.showNotAnOdinDialog) {
+    } else if (uiState.showIncompatibleDeviceDialog) {
         NotAnOdinDialog { viewModel.incompatibleDeviceDialogDismissed() }
     }
 
     if (uiState.showControllerStyleDialog) {
         CheckBoxDialogPreference(
             items = viewModel.controllerStyleOptions,
+            title = R.string.controllerStyle,
             onCancel = {
                 viewModel.hideControllerStylePreference()
             },
@@ -81,6 +83,7 @@ fun SettingsScreen(viewModel: MainViewModel = hiltViewModel(), navigateToOverrid
     if (uiState.showL2r2StyleDialog) {
         CheckBoxDialogPreference(
             items = viewModel.l2r2StyleOptions,
+            title = R.string.l2r2mode,
             onCancel = {
                 viewModel.hideL2r2StylePreference()
             },
@@ -135,14 +138,14 @@ fun SettingsScreen(viewModel: MainViewModel = hiltViewModel(), navigateToOverrid
             SwitchPreference(
                 icon = R.drawable.ic_more_time,
                 title = R.string.overrideDelay,
-                description = R.string.overrideDelayDesc,
+                description = R.string.overrideDelayDescription,
                 state = uiState.overrideDelayEnabled,
             ) {
                 viewModel.overrideDelayEnabled(it)
             }
-            SettingsHeader(R.string.quicksettings)
+            SettingsHeader(R.string.quickSettings)
             TriggerPreference(
-                icon = R.drawable.ic_controllerstyle,
+                icon = R.drawable.ic_face_buttons,
                 title = R.string.controllerStyle,
                 description = R.string.controllerStyleDesc,
             ) {
@@ -158,26 +161,26 @@ fun SettingsScreen(viewModel: MainViewModel = hiltViewModel(), navigateToOverrid
             SettingsHeader(R.string.buttons)
             SwitchPreference(
                 icon = R.drawable.ic_home,
-                title = R.string.doubleHomeTitle,
-                description = R.string.doubleHomeDescription,
-                state = uiState.singleHomeEnabled,
+                title = R.string.singlePressHome,
+                description = R.string.singlePressHomeDescription,
+                state = uiState.singlePressHomeEnabled,
             ) {
-                viewModel.updateSingleHomePreference(it)
+                viewModel.updateSinglePressHomePreference(it)
             }
             if (uiState.deviceType == ODIN2) {
                 TriggerPreference(
                     icon = R.drawable.ic_gamepad,
                     title = R.string.m1Button,
                     description = R.string.remapButtonDescription,
                 ) {
-                    viewModel.remapButtonClicked("remap_custom_to_m1_value")
+                    viewModel.remapButtonClicked(SettingsRepo.KEY_CUSTOM_M1_VALUE)
                 }
                 TriggerPreference(
                     icon = R.drawable.ic_gamepad,
                     title = R.string.m2Button,
                     description = R.string.remapButtonDescription,
                 ) {
-                    viewModel.remapButtonClicked("remap_custom_to_m2_value")
+                    viewModel.remapButtonClicked(SettingsRepo.KEY_CUSTOM_M2_VALUE)
                 }
             }
             SettingsHeader(name = R.string.display)
@@ -199,6 +202,15 @@ fun SettingsScreen(viewModel: MainViewModel = hiltViewModel(), navigateToOverrid
                 ) {
                     viewModel.updateVibrationPreference(it)
                 }
+                SettingsHeader(R.string.battery)
+                SwitchPreference(
+                    icon = R.drawable.ic_electrical_services,
+                    title = R.string.chargeLimit,
+                    description = R.string.chargeLimitDescription,
+                    state = uiState.chargeLimitEnabled,
+                ) {
+                    viewModel.updateChargeLimitPreference(it)
+                }
             }
         }
     }

app/src/main/java/de/langerhans/odintools/main/MainUiModel.kt

@@ -10,10 +10,10 @@ import de.langerhans.odintools.tools.DeviceType.ODIN2
 data class MainUiModel(
     val deviceType: DeviceType = ODIN2,
     val deviceVersion: String = "",
-    val showNotAnOdinDialog: Boolean = false,
+    val showIncompatibleDeviceDialog: Boolean = false,
     val showPServerNotAvailableDialog: Boolean = false,
 
-    val singleHomeEnabled: Boolean = false,
+    val singlePressHomeEnabled: Boolean = false,
     val appOverridesEnabled: Boolean = true,
     val overrideDelayEnabled: Boolean = false,
 
@@ -30,6 +30,8 @@ data class MainUiModel(
     val showRemapButtonDialog: Boolean = false,
     val currentButtonSetting: String = "",
     val currentButtonKeyCode: Int = 0,
+
+    val chargeLimitEnabled: Boolean = false,
 )
 
 class CheckboxPreferenceUiModel(

app/src/main/java/de/langerhans/odintools/main/MainViewModel.kt

@@ -10,6 +10,7 @@ import de.langerhans.odintools.models.ControllerStyle.*
 import de.langerhans.odintools.models.L2R2Style.*
 import de.langerhans.odintools.tools.DeviceType.ODIN2
 import de.langerhans.odintools.tools.DeviceUtils
+import de.langerhans.odintools.tools.SettingsRepo
 import de.langerhans.odintools.tools.ShellExecutor
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -21,6 +22,7 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     deviceUtils: DeviceUtils,
     private val executor: ShellExecutor,
+    private val settings: SettingsRepo,
     private val prefs: SharedPrefsRepo,
 ) : ViewModel() {
 
@@ -36,39 +38,35 @@ class MainViewModel @Inject constructor(
         get() = _l2r2StyleOptions
 
     init {
-        executor.applyRequiredSettings()
-
         val deviceType = deviceUtils.getDeviceType()
-        val preventHomePressSetting = executor.getBooleanSystemSetting("prevent_press_home_accidentally", true)
-        val vibrationOnSetting = executor.getBooleanSystemSetting("vibrate_on", true)
-        val vibrationStrength = executor.getVibrationStrength()
 
         _uiState.update { _ ->
             MainUiModel(
                 deviceType = deviceType,
                 deviceVersion = deviceUtils.getDeviceVersion(),
-                showNotAnOdinDialog = deviceType != ODIN2,
-                singleHomeEnabled = !preventHomePressSetting,
+                showIncompatibleDeviceDialog = deviceType != ODIN2,
+                singlePressHomeEnabled = !settings.preventPressHome,
                 showPServerNotAvailableDialog = !executor.pServerAvailable,
                 overrideDelayEnabled = prefs.overrideDelay,
-                vibrationEnabled = vibrationOnSetting,
-                currentVibration = vibrationStrength,
+                vibrationEnabled = settings.vibrationEnabled,
+                currentVibration = settings.vibrationStrength,
+                chargeLimitEnabled = settings.chargingLimit80Enabled,
             )
         }
     }
 
     fun incompatibleDeviceDialogDismissed() {
         _uiState.update { current ->
-            current.copy(showNotAnOdinDialog = false)
+            current.copy(showIncompatibleDeviceDialog = false)
         }
     }
 
-    fun updateSingleHomePreference(newValue: Boolean) {
+    fun updateSinglePressHomePreference(newValue: Boolean) {
         // Invert here as prevent == double press
-        executor.setBooleanSystemSetting("prevent_press_home_accidentally", !newValue)
+        settings.preventPressHome = !newValue
 
         _uiState.update { current ->
-            current.copy(singleHomeEnabled = newValue)
+            current.copy(singlePressHomeEnabled = newValue)
         }
     }
 
@@ -138,23 +136,22 @@ class MainViewModel @Inject constructor(
 
     fun saveSaturation(newValue: Float) {
         prefs.saturationOverride = newValue
-        executor.setSfSaturation(newValue)
+        settings.saturation = newValue
         _uiState.update {
             it.copy(showSaturationDialog = false)
         }
     }
 
     fun updateVibrationPreference(newValue: Boolean) {
-        executor.setBooleanSystemSetting("vibrate_on", newValue)
-
+        settings.vibrationEnabled = newValue
         _uiState.update { current ->
             current.copy(vibrationEnabled = newValue)
         }
     }
 
     fun vibrationClicked() {
         _uiState.update {
-            it.copy(showVibrationDialog = true, currentVibration = executor.getVibrationStrength())
+            it.copy(showVibrationDialog = true, currentVibration = settings.vibrationStrength)
         }
     }
 
@@ -166,7 +163,7 @@ class MainViewModel @Inject constructor(
 
     fun saveVibration(newValue: Int) {
         prefs.vibrationStrength = newValue
-        executor.setVibrationStrength(newValue)
+        settings.vibrationStrength = newValue
         _uiState.update {
             it.copy(showVibrationDialog = false, currentVibration = newValue)
         }
@@ -189,10 +186,10 @@ class MainViewModel @Inject constructor(
     }
 
     private fun getDefaultKeyCode(setting: String): Int {
-        if (setting == "remap_custom_to_m1_value") {
+        if (setting == SettingsRepo.KEY_CUSTOM_M1_VALUE) {
             return KeyEvent.KEYCODE_BUTTON_C
         }
-        if (setting == "remap_custom_to_m2_value") {
+        if (setting == SettingsRepo.KEY_CUSTOM_M2_VALUE) {
             return KeyEvent.KEYCODE_BUTTON_Z
         }
         return KeyEvent.KEYCODE_UNKNOWN
@@ -226,4 +223,12 @@ class MainViewModel @Inject constructor(
             it.copy(overrideDelayEnabled = newValue)
         }
     }
+
+    fun updateChargeLimitPreference(newValue: Boolean) {
+        settings.chargingLimit80Enabled = newValue
+
+        _uiState.update { current ->
+            current.copy(chargeLimitEnabled = newValue)
+        }
+    }
 }

app/src/main/java/de/langerhans/odintools/models/PerfMode.kt

@@ -11,7 +11,7 @@ sealed class PerfMode(
 ) {
     data object Standard : PerfMode("standard", 0, R.string.standard)
     data object Performance : PerfMode("performance", 1, R.string.performance)
-    data object HighPerformance : PerfMode("highPerformance", 2, R.string.highperformance)
+    data object HighPerformance : PerfMode("highPerformance", 2, R.string.highPerformance)
     data object Unknown : PerfMode("unknown", -1, R.string.unknown)
 
     fun enable(executor: ShellExecutor) {

app/src/main/java/de/langerhans/odintools/tools/BootReceiver.kt

@@ -11,23 +11,23 @@ import javax.inject.Inject
 class BootReceiver : BroadcastReceiver() {
 
     @Inject
-    lateinit var sharedPrefsRepo: SharedPrefsRepo
+    lateinit var prefs: SharedPrefsRepo
 
     @Inject
-    lateinit var executor: ShellExecutor
+    lateinit var settings: SettingsRepo
 
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action != Intent.ACTION_BOOT_COMPLETED) {
             return
         }
 
-        val saturation = sharedPrefsRepo.saturationOverride
+        val saturation = prefs.saturationOverride
         if (saturation != 1.0f) {
-            executor.setSfSaturation(saturation)
+            settings.saturation = saturation
         }
-        val vibrationStrength = sharedPrefsRepo.vibrationStrength
+        val vibrationStrength = prefs.vibrationStrength
         if (vibrationStrength != 0) {
-            executor.setVibrationStrength(vibrationStrength)
+            settings.vibrationStrength = vibrationStrength
         }
     }
 }

app/src/main/java/de/langerhans/odintools/tools/DeviceUtils.kt

@@ -4,20 +4,20 @@ import de.langerhans.odintools.tools.DeviceType.*
 import javax.inject.Inject
 
 class DeviceUtils @Inject constructor(
-    private val shellExecutor: ShellExecutor,
+    private val executor: ShellExecutor,
 ) {
 
+    fun getDeviceVersion() = executor.getStringProperty(SettingsRepo.KEY_BUILD_VERSION, "")
+
+    fun getDeviceVendor() = executor.getStringProperty(SettingsRepo.KEY_VENDOR_NAME, "")
+
     fun getDeviceType(): DeviceType {
-        val deviceName = shellExecutor.executeAsRoot("getprop ro.vendor.retro.name").getOrNull()
-        return when (deviceName) {
+        return when (getDeviceVendor()) {
             "Q9" -> ODIN2
             "4.0", "4.0P" -> RP4
             else -> OTHER
         }
     }
-
-    fun getDeviceVersion() = shellExecutor.executeAsRoot("getprop ro.build.odin2.ota.version").map { it ?: "" }
-        .getOrDefault("")
 }
 
 enum class DeviceType {