- move compatibility handler to compatibility library

dotnet · Jan 12, 2022 · 97a812a · 97a812a
1 parent 5c576a8
commit 97a812a
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 11 deletions.
diff --git 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/...tibility/Handlers/Android/ViewRenderer.cs → ...Core/src/Handlers/Android/ViewRenderer.cs b/...tibility/Handlers/Android/ViewRenderer.cs → ...Core/src/Handlers/Android/ViewRenderer.cs
diff --git a/...Handlers/ListView/Android/BaseCellView.cs → ...Handlers/ListView/Android/BaseCellView.cs b/...Handlers/ListView/Android/BaseCellView.cs → ...Handlers/ListView/Android/BaseCellView.cs
diff --git a/.../Handlers/ListView/Android/CellAdapter.cs → .../Handlers/ListView/Android/CellAdapter.cs b/.../Handlers/ListView/Android/CellAdapter.cs → .../Handlers/ListView/Android/CellAdapter.cs
diff --git a/.../Handlers/ListView/Android/CellFactory.cs → .../Handlers/ListView/Android/CellFactory.cs b/.../Handlers/ListView/Android/CellFactory.cs → .../Handlers/ListView/Android/CellFactory.cs
diff --git a/...Handlers/ListView/Android/CellRenderer.cs → ...Handlers/ListView/Android/CellRenderer.cs b/...Handlers/ListView/Android/CellRenderer.cs → ...Handlers/ListView/Android/CellRenderer.cs
diff --git a/...istView/Android/ConditionalFocusLayout.cs → ...istView/Android/ConditionalFocusLayout.cs b/...istView/Android/ConditionalFocusLayout.cs → ...istView/Android/ConditionalFocusLayout.cs
diff --git a/...ers/ListView/Android/EntryCellEditText.cs → ...ers/ListView/Android/EntryCellEditText.cs b/...ers/ListView/Android/EntryCellEditText.cs → ...ers/ListView/Android/EntryCellEditText.cs
diff --git a/...ers/ListView/Android/EntryCellRenderer.cs → ...ers/ListView/Android/EntryCellRenderer.cs b/...ers/ListView/Android/EntryCellRenderer.cs → ...ers/ListView/Android/EntryCellRenderer.cs
diff --git a/...andlers/ListView/Android/EntryCellView.cs → ...andlers/ListView/Android/EntryCellView.cs b/...andlers/ListView/Android/EntryCellView.cs → ...andlers/ListView/Android/EntryCellView.cs
diff --git a/...istView/Android/GroupedListViewAdapter.cs → ...istView/Android/GroupedListViewAdapter.cs b/...istView/Android/GroupedListViewAdapter.cs → ...istView/Android/GroupedListViewAdapter.cs
diff --git a/...ers/ListView/Android/ImageCellRenderer.cs → ...ers/ListView/Android/ImageCellRenderer.cs b/...ers/ListView/Android/ImageCellRenderer.cs → ...ers/ListView/Android/ImageCellRenderer.cs
diff --git a/...dlers/ListView/Android/ListViewAdapter.cs → ...dlers/ListView/Android/ListViewAdapter.cs b/...dlers/ListView/Android/ListViewAdapter.cs → ...dlers/ListView/Android/ListViewAdapter.cs
diff --git a/...lers/ListView/Android/ListViewRenderer.cs → ...lers/ListView/Android/ListViewRenderer.cs b/...lers/ListView/Android/ListViewRenderer.cs → ...lers/ListView/Android/ListViewRenderer.cs
diff --git a/...rs/ListView/Android/SwitchCellRenderer.cs → ...rs/ListView/Android/SwitchCellRenderer.cs b/...rs/ListView/Android/SwitchCellRenderer.cs → ...rs/ListView/Android/SwitchCellRenderer.cs
diff --git a/...ndlers/ListView/Android/SwitchCellView.cs → ...ndlers/ListView/Android/SwitchCellView.cs b/...ndlers/ListView/Android/SwitchCellView.cs → ...ndlers/ListView/Android/SwitchCellView.cs
diff --git a/...lers/ListView/Android/TextCellRenderer.cs → ...lers/ListView/Android/TextCellRenderer.cs b/...lers/ListView/Android/TextCellRenderer.cs → ...lers/ListView/Android/TextCellRenderer.cs
diff --git a/...lers/ListView/Android/ViewCellRenderer.cs → ...lers/ListView/Android/ViewCellRenderer.cs b/...lers/ListView/Android/ViewCellRenderer.cs → ...lers/ListView/Android/ViewCellRenderer.cs
diff --git 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
 		};