Bump to latest (#71)

- Window lifecycle (dotnet#1754) - Move New Navigation Handler to Core and make it internal (dotnet#1800) - Scrollview handler (dotnet#1669) - ScrollView Resize + Window Handler Resize (dotnet#1676) - Font AutoScalingEnabled (dotnet#1774) - Rename Font Properties (dotnet#1755) - Update layout system to ensure native measure/arrange are called for all controls, even from Page subclasses (dotnet#1819) - IContainer as IList<IView> (dotnet#1724) - Implement Layout padding for new StackLayouts and GridLayout (dotnet#1749) - Delete all the TabIndex, TabStop, Focusable things! (dotnet#1777) - Introduce SetSemanticFocus API via SemanticExtensions (dotnet#1829) - Improve Window and AnimationManager (dotnet#1653) - And so on
rookiejava · Apr 11, 2022 · 1dcc4bd · 1dcc4bd
1 parent 6a19552
commit 1dcc4bd
Show file tree

Hide file tree

Showing 30 changed files with 686 additions and 457 deletions.
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.Tizen.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.Tizen.cs
@@ -0,0 +1,34 @@
+using Microsoft.Maui.Hosting;
+using Microsoft.Maui.LifecycleEvents;
+using Microsoft.Maui.Controls.Compatibility;
+
+namespace Microsoft.Maui.Controls.Hosting
+{
+	public static partial class AppHostBuilderExtensions
+	{
+		internal static IAppHostBuilder ConfigureCompatibilityLifecycleEvents(this IAppHostBuilder builder) =>
+			   builder.ConfigureLifecycleEvents(events => events.AddTizen(OnConfigureLifeCycle));
+
+		static void OnConfigureLifeCycle(ITizenLifecycleBuilder tizen)
+		{
+			tizen.OnPreCreate((app) =>
+				{
+					// This is the initial Init to set up any system services registered by
+					// Forms.Init(). This happens before any UI has appeared.
+					// This creates a dummy MauiContext.
+
+					var services = MauiApplication.Current.Services;
+					MauiContext mauiContext = new MauiContext(services, CoreUIAppContext.GetInstance(MauiApplication.Current));
+					ActivationState state = new ActivationState(mauiContext);
+					Forms.Init(state, new InitializationOptions(MauiApplication.Current) { Flags = InitializationFlags.SkipRenderers, DisplayResolutionUnit = DisplayResolutionUnit.DP() });
+				})
+				.OnMauiContextCreated((mauiContext) =>
+				{
+					// This is the final Init that sets up the real context from the application.
+
+					var state = new ActivationState(mauiContext!);
+					Forms.Init(state);
+				});
+		}
+	}
+}
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
@@ -35,6 +35,7 @@
 using DefaultRenderer = Microsoft.Maui.Controls.Compatibility.Platform.iOS.Platform.DefaultRenderer;
 #elif TIZEN
 using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+using Microsoft.Maui.Graphics.Skia;
 using BoxRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.BoxViewRenderer;
 using CollectionViewRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.StructuredItemsViewRenderer;
 using OpenGLViewRenderer = Microsoft.Maui.Controls.Compatibility.Platform.Tizen.DefaultRenderer;

diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
@@ -22,15 +22,12 @@
   <ItemGroup>
     <Compile Remove="GTK\**" />
     <Compile Remove="MacOS\**" />
-    <Compile Remove="Tizen\**" />
     <Compile Remove="WPF\**" />
     <EmbeddedResource Remove="GTK\**" />
     <EmbeddedResource Remove="MacOS\**" />
-    <EmbeddedResource Remove="Tizen\**" />
     <EmbeddedResource Remove="WPF\**" />
     <None Remove="GTK\**" />
     <None Remove="MacOS\**" />
-    <None Remove="Tizen\**" />
     <None Remove="WPF\**" />
     <Content Remove="GTK\**" />
     <Content Remove="MacOS\**" />

diff --git a/src/Compatibility/Core/src/Tizen/HandlerToRendererShim.cs b/src/Compatibility/Core/src/Tizen/HandlerToRendererShim.cs
@@ -176,6 +176,11 @@ public void SetVirtualView(Maui.IElement view)
 			{
 				throw new NotImplementedException();
 			}
+
+			public void Invoke(string command, object args)
+			{
+				throw new NotImplementedException();
+			}
 		}
 
 	}

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/CarouselPageRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/CarouselPageRenderer.cs
@@ -173,8 +173,6 @@ void OnInnerLayoutUpdate()
 
 		void OnCurrentPageChanged(object sender, EventArgs e)
 		{
-			CustomFocusManager.StartReorderTabIndex();
-
 			Element.UpdateFocusTreePolicy();
 
 			if (IsChangedByScroll())

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/CustomFocusManager.cs b/src/Compatibility/Core/src/Tizen/Renderers/CustomFocusManager.cs
@@ -9,21 +9,15 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.Tizen
 {
 	class CustomFocusManager : IDisposable
 	{
-		static bool s_reorderTriggered;
-		static readonly ObservableCollection<CustomFocusManager> s_tabIndexList = new ObservableCollection<CustomFocusManager>();
-
 		VisualElement _nextUp;
 		VisualElement _nextDown;
 		VisualElement _nextLeft;
 		VisualElement _nextRight;
 		VisualElement _nextForward;
 		VisualElement _nextBackward;
-		int _tabIndex = -1;
-		bool _isTabStop = true;
 
 		static CustomFocusManager()
 		{
-			s_tabIndexList.CollectionChanged += TabIndexCollectionChanged;
 		}
 
 		public CustomFocusManager(VisualElement element, Widget nativeView)
@@ -40,52 +34,6 @@ public CustomFocusManager(VisualElement element, Widget nativeView)
 		VisualElement Element { get; }
 		Widget NativeView { get; }
 
-		public int TabIndex
-		{
-			get
-			{
-				return _tabIndex;
-			}
-			set
-			{
-				if (IsTabStop)
-				{
-					if (_tabIndex > -1)
-					{
-						s_tabIndexList.Remove(this);
-					}
-					if (value > -1)
-					{
-						s_tabIndexList.Add(this);
-					}
-				}
-				_tabIndex = value;
-			}
-		}
-
-		public bool IsTabStop
-		{
-			get
-			{
-				return _isTabStop;
-			}
-			set
-			{
-				if (TabIndex > -1)
-				{
-					if (_isTabStop)
-					{
-						s_tabIndexList.Remove(this);
-					}
-					if (value)
-					{
-						s_tabIndexList.Add(this);
-					}
-				}
-				_isTabStop = value;
-			}
-		}
-
 		public VisualElement NextUp
 		{
 			get => _nextUp;
@@ -152,23 +100,6 @@ public void Dispose()
 			GC.SuppressFinalize(this);
 		}
 
-		public static void StartReorderTabIndex()
-		{
-			if (Device.IsInvokeRequired)
-			{
-				Device.BeginInvokeOnMainThread(() =>
-				{
-					StartReorderTabIndex();
-				});
-				return;
-			}
-			if (!s_reorderTriggered)
-			{
-				s_reorderTriggered = true;
-				Device.BeginInvokeOnMainThread(ReorderTabIndex);
-			}
-		}
-
 		protected virtual void Dispose(bool disposing)
 		{
 			if (disposing)
@@ -198,10 +129,6 @@ protected virtual void Dispose(bool disposing)
 					NextBackward.PropertyChanged -= OnNextViewPropertyChanged;
 				}
 			}
-			if (s_tabIndexList.Contains(this))
-			{
-				s_tabIndexList.Remove(this);
-			}
 		}
 
 		void SetUpFocus(VisualElement next, FocusDirection direction)
@@ -251,36 +178,6 @@ FocusDirection GetFocusDirection(VisualElement nextView)
 			return FocusDirection.Next;
 		}
 
-		static void ReorderTabIndex()
-		{
-			s_reorderTriggered = false;
-			var list = s_tabIndexList.Where((t) => t.IsTabStop && ElementIsVisible(t)).OrderBy(x => x.Element.TabIndex);
-			CustomFocusManager first = null;
-			CustomFocusManager last = null;
-			foreach (var item in list)
-			{
-				if (first == null)
-					first = item;
-
-				if (last != null)
-				{
-					item.NextBackward = last.Element;
-					last.NextForward = item.Element;
-				}
-				last = item;
-			}
-			if (first != null && last != null)
-			{
-				first.NextBackward = last.Element;
-				last.NextForward = first.Element;
-			}
-		}
-
-		static void TabIndexCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-		{
-			StartReorderTabIndex();
-		}
-
 		static bool PageIsVisible(Page page)
 		{
 			if (page == null)

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/EntryRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/EntryRenderer.cs
@@ -121,14 +121,7 @@ void OnTextChanged(object sender, EventArgs e)
 
 		void OnCompleted(object sender, EventArgs e)
 		{
-			if (Element.ReturnType == ReturnType.Next)
-			{
-				FocusSearch(true)?.SetFocus(true);
-			}
-			else
-			{
-				Control.SetFocus(false);
-			}
+			Control.SetFocus(false);
 			((IEntryController)Element).SendCompleted();
 		}
 

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/FlyoutPageRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/FlyoutPageRenderer.cs
@@ -141,9 +141,6 @@ void UpdateDetail(bool isInit)
 
 		void UpdateIsPresented()
 		{
-			// To update TabIndex order
-			CustomFocusManager.StartReorderTabIndex();
-
 			_flyoutPage.IsPresented = Element.IsPresented;
 		}
 

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/MasterDetailPageRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/MasterDetailPageRenderer.cs
@@ -146,9 +146,6 @@ void UpdateDetailPage(bool isInit)
 
 		void UpdateIsPresented()
 		{
-			// To update TabIndex order
-			CustomFocusManager.StartReorderTabIndex();
-
 			_mdpage.IsPresented = Element.IsPresented;
 		}
 

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/TabbedPageRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/TabbedPageRenderer.cs
@@ -417,9 +417,6 @@ void OnToolbarItemSelected(object sender, EToolbarItemEventArgs e)
 
 		void OnCurrentPageChanged()
 		{
-			// To update TabIndex order
-			CustomFocusManager.StartReorderTabIndex();
-
 			if (_isUpdateByScroller || _isUpdateByToolbar || !_isInitialized)
 				return;
 

diff --git a/src/Compatibility/Core/src/Tizen/Renderers/VisualElementRenderer.cs b/src/Compatibility/Core/src/Tizen/Renderers/VisualElementRenderer.cs
@@ -74,8 +74,6 @@ protected VisualElementRenderer()
 			RegisterPropertyHandler(VisualElement.RotationYProperty, UpdateTransformation);
 			RegisterPropertyHandler(VisualElement.TranslationXProperty, UpdateTransformation);
 			RegisterPropertyHandler(VisualElement.TranslationYProperty, UpdateTransformation);
-			RegisterPropertyHandler(VisualElement.TabIndexProperty, UpdateTabIndex);
-			RegisterPropertyHandler(VisualElement.IsTabStopProperty, UpdateIsTabStop);
 
 			RegisterPropertyHandler(AutomationProperties.NameProperty, SetAccessibilityName);
 			RegisterPropertyHandler(AutomationProperties.HelpTextProperty, SetAccessibilityDescription);
@@ -508,29 +506,6 @@ protected virtual void SetLabeledBy(bool initialize)
 			}
 		}
 
-		protected Widget FocusSearch(bool forwardDirection)
-		{
-			VisualElement element = Element as VisualElement;
-			int maxAttempts = 0;
-			var tabIndexes = element?.GetTabIndexesOnParentPage(out maxAttempts);
-			if (tabIndexes == null)
-				return null;
-
-			int tabIndex = Element.TabIndex;
-			int attempt = 0;
-
-			do
-			{
-				element = element.FindNextElement(forwardDirection, tabIndexes, ref tabIndex) as VisualElement;
-				var renderer = Platform.GetRenderer(element);
-				if (renderer?.NativeView is Widget widget && widget.IsFocusAllowed)
-				{
-					return widget;
-				}
-			} while (!(element.IsFocused || ++attempt >= maxAttempts));
-			return null;
-		}
-
 		internal virtual void SendVisualElementInitialized(VisualElement element, EvasObject nativeView)
 		{
 			element.SendViewInitialized(nativeView);
@@ -1212,32 +1187,6 @@ protected virtual void ApplyTransformation()
 			}
 		}
 
-		void UpdateTabIndex()
-		{
-			if (!Forms.Flags.Contains(Flags.DisableTabIndex))
-			{
-				if (Element is View && NativeView is Widget widget && widget.IsFocusAllowed)
-				{
-					_customFocusManager.Value.TabIndex = Element.TabIndex;
-				}
-			}
-		}
-
-		void UpdateIsTabStop(bool init)
-		{
-			if (init && Element.IsTabStop)
-			{
-				return;
-			}
-			if (!Forms.Flags.Contains(Flags.DisableTabIndex))
-			{
-				if (Element is View && NativeView is Widget widget && widget.IsFocusAllowed)
-				{
-					_customFocusManager.Value.IsTabStop = Element.IsTabStop;
-				}
-			}
-		}
-
 		EFocusDirection ConvertToNativeFocusDirection(string direction)
 		{
 			if (direction == XFocusDirection.Back)

diff --git a/src/Controls/samples/Controls.Sample/Controls/BordelessEntry/BordelessEntryHandler.cs b/src/Controls/samples/Controls.Sample/Controls/BordelessEntry/BordelessEntryHandler.cs
@@ -34,14 +34,13 @@ public static void MapBorder(BordelessEntryHandler handler, BordelessEntry borde
 		public static void MapBorder(BordelessEntryHandler handler, BordelessEntry borderlessEntry)
 		{
 		}
-#else
+#elif TIZEN
 		public static void MapBorder(BordelessEntryHandler handler, BordelessEntry borderlessEntry)
 		{
 		}
-#elif TIZEN
+#else
 		public static void MapBorder(BordelessEntryHandler handler, BordelessEntry borderlessEntry)
 		{
-
 		}
 #endif
 	}