From 8149db72df7298085b982cc1a770a9b0d9fa4abc Mon Sep 17 00:00:00 2001
From: Ariel De Los Santos <ariel.delossantos@nventive.com>
Date: Tue, 16 May 2023 10:29:34 -0400
Subject: [PATCH] feat(281249): improve Login and Create Account page reader
 support

---
 ...ApplicationTemplate.Shared.Views.projitems |  3 ++-
 .../Authentication/CreateAccountPage.xaml     | 18 +++++++-------
 ...lidationStateToVoiceOverStringConverter.cs | 24 +++++++++++++++++++
 .../Styles/Application/Converters.xaml        |  2 ++
 .../Styles/Controls/CheckBox.xaml             |  6 ++---
 .../Styles/Controls/DataValidationView.xaml   |  5 ++--
 6 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 src/app/ApplicationTemplate.Shared.Views/Converters/FromDataValidationStateToVoiceOverStringConverter.cs

diff --git a/src/app/ApplicationTemplate.Shared.Views/ApplicationTemplate.Shared.Views.projitems b/src/app/ApplicationTemplate.Shared.Views/ApplicationTemplate.Shared.Views.projitems
index 7d8960b4..59aae981 100644
--- a/src/app/ApplicationTemplate.Shared.Views/ApplicationTemplate.Shared.Views.projitems
+++ b/src/app/ApplicationTemplate.Shared.Views/ApplicationTemplate.Shared.Views.projitems
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
@@ -91,6 +91,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Validation\DataValidationView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\DebugConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\FiltersConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Converters\FromDataValidationStateToVoiceOverStringConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\FromNullableAppBarButtonToAppBarButtonConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\FromNullableBoolToCustomValueConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Framework\AttachableUserControl.cs" />
diff --git a/src/app/ApplicationTemplate.Shared.Views/Content/Authentication/CreateAccountPage.xaml b/src/app/ApplicationTemplate.Shared.Views/Content/Authentication/CreateAccountPage.xaml
index 5ca98126..840c9a1e 100644
--- a/src/app/ApplicationTemplate.Shared.Views/Content/Authentication/CreateAccountPage.xaml
+++ b/src/app/ApplicationTemplate.Shared.Views/Content/Authentication/CreateAccountPage.xaml
@@ -1,4 +1,4 @@
-<Page x:Class="ApplicationTemplate.Views.Content.CreateAccountPage"
+<Page x:Class="ApplicationTemplate.Views.Content.CreateAccountPage"
 	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	  xmlns:local="using:ApplicationTemplate"
@@ -262,18 +262,18 @@
 					<local:DataValidationView PropertyName="FavoriteDadNames"
 											  Model="{Binding Form}"
 											  Margin="0,4,0,0">
-						<!-- List -->
 						<Grid Background="{StaticResource SurfaceBrush}"
 							  CornerRadius="4">
-							<!--Remove this line from listView Properties to avoid crash on Windows App: ue:ListViewBaseMultipleSelectionBehavior.SelectedItems="{Binding Form.FavoriteDadNames, Mode=TwoWay}"
-								TODO : https://dev.azure.com/nventive/Practice%20committees/_workitems/edit/251910-->
-							<ListView ItemsSource="{Binding DadNames}"
-									  ItemContainerStyle="{StaticResource CheckedListViewItemStyle}"
-									  SelectionMode="Single"
-									  IsItemClickEnabled="True" />
+							<ItemsControl ItemsSource="{Binding DadNames}">
+								<ItemsControl.ItemTemplate>
+									<DataTemplate>
+										<CheckBox Content="{Binding .}" />
+									</DataTemplate>
+								</ItemsControl.ItemTemplate>
+							</ItemsControl>
 						</Grid>
 					</local:DataValidationView>
-
+					
 					<!-- Terms of Service Agreement -->
 					<local:DataValidationView PropertyName="AgreeToTermsOfServices"
 											Model="{Binding Form}"
diff --git a/src/app/ApplicationTemplate.Shared.Views/Converters/FromDataValidationStateToVoiceOverStringConverter.cs b/src/app/ApplicationTemplate.Shared.Views/Converters/FromDataValidationStateToVoiceOverStringConverter.cs
new file mode 100644
index 00000000..7874e707
--- /dev/null
+++ b/src/app/ApplicationTemplate.Shared.Views/Converters/FromDataValidationStateToVoiceOverStringConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Nventive.View.Converters;
+
+namespace ApplicationTemplate.Views
+{
+	public class FromDataValidationStateToVoiceOverStringConverter : ConverterBase
+	{
+		protected override object Convert(object value, Type targetType, object parameter)
+		{
+			var validationFailures = value as DataValidationState;
+
+			if (validationFailures != null && validationFailures.Errors.Any())
+			{
+				var readableString = string.Join(" \n", validationFailures.Errors);
+
+				return readableString;
+			}
+			return null;
+		}
+	}
+}
diff --git a/src/app/ApplicationTemplate.Shared.Views/Styles/Application/Converters.xaml b/src/app/ApplicationTemplate.Shared.Views/Styles/Application/Converters.xaml
index f268268d..5965d640 100644
--- a/src/app/ApplicationTemplate.Shared.Views/Styles/Application/Converters.xaml
+++ b/src/app/ApplicationTemplate.Shared.Views/Styles/Application/Converters.xaml
@@ -33,4 +33,6 @@
 	<converters:DebugConverter x:Key="Debug" />
 
 	<converters:FromNullableAppBarButtonToAppBarButtonConverter x:Key="NullableAppBarButtonToAppBarButton" />
+
+	<converters:FromDataValidationStateToVoiceOverStringConverter x:Key="DataValidationStateToVoiceOverString" />
 </ResourceDictionary>
diff --git a/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/CheckBox.xaml b/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/CheckBox.xaml
index cf5b4e17..b5325023 100644
--- a/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/CheckBox.xaml
+++ b/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/CheckBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -475,7 +475,6 @@
 								  Width="12"
 								  Height="4"
 								  Opacity="0"
-								  AutomationProperties.AccessibilityView="Raw"
 								  xamarin:Margin="0,2,0,0" />
 
 							<Path x:Name="CheckGlyph"
@@ -499,7 +498,8 @@
 										  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 										  Grid.Column="1"
-										  TextWrapping="Wrap" />
+										  TextWrapping="Wrap"
+										  AutomationProperties.AccessibilityView="Raw" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/DataValidationView.xaml b/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/DataValidationView.xaml
index 093e8f92..a002cbd0 100644
--- a/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/DataValidationView.xaml
+++ b/src/app/ApplicationTemplate.Shared.Views/Styles/Controls/DataValidationView.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:local="using:ApplicationTemplate">
 
@@ -19,7 +19,8 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:DataValidationView">
-					<Grid x:Name="RootGrid">
+					<Grid x:Name="RootGrid"
+						  AutomationProperties.Name="{Binding State, RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource DataValidationStateToVoiceOverString}}" >
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="ValidationStates">
 								<VisualState x:Name="Default" />