fix: base64 string support (#69)

capacitor-community · Sep 4, 2024 · 92aea3c · 92aea3c
1 parent ece8f92
commit 92aea3c
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 26 deletions.
diff --git a/...oid/src/main/java/com/getcapacitor/community/media/photoviewer/fragments/ImageFragment.kt b/...oid/src/main/java/com/getcapacitor/community/media/photoviewer/fragments/ImageFragment.kt
@@ -164,18 +164,27 @@ class ImageFragment : Fragment() {
         val toBeLoaded = image.url?.let { mImageToBeLoaded.getToBeLoaded(it) }
 
         if (toBeLoaded is String) {
-            // load image from url
-            val lazyHeaders = LazyHeaders.Builder()
-            for (key in customHeaders.keys()) {
-                customHeaders.getString(key)?.let { lazyHeaders.addHeader(key, it) }
+            if (toBeLoaded.contains("base64")) {
+                GlideApp.with(appContext)
+                    .asBitmap()
+                    .load(toBeLoaded)
+                    .fitCenter()
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .into(ivTouchImage)
+            } else {
+                // load image from url
+                val lazyHeaders = LazyHeaders.Builder()
+                for (key in customHeaders.keys()) {
+                    customHeaders.getString(key)?.let { lazyHeaders.addHeader(key, it) }
+                }
+                val glideUrl = GlideUrl(toBeLoaded, lazyHeaders.build())
+                GlideApp.with(appContext)
+                    .asBitmap()
+                    .load(glideUrl)
+                    .fitCenter()
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .into(ivTouchImage)
             }
-            val glideUrl = GlideUrl(toBeLoaded, lazyHeaders.build())
-            GlideApp.with(appContext)
-                .asBitmap()
-                .load(glideUrl)
-                .fitCenter()
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .into(ivTouchImage)
         }
         if (toBeLoaded is File) {
             // load image from file

diff --git a/...in/java/com/getcapacitor/community/media/photoviewer/fragments/ScreenSlidePageFragment.kt b/...in/java/com/getcapacitor/community/media/photoviewer/fragments/ScreenSlidePageFragment.kt
@@ -129,17 +129,26 @@ class ScreenSlidePageFragment() : Fragment(), CallbackListener {
         val toBeLoaded = image.url?.let { mImageToBeLoaded.getToBeLoaded(it) }
 
         if (toBeLoaded is String) {
-            // load image from url
-            val lazyHeaders = LazyHeaders.Builder()
-            for (key in customHeaders.keys()) {
-                customHeaders.getString(key)?.let { lazyHeaders.addHeader(key, it) }
+            if (toBeLoaded.contains("base64")) {
+                GlideApp.with(appContext)
+                    .asBitmap()
+                    .load(toBeLoaded)
+                    .fitCenter()
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .into(ivFullscreenImage)
+            } else {
+                // load image from url
+                val lazyHeaders = LazyHeaders.Builder()
+                for (key in customHeaders.keys()) {
+                    customHeaders.getString(key)?.let { lazyHeaders.addHeader(key, it) }
+                }
+                val glideUrl = GlideUrl(toBeLoaded, lazyHeaders.build())
+                GlideApp.with(appContext)
+                    .load(glideUrl)
+                    .fitCenter()
+                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                    .into(ivFullscreenImage)
             }
-            val glideUrl = GlideUrl(toBeLoaded, lazyHeaders.build())
-            GlideApp.with(appContext)
-                .load(glideUrl)
-                .fitCenter()
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .into(ivFullscreenImage)
         }
         if (toBeLoaded is File) {
             // load image from file

diff --git a/example/android/variables.gradle b/example/android/variables.gradle
@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
-    targetSdkVersion = 33
+    compileSdkVersion = 34
+    targetSdkVersion = 34
     androidxActivityVersion = '1.7.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
@@ -13,4 +13,4 @@ ext {
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'
     cordovaAndroidVersion = '10.1.1'
-}
+}
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/src/app/home/home.page.ts b/example/src/app/home/home.page.ts