Add SettingsRepo, refactoring & setting for battery limit

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

app/build.gradle.kts

@@ -50,6 +50,9 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    hilt {
+        enableAggregatingTask = true
+    }
 }
 
 room {

app/src/main/AndroidManifest.xml

@@ -1,73 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <application
-            android:name=".OdinToolsApplication"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/appName"
-            android:supportsRtl="true"
-            android:theme="@style/Theme.OdinTools"
-            android:dataExtractionRules="@xml/data_extraction_rules">
+        android:name=".OdinToolsApplication"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/appName"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.OdinTools"
+        android:dataExtractionRules="@xml/data_extraction_rules">
         <activity
-                android:name=".main.MainActivity"
-                android:exported="true"
-                android:theme="@style/Theme.OdinTools"
-                android:screenOrientation="landscape">
+            android:name=".main.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.OdinTools"
+            android:screenOrientation="landscape">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <service
-                android:name=".tiles.ControllerTileService"
-                android:exported="true"
-                android:icon="@drawable/ic_controllerstyle"
-                android:label="@string/controllerStyle"
-                android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:name=".tiles.ControllerTileService"
+            android:exported="true"
+            android:icon="@drawable/ic_face_buttons"
+            android:label="@string/controllerStyle"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
 
             <meta-data
-                    android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                    android:value="true"/>
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
         </service>
         <service
-                android:name=".tiles.L2R2TileService"
-                android:exported="true"
-                android:icon="@drawable/ic_sliders"
-                android:label="@string/l2r2mode"
-                android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:name=".tiles.L2R2TileService"
+            android:exported="true"
+            android:icon="@drawable/ic_sliders"
+            android:label="@string/l2r2mode"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
 
             <meta-data
-                    android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                    android:value="true"/>
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
         </service>
-        <service android:name=".service.ForegroundAppWatcherService"
-                 android:exported="false"
-                 android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+        <service
+            android:name=".service.ForegroundAppWatcherService"
+            android:exported="false"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService"/>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
             </intent-filter>
-            <meta-data android:name="android.accessibilityservice"
-                       android:resource="@xml/accessibility_service_config" />
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/accessibility_service_config" />
         </service>
+        <service
+            android:name=".service.BatteryLevelMonitorService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="specialUse">
+        </service>
+
         <receiver
-                android:name=".tools.BootReceiver"
-                android:enabled="true"
-                android:exported="true">
+            android:name=".tools.BootReceiver"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/de/langerhans/odintools/appsettings/AppOverrideListScreen.kt

@@ -3,10 +3,19 @@ package de.langerhans.odintools.appsettings
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.*
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue

app/src/main/java/de/langerhans/odintools/appsettings/AppOverrideListViewModel.kt

@@ -6,7 +6,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import de.langerhans.odintools.data.AppOverrideDao
 import de.langerhans.odintools.tools.DeviceUtils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 

app/src/main/java/de/langerhans/odintools/appsettings/AppOverridesScreen.kt

@@ -2,11 +2,29 @@ package de.langerhans.odintools.appsettings
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.VerticalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -16,12 +34,21 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
 import de.langerhans.odintools.R
-import de.langerhans.odintools.models.ControllerStyle.*
-import de.langerhans.odintools.models.FanMode.*
-import de.langerhans.odintools.models.L2R2Style.*
+import de.langerhans.odintools.models.ControllerStyle.Disconnect
+import de.langerhans.odintools.models.ControllerStyle.Odin
+import de.langerhans.odintools.models.ControllerStyle.Xbox
+import de.langerhans.odintools.models.FanMode.Off
+import de.langerhans.odintools.models.FanMode.Quiet
+import de.langerhans.odintools.models.FanMode.Smart
+import de.langerhans.odintools.models.FanMode.Sport
+import de.langerhans.odintools.models.L2R2Style.Analog
+import de.langerhans.odintools.models.L2R2Style.Both
+import de.langerhans.odintools.models.L2R2Style.Digital
 import de.langerhans.odintools.models.NoChange
 import de.langerhans.odintools.models.PerfMode
-import de.langerhans.odintools.models.PerfMode.*
+import de.langerhans.odintools.models.PerfMode.HighPerformance
+import de.langerhans.odintools.models.PerfMode.Performance
+import de.langerhans.odintools.models.PerfMode.Standard
 import de.langerhans.odintools.ui.composables.DeleteConfirmDialog
 import de.langerhans.odintools.ui.composables.LargeDropdownMenu
 import de.langerhans.odintools.ui.composables.OdinTopAppBar

app/src/main/java/de/langerhans/odintools/appsettings/AppOverridesViewModel.kt

@@ -6,8 +6,12 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.langerhans.odintools.data.AppOverrideDao
 import de.langerhans.odintools.data.AppOverrideEntity
-import de.langerhans.odintools.models.*
+import de.langerhans.odintools.models.ControllerStyle
+import de.langerhans.odintools.models.FanMode
 import de.langerhans.odintools.models.FanMode.Companion.getDisabledFanModes
+import de.langerhans.odintools.models.L2R2Style
+import de.langerhans.odintools.models.NoChange
+import de.langerhans.odintools.models.PerfMode
 import de.langerhans.odintools.tools.DeviceUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/de/langerhans/odintools/data/AppOverrideDao.kt

@@ -1,6 +1,9 @@
 package de.langerhans.odintools.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import kotlinx.coroutines.flow.Flow
 
 @Dao

app/src/main/java/de/langerhans/odintools/data/SharedPrefsRepo.kt

@@ -6,7 +6,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class SharedPrefsRepo @Inject constructor(
-    @ApplicationContext context: Context,
+    @ApplicationContext private val context: Context,
 ) {
 
     private val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -35,6 +35,18 @@ class SharedPrefsRepo @Inject constructor(
         get() = prefs.getBoolean(KEY_OVERRIDE_DELAY, false)
         set(value) = prefs.edit().putBoolean(KEY_OVERRIDE_DELAY, value).apply()
 
+    var chargeLimitEnabled
+        get() = prefs.getBoolean(KEY_CHARGE_LIMIT_ENABLED, false)
+        set(value) = prefs.edit().putBoolean(KEY_CHARGE_LIMIT_ENABLED, value).apply()
+
+    var minBatteryLevel
+        get() = prefs.getInt(KEY_MIN_BATTERY_LEVEL, 20)
+        set(value) = prefs.edit().putInt(KEY_MIN_BATTERY_LEVEL, value).apply()
+
+    var maxBatteryLevel
+        get() = prefs.getInt(KEY_MAX_BATTERY_LEVEL, 80)
+        set(value) = prefs.edit().putInt(KEY_MAX_BATTERY_LEVEL, value).apply()
+
     private var appOverrideEnabledListener: OnSharedPreferenceChangeListener? = null
 
     fun observeAppOverrideEnabledState(overridesEnabled: (newState: Boolean) -> Unit, overrideDelayEnabled: (newState: Boolean) -> Unit) {
@@ -62,5 +74,8 @@ class SharedPrefsRepo @Inject constructor(
         private const val KEY_VIBRATION_STRENGTH = "vibration_strength"
         private const val KEY_APP_OVERRIDE_ENABLED = "app_override_enabled"
         private const val KEY_OVERRIDE_DELAY = "override_delay"
+        private const val KEY_CHARGE_LIMIT_ENABLED = "charge_limit_enabled"
+        private const val KEY_MIN_BATTERY_LEVEL = "min_battery_level"
+        private const val KEY_MAX_BATTERY_LEVEL = "max_battery_level"
     }
 }