Merge branch 'master' into dev/maso/lightweightpipspager2

unoplatform · Sep 29, 2023 · 6372a3c · 6372a3c
2 parents 592041a + b7a0c9a
commit 6372a3c
Show file tree

Hide file tree

Showing 45 changed files with 3,807 additions and 864 deletions.
diff --git a/doc/material-controls-styles.md b/doc/material-controls-styles.md
@@ -64,8 +64,8 @@ TextBlock|BodySmall|
 TextBlock|CaptionLarge|
 TextBlock|CaptionMedium|
 TextBlock|CaptionSmall|
-TextBox|FilledTextBoxStyle|True
-TextBox|OutlinedTextBoxStyle|
+TextBox|FilledTextBoxStyle|
+TextBox|OutlinedTextBoxStyle|True
 ToggleButton|TextToggleButtonStyle|True
 ToggleButton|IconToggleButtonStyle|
 ToggleSwitch|ToggleSwitchStyle|True

diff --git a/doc/styles/TextBox.md b/doc/styles/TextBox.md
@@ -3,8 +3,8 @@
 
 Style Key|IsDefaultStyle*
 -|-
-FilledTextBoxStyle|True
-OutlinedTextBoxStyle|
+FilledTextBoxStyle|
+OutlinedTextBoxStyle|True
 
 IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control
 

diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
@@ -55,7 +55,7 @@
 
 				<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />
 
-				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" Condition="$(_IsWinUI)" />
+				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" Condition="$(_IsWinUI)" />
 				<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />
 			</ItemGroup>
 

diff --git a/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj b/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
 
 	<!--
 	Adding project references to this project requires some manual adjustments.
@@ -19,7 +19,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="1.0.0-dev.187" />
+		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.407" />
 	</ItemGroup>
 
 	<PropertyGroup>

diff --git a/src/library/Uno.Material/Styles/Controls/v2/MediaPlayerElement.xaml b/src/library/Uno.Material/Styles/Controls/v2/MediaPlayerElement.xaml
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
@@ -9,12 +9,14 @@
 		<ResourceDictionary x:Key="Default">
 			<StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+
 			<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
 			<x:Double x:Key="ProgressBarHeight">4</x:Double>
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="Light">
 			<StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+
 			<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
 			<x:Double x:Key="ProgressBarHeight">4</x:Double>
 		</ResourceDictionary>

diff --git a/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml b/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml
@@ -22,6 +22,7 @@
 	<Style BasedOn="{StaticResource MaterialDefaultHyperlinkButtonStyle}" TargetType="HyperlinkButton" />
 	<Style BasedOn="{StaticResource MaterialDefaultListViewItemStyle}" TargetType="ListViewItem" />
 	<Style BasedOn="{StaticResource MaterialDefaultListViewStyle}" TargetType="ListView" />
+	<Style BasedOn="{StaticResource MaterialDefaultMediaTransportControlsStyle}" TargetType="MediaTransportControls" />
 	<Style BasedOn="{StaticResource MaterialDefaultMenuFlyoutItemStyle}" TargetType="MenuFlyoutItem" />
 	<Style BasedOn="{StaticResource MaterialDefaultMenuFlyoutPresenterStyle}" TargetType="MenuFlyoutPresenter" />
 	<Style BasedOn="{StaticResource MaterialDefaultMenuFlyoutSeparatorStyle}" TargetType="MenuFlyoutSeparator" />
@@ -58,6 +59,7 @@
 	<StaticResource x:Key="IconToggleButtonStyle"				ResourceKey="MaterialIconToggleButtonStyle"		/>
 	<StaticResource x:Key="ListViewItemStyle"					ResourceKey="MaterialListViewItemStyle"			/>
 	<StaticResource x:Key="ListViewStyle"						ResourceKey="MaterialListViewStyle"				/>
+	<StaticResource x:Key="MediaTransportControlsStyle"         ResourceKey="MaterialMediaTransportControlsStyle" />
 	<StaticResource x:Key="MenuFlyoutItemStyle"					ResourceKey="MaterialMenuFlyoutItemStyle"		/>
 	<StaticResource x:Key="MenuFlyoutPresenterStyle"			ResourceKey="MaterialMenuFlyoutPresenterStyle"	/>
 	<StaticResource x:Key="MenuFlyoutSeparatorStyle"			ResourceKey="MaterialMenuFlyoutSeparatorStyle"	/>

diff --git a/src/library/Uno.Material/Uno.Material.csproj b/src/library/Uno.Material/Uno.Material.csproj
@@ -60,7 +60,7 @@
 
 				<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />
 
-				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" Condition="$(_IsWinUI)" />
+				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.0" Condition="$(_IsWinUI)" />
 				<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />
 			</ItemGroup>
 

diff --git a/src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs b/src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs