iOS accessibility fix

IeuanWalker · May 7, 2024 · 2cd072b · 2cd072b
1 parent c47a7f5
commit 2cd072b
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 175 deletions.
diff --git a/Demo/App/App.csproj b/Demo/App/App.csproj
@@ -33,6 +33,7 @@
 	<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
 	  <CodesignKey>Apple Development: Ieuan Walker (R4SVVV33HW)</CodesignKey>
 	  <CodesignProvision>VS: WildCard Development</CodesignProvision>
+	  <ProvisioningType>manual</ProvisioningType>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -73,9 +74,8 @@
 	  <Compile Update="Controls\BackButton.xaml.cs">
 	    <DependentUpon>BackButton.xaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="Controls\CustomSwitchExamples\DisableSupportedSwitch.xaml.cs">
-	    <DependentUpon>DisableSupportedSwitch.xaml</DependentUpon>
-	    <SubType>Code</SubType>
+	  <Compile Update="Pages\IsEnabledTestPage.xaml.cs">
+	    <DependentUpon>IsEnabledTestPage.xaml</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 
@@ -119,6 +119,9 @@
 	  <MauiXaml Update="Controls\SwitchViewExamples\ImageSwitch.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Pages\IsEnabledTestPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Pages\AccessiblityTestPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -131,10 +134,6 @@
 	  <MauiXaml Update="Pages\SwitchViewPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Controls\CustomSwitchExamples\DisableSupportedSwitch.xaml">
-	    <SubType>Designer</SubType>
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/Demo/App/Controls/CustomSwitchExamples/DisableSupportedSwitch.xaml b/Demo/App/Controls/CustomSwitchExamples/DisableSupportedSwitch.xaml
diff --git a/Demo/App/Controls/CustomSwitchExamples/DisableSupportedSwitch.xaml.cs b/Demo/App/Controls/CustomSwitchExamples/DisableSupportedSwitch.xaml.cs
diff --git a/Demo/App/Controls/CustomSwitchExamples/IosSwitch.xaml b/Demo/App/Controls/CustomSwitchExamples/IosSwitch.xaml
@@ -5,16 +5,25 @@
              xmlns:switch="clr-namespace:IeuanWalker.Maui.Switch;assembly=IeuanWalker.Maui.Switch">
     <switch:CustomSwitch HeightRequest="40"
                          HorizontalKnobMargin="1"
+                         IsEnabled="{Binding IsEnabled, Source={RelativeSource AncestorType={x:Type ContentView}}}"
                          IsToggled="{Binding IsToggled, Source={RelativeSource AncestorType={x:Type ContentView}}}"
                          KnobBackgroundColor="White"
                          KnobHeight="36"
                          KnobLimit="Boundary"
                          KnobWidth="36"
+                         Opacity="1"
                          SemanticProperties.Hint="{Binding AccessibilityHint, Source={RelativeSource AncestorType={x:Type ContentView}}}"
                          SwitchPanUpdate="CustomSwitch_SwitchPanUpdate"
                          Toggled="CustomSwitch_Toggled"
                          ToggledCommand="{Binding ToggledCommand, Source={RelativeSource AncestorType={x:Type ContentView}}}"
                          WidthRequest="70">
+        <switch:CustomSwitch.Triggers>
+            <DataTrigger Binding="{Binding IsEnabled, Source={RelativeSource AncestorType={x:Type ContentView}}}"
+                         TargetType="switch:CustomSwitch"
+                         Value="False">
+                <Setter Property="Opacity" Value="0.6" />
+            </DataTrigger>
+        </switch:CustomSwitch.Triggers>
         <switch:CustomSwitch.StrokeShape>
             <RoundRectangle CornerRadius="20" />
         </switch:CustomSwitch.StrokeShape>

diff --git a/Demo/App/MainPage.xaml b/Demo/App/MainPage.xaml
@@ -9,6 +9,7 @@
             <controls:CustomButton Clicked="CustomSwitchBtn_Clicked" Text="CustomSwitch examples" />
             <controls:CustomButton Clicked="SwitchViewBtn_Clicked" Text="SwitchView examples" />
             <controls:CustomButton Clicked="AccessibilityBtn_Clicked" Text="Accessiblity tests" />
+            <controls:CustomButton Clicked="IsEnabledBtn_Clicked" Text="IsEnabled tests" />
             <controls:CustomButton Clicked="PanGestureBtn_Clicked" Text="PanGesture tests" />
         </VerticalStackLayout>
     </ContentPage.Content>

diff --git a/Demo/App/MainPage.xaml.cs b/Demo/App/MainPage.xaml.cs
@@ -24,6 +24,11 @@ async void AccessibilityBtn_Clicked(object sender, EventArgs e)
 		await Navigation.PushAsync(new AccessiblityTestPage());
 	}
 
+	async void IsEnabledBtn_Clicked(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new IsEnabledTestPage());
+	}
+
 	async void PanGestureBtn_Clicked(object sender, EventArgs e)
 	{
 		await Navigation.PushAsync(new PanGestureTestPage());

diff --git a/Demo/App/Pages/CustomSwitchPage.xaml b/Demo/App/Pages/CustomSwitchPage.xaml
@@ -99,17 +99,6 @@
             <examples:Other5Switch IsToggled="True"
                                    Toggled="Switch_OnToggled"
                                    ToggledCommand="{Binding ToggledCommand}" />
-            <examples:DisableSupportedSwitch Margin="0,30,0,0"
-                                             Toggled="Switch_OnToggled"
-                                             ToggledCommand="{Binding ToggledCommand}" />
-            <examples:DisableSupportedSwitch IsEnabled="False"
-                                             IsToggled="False"
-                                             Toggled="Switch_OnToggled"
-                                             ToggledCommand="{Binding ToggledCommand}" />
-            <examples:DisableSupportedSwitch IsEnabled="False"
-                                             IsToggled="True"
-                                             Toggled="Switch_OnToggled"
-                                             ToggledCommand="{Binding ToggledCommand}" />
         </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
diff --git a/Demo/App/Pages/IsEnabledTestPage.xaml b/Demo/App/Pages/IsEnabledTestPage.xaml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage x:Class="App.Pages.IsEnabledTestPage"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:controls="clr-namespace:App.Controls;assembly=App"
+             xmlns:examples="clr-namespace:App.Controls.CustomSwitchExamples;assembly=App"
+             Title="IsEnabled Test Page">
+    <ScrollView Padding="{StaticResource PagePadding}">
+        <VerticalStackLayout BackgroundColor="Transparent" MinimumHeightRequest="1000">
+            <controls:BackButton />
+
+            <Label Style="{StaticResource sectionHeading}" Text="IsEnabled false on load" />
+            <examples:IosSwitch IsEnabled="False" IsToggled="False" />
+            <examples:IosSwitch IsEnabled="False" IsToggled="True" />
+
+            <Label Style="{StaticResource sectionHeading}" Text="Dynamit IsEnabled" />
+            <HorizontalStackLayout>
+                <Label Style="{StaticResource sectionHeading}" Text="Toggle IsEnabled: " />
+                <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" />
+
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
diff --git a/Demo/App/Pages/IsEnabledTestPage.xaml.cs b/Demo/App/Pages/IsEnabledTestPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace App.Pages;
+
+public partial class IsEnabledTestPage : ContentPage
+{
+	public IsEnabledTestPage()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/Scr/Switch/Interfaces/ISwitchView.cs b/Scr/Switch/Interfaces/ISwitchView.cs
@@ -2,7 +2,7 @@
 
 namespace IeuanWalker.Maui.Switch.Interfaces;
 
-public interface ISwitchView
+public interface ISwitchView : IContentView
 {
 	bool IsToggled { get; set; }
 	ICommand ToggledCommand { get; set; }

diff --git a/Scr/Switch/Platform/CustomContentView.ios.cs b/Scr/Switch/Platform/CustomContentView.ios.cs
@@ -10,11 +10,14 @@ public class CustomContentView : ContentView
 	public CustomContentView(IContentView virtualView)
 	{
 		_switchView = (ISwitchView)virtualView;
+
 		_switchUIAccessibilityTrait = new UISwitch().AccessibilityTraits;
 
 		IsAccessibilityElement = true;
 	}
 
+	public override bool UserInteractionEnabled { get => _switchView.IsEnabled; }
+
 	public override string? AccessibilityValue
 	{
 		get => _switchView.IsToggled ? "1" : "0";