From 4b144388b42588d49619ce0e053d435586092573 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 23 May 2023 16:25:06 -0500
Subject: [PATCH] Fixed files I didn't check in

---
 .../Library/Common/HostExtensions.cs          | 43 ++++++++++-
 .../Workarounds/CustomRTLHandlerFixes.cs      | 72 ++++++++++---------
 2 files changed, 77 insertions(+), 38 deletions(-)

diff --git a/ShanedlerSamples/Library/Common/HostExtensions.cs b/ShanedlerSamples/Library/Common/HostExtensions.cs
index b243dea..cf580be 100644
--- a/ShanedlerSamples/Library/Common/HostExtensions.cs
+++ b/ShanedlerSamples/Library/Common/HostExtensions.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Shapes = Microsoft.Maui.Controls.Shapes;
 
 namespace Maui.FixesAndWorkarounds
 {
@@ -15,13 +16,49 @@ public static MauiAppBuilder ConfigureRTLFixes(this MauiAppBuilder builder)
 			builder.ConfigureMauiHandlers(handlers =>
 			{
 #if IOS || MACCATALYST
+
 				handlers.AddHandler(typeof(Microsoft.Maui.ILayout), typeof(CustomLayoutHandler));
+
+
+				handlers.AddHandler<CollectionView, CustomCollectionViewHandler>();
+				handlers.AddHandler<CarouselView, CustomCarouselViewHandler>();
+				handlers.AddHandler<ActivityIndicator, CustomActivityIndicatorHandler>();
+				handlers.AddHandler<BoxView, CustomShapeViewHandler>();
+				handlers.AddHandler<Button, CustomButtonHandler>();
+				handlers.AddHandler<CheckBox, CustomCheckBoxHandler>();
+				handlers.AddHandler<DatePicker, CustomDatePickerHandler>();
+				handlers.AddHandler<Editor, CustomEditorHandler>();
+				handlers.AddHandler<Entry, CustomEntryHandler>();
+				handlers.AddHandler<GraphicsView, CustomGraphicsViewHandler>();
+				handlers.AddHandler<Image, CustomImageHandler>();
+				handlers.AddHandler<Label, CustomLabelHandler>();
+				handlers.AddHandler<Layout, CustomLayoutHandler>();
+				handlers.AddHandler<Picker, CustomPickerHandler>();
+				handlers.AddHandler<ProgressBar, CustomProgressBarHandler>();
+				handlers.AddHandler<ScrollView, CustomScrollViewHandler>();
+				handlers.AddHandler<SearchBar, CustomSearchBarHandler>();
+				handlers.AddHandler<Slider, CustomSliderHandler>();
+				handlers.AddHandler<Stepper, CustomStepperHandler>();
+				handlers.AddHandler<Switch, CustomSwitchHandler>();
+				handlers.AddHandler<TimePicker, CustomTimePickerHandler>();
+				handlers.AddHandler<Page, CustomPageHandler>();
+				handlers.AddHandler<WebView, CustomWebViewHandler>();
+				handlers.AddHandler<Border, CustomBorderHandler>();
+				handlers.AddHandler<IContentView, CustomContentViewHandler>();
+				handlers.AddHandler<Shapes.Ellipse, CustomShapeViewHandler>();
+				handlers.AddHandler<Shapes.Line, CustomLineHandler>();
+				handlers.AddHandler<Shapes.Path, CustomPathHandler>();
+				handlers.AddHandler<Shapes.Polygon, CustomPolygonHandler>();
+				handlers.AddHandler<Shapes.Polyline, CustomPolylineHandler>();
+				handlers.AddHandler<Shapes.Rectangle, CustomRectangleHandler>();
+				handlers.AddHandler<Shapes.RoundRectangle, CustomRoundRectangleHandler>();
+				handlers.AddHandler<ImageButton, CustomImageButtonHandler>();
+				handlers.AddHandler<IndicatorView, CustomIndicatorViewHandler>();
+				handlers.AddHandler<RadioButton, CustomRadioButtonHandler>();
+
 				handlers.AddHandler(typeof(Layout), typeof(CustomLayoutHandler));
 				handlers.AddHandler(typeof(Page), typeof(CustomPageHandler));
 				handlers.AddHandler(typeof(ContentView), typeof(CustomContentViewHandler));
-				handlers.AddHandler(typeof(Button), typeof(CustomButtonViewHandler));
-				handlers.AddHandler(typeof(Label), typeof(CustomLabelViewHandler));
-				handlers.AddHandler(typeof(Entry), typeof(CustomEntryViewHandler));
 #endif
 			});
 			return builder;
diff --git a/ShanedlerSamples/Library/Workarounds/CustomRTLHandlerFixes.cs b/ShanedlerSamples/Library/Workarounds/CustomRTLHandlerFixes.cs
index b964a92..203d39e 100644
--- a/ShanedlerSamples/Library/Workarounds/CustomRTLHandlerFixes.cs
+++ b/ShanedlerSamples/Library/Workarounds/CustomRTLHandlerFixes.cs
@@ -1,11 +1,13 @@
 using System;
+#if IOS || MACCATALYST
+using UIKit;
 using CoreGraphics;
+#endif
 using Maui.FixesAndWorkarounds.Library.Common;
 using Microsoft.Maui.Controls.Handlers;
 using Microsoft.Maui.Controls.Handlers.Items;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
-using UIKit;
 
 namespace Maui.FixesAndWorkarounds
 {
@@ -15,7 +17,7 @@ public CustomPageHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -27,7 +29,7 @@ public CustomLayoutHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -39,7 +41,7 @@ public CustomContentViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -51,7 +53,7 @@ public CustomButtonHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -63,7 +65,7 @@ public CustomLabelHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -75,7 +77,7 @@ public CustomEntryHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 
@@ -95,7 +97,7 @@ public CustomBorderHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -107,7 +109,7 @@ public CustomEditorHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -119,7 +121,7 @@ public CustomCollectionViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -131,7 +133,7 @@ public CustomCarouselViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -143,7 +145,7 @@ public CustomActivityIndicatorHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -155,7 +157,7 @@ public CustomShapeViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -167,7 +169,7 @@ public CustomCheckBoxHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -179,7 +181,7 @@ public CustomDatePickerHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -191,7 +193,7 @@ public CustomGraphicsViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -203,7 +205,7 @@ public CustomImageHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -215,7 +217,7 @@ public CustomPickerHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -227,7 +229,7 @@ public CustomProgressBarHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -241,7 +243,7 @@ public CustomScrollViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect)
         {
             this.PlatformArrangeHandler(rect);
@@ -289,7 +291,7 @@ public CustomSearchBarHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -301,7 +303,7 @@ public CustomSliderHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -313,7 +315,7 @@ public CustomStepperHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -325,7 +327,7 @@ public CustomSwitchHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -337,7 +339,7 @@ public CustomTimePickerHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -349,7 +351,7 @@ public CustomWebViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -361,7 +363,7 @@ public CustomLineHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -373,7 +375,7 @@ public CustomPathHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -385,7 +387,7 @@ public CustomPolygonHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -397,7 +399,7 @@ public CustomPolylineHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -409,7 +411,7 @@ public CustomRectangleHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -421,7 +423,7 @@ public CustomRoundRectangleHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -433,7 +435,7 @@ public CustomImageButtonHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -445,7 +447,7 @@ public CustomIndicatorViewHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif
@@ -457,7 +459,7 @@ public CustomRadioButtonHandler()
 		{
 		}
 
-#if IOS
+#if IOS || MACCATALYST
         public override void PlatformArrange(Rect rect) =>
             this.PlatformArrangeHandler(rect);
 #endif