Fix UpdateBackground (#194)

sung-su · rookiejava · commit 7ce50b2dfcf5 · 2021-10-12T15:42:57.000+09:00
* Fix UpdateBackground

* Add ContentView Background mapper

* Fix Editor/Entry/Label/Layout Background

* Add IWrapperViewCanvas.Content

* Add PageHandler Background mapper

* Restore WrapperView

* Remove unnecessary namespace
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.Tizen.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.Tizen.cs
@@ -39,6 +39,12 @@ public override void SetVirtualView(IView view)
 			NativeView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;
 		}
 
+		public static void MapBackground(ContentViewHandler handler, IContentView view)
+		{
+			handler.UpdateValue(nameof(handler.ContainerView));
+			handler.GetWrappedNativeView()?.UpdateBackground(view);
+		}
+
 		public static void MapContent(ContentViewHandler handler, IContentView page)
 		{
 			handler.UpdateContent();
diff --git a/src/Core/src/Handlers/ContentView/ContentViewHandler.cs b/src/Core/src/Handlers/ContentView/ContentViewHandler.cs
@@ -6,6 +6,9 @@ public partial class ContentViewHandler
 		public static IPropertyMapper<IContentView, ContentViewHandler> ContentViewMapper = new PropertyMapper<IContentView, ContentViewHandler>(ViewMapper)
 		{
 			[nameof(IContentView.Content)] = MapContent,
+#if TIZEN
+			[nameof(IContentView.Background)] = MapBackground,
+#endif
 		};
 
 		public static CommandMapper<IPicker, PickerHandler> ContentViewCommandMapper = new(ViewCommandMapper)
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs b/src/Core/src/Handlers/Editor/EditorHandler.Tizen.cs
@@ -33,6 +33,12 @@ protected override void DisconnectHandler(Entry nativeView)
 			nativeView.TextChanged -= OnTextChanged;
 		}
 
+		public static void MapBackground(EditorHandler handler, IEditor editor)
+		{
+			handler.UpdateValue(nameof(handler.ContainerView));
+			handler.GetWrappedNativeView()?.UpdateBackground(editor);
+		}
+
 		public static void MapText(EditorHandler handler, IEditor editor)
 		{
 			handler.NativeView?.UpdateText(editor);
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.cs b/src/Core/src/Handlers/Editor/EditorHandler.cs
@@ -5,7 +5,7 @@ public partial class EditorHandler
 	{
 		public static IPropertyMapper<IEditor, EditorHandler> EditorMapper = new PropertyMapper<IEditor, EditorHandler>(ViewHandler.ViewMapper)
 		{
-#if __ANDROID__
+#if __ANDROID__ || TIZEN
 			[nameof(IEditor.Background)] = MapBackground,
 #endif
 			[nameof(IEditor.CharacterSpacing)] = MapCharacterSpacing,
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs b/src/Core/src/Handlers/Entry/EntryHandler.Tizen.cs
@@ -54,6 +54,12 @@ protected override void DisconnectHandler(Entry nativeView)
 			nativeView.EntryLayoutUnfocused -= OnUnfocused;
 		}
 
+		public static void MapBackground(EntryHandler handler, IEntry entry)
+		{
+			handler.UpdateValue(nameof(handler.ContainerView));
+			handler.GetWrappedNativeView()?.UpdateBackground(entry);
+		}
+
 		public static void MapText(EntryHandler handler, IEntry entry)
 		{
 			handler.NativeView?.UpdateText(entry);
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.cs b/src/Core/src/Handlers/Entry/EntryHandler.cs
@@ -7,7 +7,7 @@ public partial class EntryHandler
 	{
 		public static IPropertyMapper<IEntry, EntryHandler> EntryMapper = new PropertyMapper<IEntry, EntryHandler>(ViewHandler.ViewMapper)
 		{
-#if __ANDROID__
+#if __ANDROID__ || TIZEN
 			[nameof(IEntry.Background)] = MapBackground,
 #endif
 			[nameof(IEntry.CharacterSpacing)] = MapCharacterSpacing,
diff --git a/src/Core/src/Handlers/Label/LabelHandler.Tizen.cs b/src/Core/src/Handlers/Label/LabelHandler.Tizen.cs
@@ -17,6 +17,12 @@ protected override Label CreateNativeView()
 			return label;
 		}
 
+		public static void MapBackground(LabelHandler handler, ILabel label)
+		{
+			handler.UpdateValue(nameof(handler.ContainerView));
+			handler.GetWrappedNativeView()?.UpdateBackground(label);
+		}
+
 		public static void MapText(LabelHandler handler, ILabel label)
 		{
 			handler.NativeView?.UpdateText(label);
diff --git a/src/Core/src/Handlers/Label/LabelHandler.cs b/src/Core/src/Handlers/Label/LabelHandler.cs
@@ -5,7 +5,7 @@ public partial class LabelHandler
 	{
 		public static IPropertyMapper<ILabel, LabelHandler> LabelMapper = new PropertyMapper<ILabel, LabelHandler>(ViewHandler.ViewMapper)
 		{
-#if WINDOWS || __IOS__
+#if WINDOWS || __IOS__ || TIZEN
 			[nameof(ILabel.Background)] = MapBackground,
 #endif
 			[nameof(ILabel.CharacterSpacing)] = MapCharacterSpacing,
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.cs b/src/Core/src/Handlers/Layout/LayoutHandler.cs
@@ -43,6 +43,10 @@ public LayoutHandler(IPropertyMapper? mapper = null, CommandMapper? commandMappe
 
 		public static void MapBackground(ILayoutHandler handler, ILayout layout)
 		{
+#if TIZEN
+			handler.UpdateValue(nameof(handler.ContainerView));
+			handler.GetWrappedNativeView()?.UpdateBackground(layout);
+#endif
 			((NativeView?)handler.NativeView)?.UpdateBackground(layout);
 		}
 
diff --git a/src/Core/src/Handlers/Page/PageHandler.Tizen.cs b/src/Core/src/Handlers/Page/PageHandler.Tizen.cs
@@ -1,15 +1,20 @@
-﻿using Tizen.UIExtensions.Common;
-using EColor = ElmSharp.Color;
+﻿using EColor = ElmSharp.Color;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class PageHandler : ContentViewHandler
 	{
-		public static void MapTitle(PageHandler handler, IContentView page)
+		public static void MapBackground(PageHandler handler, IContentView page)
 		{
+			handler.UpdateValue(nameof(handler.ContainerView));
+			if (page.Background != null && handler.NativeView.BackgroundColor != EColor.Transparent)
+			{
+				handler.NativeView.BackgroundColor = EColor.Transparent;
+			}
+			handler.GetWrappedNativeView()?.UpdateBackground(page);
 		}
 
-		protected override ContentCanvas CreateNativeView()
+		public static void MapTitle(PageHandler handler, IContentView page)
 		{
 			var view = base.CreateNativeView();
 			view.BackgroundColor = (DeviceInfo.GetDeviceType() == DeviceType.TV) ? EColor.Transparent : EColor.White;
diff --git a/src/Core/src/Handlers/Page/PageHandler.cs b/src/Core/src/Handlers/Page/PageHandler.cs
@@ -5,6 +5,9 @@ public partial class PageHandler : ContentViewHandler
 	{
 		public static IPropertyMapper<IContentView, PageHandler> PageMapper = new PropertyMapper<IContentView, PageHandler>(ContentViewMapper)
 		{
+#if TIZEN
+			[nameof(IContentView.Background)] = MapBackground,
+#endif
 			[nameof(ITitledElement.Title)] = MapTitle
 		};
 
diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -183,12 +183,7 @@ public static void MapVisibility(IViewHandler handler, IView view)
 
 		public static void MapBackground(IViewHandler handler, IView view)
 		{
-#if TIZEN
-			handler.UpdateValue(nameof(IViewHandler.ContainerView));
-			handler.GetWrappedNativeView()?.UpdateBackground(view);
-#else
 			((NativeView?)handler.NativeView)?.UpdateBackground(view);
-#endif
 		}
 
 		public static void MapFlowDirection(IViewHandler handler, IView view)

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,12 @@ public override void SetVirtualView(IView view)`
`39`	`39`	`NativeView.CrossPlatformArrange = VirtualView.CrossPlatformArrange;`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ public static void MapBackground(ContentViewHandler handler, IContentView view)`
	`43`	`+ {`
	`44`	`+ handler.UpdateValue(nameof(handler.ContainerView));`
	`45`	`+ handler.GetWrappedNativeView()?.UpdateBackground(view);`
	`46`	`+ }`
	`47`	`+`
`42`	`48`	`public static void MapContent(ContentViewHandler handler, IContentView page)`
`43`	`49`	`{`
`44`	`50`	`handler.UpdateContent();`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ public partial class ContentViewHandler`
`6`	`6`	`public static IPropertyMapper<IContentView, ContentViewHandler> ContentViewMapper = new PropertyMapper<IContentView, ContentViewHandler>(ViewMapper)`
`7`	`7`	`{`
`8`	`8`	`[nameof(IContentView.Content)] = MapContent,`
	`9`	`+#if TIZEN`
	`10`	`+ [nameof(IContentView.Background)] = MapBackground,`
	`11`	`+#endif`
`9`	`12`	`};`
`10`	`13`
`11`	`14`	`public static CommandMapper<IPicker, PickerHandler> ContentViewCommandMapper = new(ViewCommandMapper)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,12 @@ protected override void DisconnectHandler(Entry nativeView)`
`33`	`33`	`nativeView.TextChanged -= OnTextChanged;`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ public static void MapBackground(EditorHandler handler, IEditor editor)`
	`37`	`+ {`
	`38`	`+ handler.UpdateValue(nameof(handler.ContainerView));`
	`39`	`+ handler.GetWrappedNativeView()?.UpdateBackground(editor);`
	`40`	`+ }`
	`41`	`+`
`36`	`42`	`public static void MapText(EditorHandler handler, IEditor editor)`
`37`	`43`	`{`
`38`	`44`	`handler.NativeView?.UpdateText(editor);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public partial class EditorHandler`
`5`	`5`	`{`
`6`	`6`	`public static IPropertyMapper<IEditor, EditorHandler> EditorMapper = new PropertyMapper<IEditor, EditorHandler>(ViewHandler.ViewMapper)`
`7`	`7`	`{`
`8`		`-#if __ANDROID__`
	`8`	`+#if __ANDROID__ \|\| TIZEN`
`9`	`9`	`[nameof(IEditor.Background)] = MapBackground,`
`10`	`10`	`#endif`
`11`	`11`	`[nameof(IEditor.CharacterSpacing)] = MapCharacterSpacing,`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,12 @@ protected override void DisconnectHandler(Entry nativeView)`
`54`	`54`	`nativeView.EntryLayoutUnfocused -= OnUnfocused;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ public static void MapBackground(EntryHandler handler, IEntry entry)`
	`58`	`+ {`
	`59`	`+ handler.UpdateValue(nameof(handler.ContainerView));`
	`60`	`+ handler.GetWrappedNativeView()?.UpdateBackground(entry);`
	`61`	`+ }`
	`62`	`+`
`57`	`63`	`public static void MapText(EntryHandler handler, IEntry entry)`
`58`	`64`	`{`
`59`	`65`	`handler.NativeView?.UpdateText(entry);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public partial class EntryHandler`
`7`	`7`	`{`
`8`	`8`	`public static IPropertyMapper<IEntry, EntryHandler> EntryMapper = new PropertyMapper<IEntry, EntryHandler>(ViewHandler.ViewMapper)`
`9`	`9`	`{`
`10`		`-#if __ANDROID__`
	`10`	`+#if __ANDROID__ \|\| TIZEN`
`11`	`11`	`[nameof(IEntry.Background)] = MapBackground,`
`12`	`12`	`#endif`
`13`	`13`	`[nameof(IEntry.CharacterSpacing)] = MapCharacterSpacing,`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,12 @@ protected override Label CreateNativeView()`
`17`	`17`	`return label;`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ public static void MapBackground(LabelHandler handler, ILabel label)`
	`21`	`+ {`
	`22`	`+ handler.UpdateValue(nameof(handler.ContainerView));`
	`23`	`+ handler.GetWrappedNativeView()?.UpdateBackground(label);`
	`24`	`+ }`
	`25`	`+`
`20`	`26`	`public static void MapText(LabelHandler handler, ILabel label)`
`21`	`27`	`{`
`22`	`28`	`handler.NativeView?.UpdateText(label);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public partial class LabelHandler`
`5`	`5`	`{`
`6`	`6`	`public static IPropertyMapper<ILabel, LabelHandler> LabelMapper = new PropertyMapper<ILabel, LabelHandler>(ViewHandler.ViewMapper)`
`7`	`7`	`{`
`8`		`-#if WINDOWS \|\| __IOS__`
	`8`	`+#if WINDOWS \|\| __IOS__ \|\| TIZEN`
`9`	`9`	`[nameof(ILabel.Background)] = MapBackground,`
`10`	`10`	`#endif`
`11`	`11`	`[nameof(ILabel.CharacterSpacing)] = MapCharacterSpacing,`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ public LayoutHandler(IPropertyMapper? mapper = null, CommandMapper? commandMappe`
`43`	`43`
`44`	`44`	`public static void MapBackground(ILayoutHandler handler, ILayout layout)`
`45`	`45`	`{`
	`46`	`+#if TIZEN`
	`47`	`+ handler.UpdateValue(nameof(handler.ContainerView));`
	`48`	`+ handler.GetWrappedNativeView()?.UpdateBackground(layout);`
	`49`	`+#endif`
`46`	`50`	`((NativeView?)handler.NativeView)?.UpdateBackground(layout);`
`47`	`51`	`}`
`48`	`52`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,20 @@`
`1`		`-using Tizen.UIExtensions.Common;`
`2`		`-using EColor = ElmSharp.Color;`
	`1`	`+using EColor = ElmSharp.Color;`
`3`	`2`
`4`	`3`	`namespace Microsoft.Maui.Handlers`
`5`	`4`	`{`
`6`	`5`	`public partial class PageHandler : ContentViewHandler`
`7`	`6`	`{`
`8`		`- public static void MapTitle(PageHandler handler, IContentView page)`
	`7`	`+ public static void MapBackground(PageHandler handler, IContentView page)`
`9`	`8`	`{`
	`9`	`+ handler.UpdateValue(nameof(handler.ContainerView));`
	`10`	`+ if (page.Background != null && handler.NativeView.BackgroundColor != EColor.Transparent)`
	`11`	`+ {`
	`12`	`+ handler.NativeView.BackgroundColor = EColor.Transparent;`
	`13`	`+ }`
	`14`	`+ handler.GetWrappedNativeView()?.UpdateBackground(page);`
`10`	`15`	`}`
`11`	`16`
`12`		`- protected override ContentCanvas CreateNativeView()`
	`17`	`+ public static void MapTitle(PageHandler handler, IContentView page)`
`13`	`18`	`{`
`14`	`19`	`var view = base.CreateNativeView();`
`15`	`20`	`view.BackgroundColor = (DeviceInfo.GetDeviceType() == DeviceType.TV) ? EColor.Transparent : EColor.White;`