Refactor Applications, add app list view

app/src/main/java/com/bintianqi/owndroid/MainActivity.kt

@@ -74,8 +74,12 @@ import com.bintianqi.owndroid.dpm.AffiliationId
 import com.bintianqi.owndroid.dpm.AffiliationIdScreen
 import com.bintianqi.owndroid.dpm.AlwaysOnVpnPackage
 import com.bintianqi.owndroid.dpm.AlwaysOnVpnPackageScreen
-import com.bintianqi.owndroid.dpm.Applications
-import com.bintianqi.owndroid.dpm.ApplicationsScreen
+import com.bintianqi.owndroid.dpm.ApplicationDetails
+import com.bintianqi.owndroid.dpm.ApplicationDetailsScreen
+import com.bintianqi.owndroid.dpm.ApplicationsFeatures
+import com.bintianqi.owndroid.dpm.ApplicationsFeaturesScreen
+import com.bintianqi.owndroid.dpm.BlockUninstall
+import com.bintianqi.owndroid.dpm.BlockUninstallScreen
 import com.bintianqi.owndroid.dpm.CaCert
 import com.bintianqi.owndroid.dpm.CaCertScreen
 import com.bintianqi.owndroid.dpm.ChangeTime
@@ -84,14 +88,22 @@ import com.bintianqi.owndroid.dpm.ChangeTimeZone
 import com.bintianqi.owndroid.dpm.ChangeTimeZoneScreen
 import com.bintianqi.owndroid.dpm.ChangeUsername
 import com.bintianqi.owndroid.dpm.ChangeUsernameScreen
+import com.bintianqi.owndroid.dpm.ClearAppStorage
+import com.bintianqi.owndroid.dpm.ClearAppStorageScreen
 import com.bintianqi.owndroid.dpm.ContentProtectionPolicy
 import com.bintianqi.owndroid.dpm.ContentProtectionPolicyScreen
 import com.bintianqi.owndroid.dpm.CreateUser
 import com.bintianqi.owndroid.dpm.CreateUserScreen
 import com.bintianqi.owndroid.dpm.CreateWorkProfile
 import com.bintianqi.owndroid.dpm.CreateWorkProfileScreen
+import com.bintianqi.owndroid.dpm.CredentialManagerPolicy
+import com.bintianqi.owndroid.dpm.CredentialManagerPolicyScreen
 import com.bintianqi.owndroid.dpm.CrossProfileIntentFilter
 import com.bintianqi.owndroid.dpm.CrossProfileIntentFilterScreen
+import com.bintianqi.owndroid.dpm.CrossProfilePackages
+import com.bintianqi.owndroid.dpm.CrossProfilePackagesScreen
+import com.bintianqi.owndroid.dpm.CrossProfileWidgetProviders
+import com.bintianqi.owndroid.dpm.CrossProfileWidgetProvidersScreen
 import com.bintianqi.owndroid.dpm.DelegatedAdmins
 import com.bintianqi.owndroid.dpm.DelegatedAdminsScreen
 import com.bintianqi.owndroid.dpm.DeleteWorkProfile
@@ -104,12 +116,24 @@ import com.bintianqi.owndroid.dpm.DeviceOwner
 import com.bintianqi.owndroid.dpm.DeviceOwnerScreen
 import com.bintianqi.owndroid.dpm.DisableAccountManagement
 import com.bintianqi.owndroid.dpm.DisableAccountManagementScreen
+import com.bintianqi.owndroid.dpm.DisableMeteredData
+import com.bintianqi.owndroid.dpm.DisableMeteredDataScreen
+import com.bintianqi.owndroid.dpm.DisableUserControl
+import com.bintianqi.owndroid.dpm.DisableUserControlScreen
+import com.bintianqi.owndroid.dpm.EnableSystemApp
+import com.bintianqi.owndroid.dpm.EnableSystemAppScreen
 import com.bintianqi.owndroid.dpm.FrpPolicy
 import com.bintianqi.owndroid.dpm.FrpPolicyScreen
 import com.bintianqi.owndroid.dpm.HardwareMonitor
 import com.bintianqi.owndroid.dpm.HardwareMonitorScreen
+import com.bintianqi.owndroid.dpm.Hide
+import com.bintianqi.owndroid.dpm.HideScreen
+import com.bintianqi.owndroid.dpm.InstallExistingApp
+import com.bintianqi.owndroid.dpm.InstallExistingAppScreen
 import com.bintianqi.owndroid.dpm.InstallSystemUpdate
 import com.bintianqi.owndroid.dpm.InstallSystemUpdateScreen
+import com.bintianqi.owndroid.dpm.KeepUninstalledPackages
+import com.bintianqi.owndroid.dpm.KeepUninstalledPackagesScreen
 import com.bintianqi.owndroid.dpm.Keyguard
 import com.bintianqi.owndroid.dpm.KeyguardDisabledFeatures
 import com.bintianqi.owndroid.dpm.KeyguardDisabledFeaturesScreen
@@ -142,7 +166,13 @@ import com.bintianqi.owndroid.dpm.PasswordScreen
 import com.bintianqi.owndroid.dpm.PermissionPolicy
 import com.bintianqi.owndroid.dpm.PermissionPolicyScreen
 import com.bintianqi.owndroid.dpm.Permissions
+import com.bintianqi.owndroid.dpm.PermissionsManager
+import com.bintianqi.owndroid.dpm.PermissionsManagerScreen
 import com.bintianqi.owndroid.dpm.PermissionsScreen
+import com.bintianqi.owndroid.dpm.PermittedAccessibilityServices
+import com.bintianqi.owndroid.dpm.PermittedAccessibilityServicesScreen
+import com.bintianqi.owndroid.dpm.PermittedInputMethods
+import com.bintianqi.owndroid.dpm.PermittedInputMethodsScreen
 import com.bintianqi.owndroid.dpm.PreferentialNetworkService
 import com.bintianqi.owndroid.dpm.PreferentialNetworkServiceScreen
 import com.bintianqi.owndroid.dpm.PrivateDns
@@ -163,12 +193,16 @@ import com.bintianqi.owndroid.dpm.ResetPasswordTokenScreen
 import com.bintianqi.owndroid.dpm.Restriction
 import com.bintianqi.owndroid.dpm.SecurityLogging
 import com.bintianqi.owndroid.dpm.SecurityLoggingScreen
+import com.bintianqi.owndroid.dpm.SetDefaultDialer
+import com.bintianqi.owndroid.dpm.SetDefaultDialerScreen
 import com.bintianqi.owndroid.dpm.SetSystemUpdatePolicy
 import com.bintianqi.owndroid.dpm.ShizukuScreen
 import com.bintianqi.owndroid.dpm.SupportMessage
 import com.bintianqi.owndroid.dpm.SupportMessageScreen
+import com.bintianqi.owndroid.dpm.Suspend
 import com.bintianqi.owndroid.dpm.SuspendPersonalApp
 import com.bintianqi.owndroid.dpm.SuspendPersonalAppScreen
+import com.bintianqi.owndroid.dpm.SuspendScreen
 import com.bintianqi.owndroid.dpm.SystemManager
 import com.bintianqi.owndroid.dpm.SystemManagerScreen
 import com.bintianqi.owndroid.dpm.SystemOptions
@@ -176,6 +210,8 @@ import com.bintianqi.owndroid.dpm.SystemOptionsScreen
 import com.bintianqi.owndroid.dpm.SystemUpdatePolicyScreen
 import com.bintianqi.owndroid.dpm.TransferOwnership
 import com.bintianqi.owndroid.dpm.TransferOwnershipScreen
+import com.bintianqi.owndroid.dpm.UninstallApp
+import com.bintianqi.owndroid.dpm.UninstallAppScreen
 import com.bintianqi.owndroid.dpm.UserInfo
 import com.bintianqi.owndroid.dpm.UserInfoScreen
 import com.bintianqi.owndroid.dpm.UserOperation
@@ -348,7 +384,42 @@ fun Home(vm: MyViewModel) {
         composable<CrossProfileIntentFilter> { CrossProfileIntentFilterScreen(::navigateUp) }
         composable<DeleteWorkProfile> { DeleteWorkProfileScreen(::navigateUp) }
 
-        composable<Applications> { ApplicationsScreen(::navigateUp) }
+        composable<ApplicationsList> {
+            AppChooserScreen(it.toRoute(), {
+                if(it == null) navigateUp() else navigate(ApplicationDetails(it))
+            }, {
+                SharedPrefs(context).applicationsListView = false
+                navController.navigate(ApplicationsFeatures) {
+                    popUpTo(Home)
+                }
+            })
+        }
+        composable<ApplicationsFeatures> {
+            ApplicationsFeaturesScreen(::navigateUp, ::navigate) {
+                SharedPrefs(context).applicationsListView = true
+                navController.navigate(ApplicationsList(true)) {
+                    popUpTo(Home)
+                }
+            }
+        }
+        composable<ApplicationDetails> { ApplicationDetailsScreen(it.toRoute(), ::navigateUp, ::navigate) }
+        composable<Suspend> { SuspendScreen(::navigateUp) }
+        composable<Hide> { HideScreen(::navigateUp) }
+        composable<BlockUninstall> { BlockUninstallScreen(::navigateUp) }
+        composable<DisableUserControl> { DisableUserControlScreen(::navigateUp) }
+        composable<PermissionsManager> { PermissionsManagerScreen(::navigateUp, it.toRoute()) }
+        composable<DisableMeteredData> { DisableMeteredDataScreen(::navigateUp) }
+        composable<ClearAppStorage> { ClearAppStorageScreen(::navigateUp) }
+        composable<UninstallApp> { UninstallAppScreen(::navigateUp) }
+        composable<KeepUninstalledPackages> { KeepUninstalledPackagesScreen(::navigateUp) }
+        composable<InstallExistingApp> { InstallExistingAppScreen(::navigateUp) }
+        composable<CrossProfilePackages> { CrossProfilePackagesScreen(::navigateUp) }
+        composable<CrossProfileWidgetProviders> { CrossProfileWidgetProvidersScreen(::navigateUp) }
+        composable<CredentialManagerPolicy> { CredentialManagerPolicyScreen(::navigateUp) }
+        composable<PermittedAccessibilityServices> { PermittedAccessibilityServicesScreen(::navigateUp) }
+        composable<PermittedInputMethods> { PermittedInputMethodsScreen(::navigateUp) }
+        composable<EnableSystemApp> { EnableSystemAppScreen(::navigateUp) }
+        composable<SetDefaultDialer> { SetDefaultDialerScreen(::navigateUp) }
 
         composable<UserRestriction> {
             LaunchedEffect(Unit) {
@@ -493,7 +564,9 @@ private fun HomeScreen(onNavigate: (Any) -> Unit) {
             ) {
                 HomePageItem(R.string.work_profile, R.drawable.work_fill0) { onNavigate(WorkProfile) }
             }
-            if(deviceOwner || profileOwner) HomePageItem(R.string.applications, R.drawable.apps_fill0) { onNavigate(Applications) }
+            if(deviceOwner || profileOwner) HomePageItem(R.string.applications, R.drawable.apps_fill0) {
+                onNavigate(if(SharedPrefs(context).applicationsListView) ApplicationsList(true) else ApplicationsFeatures)
+            }
             if(VERSION.SDK_INT >= 24 && (profileOwner || deviceOwner)) {
                 HomePageItem(R.string.user_restriction, R.drawable.person_off) { onNavigate(UserRestriction) }
             }

app/src/main/java/com/bintianqi/owndroid/PackageChooser.kt

@@ -1,5 +1,6 @@
 package com.bintianqi.owndroid
 
+import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
@@ -27,6 +28,7 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.List
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -41,8 +43,10 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -56,77 +60,64 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.lifecycleScope
 import com.bintianqi.owndroid.ui.theme.OwnDroidTheme
 import com.google.accompanist.drawablepainter.rememberDrawablePainter
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
 
 class PackageChooserActivity: ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val vm by viewModels<MyViewModel>()
-        if(getPackagesProgress.value < 1F) getPackages()
         setContent {
             val theme by vm.theme.collectAsStateWithLifecycle()
             OwnDroidTheme(theme) {
-                val packages by installedPackages.collectAsStateWithLifecycle()
-                val progress by getPackagesProgress.collectAsStateWithLifecycle()
-                PackageChooserScreen(packages, progress, ::getPackages) {
+                AppChooserScreen(ApplicationsList(false), {
                     setResult(0, Intent().putExtra("package", it))
                     finish()
-                }
+                }, {})
             }
         }
     }
-    val flags = if(Build.VERSION.SDK_INT >= 24) PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.MATCH_UNINSTALLED_PACKAGES else 0
-    fun getPackages() {
-        installedPackages.value = emptyList()
-        lifecycleScope.launch(Dispatchers.IO) {
-            val pm = packageManager
-            val apps = pm.getInstalledApplications(flags)
-            for(pkg in apps) {
-                installedPackages.update {
-                    it + PackageInfo(
-                        pkg.packageName, pkg.loadLabel(pm).toString(), pkg.loadIcon(pm),
-                        (pkg.flags and ApplicationInfo.FLAG_SYSTEM) != 0
-                    )
-                }
-                withContext(Dispatchers.Main) { getPackagesProgress.value = installedPackages.value.size.toFloat() / apps.size }
-            }
-        }
-    }
-    companion object {
-        val installedPackages = MutableStateFlow(emptyList<PackageInfo>())
-        val getPackagesProgress = MutableStateFlow(0F)
-    }
 }
 
-data class PackageInfo(
+val installedApps = MutableStateFlow(emptyList<AppInfo>())
+
+data class AppInfo(
     val name: String,
     val label: String,
     val icon: Drawable,
-    val system: Boolean
+    val flags: Int
 )
 
+private fun searchInString(query: String, content: String)
+    = query.split(' ').all { content.contains(it, true) }
+
+@Serializable data class ApplicationsList(val canSwitchView: Boolean)
+
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
-private fun PackageChooserScreen(
-    packages: List<PackageInfo>, progress: Float, onRefresh: () -> Unit, onChoosePackage: (String?) -> Unit
-) {
+fun AppChooserScreen(params: ApplicationsList, onChoosePackage: (String?) -> Unit, onSwitchView: () -> Unit) {
+    val packages by installedApps.collectAsStateWithLifecycle()
+    val coroutine = rememberCoroutineScope()
     val context = LocalContext.current
+    var progress by remember { mutableFloatStateOf(1F) }
     var system by remember { mutableStateOf(false) }
-    var search by remember { mutableStateOf("") }
+    var query by remember { mutableStateOf("") }
     var searchMode by remember { mutableStateOf(false) }
     val filteredPackages = packages.filter {
-        system == it.system &&
-        (if(search.isEmpty()) true
-        else it.name.contains(search, ignoreCase = true) || it.label.contains(search, ignoreCase = true))
+        system == (it.flags and ApplicationInfo.FLAG_SYSTEM != 0) &&
+                (query.isEmpty() || (searchInString(query, it.label) || searchInString(query, it.name)))
     }
     val focusMgr = LocalFocusManager.current
+    LaunchedEffect(Unit) {
+        if(packages.size <= 1) getInstalledApps(coroutine, context) { progress = it }
+    }
     Scaffold(
         topBar = {
             TopAppBar(
@@ -141,9 +132,15 @@ private fun PackageChooserScreen(
                         }) {
                             Icon(painter = painterResource(R.drawable.filter_alt_fill0), contentDescription = null)
                         }
-                        IconButton(onRefresh) {
+                        IconButton(
+                            { getInstalledApps(coroutine, context) { progress = it } },
+                            enabled = progress == 1F
+                        ) {
                             Icon(painter = painterResource(R.drawable.refresh_fill0), contentDescription = null)
                         }
+                        if(params.canSwitchView) IconButton(onSwitchView) {
+                            Icon(Icons.AutoMirrored.Default.List, null)
+                        }
                     }
                 },
                 title = {
@@ -151,8 +148,8 @@ private fun PackageChooserScreen(
                         val fr = FocusRequester()
                         LaunchedEffect(Unit) { fr.requestFocus() }
                         OutlinedTextField(
-                            value = search,
-                            onValueChange = { search = it },
+                            value = query,
+                            onValueChange = { query = it },
                             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
                             keyboardActions = KeyboardActions { focusMgr.clearFocus() },
                             placeholder = { Text(stringResource(R.string.search)) },
@@ -162,7 +159,7 @@ private fun PackageChooserScreen(
                                     contentDescription = null,
                                     modifier = Modifier.clickable {
                                         focusMgr.clearFocus()
-                                        search = ""
+                                        query = ""
                                         searchMode = false
                                     }
                                 )
@@ -170,8 +167,6 @@ private fun PackageChooserScreen(
                             textStyle = typography.bodyLarge,
                             modifier = Modifier.fillMaxWidth().focusRequester(fr)
                         )
-                    } else {
-                        Text(stringResource(R.string.package_chooser))
                     }
                 },
                 navigationIcon = {
@@ -182,11 +177,8 @@ private fun PackageChooserScreen(
                 colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.surfaceContainer)
             )
         }
-    ) { paddingValues->
-        LazyColumn(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.fillMaxSize().padding(top = paddingValues.calculateTopPadding())
-        ) {
+    ) { paddingValues ->
+        LazyColumn(Modifier.fillMaxSize().padding(paddingValues)) {
             stickyHeader {
                 AnimatedVisibility(progress < 1F) {
                     LinearProgressIndicator(progress = { progress }, modifier = Modifier.fillMaxWidth())
@@ -215,3 +207,24 @@ private fun PackageChooserScreen(
         }
     }
 }
+
+fun getInstalledApps(scope: CoroutineScope, context: Context, onProgressUpdated: (Float) -> Unit) {
+    installedApps.value = emptyList()
+    scope.launch(Dispatchers.IO) {
+        val pm = context.packageManager
+        val apps = pm.getInstalledApplications(getInstalledAppsFlags)
+        for(pkg in apps) {
+            val label = pkg.loadLabel(pm).toString()
+            val icon = pkg.loadIcon(pm)
+            withContext(Dispatchers.Main) {
+                installedApps.update {
+                    it + AppInfo(pkg.packageName, label, icon, pkg.flags)
+                }
+                onProgressUpdated(installedApps.value.size.toFloat() / apps.size)
+            }
+        }
+    }
+}
+
+val getInstalledAppsFlags =
+    if(Build.VERSION.SDK_INT >= 24) PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.MATCH_UNINSTALLED_PACKAGES else 0

app/src/main/java/com/bintianqi/owndroid/SharedPrefs.kt

@@ -20,6 +20,7 @@ class SharedPrefs(context: Context) {
     var blackTheme by BooleanSharedPref("theme.black")
     var lockPassword by StringSharedPref("lock.password")
     var biometricsUnlock by BooleanSharedPref("lock.biometrics")
+    var applicationsListView by BooleanSharedPref("applications.list_view")
 }
 
 private class BooleanSharedPref(val key: String, val defValue: Boolean = false): ReadWriteProperty<SharedPrefs, Boolean> {

app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt

@@ -602,9 +602,17 @@ fun AddDelegatedAdminScreen(data: AddDelegatedAdmin, onNavigateUp: () -> Unit) {
             readOnly = updateMode,
             modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp, horizontal = HorizontalPadding)
         )
-        DelegatedScope.entries.filter { VERSION.SDK_INT >= it.requiresApi }.forEach {scope ->
-            FullWidthCheckBoxItem(scope.string, scope in scopes) {
-                if(it) scopes += scope else scopes -= scope
+        DelegatedScope.entries.filter { VERSION.SDK_INT >= it.requiresApi }.forEach { scope ->
+            val checked = scope in scopes
+            Row(
+                Modifier.fillMaxWidth().clickable { if(!checked) scopes += scope else scopes -= scope }.padding(vertical = 4.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Checkbox(checked, { if(it) scopes += scope else scopes -= scope }, modifier = Modifier.padding(horizontal = 4.dp))
+                Column {
+                    Text(stringResource(scope.string))
+                    Text(scope.id, style = typography.bodyMedium, color = colorScheme.onSurfaceVariant)
+                }
             }
         }
         Button(

app/src/main/java/com/bintianqi/owndroid/ui/Components.kt

@@ -9,6 +9,8 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.selection.SelectionContainer
@@ -319,6 +321,28 @@ fun MyScaffold(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MyLazyScaffold(
+    @StringRes title: Int,
+    onNavIconClicked: () -> Unit,
+    content: LazyListScope.() -> Unit
+) {
+    val sb = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
+    Scaffold(
+        Modifier.nestedScroll(sb.nestedScrollConnection),
+        topBar = {
+            LargeTopAppBar(
+                { Text(stringResource(title)) },
+                navigationIcon = { NavIcon(onNavIconClicked) },
+                scrollBehavior = sb
+            )
+        }
+    ) { paddingValues ->
+        LazyColumn(Modifier.fillMaxSize().padding(paddingValues), content = content)
+    }
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MySmallTitleScaffold(