move custom handlers to toolkit configuration method

gwalus · May 21, 2024 · 614cb65 · 614cb65
1 parent cc57b46
commit 614cb65
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 40 deletions.
diff --git a/src/Dollet.Presentation/Maui/Handlers/FormHandler.cs b/src/Dollet.Presentation/Maui/Handlers/FormHandler.cs
diff --git a/src/Dollet.Presentation/Maui/MauiProgram.cs b/src/Dollet.Presentation/Maui/MauiProgram.cs
@@ -1,13 +1,11 @@
 using CommunityToolkit.Maui;
 using Dollet.Core;
-using Dollet.Handlers;
 using Dollet.Infrastructure;
+using Dollet.PlatformSpecifics.Handlers;
+using Dollet.PlatformSpecifics.Renderers;
 using Microcharts.Maui;
 using Microsoft.Extensions.Configuration;
 using System.Reflection;
-#if ANDROID
-using Dollet.Platforms.Android.Renderers;
-#endif
 
 namespace Dollet
 {
@@ -27,12 +25,23 @@ public static MauiApp CreateMauiApp()
                 .UseMauiCommunityToolkit()
                 .ConfigureMauiHandlers(handlers =>
                 {
-#if ANDROID
-                    handlers.AddHandler(typeof(Shell), typeof(CustomShellRenderer));
-#endif
-                });
+                    var platformHandlers = new Dictionary<DevicePlatform, Action>
+                    {
+                        { DevicePlatform.Android, () =>
+                            {
+                                handlers.AddHandler(typeof(Shell), typeof(CustomShellRenderer));
+                                handlers.AddHandler(typeof(Picker), typeof(CustomPickerHandler));
+                                handlers.AddHandler(typeof(DatePicker), typeof(CustomDatePickerHandler));
+                            }
+                        }
+                    };
 
-            FormHandler.RemoveBorders();
+                    if (platformHandlers.TryGetValue(DeviceInfo.Platform, out var configureHandlers))
+                    {
+                        configureHandlers();
+                    }
+                    else return;
+                });
 
             using var stream = Assembly
                 .GetExecutingAssembly()

diff --git a/src/Dollet.Presentation/Maui/PlatformSpecifics/Handlers/CustomDatePickerHandler.cs b/src/Dollet.Presentation/Maui/PlatformSpecifics/Handlers/CustomDatePickerHandler.cs
@@ -0,0 +1,4 @@
+namespace Dollet.PlatformSpecifics.Handlers
+{
+    internal partial class CustomDatePickerHandler { }
+}
diff --git a/src/Dollet.Presentation/Maui/PlatformSpecifics/Handlers/CustomPickerHandler.cs b/src/Dollet.Presentation/Maui/PlatformSpecifics/Handlers/CustomPickerHandler.cs
@@ -0,0 +1,4 @@
+namespace Dollet.PlatformSpecifics.Handlers
+{
+    internal partial class CustomPickerHandler { }
+}
diff --git a/src/Dollet.Presentation/Maui/PlatformSpecifics/Renderers/CustomShellRenderer.cs b/src/Dollet.Presentation/Maui/PlatformSpecifics/Renderers/CustomShellRenderer.cs
@@ -0,0 +1,4 @@
+namespace Dollet.PlatformSpecifics.Renderers
+{
+    internal partial class CustomShellRenderer { }
+}
diff --git a/src/Dollet.Presentation/Maui/Platforms/Android/Handlers/CustomDatePickerHandler.cs b/src/Dollet.Presentation/Maui/Platforms/Android/Handlers/CustomDatePickerHandler.cs
@@ -0,0 +1,20 @@
+using Android.Content.Res;
+using Microsoft.Maui.Controls.Compatibility.Platform.Android;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+using Color = Android.Graphics.Color;
+
+namespace Dollet.PlatformSpecifics.Handlers
+{
+    internal partial class CustomDatePickerHandler : DatePickerHandler
+    {
+        protected override void ConnectHandler(MauiDatePicker platformView)
+        {
+            base.ConnectHandler(platformView);
+
+            platformView.Background = null;
+            platformView.SetBackgroundColor(Color.Transparent);
+            platformView.BackgroundTintList = ColorStateList.ValueOf(Colors.Transparent.ToAndroid());
+        }
+    }
+}
diff --git a/src/Dollet.Presentation/Maui/Platforms/Android/Handlers/CustomPickerHandler.cs b/src/Dollet.Presentation/Maui/Platforms/Android/Handlers/CustomPickerHandler.cs
@@ -0,0 +1,20 @@
+using Android.Content.Res;
+using Microsoft.Maui.Controls.Compatibility.Platform.Android;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+using Color = Android.Graphics.Color;
+
+namespace Dollet.PlatformSpecifics.Handlers
+{
+    internal partial class CustomPickerHandler : PickerHandler
+    {
+        protected override void ConnectHandler(MauiPicker platformView)
+        {
+            base.ConnectHandler(platformView);
+
+            platformView.Background = null;
+            platformView.SetBackgroundColor(Color.Transparent);
+            platformView.BackgroundTintList = ColorStateList.ValueOf(Colors.Transparent.ToAndroid());
+        }
+    }
+}
diff --git a/src/Dollet.Presentation/Maui/Platforms/Android/Renderers/CustomShellRenderer.cs b/src/Dollet.Presentation/Maui/Platforms/Android/Renderers/CustomShellRenderer.cs
@@ -3,9 +3,9 @@
 using Microsoft.Maui.Controls.Handlers.Compatibility;
 using Microsoft.Maui.Controls.Platform.Compatibility;
 
-namespace Dollet.Platforms.Android.Renderers
+namespace Dollet.PlatformSpecifics.Renderers
 {
-    public class CustomShellRenderer(Context context) : ShellRenderer(context)
+    internal partial class CustomShellRenderer(Context context) : ShellRenderer(context)
     {
         protected override IShellTabLayoutAppearanceTracker CreateTabLayoutAppearanceTracker(ShellSection shellSection)
         {

diff --git a/src/Dollet.Presentation/Maui/Platforms/Android/Trackers/CustomTabLayoutAppearanceTracker.cs b/src/Dollet.Presentation/Maui/Platforms/Android/Trackers/CustomTabLayoutAppearanceTracker.cs
@@ -3,7 +3,7 @@
 
 namespace Dollet.Platforms.Android.Trackers
 {
-    public class CustomTabLayoutAppearanceTracker(IShellContext shellContext) : ShellTabLayoutAppearanceTracker(shellContext)
+    internal class CustomTabLayoutAppearanceTracker(IShellContext shellContext) : ShellTabLayoutAppearanceTracker(shellContext)
     {
         public override void SetAppearance(TabLayout tabLayout, ShellAppearance appearance)
         {