From fcc28f41db18c49a46711ece9a5c61963a0682ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 11:47:36 +0800
Subject: [PATCH 01/15] Refactor: Extract PolicyAccessDialog into its own file

The `PolicyAccessDialog` `DialogFragment` has been moved from `MainActivity.kt` into its own dedicated file, `PolicyAccessDialog.kt`, to improve code organization.

In `MainActivity.kt`, `enableEdgeToEdge()` is now used, and the insets handling method has been renamed from `handleEdgeToEdgeInsets` to `setupWindowInsets` for clarity.
---
 .../com/klee/volumelockr/ui/MainActivity.kt   | 53 ++++++++++---------
 .../klee/volumelockr/ui/PolicyAccessDialog.kt | 27 ++++++++++
 2 files changed, 54 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/java/com/klee/volumelockr/ui/PolicyAccessDialog.kt

diff --git a/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt b/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
index 1c882c1..eabb90d 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
@@ -1,17 +1,16 @@
 package com.klee.volumelockr.ui
 
-import android.app.AlertDialog
-import android.app.Dialog
 import android.app.NotificationManager
-import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
+import androidx.activity.enableEdgeToEdge
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.fragment.app.DialogFragment
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupWithNavController
 import com.klee.volumelockr.R
 import com.klee.volumelockr.databinding.ActivityMainBinding
 
@@ -20,10 +19,12 @@ class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        handleEdgeToEdgeInsets()
+        setupToolbar()
+        setupWindowInsets()
     }
 
     override fun onResume() {
@@ -34,6 +35,15 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun setupToolbar() {
+        setSupportActionBar(binding.toolbar)
+        val navHostFragment = supportFragmentManager
+            .findFragmentById(R.id.fragment_container_view) as NavHostFragment
+        val navController = navHostFragment.navController
+        val appBarConfiguration = AppBarConfiguration(navController.graph)
+        binding.toolbar.setupWithNavController(navController, appBarConfiguration)
+    }
+
     @RequiresApi(Build.VERSION_CODES.M)
     private fun checkDoNotDisturbPermission() {
         val notificationManager =
@@ -44,31 +54,22 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    class PolicyAccessDialog : DialogFragment() {
-        companion object {
-            const val TAG = "PolicyAccessDialog"
-        }
-
-        @RequiresApi(Build.VERSION_CODES.M)
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
-            AlertDialog.Builder(requireContext())
-                .setMessage(getString(R.string.dialog_policy_access_title))
-                .setCancelable(false)
-                .setPositiveButton(getString(R.string.dialog_allow)) { _, _ ->
-                    startActivity(Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS))
-                }
-                .create()
-    }
-
-    private fun handleEdgeToEdgeInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, windowInsets ->
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.appBarLayout) { v, windowInsets ->
             val bars = windowInsets.getInsets(
                 WindowInsetsCompat.Type.systemBars()
                     or WindowInsetsCompat.Type.displayCutout()
             )
+            v.setPadding(bars.left, bars.top, bars.right, 0)
+            WindowInsetsCompat.CONSUMED
+        }
 
-            v.setPadding(bars.left, bars.top, bars.right, bars.bottom)
-
+        ViewCompat.setOnApplyWindowInsetsListener(binding.fragmentContainerView) { v, windowInsets ->
+             val bars = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    or WindowInsetsCompat.Type.displayCutout()
+            )
+            v.setPadding(bars.left, 0, bars.right, bars.bottom)
             WindowInsetsCompat.CONSUMED
         }
     }
diff --git a/app/src/main/java/com/klee/volumelockr/ui/PolicyAccessDialog.kt b/app/src/main/java/com/klee/volumelockr/ui/PolicyAccessDialog.kt
new file mode 100644
index 0000000..4664c0e
--- /dev/null
+++ b/app/src/main/java/com/klee/volumelockr/ui/PolicyAccessDialog.kt
@@ -0,0 +1,27 @@
+package com.klee.volumelockr.ui
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.DialogFragment
+import com.klee.volumelockr.R
+
+class PolicyAccessDialog : DialogFragment() {
+    companion object {
+        const val TAG = "PolicyAccessDialog"
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+        AlertDialog.Builder(requireContext())
+            .setMessage(getString(R.string.dialog_policy_access_title))
+            .setCancelable(false)
+            .setPositiveButton(getString(R.string.dialog_allow)) { _, _ ->
+                startActivity(Intent(Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS))
+            }
+            .create()
+}

From 6fbb698865c86da8bd488ea9fcb1aae1592f47e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 11:58:17 +0800
Subject: [PATCH 02/15] feat: Add bottom navigation

Adds a `BottomNavigationView` to the main screen for easier navigation between the main volume sliders, settings, and the about page.

This includes:
- Adding a `MaterialToolbar` and `BottomNavigationView` to `activity_main.xml`.
- Creating a new `bottom_nav_menu.xml` with icons for home, settings, and info.
- Updating `MainActivity.kt` to set up the toolbar and bottom navigation with the navigation controller.
- Removing the now-redundant options menu from `VolumeSliderFragment`.
- Applying a `NoActionBar` theme to the activity.
---
 .../com/klee/volumelockr/ui/MainActivity.kt   | 11 ++--
 .../volumelockr/ui/VolumeSliderFragment.kt    | 50 -------------------
 app/src/main/res/drawable/ic_home.xml         |  9 ++++
 app/src/main/res/drawable/ic_info.xml         |  9 ++++
 app/src/main/res/drawable/ic_settings.xml     |  9 ++++
 app/src/main/res/layout/activity_main.xml     | 30 ++++++++++-
 app/src/main/res/menu/bottom_nav_menu.xml     | 17 +++++++
 app/src/main/res/values/themes.xml            |  3 +-
 8 files changed, 81 insertions(+), 57 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_home.xml
 create mode 100644 app/src/main/res/drawable/ic_info.xml
 create mode 100644 app/src/main/res/drawable/ic_settings.xml
 create mode 100644 app/src/main/res/menu/bottom_nav_menu.xml

diff --git a/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt b/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
index eabb90d..ff6c0a1 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
@@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setupToolbar()
+        setupNavigation()
         setupWindowInsets()
     }
 
@@ -35,13 +35,16 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun setupToolbar() {
+    private fun setupNavigation() {
         setSupportActionBar(binding.toolbar)
         val navHostFragment = supportFragmentManager
             .findFragmentById(R.id.fragment_container_view) as NavHostFragment
         val navController = navHostFragment.navController
-        val appBarConfiguration = AppBarConfiguration(navController.graph)
+        val appBarConfiguration = AppBarConfiguration(
+            setOf(R.id.volumeSliderFragment, R.id.settingsFragment, R.id.about_libraries)
+        )
         binding.toolbar.setupWithNavController(navController, appBarConfiguration)
+        binding.bottomNavigation.setupWithNavController(navController)
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
@@ -64,7 +67,7 @@ class MainActivity : AppCompatActivity() {
             WindowInsetsCompat.CONSUMED
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.fragmentContainerView) { v, windowInsets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigation) { v, windowInsets ->
              val bars = windowInsets.getInsets(
                 WindowInsetsCompat.Type.systemBars()
                     or WindowInsetsCompat.Type.displayCutout()
diff --git a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
index 9b60e35..fe2fd36 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
@@ -9,17 +9,10 @@ import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.klee.volumelockr.R
 import com.klee.volumelockr.databinding.FragmentVolumeSliderBinding
 import com.klee.volumelockr.service.VolumeService
 
@@ -36,16 +29,10 @@ class VolumeSliderFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        setHasOptionsMenu(true)
         _binding = FragmentVolumeSliderBinding.inflate(inflater, container, false)
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        handleEdgeToEdgeInsets()
-    }
-
     override fun onResume() {
         super.onResume()
         mService?.let {
@@ -67,49 +54,12 @@ class VolumeSliderFragment : Fragment() {
         super.onDestroyView()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
-        val inflater: MenuInflater = menuInflater
-        inflater.inflate(R.menu.options, menu)
-        super.onCreateOptionsMenu(menu, menuInflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.about -> findNavController().navigate(R.id.action_x_to_about_libs)
-            R.id.options -> findNavController().navigate(R.id.action_sliders_to_settings)
-        }
-        return true
-    }
-
     private fun setupRecyclerView(service: VolumeService) {
         binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
         mAdapter = VolumeAdapter(service.getVolumes(), service, requireContext())
         binding.recyclerView.adapter = mAdapter
     }
 
-    private fun handleEdgeToEdgeInsets() {
-        val recyclerView = binding.recyclerView
-        val startPadding = recyclerView.paddingLeft
-        val topPadding = recyclerView.paddingTop
-        val endPadding = recyclerView.paddingRight
-        val bottomPadding = recyclerView.paddingBottom
-
-        ViewCompat.setOnApplyWindowInsetsListener(recyclerView) { v, insets ->
-            val bars = insets.getInsets(
-                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-            )
-
-            v.setPadding(
-                startPadding + bars.left,
-                topPadding + bars.top,
-                endPadding + bars.right,
-                bottomPadding + bars.bottom
-            )
-
-            WindowInsetsCompat.CONSUMED
-        }
-    }
-
     private val connection = object : ServiceConnection {
 
         override fun onServiceConnected(className: ComponentName?, service: IBinder?) {
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
new file mode 100644
index 0000000..58cc391
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000..8cdd57f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2V7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..c5d4ef6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58a0.49,0.49 0 0,0 0.12,-0.61l-1.92,-3.32a0.488,0.488 0 0,0 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81a0.494,0.494 0 0,0 -0.49,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33a0.49,0.49 0 0,0 -0.59,0.22L2.74,8.87a0.49,0.49 0 0,0 0.12,0.61l2.03,1.58c-0.05,0.3 -0.07,0.62 -0.07,0.94s0.02,0.64 0.07,0.94l-2.03,1.58a0.49,0.49 0 0,0 -0.12,0.61l1.92,3.32a0.488,0.488 0 0,0 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96a0.49,0.49 0 0,0 0.59,-0.22l1.92,-3.32a0.49,0.49 0 0,0 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cd093ae..a620d88 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,22 @@
     android:layout_height="match_parent"
     tools:context=".ui.MainActivity">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:title="@string/app_name" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:name="androidx.navigation.fragment.NavHostFragment"
@@ -15,9 +31,19 @@
         app:navGraph="@navigation/navigation_graph"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
+        app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
 
         tools:layout_editor_absoluteX="24dp"
         tools:layout_editor_absoluteY="24dp" />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:menu="@menu/bottom_nav_menu"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
new file mode 100644
index 0000000..14151d0
--- /dev/null
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/volumeSliderFragment"
+        android:icon="@drawable/ic_home"
+        android:title="@string/app_name" />
+
+    <item
+        android:id="@+id/settingsFragment"
+        android:icon="@drawable/ic_settings"
+        android:title="@string/options" />
+
+    <item
+        android:id="@+id/about_libraries"
+        android:icon="@drawable/ic_info"
+        android:title="@string/about" />
+</menu>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index efd56ba..c10beda 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.VolumeLockr" parent="Theme.Material3.DynamicColors.DayNight">
+    <style name="Theme.VolumeLockr" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
         <item name="preferenceTheme">@style/ThemeOverlay.App.Preference</item>
+        <item name="android:windowBackground">?attr/colorSurface</item>
     </style>
 
     <style name="ThemeOverlay.App.Preference" parent="PreferenceThemeOverlay">

From 86147f891debed967eab75428c13f8e6af2340f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:02:10 +0800
Subject: [PATCH 03/15] fix: Stop service when no locks are set

---
 .../java/com/klee/volumelockr/service/VolumeService.kt   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
index 2495aa8..97f2f9e 100644
--- a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
+++ b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
@@ -90,6 +90,11 @@ class VolumeService : Service() {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             tryShowNotification()
+            
+            if (mVolumeLock.isEmpty()) {
+                stopForeground(true)
+                stopSelf()
+            }
         }
     }
 
@@ -262,10 +267,6 @@ class VolumeService : Service() {
     @RequiresApi(Build.VERSION_CODES.O)
     @Synchronized
     fun tryShowNotification() {
-        if (mVolumeLock.isEmpty()) {
-            return
-        }
-
         createNotificationChannel()
         val notification = Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
             .setContentTitle(NOTIFICATION_TITLE)

From 9fa8787ad838db8cca8de3936bd1efee9d4163bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:08:17 +0800
Subject: [PATCH 04/15] feat: Add tablet layout

- Introduces a two-pane layout for screens with a width of 600dp or more, using `NavigationRailView`.
- The volume sliders are now displayed in a grid with two columns on larger screens.
- Updates string resources for clarity and consistency.
---
 .../com/klee/volumelockr/ui/MainActivity.kt   | 33 ++++++++++---
 .../volumelockr/ui/VolumeSliderFragment.kt    |  3 +-
 .../main/res/layout-w600dp/activity_main.xml  | 49 +++++++++++++++++++
 app/src/main/res/menu/bottom_nav_menu.xml     |  2 +-
 app/src/main/res/values/strings.xml           | 31 +++++-------
 5 files changed, 89 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/layout-w600dp/activity_main.xml

diff --git a/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt b/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
index ff6c0a1..536c245 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/MainActivity.kt
@@ -11,6 +11,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.navigation.NavigationBarView
 import com.klee.volumelockr.R
 import com.klee.volumelockr.databinding.ActivityMainBinding
 
@@ -44,7 +45,9 @@ class MainActivity : AppCompatActivity() {
             setOf(R.id.volumeSliderFragment, R.id.settingsFragment, R.id.about_libraries)
         )
         binding.toolbar.setupWithNavController(navController, appBarConfiguration)
-        binding.bottomNavigation.setupWithNavController(navController)
+
+        val navView: NavigationBarView? = binding.bottomNavigation ?: binding.navigationRail
+        navView?.setupWithNavController(navController)
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
@@ -67,13 +70,27 @@ class MainActivity : AppCompatActivity() {
             WindowInsetsCompat.CONSUMED
         }
 
-        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigation) { v, windowInsets ->
-             val bars = windowInsets.getInsets(
-                WindowInsetsCompat.Type.systemBars()
-                    or WindowInsetsCompat.Type.displayCutout()
-            )
-            v.setPadding(bars.left, 0, bars.right, bars.bottom)
-            WindowInsetsCompat.CONSUMED
+        binding.bottomNavigation?.let { view ->
+            ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+                val bars = windowInsets.getInsets(
+                    WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout()
+                )
+                v.setPadding(bars.left, 0, bars.right, bars.bottom)
+                WindowInsetsCompat.CONSUMED
+            }
+        }
+
+        binding.navigationRail?.let { view ->
+            ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+                val bars = windowInsets.getInsets(
+                    WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout()
+                )
+                // Rail needs top and bottom padding usually, and left padding
+                v.setPadding(bars.left, bars.top, 0, bars.bottom)
+                WindowInsetsCompat.CONSUMED
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
index fe2fd36..ba65108 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
@@ -55,7 +55,8 @@ class VolumeSliderFragment : Fragment() {
     }
 
     private fun setupRecyclerView(service: VolumeService) {
-        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        val spanCount = if (resources.configuration.screenWidthDp >= 600) 2 else 1
+        binding.recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(requireContext(), spanCount)
         mAdapter = VolumeAdapter(service.getVolumes(), service, requireContext())
         binding.recyclerView.adapter = mAdapter
     }
diff --git a/app/src/main/res/layout-w600dp/activity_main.xml b/app/src/main/res/layout-w600dp/activity_main.xml
new file mode 100644
index 0000000..f645e0e
--- /dev/null
+++ b/app/src/main/res/layout-w600dp/activity_main.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.MainActivity">
+
+    <com.google.android.material.navigationrail.NavigationRailView
+        android:id="@+id/navigation_rail"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        app:menu="@menu/bottom_nav_menu"
+        app:labelVisibilityMode="labeled"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/navigation_rail"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:title="@string/app_name" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container_view"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/navigation_graph"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/navigation_rail"
+        app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
+        tools:layout_editor_absoluteX="24dp"
+        tools:layout_editor_absoluteY="24dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 14151d0..2b9c9e5 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -3,7 +3,7 @@
     <item
         android:id="@+id/volumeSliderFragment"
         android:icon="@drawable/ic_home"
-        android:title="@string/app_name" />
+        android:title="@string/home" />
 
     <item
         android:id="@+id/settingsFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c581efb..903d06f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,25 +1,18 @@
 <resources>
     <string name="app_name">VolumeLockr</string>
-    <string name="media_title">Media</string>
-    <string name="alarm_title">Alarm</string>
-    <string name="notification_title">Ringtones / Notifications</string>
-    <string name="call_title">Voice calls</string>
-    <string name="title">Title</string>
+    <string name="title">VolumeLockr</string>
     <string name="lock">Lock</string>
-    <string name="options">Settings</string>
+    <string name="options">Options</string>
     <string name="about">About</string>
-    <string name="aboutLibraries_description_text">VolumeLockr</string>
-    <string name="dialog_policy_access_title">You must allow VolumeLockr to access Do Not Disturb mode</string>
+    <string name="home">Home</string>
+    <string name="dialog_policy_access_title">To detect Ringer Mode changes (Silent, Vibrate, Normal), VolumeLockr needs \"Do Not Disturb\" access.</string>
     <string name="dialog_allow">Allow</string>
-
-    <string name="aboutLibraries_description_showIcon" translatable="false">true</string>
-    <string name="aboutLibraries_description_showVersion" translatable="false">true</string>
-
-    <!-- Preferences -->
-    <string name="limiting_header">Volume Limiting</string>
-    <string name="allow_lower">Allow lower volume than limit</string>
-    <string name="password_header">Password</string>
-    <string name="password_protected">Enable password protection</string>
-    <string name="change_password">Change password</string>
-    <string name="enter_password">Enter your password</string>
+    <string name="pref_password_protection">Password protection</string>
+    <string name="pref_password_protection_summary">Require password to unlock volume</string>
+    <string name="pref_create_password">Create password</string>
+    <string name="pref_create_password_summary">Set a password to protect volume changes</string>
+    <string name="pref_change_password">Change password</string>
+    <string name="pref_change_password_summary">Update your existing password</string>
+    <string name="pref_allow_lower_volume">Allow lowering volume</string>
+    <string name="pref_allow_lower_volume_summary">Allow volume to be lowered even if locked</string>
 </resources>
\ No newline at end of file

From 1b1e2cee61b7846d09c1b1fffa006006e2161721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:19:58 +0800
Subject: [PATCH 05/15] feat: Add about screen and improve UI

- Add a new "About" screen to display open-source library information.
- Use a `GridLayoutManager` on the about screen for larger displays.
- Replace `AlertDialog` with `MaterialAlertDialogBuilder` for a consistent look.
- Improve dialog layout by adding margins.
- Center the bottom navigation menu on wider screens.
---
 .../com/klee/volumelockr/ui/AboutFragment.kt  | 57 +++++++++++++++++++
 .../klee/volumelockr/ui/SettingsFragment.kt   | 45 +++++----------
 .../main/res/layout-w600dp/activity_main.xml  |  1 +
 app/src/main/res/layout/fragment_about.xml    |  5 ++
 .../main/res/navigation/navigation_graph.xml  |  9 ++-
 app/src/main/res/values/dimens.xml            |  4 ++
 app/src/main/res/values/strings.xml           | 17 ++++++
 7 files changed, 105 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_about.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt
new file mode 100644
index 0000000..e681162
--- /dev/null
+++ b/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt
@@ -0,0 +1,57 @@
+package com.klee.volumelockr.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.klee.volumelockr.R
+import com.mikepenz.aboutlibraries.LibsBuilder
+
+class AboutFragment : Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_about, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        if (savedInstanceState == null) {
+            val libsFragment = LibsBuilder()
+                .supportFragment()
+
+            childFragmentManager.beginTransaction()
+                .add(R.id.about_libs_container, libsFragment)
+                .commitNow()
+        }
+
+        view.post {
+            val recyclerView = findRecyclerView(view)
+            recyclerView?.let { rv ->
+                val spanCount = if (resources.configuration.screenWidthDp >= 600) 2 else 1
+                if (spanCount > 1) {
+                    rv.layoutManager = GridLayoutManager(requireContext(), spanCount)
+                }
+            }
+        }
+    }
+
+    private fun findRecyclerView(view: View): RecyclerView? {
+        if (view is RecyclerView) return view
+        if (view is ViewGroup) {
+            for (i in 0 until view.childCount) {
+                val child = view.getChildAt(i)
+                val rv = findRecyclerView(child)
+                if (rv != null) return rv
+            }
+        }
+        return null
+    }
+}
diff --git a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
index 054cf71..7c58ac3 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
@@ -1,18 +1,17 @@
 package com.klee.volumelockr.ui
 
-import android.app.AlertDialog
 import android.content.Context
 import android.os.Bundle
 import android.text.InputType
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import android.widget.FrameLayout
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreferenceCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.klee.volumelockr.R
 import com.klee.volumelockr.service.VolumeService
 
@@ -62,31 +61,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
         passwordProtected.isEnabled = isPasswordSet()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val preferenceList = listView
-        val startPadding = preferenceList.paddingLeft
-        val topPadding = preferenceList.paddingTop
-        val endPadding = preferenceList.paddingRight
-        val bottomPadding = preferenceList.paddingBottom
-
-        ViewCompat.setOnApplyWindowInsetsListener(preferenceList) { v, windowInsets ->
-            val bars = windowInsets.getInsets(
-                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
-            )
-
-            v.setPadding(
-                startPadding + bars.left,
-                topPadding + bars.top,
-                endPadding + bars.right,
-                bottomPadding + bars.bottom
-            )
-
-            WindowInsetsCompat.CONSUMED
-        }
-    }
-
     private fun askForPassword() {
         val editText = EditText(context)
         editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
@@ -95,10 +69,21 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
         editText.requestFocus()
 
-        AlertDialog.Builder(context)
+        val container = FrameLayout(requireContext())
+        val params = FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.WRAP_CONTENT
+        )
+        val margin = resources.getDimensionPixelSize(R.dimen.dialog_margin)
+        params.leftMargin = margin
+        params.rightMargin = margin
+        editText.layoutParams = params
+        container.addView(editText)
+
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.enter_password))
             .setCancelable(false)
-            .setView(editText)
+            .setView(container)
             .setPositiveButton("OK") { _, _ ->
                 checkPassword(editText.text.toString())
             }
diff --git a/app/src/main/res/layout-w600dp/activity_main.xml b/app/src/main/res/layout-w600dp/activity_main.xml
index f645e0e..6792117 100644
--- a/app/src/main/res/layout-w600dp/activity_main.xml
+++ b/app/src/main/res/layout-w600dp/activity_main.xml
@@ -12,6 +12,7 @@
         android:layout_height="0dp"
         app:menu="@menu/bottom_nav_menu"
         app:labelVisibilityMode="labeled"
+        app:menuGravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 0000000..50a4241
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/about_libs_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/app/src/main/res/navigation/navigation_graph.xml b/app/src/main/res/navigation/navigation_graph.xml
index 2e557ff..4079252 100644
--- a/app/src/main/res/navigation/navigation_graph.xml
+++ b/app/src/main/res/navigation/navigation_graph.xml
@@ -5,12 +5,15 @@
     android:id="@+id/navigation_graph"
     app:startDestination="@id/volumeSliderFragment">
 
-    <include app:graph="@navigation/aboutlibs_navigation" />
+    <fragment
+        android:id="@+id/about_libraries"
+        android:name="com.klee.volumelockr.ui.AboutFragment"
+        android:label="@string/about" />
 
     <fragment
         android:id="@+id/volumeSliderFragment"
         android:name="com.klee.volumelockr.ui.VolumeSliderFragment"
-        android:label="VolumeSliderFragment">
+        android:label="@string/app_name">
         <action
             android:id="@+id/action_x_to_about_libs"
             app:destination="@id/about_libraries" />
@@ -22,6 +25,6 @@
     <fragment
       android:id="@+id/settingsFragment"
       android:name="com.klee.volumelockr.ui.SettingsFragment"
-      android:label="SettingsFragment" />
+      android:label="@string/options" />
 
 </navigation>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..cabfc2e
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialog_margin">24dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 903d06f..ca485cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,23 @@
     <string name="home">Home</string>
     <string name="dialog_policy_access_title">To detect Ringer Mode changes (Silent, Vibrate, Normal), VolumeLockr needs \"Do Not Disturb\" access.</string>
     <string name="dialog_allow">Allow</string>
+
+    <string name="media_title">Media</string>
+    <string name="alarm_title">Alarm</string>
+    <string name="notification_title">Ring / Notification</string>
+    <string name="call_title">Call</string>
+
+    <string name="password_header">Password</string>
+    <string name="password_protected">Enable password protection</string>
+    <string name="change_password">Change password</string>
+    <string name="enter_password">Enter password</string>
+
+    <string name="limiting_header">Volume Limits</string>
+    <string name="allow_lower">Allow lowering volume</string>
+
+    <string name="aboutLibraries_description_text">VolumeLockr</string>
+
+    <!-- Legacy / Unused? -->
     <string name="pref_password_protection">Password protection</string>
     <string name="pref_password_protection_summary">Require password to unlock volume</string>
     <string name="pref_create_password">Create password</string>

From f788e90e80466ed4e39c96ea76219acc9c015c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:22:05 +0800
Subject: [PATCH 06/15] chore: Update gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index ef02891..d9c34ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .idea
 .gradle
 local.properties
+build/
+.kotlin/
\ No newline at end of file

From 38ac8bead3a45d7389b6f7faa352a05ff28f990f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:27:22 +0800
Subject: [PATCH 07/15] refactor: Improve password dialog

Inflate password dialog from XML layout instead of creating it programmatically. This also adds a lock icon and uses a centered Material 3 theme for the dialog.
---
 .../klee/volumelockr/ui/SettingsFragment.kt   | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
index 7c58ac3..96ec729 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
@@ -3,10 +3,10 @@ package com.klee.volumelockr.ui
 import android.content.Context
 import android.os.Bundle
 import android.text.InputType
+import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
-import android.widget.FrameLayout
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
@@ -62,28 +62,19 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     private fun askForPassword() {
-        val editText = EditText(context)
-        editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_password, null)
+        val editText = view.findViewById<EditText>(R.id.password_input)
+        
         editText.setOnFocusChangeListener { _, _ ->
             editText.postDelayed({ showKeyboard(editText) }, DELAY_IN_MS)
         }
         editText.requestFocus()
 
-        val container = FrameLayout(requireContext())
-        val params = FrameLayout.LayoutParams(
-            FrameLayout.LayoutParams.MATCH_PARENT,
-            FrameLayout.LayoutParams.WRAP_CONTENT
-        )
-        val margin = resources.getDimensionPixelSize(R.dimen.dialog_margin)
-        params.leftMargin = margin
-        params.rightMargin = margin
-        editText.layoutParams = params
-        container.addView(editText)
-
-        MaterialAlertDialogBuilder(requireContext())
+        MaterialAlertDialogBuilder(requireContext(), com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
+            .setIcon(R.drawable.ic_lock)
             .setTitle(getString(R.string.enter_password))
             .setCancelable(false)
-            .setView(container)
+            .setView(view)
             .setPositiveButton("OK") { _, _ ->
                 checkPassword(editText.text.toString())
             }

From 3a23ed9e8202c0b4e611de5b1a3a832244881490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:34:19 +0800
Subject: [PATCH 08/15] chore: Use standard AlertDialog

---
 .../com/klee/volumelockr/ui/SettingsFragment.kt     | 13 +++++--------
 app/src/main/res/values/dimens.xml                  |  4 ----
 2 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
index 96ec729..38591f9 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
@@ -1,9 +1,9 @@
 package com.klee.volumelockr.ui
 
+import android.app.AlertDialog
 import android.content.Context
 import android.os.Bundle
 import android.text.InputType
-import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
@@ -11,7 +11,6 @@ import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreferenceCompat
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.klee.volumelockr.R
 import com.klee.volumelockr.service.VolumeService
 
@@ -62,19 +61,17 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     private fun askForPassword() {
-        val view = LayoutInflater.from(context).inflate(R.layout.dialog_password, null)
-        val editText = view.findViewById<EditText>(R.id.password_input)
-        
+        val editText = EditText(context)
+        editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
         editText.setOnFocusChangeListener { _, _ ->
             editText.postDelayed({ showKeyboard(editText) }, DELAY_IN_MS)
         }
         editText.requestFocus()
 
-        MaterialAlertDialogBuilder(requireContext(), com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
-            .setIcon(R.drawable.ic_lock)
+        AlertDialog.Builder(context)
             .setTitle(getString(R.string.enter_password))
             .setCancelable(false)
-            .setView(view)
+            .setView(editText)
             .setPositiveButton("OK") { _, _ ->
                 checkPassword(editText.text.toString())
             }
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index cabfc2e..0000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="dialog_margin">24dp</dimen>
-</resources>

From 84ec54543d2d3d473002606f768f320ee442498a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:53:30 +0800
Subject: [PATCH 09/15] fix: Resolve stopForeground issues and clean up strings

---
 .../java/com/klee/volumelockr/service/VolumeService.kt |  8 +++-----
 app/src/main/res/values/strings.xml                    | 10 ----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
index 97f2f9e..05e7cbe 100644
--- a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
+++ b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
@@ -1,6 +1,5 @@
 package com.klee.volumelockr.service
 
-import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -92,7 +91,7 @@ class VolumeService : Service() {
             tryShowNotification()
             
             if (mVolumeLock.isEmpty()) {
-                stopForeground(true)
+                stopForeground(Service.STOP_FOREGROUND_REMOVE)
                 stopSelf()
             }
         }
@@ -278,7 +277,6 @@ class VolumeService : Service() {
         startForeground(NOTIFICATION_ID, notification)
     }
 
-    @SuppressLint("WrongConstant")
     @RequiresApi(Build.VERSION_CODES.N)
     @Synchronized
     fun tryHideNotification() {
@@ -286,7 +284,7 @@ class VolumeService : Service() {
             return
         }
 
-        stopForeground(NOTIFICATION_ID)
+        stopForeground(Service.STOP_FOREGROUND_REMOVE)
     }
 
     private fun createNotificationContentIntent(): PendingIntent {
@@ -325,4 +323,4 @@ class VolumeService : Service() {
         unregisterObservers()
         stopLocking()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca485cd..7a6c098 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,14 +22,4 @@
     <string name="allow_lower">Allow lowering volume</string>
 
     <string name="aboutLibraries_description_text">VolumeLockr</string>
-
-    <!-- Legacy / Unused? -->
-    <string name="pref_password_protection">Password protection</string>
-    <string name="pref_password_protection_summary">Require password to unlock volume</string>
-    <string name="pref_create_password">Create password</string>
-    <string name="pref_create_password_summary">Set a password to protect volume changes</string>
-    <string name="pref_change_password">Change password</string>
-    <string name="pref_change_password_summary">Update your existing password</string>
-    <string name="pref_allow_lower_volume">Allow lowering volume</string>
-    <string name="pref_allow_lower_volume_summary">Allow volume to be lowered even if locked</string>
 </resources>
\ No newline at end of file

From af5c02750854c0093fdb1076c7503fe9c3b7c03f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 12:57:44 +0800
Subject: [PATCH 10/15] fix: Prevent service start on boot if no locks active

---
 app/src/main/java/com/klee/volumelockr/BootReceiver.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/klee/volumelockr/BootReceiver.kt b/app/src/main/java/com/klee/volumelockr/BootReceiver.kt
index b83d9d9..a5f230b 100644
--- a/app/src/main/java/com/klee/volumelockr/BootReceiver.kt
+++ b/app/src/main/java/com/klee/volumelockr/BootReceiver.kt
@@ -9,7 +9,12 @@ class BootReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
-            VolumeService.start(context)
+            val prefs = context.getSharedPreferences(VolumeService.APP_SHARED_PREFERENCES, Context.MODE_PRIVATE)
+            val locks = prefs.getString(VolumeService.LOCKS_KEY, "")
+            
+            if (!locks.isNullOrEmpty() && locks != "{}") {
+                VolumeService.start(context)
+            }
         }
     }
 }

From c09613dcf3b3c330cea2a02c2e20e5360e1a7765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 19:18:10 +0800
Subject: [PATCH 11/15] refactor: Use resource-based layout logic and safe
 fragment commit

---
 .../java/com/klee/volumelockr/service/VolumeService.kt    | 8 +++++---
 .../main/java/com/klee/volumelockr/ui/AboutFragment.kt    | 4 ++--
 .../java/com/klee/volumelockr/ui/VolumeSliderFragment.kt  | 3 ++-
 app/src/main/res/values-w600dp/bools.xml                  | 4 ++++
 app/src/main/res/values/bools.xml                         | 4 ++++
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/values-w600dp/bools.xml
 create mode 100644 app/src/main/res/values/bools.xml

diff --git a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
index 05e7cbe..4856179 100644
--- a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
+++ b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
@@ -89,11 +89,13 @@ class VolumeService : Service() {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             tryShowNotification()
-            
-            if (mVolumeLock.isEmpty()) {
+        }
+
+        if (mVolumeLock.isEmpty()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 stopForeground(Service.STOP_FOREGROUND_REMOVE)
-                stopSelf()
             }
+            stopSelf()
         }
     }
 
diff --git a/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt
index e681162..a507b22 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/AboutFragment.kt
@@ -29,13 +29,13 @@ class AboutFragment : Fragment() {
 
             childFragmentManager.beginTransaction()
                 .add(R.id.about_libs_container, libsFragment)
-                .commitNow()
+                .commit()
         }
 
         view.post {
             val recyclerView = findRecyclerView(view)
             recyclerView?.let { rv ->
-                val spanCount = if (resources.configuration.screenWidthDp >= 600) 2 else 1
+                val spanCount = if (resources.getBoolean(R.bool.use_two_columns)) 2 else 1
                 if (spanCount > 1) {
                     rv.layoutManager = GridLayoutManager(requireContext(), spanCount)
                 }
diff --git a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
index ba65108..85684ce 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
@@ -13,6 +13,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.klee.volumelockr.R
 import com.klee.volumelockr.databinding.FragmentVolumeSliderBinding
 import com.klee.volumelockr.service.VolumeService
 
@@ -55,7 +56,7 @@ class VolumeSliderFragment : Fragment() {
     }
 
     private fun setupRecyclerView(service: VolumeService) {
-        val spanCount = if (resources.configuration.screenWidthDp >= 600) 2 else 1
+        val spanCount = if (resources.getBoolean(R.bool.use_two_columns)) 2 else 1
         binding.recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(requireContext(), spanCount)
         mAdapter = VolumeAdapter(service.getVolumes(), service, requireContext())
         binding.recyclerView.adapter = mAdapter
diff --git a/app/src/main/res/values-w600dp/bools.xml b/app/src/main/res/values-w600dp/bools.xml
new file mode 100644
index 0000000..72df60f
--- /dev/null
+++ b/app/src/main/res/values-w600dp/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="use_two_columns">true</bool>
+</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
new file mode 100644
index 0000000..dcd6034
--- /dev/null
+++ b/app/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="use_two_columns">false</bool>
+</resources>

From 59b9d8229998a2296927646e2742d7ab49f9b938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 19:43:20 +0800
Subject: [PATCH 12/15] refactor: Use MaterialAlertDialogBuilder for password
 dialogs

Replace EditTextPreference with Preference and custom MaterialAlertDialogBuilder
to ensure password dialogs follow Material Design 3 styling with rounded corners.
---
 .../klee/volumelockr/ui/SettingsFragment.kt   | 55 ++++++++++++++-----
 app/src/main/res/drawable/ic_lock.xml         |  9 +++
 app/src/main/res/layout/dialog_password.xml   | 23 ++++++++
 app/src/main/res/values/dimens.xml            |  4 ++
 app/src/main/res/values/themes.xml            |  2 +
 app/src/main/res/xml/root_preferences.xml     |  6 +-
 6 files changed, 80 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_lock.xml
 create mode 100644 app/src/main/res/layout/dialog_password.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
index 38591f9..5027eab 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
@@ -1,16 +1,16 @@
 package com.klee.volumelockr.ui
 
-import android.app.AlertDialog
 import android.content.Context
 import android.os.Bundle
-import android.text.InputType
+import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
-import androidx.preference.EditTextPreference
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreferenceCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.klee.volumelockr.R
 import com.klee.volumelockr.service.VolumeService
 
@@ -24,7 +24,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     private lateinit var passwordProtected: SwitchPreferenceCompat
-    private lateinit var passwordChange: EditTextPreference
+    private lateinit var passwordChange: Preference
     private lateinit var shouldAllowLower: SwitchPreferenceCompat
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -40,12 +40,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         passwordChange.isEnabled = !passwordProtected.isChecked
-        passwordChange.setOnBindEditTextListener { editText ->
-            editText.text.clear()
-            editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
-        }
-        passwordChange.setOnPreferenceChangeListener { _, value ->
-            passwordProtected.isEnabled = value.toString().isNotEmpty()
+        passwordChange.setOnPreferenceClickListener {
+            showChangePasswordDialog()
             true
         }
 
@@ -60,19 +56,48 @@ class SettingsFragment : PreferenceFragmentCompat() {
         passwordProtected.isEnabled = isPasswordSet()
     }
 
+    private fun showChangePasswordDialog() {
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_password, null)
+        val editText = view.findViewById<EditText>(android.R.id.edit)
+
+        editText.setOnFocusChangeListener { _, _ ->
+            editText.postDelayed({ showKeyboard(editText) }, DELAY_IN_MS)
+        }
+        editText.requestFocus()
+
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(getString(R.string.change_password))
+            .setView(view)
+            .setNegativeButton(android.R.string.cancel, null)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                savePassword(editText.text.toString())
+            }
+            .show()
+    }
+
+    private fun savePassword(newPassword: String) {
+        PreferenceManager.getDefaultSharedPreferences(requireContext())
+            .edit()
+            .putString(PASSWORD_CHANGE_PREFERENCE, newPassword)
+            .apply()
+        passwordProtected.isEnabled = newPassword.isNotEmpty()
+    }
+
     private fun askForPassword() {
-        val editText = EditText(context)
-        editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+        val view = LayoutInflater.from(context).inflate(R.layout.dialog_password, null)
+        val editText = view.findViewById<EditText>(android.R.id.edit)
+
         editText.setOnFocusChangeListener { _, _ ->
             editText.postDelayed({ showKeyboard(editText) }, DELAY_IN_MS)
         }
         editText.requestFocus()
 
-        AlertDialog.Builder(context)
+        MaterialAlertDialogBuilder(requireContext())
+            .setIcon(R.drawable.ic_lock)
             .setTitle(getString(R.string.enter_password))
             .setCancelable(false)
-            .setView(editText)
-            .setPositiveButton("OK") { _, _ ->
+            .setView(view)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 checkPassword(editText.text.toString())
             }
             .show()
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..f5d0a14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
new file mode 100644
index 0000000..b0708fa
--- /dev/null
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/dialog_margin"
+    android:paddingEnd="@dimen/dialog_margin">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/password_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/password_header"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@android:id/edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+</FrameLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..cabfc2e
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialog_margin">24dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c10beda..8ba7a27 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -7,6 +7,8 @@
 
     <style name="ThemeOverlay.App.Preference" parent="PreferenceThemeOverlay">
         <item name="switchPreferenceCompatStyle">@style/PreferenceMaterialSwitch</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog.Centered</item>
     </style>
 
     <style name="PreferenceMaterialSwitch" parent="@style/Preference.SwitchPreferenceCompat.Material">
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 44e6bd2..52f30b8 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -15,11 +15,9 @@
         app:key="password_protected"
         app:title="@string/password_protected" />
 
-    <EditTextPreference
+    <Preference
         app:key="password"
-        app:title="@string/change_password">
-
-    </EditTextPreference>
+        app:title="@string/change_password" />
 
   </PreferenceCategory>
 

From 351829b6208578927f6fd62c03f7cf8f87989462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Sun, 14 Dec 2025 21:14:24 +0800
Subject: [PATCH 13/15] feat: Add password validation and encrypted storage

- Enforce minimum 6-character password length with inline error display
- Use custom OnClickListener to prevent dialog dismiss on validation failure
- Replace SharedPreferences with EncryptedSharedPreferences for secure storage
- Add error handling for MasterKey/storage creation with user-facing Toast
---
 app/build.gradle                              |   1 +
 .../klee/volumelockr/ui/SettingsFragment.kt   | 106 ++++++++++++++----
 app/src/main/res/values/strings.xml           |   2 +
 gradle/libs.versions.toml                     |   2 +
 4 files changed, 87 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ef1b9bd..34f3abe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,7 @@ dependencies {
     implementation libs.aboutlibraries.core
     implementation libs.aboutlibraries
     implementation libs.preference.ktx
+    implementation libs.security.crypto
 
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
diff --git a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
index 5027eab..a618329 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
@@ -1,16 +1,20 @@
 package com.klee.volumelockr.ui
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
+import android.widget.Toast
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreferenceCompat
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputLayout
 import com.klee.volumelockr.R
 import com.klee.volumelockr.service.VolumeService
 
@@ -21,14 +25,19 @@ class SettingsFragment : PreferenceFragmentCompat() {
         const val PASSWORD_CHANGE_PREFERENCE = "password"
         const val ALLOW_LOWER_PREFERENCE = "allow_lower"
         const val DELAY_IN_MS = 100L
+        const val MIN_PASSWORD_LENGTH = 6
+        private const val ENCRYPTED_PREFS_FILE = "secure_settings"
     }
 
+    private var encryptedPrefs: SharedPreferences? = null
+
     private lateinit var passwordProtected: SwitchPreferenceCompat
     private lateinit var passwordChange: Preference
     private lateinit var shouldAllowLower: SwitchPreferenceCompat
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.root_preferences, rootKey)
+        initializeEncryptedPrefs()
 
         shouldAllowLower = findPreference(ALLOW_LOWER_PREFERENCE)!!
         passwordChange = findPreference(PASSWORD_CHANGE_PREFERENCE)!!
@@ -56,8 +65,27 @@ class SettingsFragment : PreferenceFragmentCompat() {
         passwordProtected.isEnabled = isPasswordSet()
     }
 
+    private fun initializeEncryptedPrefs() {
+        try {
+            val masterKey = MasterKey.Builder(requireContext())
+                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                .build()
+
+            encryptedPrefs = EncryptedSharedPreferences.create(
+                requireContext(),
+                ENCRYPTED_PREFS_FILE,
+                masterKey,
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+            )
+        } catch (e: Exception) {
+            Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_LONG).show()
+        }
+    }
+
     private fun showChangePasswordDialog() {
         val view = LayoutInflater.from(context).inflate(R.layout.dialog_password, null)
+        val inputLayout = view.findViewById<TextInputLayout>(R.id.password_input_layout)
         val editText = view.findViewById<EditText>(android.R.id.edit)
 
         editText.setOnFocusChangeListener { _, _ ->
@@ -65,22 +93,60 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
         editText.requestFocus()
 
-        MaterialAlertDialogBuilder(requireContext())
+        val dialog = MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.change_password))
             .setView(view)
             .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                savePassword(editText.text.toString())
+            .setPositiveButton(android.R.string.ok, null)
+            .create()
+
+        dialog.setOnShowListener {
+            dialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+                val password = editText.text.toString()
+                val validationError = validatePassword(password)
+
+                if (validationError != null) {
+                    inputLayout.error = validationError
+                } else {
+                    inputLayout.error = null
+                    if (savePassword(password)) {
+                        dialog.dismiss()
+                    }
+                }
             }
-            .show()
+        }
+
+        dialog.show()
     }
 
-    private fun savePassword(newPassword: String) {
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .edit()
-            .putString(PASSWORD_CHANGE_PREFERENCE, newPassword)
-            .apply()
-        passwordProtected.isEnabled = newPassword.isNotEmpty()
+    private fun validatePassword(password: String): String? {
+        if (password.length < MIN_PASSWORD_LENGTH) {
+            return getString(R.string.password_too_short, MIN_PASSWORD_LENGTH)
+        }
+        return null
+    }
+
+    private fun savePassword(newPassword: String): Boolean {
+        val prefs = encryptedPrefs
+        if (prefs == null) {
+            Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_SHORT).show()
+            return false
+        }
+
+        return try {
+            prefs.edit()
+                .putString(PASSWORD_CHANGE_PREFERENCE, newPassword)
+                .apply()
+            passwordProtected.isEnabled = newPassword.isNotEmpty()
+            true
+        } catch (e: Exception) {
+            Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_SHORT).show()
+            false
+        }
+    }
+
+    private fun getStoredPassword(): String {
+        return encryptedPrefs?.getString(PASSWORD_CHANGE_PREFERENCE, "") ?: ""
     }
 
     private fun askForPassword() {
@@ -109,21 +175,13 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     private fun checkPassword(challenger: String) {
-        val password =
-            PreferenceManager.getDefaultSharedPreferences(requireContext()).getString(
-                PASSWORD_CHANGE_PREFERENCE,
-                ""
-            )
-
-        val isOk = password == challenger
-        passwordProtected.isChecked = !isOk
-        passwordChange.isEnabled = isOk
+        val storedPassword = getStoredPassword()
+        val isCorrect = storedPassword == challenger
+        passwordProtected.isChecked = !isCorrect
+        passwordChange.isEnabled = isCorrect
     }
 
     private fun isPasswordSet(): Boolean {
-        return PreferenceManager.getDefaultSharedPreferences(requireContext()).getString(
-            PASSWORD_CHANGE_PREFERENCE,
-            ""
-        )?.isNotEmpty()!!
+        return getStoredPassword().isNotEmpty()
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a6c098..97c7fff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,8 @@
     <string name="password_protected">Enable password protection</string>
     <string name="change_password">Change password</string>
     <string name="enter_password">Enter password</string>
+    <string name="password_too_short">Password must be at least %d characters</string>
+    <string name="password_save_error">Failed to save password</string>
 
     <string name="limiting_header">Volume Limits</string>
     <string name="allow_lower">Allow lowering volume</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6199211..7886001 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,6 +16,7 @@ legacySupportV4 = "1.0.0"
 material = "1.13.0"
 navigationFragmentKtx = "2.9.5"
 preferenceKtx = "1.2.1"
+securityCrypto = "1.1.0-alpha06"
 
 [libraries]
 aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibraries" }
@@ -37,6 +38,7 @@ material = { module = "com.google.android.material:material", version.ref = "mat
 navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
 navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" }
 preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+security-crypto = { module = "androidx.security:security-crypto", version.ref = "securityCrypto" }
 
 [plugins]
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }

From c3354fcf0c841cf788fbf086dec26249465bfd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Mon, 15 Dec 2025 00:47:29 +0800
Subject: [PATCH 14/15] fix: Resolve detekt lint issues

- Catch specific exceptions (GeneralSecurityException, IOException) instead of generic Exception
- Log caught exceptions to avoid SwallowedException warnings
- Remove trailing whitespace in BootReceiver.kt
- Add missing newline at end of VolumeService.kt
- Remove unused LinearLayoutManager import in VolumeSliderFragment.kt
- Fix import ordering in SettingsFragment.kt
---
 .../java/com/klee/volumelockr/BootReceiver.kt   |  2 +-
 .../klee/volumelockr/service/VolumeService.kt   |  2 +-
 .../com/klee/volumelockr/ui/SettingsFragment.kt | 17 +++++++++++++++--
 .../klee/volumelockr/ui/VolumeSliderFragment.kt |  1 -
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/klee/volumelockr/BootReceiver.kt b/app/src/main/java/com/klee/volumelockr/BootReceiver.kt
index a5f230b..832ce1a 100644
--- a/app/src/main/java/com/klee/volumelockr/BootReceiver.kt
+++ b/app/src/main/java/com/klee/volumelockr/BootReceiver.kt
@@ -11,7 +11,7 @@ class BootReceiver : BroadcastReceiver() {
         if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
             val prefs = context.getSharedPreferences(VolumeService.APP_SHARED_PREFERENCES, Context.MODE_PRIVATE)
             val locks = prefs.getString(VolumeService.LOCKS_KEY, "")
-            
+
             if (!locks.isNullOrEmpty() && locks != "{}") {
                 VolumeService.start(context)
             }
diff --git a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
index 4856179..b24993a 100644
--- a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
+++ b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
@@ -325,4 +325,4 @@ class VolumeService : Service() {
         unregisterObservers()
         stopLocking()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
index a618329..d1deb59 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/SettingsFragment.kt
@@ -3,6 +3,7 @@ package com.klee.volumelockr.ui
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.inputmethod.InputMethodManager
@@ -17,10 +18,13 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
 import com.klee.volumelockr.R
 import com.klee.volumelockr.service.VolumeService
+import java.io.IOException
+import java.security.GeneralSecurityException
 
 class SettingsFragment : PreferenceFragmentCompat() {
 
     companion object {
+        private const val TAG = "SettingsFragment"
         const val PASSWORD_PROTECTED_PREFERENCE = "password_protected"
         const val PASSWORD_CHANGE_PREFERENCE = "password"
         const val ALLOW_LOWER_PREFERENCE = "allow_lower"
@@ -78,7 +82,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
                 EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
                 EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
             )
-        } catch (e: Exception) {
+        } catch (e: GeneralSecurityException) {
+            Log.e(TAG, "Failed to create encrypted preferences: security error", e)
+            Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_LONG).show()
+        } catch (e: IOException) {
+            Log.e(TAG, "Failed to create encrypted preferences: IO error", e)
             Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_LONG).show()
         }
     }
@@ -139,7 +147,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
                 .apply()
             passwordProtected.isEnabled = newPassword.isNotEmpty()
             true
-        } catch (e: Exception) {
+        } catch (e: GeneralSecurityException) {
+            Log.e(TAG, "Failed to save password: security error", e)
+            Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_SHORT).show()
+            false
+        } catch (e: IOException) {
+            Log.e(TAG, "Failed to save password: IO error", e)
             Toast.makeText(context, R.string.password_save_error, Toast.LENGTH_SHORT).show()
             false
         }
diff --git a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
index 85684ce..cb7f232 100644
--- a/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
+++ b/app/src/main/java/com/klee/volumelockr/ui/VolumeSliderFragment.kt
@@ -12,7 +12,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.klee.volumelockr.R
 import com.klee.volumelockr.databinding.FragmentVolumeSliderBinding
 import com.klee.volumelockr.service.VolumeService

From b391937c5cc4b03c2fdded15a4ac8e2313d4c3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B3=E5=BE=B7=E7=94=9F?=
 <111033412+KoukeNeko@users.noreply.github.com>
Date: Mon, 15 Dec 2025 00:52:56 +0800
Subject: [PATCH 15/15] fix: Stop service when last volume lock is removed

Add stopSelf() after stopForeground() in tryHideNotification() to properly
terminate the service when no locks remain active.
---
 app/src/main/java/com/klee/volumelockr/service/VolumeService.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
index b24993a..8d6863f 100644
--- a/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
+++ b/app/src/main/java/com/klee/volumelockr/service/VolumeService.kt
@@ -287,6 +287,7 @@ class VolumeService : Service() {
         }
 
         stopForeground(Service.STOP_FOREGROUND_REMOVE)
+        stopSelf()
     }
 
     private fun createNotificationContentIntent(): PendingIntent {