Merge pull request #271 from Mahmud0808/master

Merge master into fdroid

Author: Mahmud0808

.github/workflows/build_apk.yml

@@ -2,15 +2,29 @@ name: Build Release APK
 
 on:
   workflow_dispatch:
-    branches:
-      - fdroid
 
 jobs:
   build:
     name: Build Release APK
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout fdroid branch
+        uses: actions/checkout@v4
+        with:
+          ref: fdroid
+          fetch-depth: 0
+
+      - name: Show Git info
+        run: |
+          echo "Branch:"
+          git branch --show-current
+          echo ""
+          echo "Commit hash:"
+          git rev-parse HEAD
+          echo ""
+          echo "Commit info:"
+          git log -1 --oneline
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4

README.md

@@ -45,6 +45,10 @@ Elevate your creativity with effortless material customization. Instantly tweak
 
 - Working **Root**, **Shizuku**, or **Wireless ADB** environment
 
+> [!WARNING]
+> 
+> SuperSU root is not supported.
+
 ## How to Use 🚀
 
 - Download and install the apk

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdk = 31
         targetSdk = 36
-        versionCode = 38
-        versionName = "v2.0.3"
+        versionCode = 39
+        versionName = "v2.1"
 
         ndk {
             abiFilters.addAll(listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64"))
@@ -136,6 +136,7 @@ dependencies {
     compileOnly(project(":systemstubs"))
     implementation(project(":libadb"))
     implementation(project(":colorpickerdialog"))
+    implementation(project(":materialcolorutilities"))
 
     implementation(libs.core.ktx)
     implementation(libs.libsu.core)

app/src/main/aidl/com/drdisagree/colorblendr/service/IShizukuConnection.aidl

@@ -6,4 +6,5 @@ interface IShizukuConnection {
     void applyFabricatedColors(String jsonString) = 2;
     void removeFabricatedColors() = 3;
     String getCurrentSettings() = 4;
+    String run(String command) = 5;
 }

app/src/main/assets/privacy_policy.txt

@@ -29,25 +29,25 @@ Permissions Used and Justifications
 The app requests the following permissions only to enable essential functionality:
 
 1. **Query All Packages**
-   - Purpose: To list installed apps for per-app theming functionality.
-   - Justification: Required for selecting which apps to apply themes to.
-   - Access is entirely local and is never shared or transmitted.
+	• Purpose: To list installed apps for per-app theming functionality.
+	• Justification: Required for selecting which apps to apply themes to.
+	• Access is entirely local and is never shared or transmitted.
 
 2. **Post Notification**
-   - Purpose: To keep the app's background service alive.
-   - ColorBlendr does **not** read or analyze the contents of your notifications.
+	• Purpose: To keep the app's background service alive.
+	• ColorBlendr does **not** read or analyze the contents of your notifications.
 
 3. **Read External Storage / File Access**
-   - Purpose: To read the current wallpaper file for extracting color data.
-   - Accessed locally and not stored or transmitted.
+	• Purpose: To read the current wallpaper file for extracting color data.
+	• Accessed locally and not stored or transmitted.
 
 4. **Photos / Media / Images Permission**
-   - Purpose: To allow the user to pick an image and extract colors from it.
-   - The image is processed locally and not stored or uploaded.
+	• Purpose: To allow the user to pick an image and extract colors from it.
+	• The image is processed locally and not stored or uploaded.
 
 5. **Internet Permission**
-   - Purpose: To load profile pictures of app contributors and translators.
-   - No user data is sent or received beyond basic image display.
+	• Purpose: To load profile pictures of app contributors and translators.
+	• No user data is sent or received beyond basic image display.
 
 External Links
 --------------

app/src/main/assets/translators.json

@@ -51,6 +51,7 @@ object Constant {
     const val CUSTOM_MONET_STYLE = "userGeneratedMonetStyle"
     const val MODE_SPECIFIC_THEMES = "modeSpecificThemes"
     const val SCREEN_OFF_UPDATE_COLORS = "screenOffUpdateColors"
+    const val COLORSPEC_VERSION_2025 = "colorspecVersion2025"
     const val DARKER_LAUNCHER_ICONS = "darkerLauncherIcons"
     const val SEMI_TRANSPARENT_LAUNCHER_ICONS = "semiTransparentLauncherIcons"
     const val FORCE_PITCH_BLACK_SETTINGS = "forcePitchBlackSettings"

app/src/main/java/com/drdisagree/colorblendr/data/common/Constant.kt

@@ -2,6 +2,7 @@ package com.drdisagree.colorblendr.data.common
 
 import android.graphics.Color
 import com.drdisagree.colorblendr.data.common.Constant.APP_LIST_FILTER_METHOD
+import com.drdisagree.colorblendr.data.common.Constant.COLORSPEC_VERSION_2025
 import com.drdisagree.colorblendr.data.common.Constant.CUSTOM_MONET_STYLE
 import com.drdisagree.colorblendr.data.common.Constant.DARKER_LAUNCHER_ICONS
 import com.drdisagree.colorblendr.data.common.Constant.FABRICATED_OVERLAY_FOR_APPS_STATE
@@ -155,6 +156,14 @@ object Utilities {
         putBoolean(SCREEN_OFF_UPDATE_COLORS, enabled)
     }
 
+    fun getColorSpecVersion2025Enabled(): Boolean {
+        return getBoolean(COLORSPEC_VERSION_2025, false)
+    }
+
+    fun setColorSpecVersion2025Enabled(enabled: Boolean) {
+        putBoolean(COLORSPEC_VERSION_2025, enabled)
+    }
+
     fun darkerLauncherIconsEnabled(): Boolean {
         return getBoolean(DARKER_LAUNCHER_ICONS, false)
     }

app/src/main/java/com/drdisagree/colorblendr/data/common/Utilities.kt

@@ -45,6 +45,16 @@ class RootConnection : RootService() {
          * the Activity Manager to receive notifications about process state changes.
          */
         private val processListener: IProcessObserver.Stub = object : IProcessObserver.Stub() {
+            override fun onProcessStarted(
+                pid: Int,
+                processUid: Int,
+                packageUid: Int,
+                packageName: String?,
+                processName: String?
+            ) {
+                // Do nothing
+            }
+
             @Throws(RemoteException::class)
             override fun onForegroundActivitiesChanged(
                 pid: Int,

app/src/main/java/com/drdisagree/colorblendr/service/RootConnection.kt

@@ -103,4 +103,18 @@ class ShizukuConnection : IShizukuConnection.Stub {
             currentSettings
         }
     }
+
+    /**
+     * Runs a specified shell command and returns its output.
+     *
+     * This function executes a given command using the `Shell.cmd()` utility.
+     * It captures the standard output of the command execution and returns it as a list of strings,
+     * where each string is a line from the output.
+     *
+     * @param command The shell command to be executed.
+     * @return A list of strings representing the lines of the command's standard output.
+     */
+    override fun run(command: String): String {
+        return Shell.cmd(command).exec().out.joinToString("\n")
+    }
 }