Tidying up

Esri · Sep 11, 2023 · e3d4fd9 · e3d4fd9
1 parent 7462602
commit e3d4fd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupMediaView.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupMediaView.cs
@@ -211,7 +211,6 @@ private void OnPopupMediaPropertyChanged()
         // Also used for embedded images in TextPopupElement views
         internal static bool TryCreateImageSource(string? sourceUri, out ImageSource? source)
         {
-            source = null;
             if (sourceUri != null && sourceUri.StartsWith("data:image/"))
             {
                 // might be base64
@@ -223,7 +222,7 @@ internal static bool TryCreateImageSource(string? sourceUri, out ImageSource? so
                         var base64data = sourceUri.Substring(idx + 8);
                         var data = Convert.FromBase64String(base64data);
 #if MAUI
-                        var newSource = new StreamImageSource() { Stream = (token) => Task.FromResult<Stream>(new MemoryStream(data)) };
+                        var newSource = new StreamImageSource { Stream = (token) => Task.FromResult<Stream>(new MemoryStream(data)) };
 #else
                         var newSource = new BitmapImage();
                         newSource.BeginInit();
@@ -245,6 +244,7 @@ internal static bool TryCreateImageSource(string? sourceUri, out ImageSource? so
 #endif
                 return true;
             }
+            source = null;
             return false;
         }
     }

diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Maui.cs
@@ -19,9 +19,7 @@
 using Esri.ArcGISRuntime.Mapping.Popups;
 using Esri.ArcGISRuntime.Toolkit.Internal;
 using Microsoft.Maui.ApplicationModel;
-using Esri.ArcGISRuntime.UI;
 using Grid = Microsoft.Maui.Controls.Grid;
-using RuntimeImageExtensions = Esri.ArcGISRuntime.Maui.RuntimeImageExtensions;
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives
 {