update gradle plugin, bump version, update changelog

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.42.0]
+
+### Changed
+- Removed manual discount message
+- Added in memory lru cache for asset decoding
+- Added async parameter for asset loading
+
 ## [0.41.0]
 
 ### Added

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath 'gradle.plugin.com.github.jlouns:gradle-cross-platform-exec-plugin:0.5.0'
         classpath "gradle.plugin.gmazzo:sqlite-plugin:0.2"
     }
@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.41.0'
+        sdkVersion='0.42.0'
         versionCode=1
 
         compileSdkVersion=30

core/src/main/java/io/snabble/sdk/Assets.java

@@ -45,6 +45,20 @@
 import okhttp3.ResponseBody;
 
 public class Assets {
+    private static LruCache<String, Bitmap> memoryCache;
+
+    static {
+        final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
+        final int cacheSize = maxMemory / 8;
+        Logger.d("setup lru cache " + (cacheSize / 1024) + " MB");
+        memoryCache = new LruCache<String, Bitmap>(cacheSize) {
+            @Override
+            protected int sizeOf(String key, Bitmap bitmap) {
+                return bitmap.getByteCount() / 1024;
+            }
+        };
+    }
+
     private enum Variant {
         @SerializedName("1x")
         MDPI("1x", 1.0f),
@@ -109,7 +123,6 @@ public interface Callback {
     private Project project;
     private File manifestFile;
     private Manifest manifest;
-    private LruCache<String, Bitmap> memoryCache;
 
     Assets(Project project) {
         this.app = Snabble.getInstance().getApplication();
@@ -118,16 +131,6 @@ public interface Callback {
         this.assetDir = new File(project.getInternalStorageDirectory(), "assets/");
         this.assetDir.mkdirs();
 
-        final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
-        final int cacheSize = maxMemory / 16;
-        Logger.d("setup lru cache " + (cacheSize / 1024) + " MB");
-        memoryCache = new LruCache<String, Bitmap>(cacheSize) {
-            @Override
-            protected int sizeOf(String key, Bitmap bitmap) {
-                return bitmap.getByteCount() / 1024;
-            }
-        };
-
         loadManifest();
     }
 
@@ -354,19 +357,26 @@ private static boolean isNightModeActive(Context context) {
     }
 
     public Bitmap getBitmap(String name) {
-        return getBitmapSVG(name);
+        return getBitmap(name, Type.SVG);
     }
 
     public Bitmap getBitmap(String name, Type type) {
+        Bitmap bitmap;
+
         switch (type) {
             case SVG:
-                return getBitmapSVG(name);
+                bitmap = getBitmapSVG(name);
+                break;
             case JPG:
             case WEBP:
-                return getBitmapByType(name, type);
+                bitmap = getBitmapByType(name, type);
+                break;
             default:
-                return null;
+                bitmap = null;
+                break;
         }
+
+        return bitmap;
     }
 
     private Asset getAsset(String name, Type type) {
@@ -390,31 +400,21 @@ private Asset getAsset(String name, Type type) {
                 break;
         }
 
-        synchronized (this) {
-            Asset asset = manifest.assets.get(fileName);
-            if (asset == null) {
-                // try non night mode version
-                asset = manifest.assets.get(name);
-            }
-
-            return asset;
+        Asset asset = manifest.assets.get(fileName);
+        if (asset == null) {
+            // try non night mode version
+            asset = manifest.assets.get(name);
         }
+
+        return asset;
     }
 
     private Bitmap getBitmapByType(String name, Type type) {
         Asset asset = getAsset(name, type);
         if (asset != null) {
             try {
                 Logger.d("render %s %s/%s", type.name(), project.getId(), name);
-                String cacheKey = asset.hash;
-                Bitmap cachedBitmap = getBitmapFromMemCache(cacheKey);
-                if (cachedBitmap != null) {
-                    return cachedBitmap;
-                }
-
-                Bitmap bitmap = BitmapFactory.decodeStream(new FileInputStream(asset.file));
-                addBitmapToMemoryCache(cacheKey, bitmap);
-                return bitmap;
+                return BitmapFactory.decodeStream(new FileInputStream(asset.file));
             } catch (Exception e) {
                 Logger.d("could not decode " + name + ": " + e.toString());
                 return null;
@@ -440,16 +440,9 @@ private Bitmap getBitmapSVG(String name) {
                 svg.setDocumentWidth(width);
                 svg.setDocumentHeight(height);
 
-                String cacheKey = asset.hash;
-                Bitmap cachedBitmap = getBitmapFromMemCache(cacheKey);
-                if (cachedBitmap != null) {
-                    return cachedBitmap;
-                }
-
                 Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
                 Canvas canvas = new Canvas(bitmap);
                 svg.renderToCanvas(canvas);
-                addBitmapToMemoryCache(cacheKey, bitmap);
                 return bitmap;
             } catch (Exception e) {
                 Logger.d("could not decode " + name + ": " + e.toString());
@@ -483,17 +476,35 @@ public void get(String name, Type type, boolean async, Callback callback) {
         }
         final String finalFileName = fileName;
 
+        Asset asset = getAsset(name, type);
+        if (asset != null) {
+            String cacheKey = asset.hash;
+            Bitmap cachedBitmap = getBitmapFromMemCache(cacheKey);
+            if (cachedBitmap != null) {
+                callback.onReceive(cachedBitmap);
+                return;
+            }
+        }
+
         if (async) {
-            Dispatch.background(() -> get(finalFileName, type, callback));
+            Dispatch.background(() -> {
+                get(finalFileName, type, callback);
+            });
         } else {
             get(finalFileName, type, callback);
         }
     }
 
-    private void get(final String name, Type type, Callback callback) {
+    private void get(String name, Type type, Callback callback) {
         Bitmap bitmap = getBitmap(name, type);
         if (bitmap != null) {
             Logger.d("cache hit " + name);
+            Asset asset = getAsset(name, type);
+            if (asset != null) {
+                String cacheKey = asset.hash;
+                addBitmapToMemoryCache(cacheKey, bitmap);
+            }
+
             Dispatch.mainThread(() -> callback.onReceive(bitmap));
         } else {
             Logger.d("cache miss " + name);
@@ -502,6 +513,12 @@ private void get(final String name, Type type, Callback callback) {
                 @Override
                 public void success() {
                     Bitmap b = getBitmap(name, type);
+                    Asset asset = getAsset(name, type);
+                    if (asset != null) {
+                        String cacheKey = asset.hash;
+                        addBitmapToMemoryCache(cacheKey, b);
+                    }
+
                     Dispatch.mainThread(() -> callback.onReceive(b));
                 }
 
@@ -514,14 +531,14 @@ public void failure() {
         }
     }
 
-    public void addBitmapToMemoryCache(String key, Bitmap bitmap) {
+    public static void addBitmapToMemoryCache(String key, Bitmap bitmap) {
         if (getBitmapFromMemCache(key) == null) {
-            Logger.d("put lru cache " + key);
+            Logger.d("put lru cache %d / %d MB %s", memoryCache.size() / 1024, memoryCache.maxSize() / 1024, key);
             memoryCache.put(key, bitmap);
         }
     }
 
-    public Bitmap getBitmapFromMemCache(String key) {
+    public static Bitmap getBitmapFromMemCache(String key) {
         Bitmap bitmap = memoryCache.get(key);
         Logger.d("get lru cache %s %s", bitmap != null ? "HIT" : "MISS", key);
         return bitmap;