Use material 3 theme

app/build.gradle.kts

@@ -84,9 +84,8 @@ tasks.register("license") {
 
 dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("com.jaredrummler:colorpicker:1.1.0")
-    implementation("androidx.cardview:cardview:1.0.0")
     implementation("com.android.volley:volley:1.2.1")
 }

app/src/main/AndroidManifest.xml

@@ -25,13 +25,14 @@
         tools:ignore="QueryAllPackagesPermission" />
 
     <application
+        android:name=".Application"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeLight"
+        android:theme="@style/Theme.Material3.DayNight"
         android:dataExtractionRules="@xml/data_extraction_rules"
         tools:targetApi="s">
         <activity android:name=".activities.HelpActivity"
@@ -159,6 +160,7 @@
 
         <activity
             android:name=".activities.MainActivity"
+            android:theme="@style/Theme.Material3.DayNight.NoActionBar"
             android:launchMode="singleTop" />
         <activity
             android:name=".activities.PermissionsActivity"

app/src/main/java/io/github/domi04151309/alwayson/Application.kt

@@ -0,0 +1,10 @@
+package io.github.domi04151309.alwayson
+
+import com.google.android.material.color.DynamicColors
+
+class Application : android.app.Application() {
+    override fun onCreate() {
+        super.onCreate()
+        DynamicColors.applyToActivitiesIfAvailable(this)
+    }
+}

app/src/main/java/io/github/domi04151309/alwayson/activities/AboutActivity.kt

@@ -3,23 +3,20 @@ package io.github.domi04151309.alwayson.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.github.domi04151309.alwayson.BuildConfig
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.helpers.PreferenceScreenHelper
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class AboutActivity : AppCompatActivity() {
+class AboutActivity : BaseActivity() {
     companion object {
         internal const val GITHUB_REPOSITORY: String = "Domi04151309/AlwaysOn"
         private const val REPOSITORY_URL: String = "https://github.com/$GITHUB_REPOSITORY"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager
@@ -31,7 +28,7 @@ class AboutActivity : AppCompatActivity() {
     class GeneralPreferenceFragment : PreferenceFragmentCompat() {
         @Suppress("SameReturnValue")
         private fun onIconsClicked(): Boolean {
-            AlertDialog.Builder(requireContext())
+            MaterialAlertDialogBuilder(requireContext())
                 .setTitle(R.string.about_icons)
                 .setItems(resources.getStringArray(R.array.about_icons_array)) { _, which ->
                     startActivity(
@@ -53,7 +50,7 @@ class AboutActivity : AppCompatActivity() {
 
         @Suppress("SameReturnValue")
         private fun onContributorsClicked(): Boolean {
-            AlertDialog.Builder(requireContext())
+            MaterialAlertDialogBuilder(requireContext())
                 .setTitle(R.string.about_privacy)
                 .setMessage(R.string.about_privacy_desc)
                 .setPositiveButton(android.R.string.ok) { _, _ ->

app/src/main/java/io/github/domi04151309/alwayson/activities/BaseActivity.kt

@@ -0,0 +1,22 @@
+package io.github.domi04151309.alwayson.activities
+
+import android.content.res.Configuration
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.elevation.SurfaceColors
+import io.github.domi04151309.alwayson.R
+
+abstract class BaseActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (resources.configuration.uiMode.and(
+                Configuration.UI_MODE_NIGHT_MASK,
+            ) != Configuration.UI_MODE_NIGHT_YES
+        ) {
+            setTheme(R.style.LightStatusBarOverlay)
+        }
+        val color = SurfaceColors.SURFACE_2.getColor(this)
+        window.statusBarColor = color
+        window.navigationBarColor = color
+    }
+}

app/src/main/java/io/github/domi04151309/alwayson/activities/ContributorActivity.kt

@@ -5,7 +5,6 @@ import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.util.Log
 import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -15,12 +14,10 @@ import com.android.volley.toolbox.JsonArrayRequest
 import com.android.volley.toolbox.Volley
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.helpers.Global
-import io.github.domi04151309.alwayson.helpers.Theme
 import org.json.JSONObject
 
-class ContributorActivity : AppCompatActivity() {
+class ContributorActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager

app/src/main/java/io/github/domi04151309/alwayson/activities/HelpActivity.kt

@@ -8,14 +8,11 @@ import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import android.widget.Button
-import androidx.appcompat.app.AppCompatActivity
 import io.github.domi04151309.alwayson.R
-import io.github.domi04151309.alwayson.helpers.Theme
 import io.github.domi04151309.alwayson.receivers.AdminReceiver
 
-class HelpActivity : AppCompatActivity() {
+class HelpActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_help)
 

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFAlwaysOnLookActivity.kt

@@ -2,16 +2,14 @@ package io.github.domi04151309.alwayson.activities
 
 import android.os.Bundle
 import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.actions.alwayson.AlwaysOn
 import io.github.domi04151309.alwayson.adapters.LayoutListAdapter
 import io.github.domi04151309.alwayson.helpers.P
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class LAFAlwaysOnLookActivity : AppCompatActivity(), LayoutListAdapter.OnItemClickListener {
+class LAFAlwaysOnLookActivity : BaseActivity(), LayoutListAdapter.OnItemClickListener {
     internal var value: String = P.USER_THEME_DEFAULT
     private lateinit var preview: ImageView
     private lateinit var layoutList: RecyclerView
@@ -80,7 +78,6 @@ class LAFAlwaysOnLookActivity : AppCompatActivity(), LayoutListAdapter.OnItemCli
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_layout_list)
 

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBackgroundActivity.kt

@@ -3,16 +3,13 @@ package io.github.domi04151309.alwayson.activities
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.custom.BasePreferenceFragment
 import io.github.domi04151309.alwayson.helpers.P
 import io.github.domi04151309.alwayson.helpers.PreferenceScreenHelper
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class LAFBackgroundActivity : AppCompatActivity() {
+class LAFBackgroundActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBackgroundImageActivity.kt

@@ -16,21 +16,19 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.actions.alwayson.AlwaysOn
 import io.github.domi04151309.alwayson.adapters.LayoutListAdapter
 import io.github.domi04151309.alwayson.helpers.P
-import io.github.domi04151309.alwayson.helpers.Theme
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 import java.lang.Integer.min
 
 class LAFBackgroundImageActivity :
-    AppCompatActivity(),
+    BaseActivity(),
     ActivityResultCallback<ActivityResult>,
     LayoutListAdapter.OnItemClickListener {
     internal var value: String = P.BACKGROUND_IMAGE_DEFAULT
@@ -97,7 +95,6 @@ class LAFBackgroundImageActivity :
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_layout_list)
 

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBehaviorActivity.kt

@@ -2,17 +2,14 @@ package io.github.domi04151309.alwayson.activities
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.SwitchPreference
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.custom.BasePreferenceFragment
 import io.github.domi04151309.alwayson.helpers.P
 import io.github.domi04151309.alwayson.helpers.PreferenceScreenHelper
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class LAFBehaviorActivity : AppCompatActivity() {
+class LAFBehaviorActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBrightnessActivity.kt

@@ -2,19 +2,16 @@ package io.github.domi04151309.alwayson.activities
 
 import android.os.Bundle
 import android.widget.SeekBar
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SwitchCompat
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.actions.alwayson.AlwaysOn
 import io.github.domi04151309.alwayson.helpers.P
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class LAFBrightnessActivity : AppCompatActivity() {
+class LAFBrightnessActivity : BaseActivity() {
     private lateinit var brightnessSwitch: SwitchCompat
     private lateinit var seekBar: SeekBar
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_brightness)
         brightnessSwitch = findViewById(R.id.brightnessSwitch)

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFChargingLookActivity.kt

@@ -2,15 +2,13 @@ package io.github.domi04151309.alwayson.activities
 
 import android.os.Bundle
 import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.adapters.LayoutListAdapter
 import io.github.domi04151309.alwayson.helpers.P
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class LAFChargingLookActivity : AppCompatActivity(), LayoutListAdapter.OnItemClickListener {
+class LAFChargingLookActivity : BaseActivity(), LayoutListAdapter.OnItemClickListener {
     internal var value: String = P.CHARGING_STYLE_DEFAULT
     private lateinit var preview: ImageView
     private lateinit var layoutList: RecyclerView
@@ -39,7 +37,6 @@ class LAFChargingLookActivity : AppCompatActivity(), LayoutListAdapter.OnItemCli
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_layout_list)
 

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFFilterNotificationsActivity.kt

@@ -4,21 +4,18 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.actions.alwayson.AlwaysOn
 import io.github.domi04151309.alwayson.helpers.Global
 import io.github.domi04151309.alwayson.helpers.JSON
-import io.github.domi04151309.alwayson.helpers.Theme
 import io.github.domi04151309.alwayson.services.NotificationService
 import org.json.JSONArray
 
-class LAFFilterNotificationsActivity : AppCompatActivity() {
+class LAFFilterNotificationsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFRulesActivity.kt

@@ -4,20 +4,17 @@ import android.app.TimePickerDialog
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.custom.BasePreferenceFragment
 import io.github.domi04151309.alwayson.custom.EditIntegerPreference
 import io.github.domi04151309.alwayson.helpers.P
 import io.github.domi04151309.alwayson.helpers.PreferenceScreenHelper
 import io.github.domi04151309.alwayson.helpers.Rules
-import io.github.domi04151309.alwayson.helpers.Theme
 import java.lang.Integer.parseInt
 
-class LAFRulesActivity : AppCompatActivity() {
+class LAFRulesActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWFColorsActivity.kt

@@ -1,14 +1,11 @@
 package io.github.domi04151309.alwayson.activities
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.custom.BasePreferenceFragment
-import io.github.domi04151309.alwayson.helpers.Theme
 
-class LAFWFColorsActivity : AppCompatActivity() {
+class LAFWFColorsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager

app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWatchFaceActivity.kt

@@ -9,22 +9,20 @@ import android.util.Log
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.preference.Preference
 import androidx.preference.SeekBarPreference
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.github.domi04151309.alwayson.R
 import io.github.domi04151309.alwayson.custom.BasePreferenceFragment
 import io.github.domi04151309.alwayson.helpers.Global
 import io.github.domi04151309.alwayson.helpers.P
 import io.github.domi04151309.alwayson.helpers.PreferenceScreenHelper
-import io.github.domi04151309.alwayson.helpers.Theme
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class LAFWatchFaceActivity : AppCompatActivity() {
+class LAFWatchFaceActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        Theme.set(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         supportFragmentManager
@@ -45,7 +43,7 @@ class LAFWatchFaceActivity : AppCompatActivity() {
                 ),
             )
             val dialog =
-                AlertDialog.Builder(requireContext())
+                MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.pref_ao_date_format)
                     .setView(dialogView)
                     .setPositiveButton(android.R.string.ok, null)