Retrieve adaptive icons as Square

Author: Kaiserdragon2

app/build.gradle

@@ -9,8 +9,8 @@ android {
         vectorDrawables.generatedDensities = []
         minSdkVersion 23
         targetSdk 35
-        versionName '2.5.6'
-        versionCode 28
+        versionName '2.5.7'
+        versionCode 29
     }
 
     dependenciesInfo {
@@ -53,4 +53,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.core:core:1.15.0'
     implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.github.sarsamurmu:AdaptiveIconBitmap:1.0.2'
 }

app/src/main/java/de/kaiserdragon/iconrequest/AppAdapter.java

@@ -1,5 +1,7 @@
 package de.kaiserdragon.iconrequest;
 
+import static de.kaiserdragon.iconrequest.helper.DrawableHelper.getBitmapFromDrawable;
+
 import android.app.Activity;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -113,12 +115,12 @@ public void onBindViewHolder(@NonNull AppViewHolder holder, int position) {
         holder.labelView.setText(app.getLabel());
         holder.packageNameView.setText(app.packageName);
         holder.classNameView.setText(app.className);
-        holder.imageView.setImageDrawable(app.getIcon());
+        holder.imageView.setImageBitmap(getBitmapFromDrawable(app.getIcon()));
         if (app.selected) holder.checkBox.setDisplayedChild(1);
         else holder.checkBox.setDisplayedChild(0);
         if (secondIcon) {
             holder.apkIconView.setVisibility(View.VISIBLE);
-            holder.apkIconView.setImageDrawable(app.getIcon2());
+            holder.apkIconView.setImageBitmap(getBitmapFromDrawable(app.getIcon2()));
         }
 
     }

app/src/main/java/de/kaiserdragon/iconrequest/helper/DrawableHelper.java

@@ -6,11 +6,16 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.Log;
 
 import androidx.core.content.res.ResourcesCompat;
 
+import sarsamurmu.adaptiveicon.AdaptiveIcon;
+
+
 public class DrawableHelper {
     private static final String TAG = "DrawableHelper";
 
@@ -37,6 +42,13 @@ public static Drawable getHighResIcon(PackageManager pm, ResolveInfo resolveInfo
     }
 
     public static Bitmap getBitmapFromDrawable(Drawable drawable) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && drawable instanceof AdaptiveIconDrawable) {
+            return new AdaptiveIcon()
+                    .setDrawable((AdaptiveIconDrawable) drawable)
+                    .setPath(AdaptiveIcon.PATH_SQUARE)
+                    .setSize(256)
+                    .render();
+        }
         final Bitmap bmp = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
         final Canvas canvas = new Canvas(bmp);
         drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());

app/src/main/java/de/kaiserdragon/iconrequest/helper/ShareHelper.java

@@ -8,6 +8,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.util.Log;
 
@@ -52,7 +53,7 @@ public static void actionSend(String[] array, byte[] zipData, Context context) {
         Intent intent = new Intent(android.content.Intent.ACTION_SEND);
         intent.setType("application/zip");
         deleteDirectory(ZipLocation);
-        if(ZipLocation.mkdir()){
+        if (ZipLocation.mkdir()) {
             File file = new File(ZipLocation, array[0] + ".zip");
 
             try (FileOutputStream fos = new FileOutputStream(file)) {
@@ -75,7 +76,7 @@ public static void actionSend(String[] array, byte[] zipData, Context context) {
                 makeToast(context.getString(R.string.no_email_clients), context);
                 Log.e(TAG, "actionSend: ", e);
             }
-        }else CommonHelper.makeToast("Something went wrong", context);
+        } else CommonHelper.makeToast("Something went wrong", context);
     }
 
     public static void actionSendText(String[] array, Context context) {
@@ -150,7 +151,8 @@ public static String[] actionSave(AppAdapter adapter, Boolean updateOnly, Contex
                 LabelList.add(iconName);
 
                 try {
-                    Bitmap bitmap = DrawableHelper.getBitmapFromDrawable(arrayList.get(i).getIcon());
+                    Drawable drawable = arrayList.get(i).getIcon();
+                    Bitmap bitmap = DrawableHelper.getBitmapFromDrawable(drawable);
                     ByteArrayOutputStream BaOsImg = new ByteArrayOutputStream();
                     ZipEntry ze = new ZipEntry(iconName + ".png");
                     bitmap.compress(Bitmap.CompressFormat.PNG, 100, BaOsImg);
@@ -203,14 +205,14 @@ private static void deleteDirectory(File path) {
             for (File file : files) {
                 if (file.isDirectory()) {
                     deleteDirectory(file);
-                } else if(file.delete()){
+                } else if (file.delete()) {
                     Log.i(TAG, "deleteDirectory: " + file.getName());
-                }else Log.e(TAG, "deleteDirectory: ", new IOException());
+                } else Log.e(TAG, "deleteDirectory: ", new IOException());
             }
         }
-        if(path.delete()){
+        if (path.delete()) {
             Log.i(TAG, "deleteDirectory: " + path.getName());
-        }else {
+        } else {
             Log.e(TAG, "deleteDirectory: ", new IOException());
         }
     }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.1'
+        classpath 'com.android.tools.build:gradle:8.7.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,6 +16,7 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://jitpack.io' }
         mavenCentral()
         google()
     }