Merge branch 'master' into develop

FreakyAli · Sep 8, 2023 · 348b7e7 · 348b7e7
2 parents 3b66512 + bef70dc
commit 348b7e7
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 83 deletions.
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyDatePicker/FreakyDatePickerHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyDatePicker/FreakyDatePickerHandler.cs
@@ -1,43 +1,43 @@
-using System;
-using Maui.FreakyControls.Extensions;
-using Microsoft.Maui.Handlers;
-
-namespace Maui.FreakyControls;
+using System;
+using Maui.FreakyControls.Extensions;
+using Microsoft.Maui.Handlers;
 
-#if ANDROID || IOS
-public partial class FreakyDatePickerHandler : DatePickerHandler
-{
-    public FreakyDatePickerHandler()
-    {
-        Mapper.AppendToMapping("FreakyDatePickerCustomization", MapDatePicker);
-    }
-
-    // Todo: Remove try-catch added as a quickfix for https://github.com/FreakyAli/Maui.FreakyControls/issues/76
-    private void MapDatePicker(IDatePickerHandler datePickerHandler, IDatePicker datePicker)
-    {
-        try
-        {
-            if (datePicker is FreakyDatePicker freakyDatePicker &&
-                     datePickerHandler is FreakyDatePickerHandler freakyDatePickerHandler)
-            {
-                if (PlatformView != null && VirtualView != null)
-                {
-                    if (freakyDatePicker.ImageSource != default(ImageSource))
-                    {
-                        freakyDatePickerHandler.HandleAndAlignImageSourceAsync(freakyDatePicker).RunConcurrently();
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            ex.TraceException();
-        }
-    }
-}
-
-#else
-public partial class FreakyDatePickerHandler : DatePickerHandler
-{
-}
-#endif
+namespace Maui.FreakyControls;
+
+#if ANDROID || IOS
+public partial class FreakyDatePickerHandler : DatePickerHandler
+{
+    public FreakyDatePickerHandler()
+    {
+        Mapper.AppendToMapping("FreakyDatePickerCustomization", MapDatePicker);
+    }
+
+    // Todo: Remove try-catch added as a quickfix for https://github.com/FreakyAli/Maui.FreakyControls/issues/76
+    private void MapDatePicker(IDatePickerHandler datePickerHandler, IDatePicker datePicker)
+    {
+        try
+        {
+            if (datePicker is FreakyDatePicker freakyDatePicker &&
+                     datePickerHandler is FreakyDatePickerHandler freakyDatePickerHandler)
+            {
+                if (PlatformView != null && VirtualView != null)
+                {
+                    if (freakyDatePicker.ImageSource != default(ImageSource))
+                    {
+                        freakyDatePickerHandler.HandleAndAlignImageSourceAsync(freakyDatePicker).RunConcurrently();
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            ex.TraceException();
+        }
+    }
+}
+
+#else
+public partial class FreakyDatePickerHandler : DatePickerHandler
+{
+}
+#endif
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditorHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditorHandler.cs
@@ -9,24 +9,24 @@ public sealed partial class FreakyEditorHandler : EditorHandler
     public FreakyEditorHandler()
     {
         Mapper.AppendToMapping("FreakyEntryCustomization", MapFreakyEditor);
-    }
-
-    // Todo: Remove try-catch added as a quickfix for https://github.com/FreakyAli/Maui.FreakyControls/issues/76
+    }
+
+    // Todo: Remove try-catch added as a quickfix for https://github.com/FreakyAli/Maui.FreakyControls/issues/76
     private void MapFreakyEditor(IEditorHandler editorHandler, IEditor editor)
     {
-        try
-        {
-            if (editor is FreakyEditor feditor && editorHandler is FreakyEditorHandler freakyEditorHandler)
-            {
-                if (PlatformView != null && VirtualView != null)
-                {
-                    HandleAllowCopyPaste(feditor);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            ex.TraceException();
+        try
+        {
+            if (editor is FreakyEditor feditor && editorHandler is FreakyEditorHandler freakyEditorHandler)
+            {
+                if (PlatformView != null && VirtualView != null)
+                {
+                    HandleAllowCopyPaste(feditor);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            ex.TraceException();
         }
     }
 }

diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs
@@ -12,30 +12,29 @@ public sealed partial class FreakyEntryHandler : EntryHandler
     public FreakyEntryHandler()
     {
         Mapper.AppendToMapping("FreakyEntryCustomization", MapFreakyEntry);
-    }
-
-    // Todo: Remove try-catch added as a quickfix for https://github.com/FreakyAli/Maui.FreakyControls/issues/76
+    }
+
+    // Todo: Remove try-catch added as a quickfix for https://github.com/FreakyAli/Maui.FreakyControls/issues/76
     private void MapFreakyEntry(IEntryHandler entryHandler, IEntry entry)
     {
-        try
-        {
-            if (entry is FreakyEntry freakyEntry && entryHandler is FreakyEntryHandler freakyEntryHandler)
-            {
-                if (PlatformView != null && VirtualView != null)
-                {
-                    if (freakyEntry.ImageSource != default(ImageSource))
-                    {
-                        freakyEntryHandler.HandleAndAlignImageSourceAsync(freakyEntry).RunConcurrently();
-                    }
-                    HandleAllowCopyPaste(freakyEntry);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            ex.TraceException();
-        }
-
+        try
+        {
+            if (entry is FreakyEntry freakyEntry && entryHandler is FreakyEntryHandler freakyEntryHandler)
+            {
+                if (PlatformView != null && VirtualView != null)
+                {
+                    if (freakyEntry.ImageSource != default(ImageSource))
+                    {
+                        freakyEntryHandler.HandleAndAlignImageSourceAsync(freakyEntry).RunConcurrently();
+                    }
+                    HandleAllowCopyPaste(freakyEntry);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            ex.TraceException();
+        }
     }
 }
 

diff --git a/MAUI.FreakyControls/Samples/AppShell.xaml.cs b/MAUI.FreakyControls/Samples/AppShell.xaml.cs
@@ -1,4 +1,4 @@
-namespace Samples;
+namespace Samples;
 
 public partial class AppShell : Shell
 {
@@ -26,5 +26,6 @@ public AppShell()
         Routing.RegisterRoute(radioButtons, typeof(RadioButtons.RadioButtonsView));
         Routing.RegisterRoute(buttons, typeof(ButtonsView.ButtonsView));
         Routing.RegisterRoute(jumpList, typeof(JumpList.JumpListView));
+
     }
 }
diff --git a/MAUI.FreakyControls/Samples/MainViewModel.cs b/MAUI.FreakyControls/Samples/MainViewModel.cs
@@ -1,4 +1,4 @@
-using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
 using Application = Microsoft.Maui.Controls.Application;
@@ -7,6 +7,7 @@ namespace Samples
 {
     public class MainViewModel : BaseViewModel
     {
+
         private ObservableCollection<string> items;
 
         public MainViewModel()
@@ -25,6 +26,7 @@ public MainViewModel()
                 AppShell.radioButtons,
                 AppShell.buttons,
                 AppShell.jumpList
+
             };
         }
 

diff --git a/README.md b/README.md
@@ -68,11 +68,12 @@ Add the following using statement and Initialization in your MauiProgram:
                      fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                      fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
                  });
-            //Takes one argument if you would like to init Skiasharp through FreakyControls or not. (Used for RadioButton, Checkbox & SVGImageView)
+             //Takes one argument if you would like to init Skiasharp through FreakyControls or not. (Used for RadioButton, Checkbox & SVGImageView)
              builder.InitializeFreakyControls();
              return builder.Build();
          }
       }
+      
 Now you can use the controls in your app.
 
 ## Activity