Icon pack fixes

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/IconPack.java b/app/src/main/java/com/farmerbb/taskbar/util/IconPack.java
index c556a95..da0865b 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/IconPack.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/IconPack.java
@@ -47,6 +47,7 @@ public class IconPack {
     private String packageName;
     private String name;
 
+    private boolean mIsLoading = false;
     private boolean mLoaded = false;
     private Map<String, String> mPackagesDrawables = new HashMap<>();
 
@@ -74,84 +75,91 @@ public class IconPack {
         this.packageName = packageName;
     }
 
-    void load(Context mContext) {
-        SharedPreferences pref = U.getSharedPreferences(mContext);
-        boolean loadMasks = pref.getBoolean("icon_pack_use_mask", false);
-
-        // Load appfilter.xml from the icon pack package
-        PackageManager pm = mContext.getPackageManager();
-        try {
-            XmlPullParser xpp = null;
-
-            iconPackres = pm.getResourcesForApplication(packageName);
-            int appfilterid = iconPackres.getIdentifier("appfilter", "xml", packageName);
-            if(appfilterid > 0) {
-                xpp = iconPackres.getXml(appfilterid);
-            } else {
-                // No resource found, try to open it from assets folder
-                try {
-                    InputStream appfilterstream = iconPackres.getAssets().open("appfilter.xml");
-
-                    XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
-                    factory.setNamespaceAware(true);
-                    xpp = factory.newPullParser();
-                    xpp.setInput(appfilterstream, "utf-8");
-                } catch (IOException e) { /* Gracefully fail */ }
-            }
+    private void load(Context mContext) {
+        if(!mIsLoading) {
+            mIsLoading = true;
+
+            SharedPreferences pref = U.getSharedPreferences(mContext);
+            boolean loadMasks = pref.getBoolean("icon_pack_use_mask", false);
+
+            // Load appfilter.xml from the icon pack package
+            PackageManager pm = mContext.getPackageManager();
+            try {
+                XmlPullParser xpp = null;
+
+                iconPackres = pm.getResourcesForApplication(packageName);
+                int appfilterid = iconPackres.getIdentifier("appfilter", "xml", packageName);
+                if(appfilterid > 0) {
+                    xpp = iconPackres.getXml(appfilterid);
+                } else {
+                    // No resource found, try to open it from assets folder
+                    try {
+                        InputStream appfilterstream = iconPackres.getAssets().open("appfilter.xml");
+
+                        XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+                        factory.setNamespaceAware(true);
+                        xpp = factory.newPullParser();
+                        xpp.setInput(appfilterstream, "utf-8");
+                    } catch (IOException e) { /* Gracefully fail */ }
+                }
 
-            if(xpp != null) {
-                int eventType = xpp.getEventType();
-                while(eventType != XmlPullParser.END_DOCUMENT) {
-                    if(eventType == XmlPullParser.START_TAG) {
-                        if(loadMasks) {
-                            if(xpp.getName().equals("iconback")) {
-                                for(int i = 0; i < xpp.getAttributeCount(); i++) {
-                                    if(xpp.getAttributeName(i).startsWith("img")) {
-                                        String drawableName = xpp.getAttributeValue(i);
-                                        Bitmap iconback = loadBitmap(drawableName);
-                                        if(iconback != null)
-                                            mBackImages.add(iconback);
+                if(xpp != null) {
+                    int eventType = xpp.getEventType();
+                    while(eventType != XmlPullParser.END_DOCUMENT) {
+                        if(eventType == XmlPullParser.START_TAG) {
+                            if(loadMasks) {
+                                if(xpp.getName().equals("iconback")) {
+                                    for(int i = 0; i < xpp.getAttributeCount(); i++) {
+                                        if(xpp.getAttributeName(i).startsWith("img")) {
+                                            String drawableName = xpp.getAttributeValue(i);
+                                            Bitmap iconback = loadBitmap(drawableName);
+                                            if(iconback != null)
+                                                mBackImages.add(iconback);
+                                        }
+                                    }
+                                } else if(xpp.getName().equals("iconmask")) {
+                                    if(xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("img1")) {
+                                        String drawableName = xpp.getAttributeValue(0);
+                                        mMaskImage = loadBitmap(drawableName);
+                                    }
+                                } else if(xpp.getName().equals("iconupon")) {
+                                    if(xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("img1")) {
+                                        String drawableName = xpp.getAttributeValue(0);
+                                        mFrontImage = loadBitmap(drawableName);
+                                    }
+                                } else if(xpp.getName().equals("scale")) {
+                                    if(xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("factor")) {
+                                        mFactor = Float.valueOf(xpp.getAttributeValue(0));
                                     }
-                                }
-                            } else if(xpp.getName().equals("iconmask")) {
-                                if(xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("img1")) {
-                                    String drawableName = xpp.getAttributeValue(0);
-                                    mMaskImage = loadBitmap(drawableName);
-                                }
-                            } else if(xpp.getName().equals("iconupon")) {
-                                if(xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("img1")) {
-                                    String drawableName = xpp.getAttributeValue(0);
-                                    mFrontImage = loadBitmap(drawableName);
-                                }
-                            } else if(xpp.getName().equals("scale")) {
-                                if(xpp.getAttributeCount() > 0 && xpp.getAttributeName(0).equals("factor")) {
-                                    mFactor = Float.valueOf(xpp.getAttributeValue(0));
                                 }
                             }
-                        }
 
-                        if(xpp.getName().equals("item")) {
-                            String componentName = null;
-                            String drawableName = null;
+                            if(xpp.getName().equals("item")) {
+                                String componentName = null;
+                                String drawableName = null;
 
-                            for(int i = 0; i < xpp.getAttributeCount(); i++) {
-                                if(xpp.getAttributeName(i).equals("component")) {
-                                    componentName = xpp.getAttributeValue(i);
-                                } else if(xpp.getAttributeName(i).equals("drawable")) {
-                                    drawableName = xpp.getAttributeValue(i);
+                                for(int i = 0; i < xpp.getAttributeCount(); i++) {
+                                    if(xpp.getAttributeName(i).equals("component")) {
+                                        componentName = xpp.getAttributeValue(i);
+                                    } else if(xpp.getAttributeName(i).equals("drawable")) {
+                                        drawableName = xpp.getAttributeValue(i);
+                                    }
+                                }
+                                if(!mPackagesDrawables.containsKey(componentName)) {
+                                    mPackagesDrawables.put(componentName, drawableName);
+                                    totalIcons = totalIcons + 1;
                                 }
-                            }
-                            if(!mPackagesDrawables.containsKey(componentName)) {
-                                mPackagesDrawables.put(componentName, drawableName);
-                                totalIcons = totalIcons + 1;
                             }
                         }
+                        eventType = xpp.next();
                     }
-                    eventType = xpp.next();
                 }
-            }
-            mLoaded = true;
-        } catch (PackageManager.NameNotFoundException | XmlPullParserException | IOException e) { /* Gracefully fail */ }
+
+                mLoaded = true;
+            } catch (PackageManager.NameNotFoundException | XmlPullParserException | IOException e) { /* Gracefully fail */ }
+
+            mIsLoading = false;
+        }
     }
 
     @SuppressWarnings("deprecation")
@@ -202,7 +210,7 @@ public class IconPack {
         if(drawable != null) {
             Bitmap BMP = loadBitmap(drawable);
             if(BMP == null) {
-                return generateBitmap(defaultBitmap);
+                return generateBitmap(componentName, defaultBitmap);
             } else {
                 return BMP;
             }
@@ -219,14 +227,14 @@ public class IconPack {
             }
         }
 
-        return generateBitmap(defaultBitmap);
+        return generateBitmap(componentName, defaultBitmap);
     }
 
-    private Bitmap generateBitmap(Bitmap defaultBitmap) {
+    private Bitmap generateBitmap(String componentName, Bitmap defaultBitmap) {
         // If no support images in the icon pack, return the bitmap itself
         if(mBackImages.size() == 0) return defaultBitmap;
 
-        Random r = new Random();
+        Random r = new Random(generateSeed(componentName));
         int backImageInd = r.nextInt(mBackImages.size());
         Bitmap backImage = mBackImages.get(backImageInd);
         int w = backImage.getWidth();
@@ -276,4 +284,15 @@ public class IconPack {
 
         return result;
     }
+
+    private long generateSeed(String packageName) {
+        long seed = 0;
+
+        for(int i = 0; i < packageName.length(); i++) {
+            char ch = packageName.charAt(i);
+            seed = seed + (long) ch;
+        }
+
+        return seed;
+    }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/IconPackManager.java b/app/src/main/java/com/farmerbb/taskbar/util/IconPackManager.java
index 99a11fb..87287a9 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/IconPackManager.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/IconPackManager.java
@@ -70,13 +70,12 @@ public class IconPackManager {
         forceReload = true;
     }
 
-    IconPack getIconPack(Context context, String packageName) {
+    IconPack getIconPack(String packageName) {
         if(forceReload || currentIconPack == null || !currentIconPack.getPackageName().equals(packageName)) {
             forceReload = false;
 
             currentIconPack = new IconPack();
             currentIconPack.setPackageName(packageName);
-            currentIconPack.load(context);
         }
 
         return currentIconPack;

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index ad8846d..a2f3b59 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -446,7 +446,7 @@ public class U {
         if(iconPackPackage.equals(BuildConfig.APPLICATION_ID))
             return appInfo.loadIcon(pm);
         else {
-            IconPack iconPack = iconPackManager.getIconPack(context, iconPackPackage);
+            IconPack iconPack = iconPackManager.getIconPack(iconPackPackage);
             String componentName = new ComponentName(appInfo.packageName, appInfo.name).toString();
 
             if(!useMask) {