From 97a812a6c054f89a67eb0e07f71fa3c70df37ee7 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 12 Jan 2022 10:30:16 -0600
Subject: [PATCH] - move compatibility handler to compatibility library

---
 .../Core/src/AppHostBuilderExtensions.cs              | 10 ++++++++++
 .../Core/src}/Handlers/Android/ViewRenderer.cs        |  0
 .../src}/Handlers/ListView/Android/BaseCellView.cs    |  0
 .../src}/Handlers/ListView/Android/CellAdapter.cs     |  0
 .../src}/Handlers/ListView/Android/CellFactory.cs     |  0
 .../src}/Handlers/ListView/Android/CellRenderer.cs    |  0
 .../ListView/Android/ConditionalFocusLayout.cs        |  0
 .../Handlers/ListView/Android/EntryCellEditText.cs    |  0
 .../Handlers/ListView/Android/EntryCellRenderer.cs    |  0
 .../src}/Handlers/ListView/Android/EntryCellView.cs   |  0
 .../ListView/Android/GroupedListViewAdapter.cs        |  0
 .../Handlers/ListView/Android/ImageCellRenderer.cs    |  0
 .../src}/Handlers/ListView/Android/ListViewAdapter.cs |  0
 .../Handlers/ListView/Android/ListViewRenderer.cs     |  0
 .../Handlers/ListView/Android/SwitchCellRenderer.cs   |  0
 .../src}/Handlers/ListView/Android/SwitchCellView.cs  |  0
 .../Handlers/ListView/Android/TextCellRenderer.cs     |  0
 .../Handlers/ListView/Android/ViewCellRenderer.cs     |  0
 .../src/Core/Hosting/AppHostBuilderExtensions.cs      | 11 -----------
 19 files changed, 10 insertions(+), 11 deletions(-)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/Android/ViewRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/BaseCellView.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/CellAdapter.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/CellFactory.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/CellRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/ConditionalFocusLayout.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/EntryCellEditText.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/EntryCellRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/EntryCellView.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/GroupedListViewAdapter.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/ImageCellRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/ListViewAdapter.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/ListViewRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/SwitchCellRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/SwitchCellView.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/TextCellRenderer.cs (100%)
 rename src/{Controls/src/Core/Compatibility => Compatibility/Core/src}/Handlers/ListView/Android/ViewCellRenderer.cs (100%)

diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
index 09e77440fdb5..62125fe0361d 100644
--- a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
+++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
@@ -9,6 +9,7 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Hosting;
 using Microsoft.Maui.LifecycleEvents;
+using Microsoft.Maui.Controls.Handlers.Compatibility;
 
 #if __ANDROID__
 using Microsoft.Maui.Controls.Compatibility.Platform.Android;
@@ -79,6 +80,15 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 					handlers.TryAddCompatibilityRenderer(typeof(TextCell), typeof(TextCellRenderer));
 					handlers.TryAddCompatibilityRenderer(typeof(ViewCell), typeof(ViewCellRenderer));
 					handlers.TryAddCompatibilityRenderer(typeof(SwitchCell), typeof(SwitchCellRenderer));
+#elif ANDROID
+					handlers.AddHandler(typeof(ListView), typeof(ListViewRenderer));
+					handlers.AddHandler(typeof(Cell), typeof(CellRenderer));
+					handlers.AddHandler(typeof(ImageCell), typeof(ImageCellRenderer));
+					handlers.AddHandler(typeof(EntryCell), typeof(EntryCellRenderer));
+					handlers.AddHandler(typeof(TextCell), typeof(TextCellRenderer));
+					handlers.AddHandler(typeof(ViewCell), typeof(ViewCellRenderer));
+					handlers.AddHandler(typeof(SwitchCell), typeof(SwitchCellRenderer));
+
 #endif
 
 #if __ANDROID__ || __IOS__ || WINDOWS || MACCATALYST
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/ViewRenderer.cs b/src/Compatibility/Core/src/Handlers/Android/ViewRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/Android/ViewRenderer.cs
rename to src/Compatibility/Core/src/Handlers/Android/ViewRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/BaseCellView.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/BaseCellView.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/BaseCellView.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/BaseCellView.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellAdapter.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/CellAdapter.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellAdapter.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/CellAdapter.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellFactory.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/CellFactory.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellFactory.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/CellFactory.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/CellRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/CellRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/CellRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ConditionalFocusLayout.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/ConditionalFocusLayout.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ConditionalFocusLayout.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/ConditionalFocusLayout.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/EntryCellEditText.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/EntryCellEditText.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/EntryCellEditText.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/EntryCellEditText.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/EntryCellRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/EntryCellRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/EntryCellRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/EntryCellRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/EntryCellView.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/EntryCellView.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/EntryCellView.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/EntryCellView.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/GroupedListViewAdapter.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/GroupedListViewAdapter.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/GroupedListViewAdapter.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/GroupedListViewAdapter.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ImageCellRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/ImageCellRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ImageCellRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/ImageCellRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/ListViewAdapter.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewAdapter.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/ListViewAdapter.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/ListViewRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ListViewRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/ListViewRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/SwitchCellRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/SwitchCellRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/SwitchCellRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/SwitchCellRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/SwitchCellView.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/SwitchCellView.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/SwitchCellView.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/SwitchCellView.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/TextCellRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/TextCellRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/TextCellRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/TextCellRenderer.cs
diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ViewCellRenderer.cs b/src/Compatibility/Core/src/Handlers/ListView/Android/ViewCellRenderer.cs
similarity index 100%
rename from src/Controls/src/Core/Compatibility/Handlers/ListView/Android/ViewCellRenderer.cs
rename to src/Compatibility/Core/src/Handlers/ListView/Android/ViewCellRenderer.cs
diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
index 4711ac8ea2f4..2659dcdd0907 100644
--- a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -65,17 +65,6 @@ public static partial class AppHostBuilderExtensions
 #if WINDOWS || ANDROID
 			{ typeof(NavigationPage), typeof(NavigationViewHandler) },
 			{ typeof(Toolbar), typeof(ToolbarHandler) },
-#endif
-#if ANDROID
-			{ typeof(TabbedPage), typeof(Controls.Handlers.TabbedPageHandler) },
-			{ typeof(FlyoutPage), typeof(FlyoutViewHandler) },
-			{ typeof(ListView), typeof(Controls.Handlers.Compatibility.ListViewRenderer) },
-			{ typeof(Cell), typeof(Controls.Handlers.Compatibility.CellRenderer) },
-			{ typeof(ImageCell), typeof(Handlers.Compatibility.ImageCellRenderer) },
-			{ typeof(EntryCell), typeof(Handlers.Compatibility.EntryCellRenderer) },
-			{ typeof(TextCell), typeof(Handlers.Compatibility.TextCellRenderer) },
-			{ typeof(ViewCell), typeof(Handlers.Compatibility.ViewCellRenderer) },
-			{ typeof(SwitchCell), typeof(Handlers.Compatibility.SwitchCellRenderer) },
 #endif
 		};