Add xmlns:control and x:DataType to various XAML files

Added xmlns:control namespace to reference App.Controls or App.Controls.CustomSwitchExamples in multiple XAML files. Added x:DataType attribute to enable compile-time data binding checks and IntelliSense support. Reordered xmlns:stateButton namespace and added x:DataType in CustomButton.xaml. Added x:DataType to examples:IosSwitch elements and DataTrigger elements in IsBusyTestPage.xaml and IsEnabledTestPage.xaml. Added x:DataType to Grid element in CustomSwitch.xaml.
IeuanWalker · Nov 19, 2024 · 22caa4c · 22caa4c
1 parent 383b150
commit 22caa4c
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 17 deletions.
diff --git a/Demo/App/Controls/CustomButton.xaml b/Demo/App/Controls/CustomButton.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomButton"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:stateButton="clr-namespace:IeuanWalker.Maui.StateButton;assembly=IeuanWalker.Maui.StateButton">
+             xmlns:control="clr-namespace:App.Controls"
+             xmlns:stateButton="clr-namespace:IeuanWalker.Maui.StateButton;assembly=IeuanWalker.Maui.StateButton"
+             x:DataType="control:CustomButton">
     <ContentView.ControlTemplate>
         <ControlTemplate>
             <stateButton:StateButton Padding="20,20"

diff --git a/Demo/App/Controls/CustomSwitchExamples/AndroidSwitch.xaml b/Demo/App/Controls/CustomSwitchExamples/AndroidSwitch.xaml
@@ -3,7 +3,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.AndroidSwitch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:AndroidSwitch">
     <switch:CustomSwitch BackgroundColor="#A6A6A6"
                          HeightRequest="20"
                          HorizontalOptions="Center"

diff --git a/Demo/App/Controls/CustomSwitchExamples/IosSwitch.xaml b/Demo/App/Controls/CustomSwitchExamples/IosSwitch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.IosSwitch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:IosSwitch">
     <switch:CustomSwitch HeightRequest="40"
                          HorizontalKnobMargin="1"
                          IsBusy="{Binding IsBusy, Source={RelativeSource AncestorType={x:Type ContentView}}}"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Other1Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Other1Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Other1Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Other1Switch">
     <switch:CustomSwitch BackgroundColor="White"
                          HeightRequest="40"
                          IsToggled="{Binding IsToggled, Source={RelativeSource AncestorType={x:Type ContentView}}}"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Other2Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Other2Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Other2Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Other2Switch">
     <switch:CustomSwitch BackgroundColor="White"
                          HeightRequest="40"
                          HorizontalKnobMargin="3"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Other3Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Other3Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Other3Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Other3Switch">
     <switch:CustomSwitch BackgroundColor="White"
                          HeightRequest="35"
                          HorizontalKnobMargin="-1"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Other4Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Other4Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Other4Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Other4Switch">
     <switch:CustomSwitch BackgroundColor="#f3f3f2"
                          HeightRequest="50"
                          IsToggled="{Binding IsToggled, Source={RelativeSource AncestorType={x:Type ContentView}}}"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Other5Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Other5Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Other5Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Other5Switch">
     <switch:CustomSwitch BackgroundColor="White"
                          HeightRequest="50"
                          IsToggled="{Binding IsToggled, Source={RelativeSource AncestorType={x:Type ContentView}}}"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Theme1Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Theme1Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Theme1Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Theme1Switch">
     <switch:CustomSwitch BackgroundColor="White"
                          HeightRequest="50"
                          IsToggled="{Binding IsToggled, Source={RelativeSource AncestorType={x:Type ContentView}}}"

diff --git a/Demo/App/Controls/CustomSwitchExamples/Theme2Switch.xaml b/Demo/App/Controls/CustomSwitchExamples/Theme2Switch.xaml
@@ -2,7 +2,9 @@
 <ContentView x:Class="App.Controls.CustomSwitchExamples.Theme2Switch"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
+             xmlns:control="clr-namespace:App.Controls.CustomSwitchExamples"
+             xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch"
+             x:DataType="control:Theme2Switch">
     <switch:CustomSwitch BackgroundColor="White"
                          HeightRequest="40"
                          HorizontalKnobMargin="2"

diff --git a/Demo/App/Pages/IsBusyTestPage.xaml b/Demo/App/Pages/IsBusyTestPage.xaml
@@ -14,18 +14,24 @@
                 <examples:AndroidSwitch x:Name="DynamicToggle" />
             </HorizontalStackLayout>
 
-            <examples:IosSwitch IsBusy="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}" IsToggled="False">
+            <examples:IosSwitch x:DataType="examples:AndroidSwitch"
+                                IsBusy="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
+                                IsToggled="False">
                 <examples:IosSwitch.Triggers>
-                    <DataTrigger Binding="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
+                    <DataTrigger x:DataType="examples:AndroidSwitch"
+                                 Binding="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
                                  TargetType="examples:IosSwitch"
                                  Value="True">
                         <Setter Property="IsEnabled" Value="False" />
                     </DataTrigger>
                 </examples:IosSwitch.Triggers>
             </examples:IosSwitch>
-            <examples:IosSwitch IsBusy="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}" IsToggled="True">
+            <examples:IosSwitch x:DataType="examples:AndroidSwitch"
+                                IsBusy="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
+                                IsToggled="True">
                 <examples:IosSwitch.Triggers>
-                    <DataTrigger Binding="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
+                    <DataTrigger x:DataType="examples:AndroidSwitch"
+                                 Binding="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
                                  TargetType="examples:IosSwitch"
                                  Value="True">
                         <Setter Property="IsEnabled" Value="False" />

diff --git a/Demo/App/Pages/IsEnabledTestPage.xaml b/Demo/App/Pages/IsEnabledTestPage.xaml
@@ -19,8 +19,12 @@
                 <examples:AndroidSwitch x:Name="DynamicToggle" />
             </HorizontalStackLayout>
 
-            <examples:IosSwitch IsEnabled="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}" IsToggled="False" />
-            <examples:IosSwitch IsEnabled="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}" IsToggled="True" />
+            <examples:IosSwitch x:DataType="examples:AndroidSwitch"
+                                IsEnabled="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
+                                IsToggled="False" />
+            <examples:IosSwitch x:DataType="examples:AndroidSwitch"
+                                IsEnabled="{Binding Source={x:Reference DynamicToggle}, Path=IsToggled}"
+                                IsToggled="True" />
 
         </VerticalStackLayout>
     </ScrollView>

diff --git a/Scr/Switch/CustomSwitch.xaml b/Scr/Switch/CustomSwitch.xaml
@@ -4,7 +4,9 @@
                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                  xmlns:view="clr-namespace:IeuanWalker.Maui.Switch">
     <view:SwitchView.Content>
-        <Grid AutomationProperties.ExcludedWithChildren="True" AutomationProperties.IsInAccessibleTree="False">
+        <Grid x:DataType="view:CustomSwitch"
+              AutomationProperties.ExcludedWithChildren="True"
+              AutomationProperties.IsInAccessibleTree="False">
             <Grid.GestureRecognizers>
                 <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" />
                 <PanGestureRecognizer PanUpdated="PanGestureRecognizer_PanUpdated" />