Testing Theming

src/MauiReactor.Scaffold/TypeGenerator.cs

@@ -908,16 +908,16 @@ public virtual string TransformText()
 
             #line default
             #line hidden
-            this.Write("\n    protected override void OnThemeChanged()\n    {\n        if (Theme != null && " +
-                    "");
+            this.Write("\n    protected override void OnThemeChanged()\n    {\n        if (ThemeKey != null " +
+                    "&& ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName()));
 
             #line default
             #line hidden
-            this.Write("Styles.Themes.TryGetValue(Theme, out var styleAction))\n        {\n            styl" +
-                    "eAction(this);\n        }\n\n        base.OnThemeChanged();\n    }\n    ");
+            this.Write("Styles.Themes.TryGetValue(ThemeKey, out var styleAction))\n        {\n            s" +
+                    "tyleAction(this);\n        }\n\n        base.OnThemeChanged();\n    }\n    ");
 
             #line 1 "C:\Source\github\reactorui-maui\src\MauiReactor.Scaffold\TypeGenerator.tt"
  } 

src/MauiReactor.Scaffold/TypeGenerator.tt

@@ -187,7 +187,7 @@ public abstract partial class <#= TypeName() #><T> : <#= BaseTypeName() #><T>, <
     <# if (!IsGenericType()) { #>
     protected override void OnThemeChanged()
     {
-        if (Theme != null && <#= TypeName() #>Styles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && <#= TypeName() #>Styles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.cs

@@ -1283,16 +1283,16 @@ protected override void OnRemoveChild(VisualNode widget, Microsoft.Maui.Controls
             #line default
             #line hidden
             this.Write("        protected override void OnThemeChanged()\r\n        {\r\n            if (Them" +
-                    "e != null && ");
+                    "eKey != null && ");
 
             #line 327 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(TypeName));
 
             #line default
             #line hidden
-            this.Write("Styles.Themes.TryGetValue(Theme, out var styleAction))\r\n            {\r\n          " +
-                    "      styleAction(this);\r\n            }\r\n\r\n            base.OnThemeChanged();\r\n " +
-                    "       }\r\n        ");
+            this.Write("Styles.Themes.TryGetValue(ThemeKey, out var styleAction))\r\n            {\r\n       " +
+                    "         styleAction(this);\r\n            }\r\n\r\n            base.OnThemeChanged();" +
+                    "\r\n        }\r\n        ");
 
             #line 334 "C:\Source\github\reactorui-maui\src\MauiReactor.ScaffoldGenerator\ScaffoldTypeGenerator.tt"
  } 

src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.tt

@@ -324,7 +324,7 @@ namespace <#= Namespace #>
         <# if (!IsGenericType) { #>
         protected override void OnThemeChanged()
         {
-            if (Theme != null && <#= TypeName #>Styles.Themes.TryGetValue(Theme, out var styleAction))
+            if (ThemeKey != null && <#= TypeName #>Styles.Themes.TryGetValue(ThemeKey, out var styleAction))
             {
                 styleAction(this);
             }

src/MauiReactor/AbsoluteLayout.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && AbsoluteLayoutStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && AbsoluteLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/ActivityIndicator.cs

@@ -60,7 +60,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ActivityIndicatorStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ActivityIndicatorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/BaseMenuItem.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && BaseMenuItemStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && BaseMenuItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/BaseShellItem.cs

@@ -98,7 +98,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && BaseShellItemStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && BaseShellItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Behavior.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && BehaviorStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && BehaviorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Border.cs

@@ -108,7 +108,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && BorderStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && BorderStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/BoxView.cs

@@ -69,7 +69,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && BoxViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && BoxViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Button.cs

@@ -180,7 +180,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ButtonStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ButtonStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/CarouselView.cs

@@ -119,7 +119,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && CarouselViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && CarouselViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Cell.cs

@@ -84,7 +84,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && CellStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && CellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/CheckBox.cs

@@ -70,7 +70,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && CheckBoxStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && CheckBoxStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/CollectionView.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && CollectionViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && CollectionViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Compatibility/Layout.cs

@@ -85,7 +85,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && LayoutStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && LayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/ContentPage.cs

@@ -54,7 +54,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ContentPageStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ContentPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/ContentView.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ContentViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ContentViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/DatePicker.cs

@@ -128,7 +128,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && DatePickerStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && DatePickerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/DragGestureRecognizer.cs

@@ -74,7 +74,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && DragGestureRecognizerStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && DragGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/DropGestureRecognizer.cs

@@ -84,7 +84,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && DropGestureRecognizerStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && DropGestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Editor.cs

@@ -76,7 +76,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && EditorStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && EditorStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Element.cs

@@ -140,7 +140,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ElementStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ElementStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Entry.cs

@@ -88,7 +88,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && EntryStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && EntryStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/EntryCell.cs

@@ -100,7 +100,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && EntryCellStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && EntryCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/FlexLayout.cs

@@ -84,7 +84,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && FlexLayoutStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && FlexLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/FlyoutBase.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && FlyoutBaseStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && FlyoutBaseStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/FlyoutItem.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && FlyoutItemStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && FlyoutItemStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/FlyoutPage.cs

@@ -76,7 +76,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && FlyoutPageStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && FlyoutPageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Frame.cs

@@ -66,7 +66,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && FrameStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && FrameStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/GestureRecognizer.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && GestureRecognizerStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && GestureRecognizerStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/GraphicsView.cs

@@ -124,7 +124,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && GraphicsViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && GraphicsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Grid.cs

@@ -70,7 +70,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && GridStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && GridStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/GridItemsLayout.cs

@@ -76,7 +76,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && GridItemsLayoutStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && GridItemsLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/GroupableItemsView.cs

@@ -54,7 +54,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && GroupableItemsViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && GroupableItemsViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/HorizontalStackLayout.cs

@@ -46,7 +46,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && HorizontalStackLayoutStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && HorizontalStackLayoutStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/Image.cs

@@ -72,7 +72,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ImageStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ImageStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/ImageButton.cs

@@ -130,7 +130,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ImageButtonStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ImageButtonStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/ImageCell.cs

@@ -54,7 +54,7 @@ protected override void OnUpdate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && ImageCellStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && ImageCellStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }

src/MauiReactor/IndicatorView.cs

@@ -105,7 +105,7 @@ protected override void OnAnimate()
     partial void OnEndAnimate();
     protected override void OnThemeChanged()
     {
-        if (Theme != null && IndicatorViewStyles.Themes.TryGetValue(Theme, out var styleAction))
+        if (ThemeKey != null && IndicatorViewStyles.Themes.TryGetValue(ThemeKey, out var styleAction))
         {
             styleAction(this);
         }