Skip to content

Commit 969480a

Browse files
jfversluisjfversluis
authored
Merge branch 'main' into dev/TJ/ChangeChart
2 parents 6d9184b + 11f5174 commit 969480a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+9382
-23
lines changed

‎.github/workflows/build-all.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: dotnet workload install maui
2626

2727
- name: Select Xcode Version
28-
run: sudo xcode-select -s /Applications/Xcode_16.1.app
28+
run: sudo xcode-select -s /Applications/Xcode_16.2.app
2929
if: runner.os == 'macOS'
3030

3131
- name: Find and build all C# projects

‎.github/workflows/build-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: dotnet workload install maui
3030

3131
- name: Select Xcode Version
32-
run: sudo xcode-select -s /Applications/Xcode_16.1.app
32+
run: sudo xcode-select -s /Applications/Xcode_16.2.app
3333
if: runner.os == 'macOS'
3434

3535
- name: Find and build changed projects

‎9.0/Apps/DeveloperBalance/DeveloperBalance/Pages/MainPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
WidthRequest="44"
6565
IsVisible="{Binding HasCompletedTasks}"
6666
Command="{Binding CleanTasksCommand}"
67-
/>
67+
SemanticProperties.Description="Clean tasks" />
6868
</Grid>
6969
<VerticalStackLayout Spacing="15"
7070
BindableLayout.ItemsSource="{Binding Tasks}">

‎9.0/Apps/DeveloperBalance/DeveloperBalance/Pages/ManageMetaPage.xaml‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,49 +54,63 @@
5454
<BindableLayout.ItemTemplate>
5555
<DataTemplate x:DataType="models:Category">
5656
<Grid ColumnSpacing="{StaticResource LayoutSpacing}" ColumnDefinitions="4*,3*,30,Auto">
57-
<Entry Text="{Binding Title}" Grid.Column="0"/>
58-
<Entry Text="{Binding Color}" Grid.Column="1" x:Name="ColorEntry">
57+
<Entry Text="{Binding Title}" Grid.Column="0" SemanticProperties.Description="Title" />
58+
<Entry Text="{Binding Color}" Grid.Column="1" x:Name="ColorEntry"
59+
SemanticProperties.Description="Color"
60+
SemanticProperties.Hint="Category color in HEX format">
5961
<Entry.Behaviors>
6062
<toolkit:TextValidationBehavior
6163
InvalidStyle="{StaticResource InvalidEntryStyle}"
6264
Flags="ValidateOnUnfocusing"
6365
RegexPattern="^#(?:[0-9a-fA-F]{3}){1,2}$" />
6466
</Entry.Behaviors>
6567
</Entry>
68+
6669
<BoxView HeightRequest="30" WidthRequest="30" VerticalOptions="Center"
67-
Color="{Binding Text, Source={x:Reference ColorEntry}, x:DataType=Entry}" Grid.Column="2"/>
70+
Color="{Binding Text, Source={x:Reference ColorEntry}, x:DataType=Entry}" Grid.Column="2"
71+
SemanticProperties.HeadingLevel="None" />
72+
6873
<Button
6974
ImageSource="{StaticResource IconDelete}"
7075
Background="Transparent"
7176
Command="{Binding DeleteCategoryCommand, Source={RelativeSource AncestorType={x:Type pageModels:ManageMetaPageModel}}, x:DataType=pageModels:ManageMetaPageModel}" CommandParameter="{Binding .}"
72-
Grid.Column="3"/>
77+
Grid.Column="3"
78+
SemanticProperties.Description="Delete" />
7379
</Grid>
7480
</DataTemplate>
7581
</BindableLayout.ItemTemplate>
7682
</VerticalStackLayout>
7783

7884
<Grid ColumnSpacing="{StaticResource LayoutSpacing}" ColumnDefinitions="*,Auto" Margin="0,10">
79-
<Button Text="Save" Command="{Binding SaveCategoriesCommand}" HeightRequest="{OnIdiom 44,Desktop=60}" Grid.Column="0"/>
80-
<Button ImageSource="{StaticResource IconAdd}" Command="{Binding AddCategoryCommand}" Grid.Column="1"/>
85+
<Button Text="Save" Command="{Binding SaveCategoriesCommand}"
86+
HeightRequest="{OnIdiom 44,Desktop=60}" Grid.Column="0" />
87+
88+
<Button ImageSource="{StaticResource IconAdd}"
89+
Command="{Binding AddCategoryCommand}" Grid.Column="1"
90+
SemanticProperties.Description="Add" />
8191
</Grid>
8292

83-
<Label Text="Tags" Style="{StaticResource Title2}"/>
93+
<Label Text="Tags" Style="{StaticResource Title2}" />
8494
<VerticalStackLayout Spacing="{StaticResource LayoutSpacing}"
8595
BindableLayout.ItemsSource="{Binding Tags}">
8696
<BindableLayout.ItemTemplate>
8797
<DataTemplate x:DataType="models:Tag">
8898
<Grid ColumnSpacing="{StaticResource LayoutSpacing}" ColumnDefinitions="4*,3*,30,Auto">
89-
<Entry Text="{Binding Title}" Grid.Column="0"/>
90-
<Entry Text="{Binding Color}" Grid.Column="1" x:Name="ColorEntry">
99+
<Entry Text="{Binding Title}" Grid.Column="0" SemanticProperties.Description="Title" />
100+
<Entry Text="{Binding Color}" Grid.Column="1" x:Name="ColorEntry"
101+
SemanticProperties.Description="Color"
102+
SemanticProperties.Hint="Tag color in HEX format">
91103
<Entry.Behaviors>
92104
<toolkit:TextValidationBehavior
93105
InvalidStyle="{StaticResource InvalidEntryStyle}"
94106
Flags="ValidateOnUnfocusing"
95107
RegexPattern="^#(?:[0-9a-fA-F]{3}){1,2}$" />
96108
</Entry.Behaviors>
97109
</Entry>
110+
98111
<BoxView HeightRequest="30" WidthRequest="30" VerticalOptions="Center"
99-
Color="{Binding Text, Source={x:Reference ColorEntry}, x:DataType=Entry}" Grid.Column="2"/>
112+
Color="{Binding Text, Source={x:Reference ColorEntry}, x:DataType=Entry}" Grid.Column="2"
113+
SemanticProperties.HeadingLevel="None" />
100114

101115
<Button
102116
ImageSource="{StaticResource IconDelete}"
@@ -109,8 +123,12 @@
109123
</VerticalStackLayout>
110124

111125
<Grid ColumnSpacing="{StaticResource LayoutSpacing}" ColumnDefinitions="*,Auto" Margin="0,10">
112-
<Button Text="Save" Command="{Binding SaveTagsCommand}" HeightRequest="{OnIdiom 44,Desktop=60}" Grid.Column="0"/>
113-
<Button ImageSource="{StaticResource IconAdd}" Command="{Binding AddTagCommand}" Grid.Column="1"/>
126+
<Button Text="Save" Command="{Binding SaveTagsCommand}"
127+
HeightRequest="{OnIdiom 44,Desktop=60}" Grid.Column="0" />
128+
129+
<Button ImageSource="{StaticResource IconAdd}"
130+
Command="{Binding AddTagCommand}" Grid.Column="1"
131+
SemanticProperties.Description="Add" />
114132
</Grid>
115133
</VerticalStackLayout>
116134
</ScrollView>

‎9.0/Apps/DeveloperBalance/DeveloperBalance/Pages/TaskDetailPage.xaml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@
1414
Command="{Binding DeleteCommand}"
1515
Order="Primary"
1616
Priority="0"
17-
IconImageSource="{StaticResource IconDelete}" />
17+
IconImageSource="{StaticResource IconDelete}"
18+
SemanticProperties.Description="Delete" />
1819
</ContentPage.ToolbarItems>
1920

2021
<Grid>
2122
<ScrollView>
2223
<VerticalStackLayout Spacing="{StaticResource LayoutSpacing}" Padding="{StaticResource LayoutPadding}">
23-
<sf:SfTextInputLayout
24-
Hint="Task">
24+
<sf:SfTextInputLayout Hint="Task">
2525
<Entry
26-
Text="{Binding Title}" />
26+
Text="{Binding Title}"
27+
SemanticProperties.Description="Title" />
2728
</sf:SfTextInputLayout>
2829

29-
<sf:SfTextInputLayout
30-
Hint="Completed">
30+
<sf:SfTextInputLayout Hint="Completed">
3131
<CheckBox
3232
HorizontalOptions="End"
33-
IsChecked="{Binding IsCompleted}" />
33+
IsChecked="{Binding IsCompleted}"
34+
SemanticProperties.Description="Status"
35+
SemanticProperties.Hint="Indicates if this task is completed" />
3436
</sf:SfTextInputLayout>
3537

3638
<sf:SfTextInputLayout
@@ -40,7 +42,9 @@
4042
ItemsSource="{Binding Projects}"
4143
ItemDisplayBinding="{Binding Name, x:DataType=models:Project}"
4244
SelectedItem="{Binding Project}"
43-
SelectedIndex="{Binding SelectedProjectIndex}" />
45+
SelectedIndex="{Binding SelectedProjectIndex}"
46+
SemanticProperties.Description="Project"
47+
SemanticProperties.Hint="Which project this task belongs to" />
4448
</sf:SfTextInputLayout>
4549

4650
<Button

‎9.0/UserInterface/Views/ContentViewDemo/CardViewDemo.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35527.113 d17.12
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CardViewDemo", "CardViewDemo\CardViewDemo.csproj", "{1CC7B627-6833-4695-8231-A5A547421A10}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{1CC7B627-6833-4695-8231-A5A547421A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{1CC7B627-6833-4695-8231-A5A547421A10}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{1CC7B627-6833-4695-8231-A5A547421A10}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{1CC7B627-6833-4695-8231-A5A547421A10}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

‎9.0/UserInterface/Views/ContentViewDemo/CardViewDemo/App.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
3+
xmlns:windows="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;assembly=Microsoft.Maui.Controls"
4+
xmlns:local="clr-namespace:CardViewDemo"
5+
x:Class="CardViewDemo.App"
6+
windows:Application.ImageDirectory="Assets">
7+
<Application.Resources>
8+
9+
</Application.Resources>
10+
</Application>

‎9.0/UserInterface/Views/ContentViewDemo/CardViewDemo/App.xaml.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace CardViewDemo;
2+
3+
public partial class App : Application
4+
{
5+
public App()
6+
{
7+
InitializeComponent();
8+
}
9+
10+
protected override Window CreateWindow(IActivationState activationState)
11+
{
12+
return new Window(new AppShell());
13+
}
14+
}

‎9.0/UserInterface/Views/ContentViewDemo/CardViewDemo/AppShell.xaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Shell
3+
x:Class="CardViewDemo.AppShell"
4+
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
6+
xmlns:local="clr-namespace:CardViewDemo"
7+
Shell.FlyoutBehavior="Disabled">
8+
9+
<ShellContent
10+
Title="Home"
11+
ContentTemplate="{DataTemplate local:MainPage}"
12+
Route="MainPage" />
13+
14+
</Shell>

‎9.0/UserInterface/Views/ContentViewDemo/CardViewDemo/AppShell.xaml.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace CardViewDemo;
2+
3+
public partial class AppShell : Shell
4+
{
5+
public AppShell()
6+
{
7+
InitializeComponent();
8+
}
9+
}

0 commit comments

Comments
 (0)