Clean up and improve UI

Signed-off-by: Tyler Nijmeh <tylernij@gmail.com>

2 files changed, 16 insertions, 23 deletions

diff --git a/app/src/main/java/com/draco/buoy/recyclers/BatterySaverProfileRecyclerAdapter.kt b/app/src/main/java/com/draco/buoy/recyclers/BatterySaverProfileRecyclerAdapter.kt
index 3e4669b..0957ee7 100644
--- a/app/src/main/java/com/draco/buoy/recyclers/BatterySaverProfileRecyclerAdapter.kt
+++ b/app/src/main/java/com/draco/buoy/recyclers/BatterySaverProfileRecyclerAdapter.kt
@@ -14,7 +14,7 @@ class BatterySaverProfileRecyclerAdapter(
     contentResolver: ContentResolver
 ) : RecyclerView.Adapter<BatterySaverProfileRecyclerAdapter.ViewHolder>() {
     private val batterySaverProfiles = arrayOf(
-        BatterySaverConstantsConfigProfiles.DEFAULT,
+        null, /* Reset */
         BatterySaverConstantsConfigProfiles.LIGHT,
         BatterySaverConstantsConfigProfiles.MODERATE,
         BatterySaverConstantsConfigProfiles.HIGH,
@@ -36,12 +36,10 @@ class BatterySaverProfileRecyclerAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val profile = batterySaverProfiles[position]
 
-        val isDefaultProfile = (profile == BatterySaverConstantsConfigProfiles.DEFAULT)
-
         when (profile) {
-            BatterySaverConstantsConfigProfiles.DEFAULT -> {
-                holder.title.setText(R.string.profile_title_default)
-                holder.description.setText(R.string.profile_description_default)
+            null -> {
+                holder.title.setText(R.string.profile_title_reset)
+                holder.description.setText(R.string.profile_description_reset)
             }
 
             BatterySaverConstantsConfigProfiles.LIGHT -> {
@@ -66,13 +64,17 @@ class BatterySaverProfileRecyclerAdapter(
         }
 
         holder.itemView.setOnClickListener {
-            /* Apply profile */
-            batterySaverManager.setConstantsConfig(profile)
-            /* Enable low power mode */
-            batterySaverManager.setLowPower(true)
-            /* If this is not the default config, set sticky and don't auto disable */
-            batterySaverManager.setLowPowerSticky(!isDefaultProfile)
-            batterySaverManager.setLowPowerStickyAutoDisableEnabled(isDefaultProfile)
+            if (profile == null) {
+                batterySaverManager.resetConstants()
+                batterySaverManager.setLowPower(false)
+                batterySaverManager.setLowPowerSticky(false)
+                batterySaverManager.setLowPowerStickyAutoDisableEnabled(true)
+            } else {
+                batterySaverManager.setConstantsConfig(profile)
+                batterySaverManager.setLowPower(true)
+                batterySaverManager.setLowPowerSticky(true)
+                batterySaverManager.setLowPowerStickyAutoDisableEnabled(false)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/draco/buoy/repositories/BatterySaverConstantsConfigProfiles.kt b/app/src/main/java/com/draco/buoy/repositories/BatterySaverConstantsConfigProfiles.kt
index a935385..75a5228 100644
--- a/app/src/main/java/com/draco/buoy/repositories/BatterySaverConstantsConfigProfiles.kt
+++ b/app/src/main/java/com/draco/buoy/repositories/BatterySaverConstantsConfigProfiles.kt
@@ -4,15 +4,6 @@ import com.draco.buoy.models.BatterySaverConstantsConfig
 
 object BatterySaverConstantsConfigProfiles {
     /**
-     * Default battery saver configuration
-     * Fits between MODERATE and HIGH
-     *
-     * @see MODERATE
-     * @see HIGH
-     */
-    val DEFAULT = BatterySaverConstantsConfig()
-
-    /**
      * Keep the system running smoothly with some idle tweaks
      */
     val LIGHT = BatterySaverConstantsConfig(
@@ -34,8 +25,8 @@ object BatterySaverConstantsConfigProfiles {
     val MODERATE = BatterySaverConstantsConfig(
         launchBoostDisabled = false,
         vibrationDisabled = false,
-        fireWallDisabled = false,
         soundTriggerDisabled = false,
+        fireWallDisabled = false,
         gpsMode = PowerManagerLocationModes.THROTTLE_SCREEN_OFF,
         forceAllAppsStandby = false,
         forceBackgroundCheck = false,