show uninstalled detached apps

j-hc · Mar 30, 2024 · 1795d2f · 1795d2f
1 parent 6f792c7
commit 1795d2f
Show file tree

Hide file tree

Showing 12 changed files with 144 additions and 19 deletions.
diff --git a/app/src/main/java/com/jhc/detach/MainActivity.kt b/app/src/main/java/com/jhc/detach/MainActivity.kt
@@ -4,6 +4,9 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -51,6 +54,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalFocusManager
@@ -69,10 +73,12 @@ fun AppsList(
     packageManager: PackageManager,
     detachedApps: MutableState<List<DetachedApp>>,
     renderedApps: MutableState<List<DetachedApp>>,
-    detachBin: DetachBin
+    detachBin: DetachBin,
+    uninstalledAppBitmap: ImageBitmap
 ) {
+
     LazyColumn {
-        items(renderedApps.value, key = { it.pi.packageName }) { app ->
+        items(renderedApps.value, key = { it.packageName }) { app ->
             OutlinedCard(
                 modifier = Modifier.padding(3.dp)
             ) {
@@ -87,8 +93,9 @@ fun AppsList(
                             .fillMaxHeight(0.6f)
                             .padding(5.dp)
                             .padding(PaddingValues(start = 5.dp, end = 10.dp)),
-                        bitmap = packageManager.getApplicationIcon(app.pi.packageName).toBitmap()
-                            .asImageBitmap(),
+                        bitmap = if (app.installed) packageManager.getApplicationIcon(app.packageName)
+                            .toBitmap()
+                            .asImageBitmap() else uninstalledAppBitmap,
                         contentDescription = ""
                     )
                     Row(
@@ -100,7 +107,7 @@ fun AppsList(
                             Text(text = app.label, modifier = Modifier.wrapContentHeight())
                             Text(
                                 maxLines = 1,
-                                text = app.pi.packageName,
+                                text = app.packageName,
                                 fontSize = 14.sp,
                                 overflow = TextOverflow.Ellipsis,
                                 modifier = Modifier
@@ -115,7 +122,7 @@ fun AppsList(
                                 app.detached = it
                                 detachBin.detached =
                                     detachedApps.value.filter { app -> app.detached }
-                                        .map { app -> app.pi.packageName }
+                                        .map { app -> app.packageName }
                             }, modifier = Modifier
                                 .wrapContentSize()
                                 .padding(
@@ -162,7 +169,7 @@ fun SearchBar(
             val searchText = it.lowercase()
             if (it.isNotEmpty()) {
                 renderedApps.value = detachedApps.value.filter { app ->
-                    app.pi.packageName.lowercase().contains(searchText) || app.label.lowercase()
+                    app.packageName.lowercase().contains(searchText) || app.label.lowercase()
                         .contains(searchText)
                 }
             }
@@ -202,7 +209,10 @@ fun AppsFilter(
 }
 
 data class DetachedApp(
-    val pi: PackageInfo, val label: String, var detached: Boolean = false
+    val packageName: String,
+    val label: String,
+    var detached: Boolean = false,
+    val installed: Boolean = true
 )
 
 class DetachBin(filesDir: File, private val context: Context) {
@@ -215,7 +225,7 @@ class DetachBin(filesDir: File, private val context: Context) {
         Shell.cmd("rm -f $remote").exec()
     }
 
-    fun getDetached(a: Int = 0): List<String> {
+    fun getDetached(dummy: Int = 0): List<String> {
         File(internal).delete()
         if (Shell.cmd("cp -f $remote $internal").exec().code == 0) {
             Shell.cmd("chmod 0777 $internal").exec()
@@ -275,21 +285,25 @@ class MainActivity : ComponentActivity() {
 
         var apps = packageManager.getInstalledPackages(0).map {
             DetachedApp(
-                it, packageManager.getApplicationLabel(it.applicationInfo).toString()
+                it.packageName, packageManager.getApplicationLabel(it.applicationInfo).toString()
             )
-        }.sortedBy { it.label }
+        }.sortedBy { it.label }.toMutableList()
         val alDetach = try {
             detachBin.getDetached()
         } catch (e: IndexOutOfBoundsException) {
             detachBin.deleteBin()
             listOf()
         }
-
-        apps.forEach { it.detached = alDetach.contains(it.pi.packageName) }
-        apps = apps.sortedBy { it.label }.sortedBy { !it.detached }
+        for (d in alDetach) {
+            if (apps.find { it.packageName == d } == null) {
+                apps.add(DetachedApp(d, d, detached = true, installed = false))
+            }
+        }
+        apps.forEach { it.detached = alDetach.contains(it.packageName) }
+        val appsFinal = apps.sortedBy { it.label }.sortedBy { !it.detached }.toList()
         setContent {
-            val detachedApps = remember { mutableStateOf(apps) }
-            val renderedApps = remember { mutableStateOf(apps) }
+            val detachedApps = remember { mutableStateOf(appsFinal) }
+            val renderedApps = remember { mutableStateOf(appsFinal) }
             ZygiskdetachTheme {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
@@ -318,7 +332,8 @@ class MainActivity : ComponentActivity() {
                                     packageManager = packageManager,
                                     detachedApps = detachedApps,
                                     renderedApps = renderedApps,
-                                    detachBin = detachBin
+                                    detachBin = detachBin,
+                                    getDrawable(R.mipmap.unistalled_app)!!.toBitmap().asImageBitmap()
                                 )
                             }
                         }

diff --git a/app/src/main/res/drawable/unistalled_app_background.xml b/app/src/main/res/drawable/unistalled_app_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/app/src/main/res/drawable/unistalled_app_foreground.xml b/app/src/main/res/drawable/unistalled_app_foreground.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="49.59793"
+                android:startX="42.9492"
+                android:endY="92.4963"
+                android:endX="85.84757"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/unistalled_app.xml b/app/src/main/res/mipmap-anydpi-v26/unistalled_app.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/unistalled_app_background"/>
+    <foreground android:drawable="@drawable/unistalled_app_foreground"/>
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/unistalled_app.png b/app/src/main/res/mipmap-hdpi/unistalled_app.png
diff --git a/app/src/main/res/mipmap-mdpi/unistalled_app.png b/app/src/main/res/mipmap-mdpi/unistalled_app.png
diff --git a/app/src/main/res/mipmap-xhdpi/unistalled_app.png b/app/src/main/res/mipmap-xhdpi/unistalled_app.png
diff --git a/app/src/main/res/mipmap-xxhdpi/unistalled_app.png b/app/src/main/res/mipmap-xxhdpi/unistalled_app.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/unistalled_app.png b/app/src/main/res/mipmap-xxxhdpi/unistalled_app.png
diff --git a/app/src/main/unistalled_app-playstore.png b/app/src/main/unistalled_app-playstore.png
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.1" apply false
+    id("com.android.application") version "8.3.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jan 22 03:19:59 TRT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists