Merge remote-tracking branch 'origin/main'

Author: d4rken

.claude/CLAUDE.md

@@ -23,6 +23,6 @@ Detailed guidelines are in `.claude/rules/`:
 - `commit-guidelines.md` — Commit message format, PR description format, area prefixes
 - `build-commands.md` — Build, test, lint, screenshot, and release commands
 - `architecture.md` — Module structure, patterns, base classes, data flow
-- `code-style.md` — Kotlin conventions, ViewModel/Fragment patterns, logging
+- `code-style.md` — Kotlin conventions, ViewModel/Compose patterns, logging
 - `testing.md` — Test locations, patterns, running tests
 - `localization.md` — String resources, naming conventions

.claude/rules/architecture.md

@@ -7,20 +7,21 @@
 
 ## Core Architecture Patterns
 
-- **MVVM**: ViewModels with LiveData/StateFlow for UI state management
+- **MVVM**: ViewModels with StateFlow for UI state management
 - **Dependency Injection**: Hilt/Dagger for dependency management
 - **Coroutines**: Extensive use of Kotlin coroutines for async operations
 - **Repository Pattern**: Data layer abstraction with sealed State classes
-- **Single Activity**: Navigation Component with multiple fragments
+- **Single Activity**: Navigation3 with Compose screens
 
 ## Base UI Classes (`app/src/main/java/eu/darken/myperm/common/uix/`)
 
-- `ViewModel3`: Full MVVM support with nav events + error events (most feature VMs extend this)
+- `ViewModel4`: Primary base class — implements `NavigationEventSource` + `ErrorEventSource2` via `SingleEventFlow` (all
+  feature VMs extend this)
+- `ViewModel3`: Legacy MVVM base with `SingleLiveEvent` (still exists, not used by new code)
 - `ViewModel2`: Coroutine scope with error handlers
 - `ViewModel1`: Basic logging
-- `Fragment3`: MVVM integration, observes navEvents/errorEvents from ViewModel
-- `Fragment2`: Lifecycle logging
 - `Activity2`: Base activity with logging
+- `Service2`: Base service with logging
 
 ## Repository Pattern
 
@@ -38,16 +39,17 @@ sealed class State {
 
 ## Navigation System
 
-- Single Activity (`MainActivity`) with `NavHostFragment`
-- AndroidX Navigation with Safe Args (KSP-generated)
-- Navigation graphs: `res/navigation/main_navigation.xml`, `res/navigation/bottom_navigation.xml`
-- `NavEventSource` interface: ViewModels expose `navEvents: SingleLiveEvent<NavDirections>`
-- `ErrorEventSource` interface: ViewModels expose `errorEvents: SingleLiveEvent<Throwable>`
+- Single Activity (`MainActivity`) with Navigation3 (Compose-based, no fragments)
+- Custom `NavigationController` + `NavigationEntry` (not AndroidX Navigation fragments)
+- `NavigationEventSource` interface: ViewModels expose `navEvents: SingleEventFlow<NavEvent>`
+- `NavEvent` sealed class: `GoTo(destination, popUpTo, inclusive)` and `Up`
+- `ErrorEventSource2` interface: ViewModels expose `errorEvents: SingleEventFlow<Throwable>`
 
 ## Settings System
 
-- `GeneralSettings` singleton uses SharedPreferences with Moshi JSON serialization
-- Flow-based preference reading via `createFlowPreference()`
+- `GeneralSettings` singleton uses DataStore Preferences with Kotlinx Serialization
+- Flow-based preference reading via `createValue()` with `kotlinxReader`/`kotlinxWriter` helpers
+- SharedPreferences retained only for migration via `SharedPreferencesMigration`
 - Located in `settings/core/GeneralSettings.kt`
 
 ## Data Flow
@@ -57,36 +59,45 @@ The app follows unidirectional data flow:
 1. `AppRepo` queries PackageManager for installed apps
 2. `PermissionRepo` aggregates permission data from apps
 3. ViewModels combine repository flows with filter/sort options
-4. UI observes ViewModel state via LiveData
+4. Compose UI collects ViewModel state via StateFlow
 5. User actions trigger ViewModel methods which update repository or navigate
 
 ## Project Structure
 
+Representative structure (not exhaustive):
+
 ```
 app/src/main/java/eu/darken/myperm/
 ├── main/           # MainActivity, main navigation hub
 ├── permissions/    # Permissions feature
 │   ├── core/       # PermissionRepo, data models
-│   └── ui/         # List and details fragments
+│   └── ui/         # List and details Compose screens
 ├── apps/           # Apps feature
 │   ├── core/       # AppRepo, PackageManager interactions
-│   └── ui/         # List and details fragments
+│   └── ui/         # List and details Compose screens
+├── watcher/        # Permission change monitoring
+│   ├── core/       # WatcherManager, SnapshotDiffer, PermissionDiff
+│   └── ui/         # Dashboard and report detail screens
 ├── settings/       # Settings feature
 │   ├── core/       # GeneralSettings
-│   └── ui/         # Settings fragments
+│   └── ui/         # Settings Compose screens
 └── common/         # Shared utilities
-    ├── uix/        # Base UI classes
+    ├── uix/        # Base UI classes (ViewModel4, Activity2, Service2)
+    ├── compose/    # Shared Compose components
     ├── coroutine/  # DispatcherProvider, AppScope
     ├── dagger/     # Hilt DI modules
-    ├── navigation/ # Nav extensions
-    ├── lists/      # ModularAdapter pattern for RecyclerView
-    └── preferences/# FlowPreference utilities
+    ├── datastore/  # DataStore helpers (createValue, kotlinxReader/Writer)
+    ├── navigation/ # Navigation3 extensions, NavigationEventSource
+    ├── room/       # Room database, DAOs, entities
+    └── serialization/ # Kotlinx Serialization utilities
 ```
 
 ## Key Dependencies
 
+- **Jetpack Compose**: UI framework (Material 3)
 - **Hilt**: Dependency injection framework
-- **AndroidX Navigation**: Fragment navigation with SafeArgs
-- **Moshi**: JSON serialization for settings and data
+- **Navigation3**: Compose-based navigation
+- **Kotlinx Serialization**: JSON serialization for settings and data
+- **DataStore**: Preferences storage
+- **Room**: Database for watcher snapshots
 - **Coil**: Image loading for app icons
-- **Material Design**: UI components

.claude/rules/code-style.md

@@ -22,20 +22,22 @@ Use `DispatcherProvider` interface for testability instead of hardcoded dispatch
 
 ```kotlin
 @HiltViewModel
-class MyFeatureVM @Inject constructor(
+class MyFeatureViewModel @Inject constructor(
     private val handle: SavedStateHandle,
     dispatcherProvider: DispatcherProvider,
     private val myRepo: MyRepo,
-) : ViewModel3(dispatcherProvider = dispatcherProvider)
+) : ViewModel4(dispatcherProvider = dispatcherProvider)
 ```
 
-## Fragment Creation Pattern
+## Screen Creation Pattern
 
 ```kotlin
-@AndroidEntryPoint
-class MyFeatureFragment : Fragment3(R.layout.my_feature_fragment) {
-    override val vm: MyFeatureVM by viewModels()
-    override val ui: MyFeatureFragmentBinding by viewBinding()
+@Composable
+fun MyFeatureScreenHost(vm: MyFeatureViewModel = hiltViewModel()) {
+    ErrorEventHandler(vm)
+    NavigationEventHandler(vm)
+    val state by vm.state.collectAsState()
+    MyFeatureScreen(state = state, ...)
 }
 ```
 
@@ -58,19 +60,18 @@ log(TAG, WARN) { "Unexpected state" }     // WARN
 
 ## UI Patterns
 
-- XML layouts with ViewBinding for UI components
+- Jetpack Compose is the sole UI framework — no XML layouts remain
 - Material 3 theming and design system
-- Single Activity architecture with Fragment-based navigation
-- Compose is used for new screens alongside existing XML/ViewBinding
+- Single Activity architecture with Compose-based navigation
 
 ## Error Handling
 
-- Use the established error handling patterns with `ErrorEventSource`
-- ViewModels expose `errorEvents: SingleLiveEvent<Throwable>`
+- ViewModels implement `ErrorEventSource2`, exposing `errorEvents: SingleEventFlow<Throwable>`
+- Compose screens wire errors via `ErrorEventHandler(vm)` composable
 
 ## Data & State
 
 - Reactive programming with Kotlin Flow and StateFlow
-- SharedPreferences with Moshi JSON serialization for settings
+- DataStore with Kotlinx Serialization for settings
 - Room for database operations
 - Coil for image loading

app/src/main/java/eu/darken/myperm/apps/ui/list/AppsFilterOptions.kt

@@ -136,7 +136,55 @@ data class AppsFilterOptions(
         SECONDARY_PROFILE(
             group = Group.PROFILE,
             labelRes = R.string.apps_filter_profile_secondary_label,
-            matches = { it.pkgType == PkgType.SECONDARY_PROFILE }
+            matches = { it.pkgType == PkgType.SECONDARY_PROFILE || it.pkgType == PkgType.SECONDARY_USER }
+        ),
+        @SerialName("CAMERA")
+        CAMERA(
+            group = Group.PROPERTIES,
+            labelRes = R.string.apps_filter_camera_label,
+            matches = { app ->
+                app.requestedPermissions.any {
+                    it.permissionId == "android.permission.CAMERA" && it.status.isGranted
+                }
+            }
+        ),
+        @SerialName("LOCATION")
+        LOCATION(
+            group = Group.PROPERTIES,
+            labelRes = R.string.apps_filter_location_label,
+            matches = { app ->
+                app.requestedPermissions.any {
+                    (it.permissionId == "android.permission.ACCESS_FINE_LOCATION"
+                            || it.permissionId == "android.permission.ACCESS_COARSE_LOCATION")
+                            && it.status.isGranted
+                }
+            }
+        ),
+        @SerialName("MICROPHONE")
+        MICROPHONE(
+            group = Group.PROPERTIES,
+            labelRes = R.string.apps_filter_microphone_label,
+            matches = { app ->
+                app.requestedPermissions.any {
+                    it.permissionId == "android.permission.RECORD_AUDIO" && it.status.isGranted
+                }
+            }
+        ),
+        @SerialName("CONTACTS")
+        CONTACTS(
+            group = Group.PROPERTIES,
+            labelRes = R.string.apps_filter_contacts_label,
+            matches = { app ->
+                app.requestedPermissions.any {
+                    it.permissionId == "android.permission.READ_CONTACTS" && it.status.isGranted
+                }
+            }
+        ),
+        @SerialName("OLD_API_TARGET")
+        OLD_API_TARGET(
+            group = Group.PROPERTIES,
+            labelRes = R.string.apps_filter_old_api_target_label,
+            matches = { it.apiTargetLevel != null && it.apiTargetLevel < OLD_API_THRESHOLD }
         ),
         ;
     }
@@ -147,4 +195,8 @@ data class AppsFilterOptions(
             groupFilters.any { it.matches(app) }
         }
     }
+
+    companion object {
+        const val OLD_API_THRESHOLD = 29 // Android 10 (Q)
+    }
 }

app/src/main/java/eu/darken/myperm/apps/ui/list/AppsScreen.kt

@@ -2,7 +2,11 @@ package eu.darken.myperm.apps.ui.list
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -44,6 +48,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.pluralStringResource
@@ -60,6 +65,7 @@ import eu.darken.myperm.common.compose.AppIcon
 import eu.darken.myperm.common.compose.Preview2
 import eu.darken.myperm.common.compose.PreviewWrapper
 import eu.darken.myperm.common.compose.SearchTextField
+import eu.darken.myperm.common.compose.rememberFabVisibility
 import androidx.compose.runtime.collectAsState
 import eu.darken.myperm.common.error.ErrorEventHandler
 import eu.darken.myperm.common.navigation.NavigationEventHandler
@@ -119,16 +125,24 @@ fun AppsScreen(
     var searchQuery by rememberSaveable { mutableStateOf("") }
     var isSearchActive by rememberSaveable { mutableStateOf(false) }
     var showOverflowMenu by rememberSaveable { mutableStateOf(false) }
+    val (fabVisible, scrollConnection) = rememberFabVisibility()
 
     Scaffold(
+        modifier = Modifier.nestedScroll(scrollConnection),
         floatingActionButton = {
-            FloatingActionButton(
-                onClick = { if (!isRefreshing) onRefresh() },
+            AnimatedVisibility(
+                visible = fabVisible,
+                enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
+                exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
             ) {
-                if (isRefreshing) {
-                    CircularProgressIndicator(modifier = Modifier.size(24.dp))
-                } else {
-                    Icon(Icons.Filled.Refresh, contentDescription = stringResource(R.string.general_refresh_action))
+                FloatingActionButton(
+                    onClick = { if (!isRefreshing) onRefresh() },
+                ) {
+                    if (isRefreshing) {
+                        CircularProgressIndicator(modifier = Modifier.size(24.dp))
+                    } else {
+                        Icon(Icons.Filled.Refresh, contentDescription = stringResource(R.string.general_refresh_action))
+                    }
                 }
             }
         },

app/src/main/java/eu/darken/myperm/common/compose/ScrollAwareFab.kt

@@ -0,0 +1,35 @@
+package eu.darken.myperm.common.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+
+@Composable
+fun rememberFabVisibility(threshold: Float = 10f): Pair<Boolean, NestedScrollConnection> {
+    var visible by remember { mutableStateOf(true) }
+    var cumDelta by remember { mutableFloatStateOf(0f) }
+
+    val connection = remember {
+        object : NestedScrollConnection {
+            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+                cumDelta += available.y
+                if (cumDelta > threshold) {
+                    visible = true
+                    cumDelta = 0f
+                } else if (cumDelta < -threshold) {
+                    visible = false
+                    cumDelta = 0f
+                }
+                return Offset.Zero
+            }
+        }
+    }
+
+    return visible to connection
+}

app/src/main/java/eu/darken/myperm/main/ui/overview/OverviewPreviewData.kt

@@ -1,5 +1,7 @@
 package eu.darken.myperm.main.ui.overview
 
+import eu.darken.myperm.main.ui.overview.OverviewViewModel.SummaryCategory
+
 internal object OverviewPreviewData {
 
     fun loadedState() = OverviewViewModel.State(
@@ -9,21 +11,24 @@ internal object OverviewPreviewData {
             patchLevel = "2026-01-05",
         ),
         summaryInfo = OverviewViewModel.SummaryInfo(
-            activeProfileUser = 9,
-            activeProfileSystem = 339,
-            otherProfileUser = 0,
-            otherProfileSystem = 1,
-            sideloaded = 5,
-            installerAppsUser = 0,
-            installerAppsSystem = 1,
-            systemAlertWindowUser = 0,
-            systemAlertWindowSystem = 5,
-            noInternetUser = 2,
-            noInternetSystem = 1,
-            clonesUser = 0,
-            clonesSystem = 0,
-            sharedIdsUser = 0,
-            sharedIdsSystem = 39,
+            counts = mapOf(
+                SummaryCategory.ACTIVE_PROFILE to PkgCount(9, 339),
+                SummaryCategory.OTHER_PROFILES to PkgCount(0, 1),
+                SummaryCategory.CLONES to PkgCount(0, 0),
+                SummaryCategory.GOOGLE_PLAY to PkgCount(6, 0),
+                SummaryCategory.OEM_STORE to PkgCount(1, 0),
+                SummaryCategory.SIDELOADED to PkgCount(5, 0),
+                SummaryCategory.CAMERA to PkgCount(4, 2),
+                SummaryCategory.LOCATION to PkgCount(7, 5),
+                SummaryCategory.MICROPHONE to PkgCount(3, 1),
+                SummaryCategory.CONTACTS to PkgCount(5, 3),
+                SummaryCategory.INSTALLERS to PkgCount(0, 1),
+                SummaryCategory.OVERLAYERS to PkgCount(0, 5),
+                SummaryCategory.NO_INTERNET to PkgCount(2, 1),
+                SummaryCategory.SHARED_IDS to PkgCount(0, 39),
+                SummaryCategory.BATTERY_OPT to PkgCount(3, 12),
+                SummaryCategory.OLD_API to PkgCount(1, 8),
+            ),
         ),
         versionDesc = "v1.2.3 (42) ~ abc1234/foss/debug",
         isLoading = false,