Merge branch 'main' of https://github.com/Redth/FFImageLoading.Compat

Redth · Mar 24, 2023 · 0bddc81 · 0bddc81
2 parents c614025 + f668a93
commit 0bddc81
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 3 deletions.
diff --git a/source/FFImageLoading/Platforms/MacCatalyst/DataResolvers/FileDataResolver.cs b/source/FFImageLoading/Platforms/MacCatalyst/DataResolvers/FileDataResolver.cs
@@ -5,6 +5,8 @@
 using System.Threading.Tasks;
 using FFImageLoading.Helpers;
 using System.Threading;
+using Foundation;
+using Microsoft.Maui.Storage;
 
 namespace FFImageLoading.DataResolvers
 {
@@ -37,10 +39,31 @@ public virtual Task<DataResolverResult> Resolve(string identifier, TaskParameter
 
             if (string.IsNullOrEmpty(file) && FileStore.Exists(identifier))
             {
-                file = identifier;
-            }
+				file = identifier;
+			}
+
+            // Let's check the bundle and bundle resource paths too
+            foreach (var bu in NSBundle._AllBundles)
+			{
+                var path = Path.Combine(bu.ResourcePath, identifier);
+
+                if (File.Exists(path))
+                {
+                    file = path;
+                    break;
+                }
+
+				path = Path.Combine(bu.BundlePath, identifier);
+
+				if (File.Exists(path))
+				{
+					file = path;
+					break;
+				}
+			}
+
 
-            token.ThrowIfCancellationRequested();
+			token.ThrowIfCancellationRequested();
 
             if (!string.IsNullOrEmpty(file))
             {

diff --git a/source/FFImageLoading/Platforms/iOS/DataResolvers/FileDataResolver.cs b/source/FFImageLoading/Platforms/iOS/DataResolvers/FileDataResolver.cs
@@ -5,6 +5,8 @@
 using System.Threading.Tasks;
 using FFImageLoading.Helpers;
 using System.Threading;
+using Foundation;
+using Microsoft.Maui.Storage;
 
 namespace FFImageLoading.DataResolvers
 {
@@ -40,6 +42,27 @@ public virtual Task<DataResolverResult> Resolve(string identifier, TaskParameter
 				file = identifier;
 			}
 
+			// Let's check the bundle and bundle resource paths too
+			foreach (var bu in NSBundle._AllBundles)
+			{
+				var path = Path.Combine(bu.ResourcePath, identifier);
+
+				if (File.Exists(path))
+				{
+					file = path;
+					break;
+				}
+
+				path = Path.Combine(bu.BundlePath, identifier);
+
+				if (File.Exists(path))
+				{
+					file = path;
+					break;
+				}
+			}
+
+
 			token.ThrowIfCancellationRequested();
 
 			if (!string.IsNullOrEmpty(file))