From 4a0f696fbae98d80799866fc4ee95a2a93ccf70c Mon Sep 17 00:00:00 2001 From: Marc-Antoine Soucy Date: Fri, 14 Jul 2023 08:07:39 -0400 Subject: [PATCH 01/82] fix(checkbox): the checkbox will have the same color as figma --- .../Styles/Controls/v2/CheckBox.xaml | 140 ++++++++++-------- 1 file changed, 79 insertions(+), 61 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml index 7a4b17908..79697ad7e 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml @@ -21,46 +21,46 @@ - + - + - + - + - + - - - - + + + + - + - + @@ -85,6 +85,21 @@ + + M0,0L32,0 32,5.3 0,5.3z + M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z + + + + 40 + + + + 18 + 40 + 2 + 2 + 8,0,0,0 @@ -99,46 +114,46 @@ - + - + - + - + - + - - - - + + + + - + - + @@ -163,23 +178,25 @@ + + M0,0L32,0 32,5.3 0,5.3z + M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z + + 40 + + + + 18 + 40 + 2 + 2 + 8,0,0,0 + - - M0,0L32,0 32,5.3 0,5.3z - M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z - - - 40 - - - 18 - 40 - 4 - + From 8e44d6c04ea75c20c8645064cc719aaa4fb1dfb4 Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Thu, 20 Jul 2023 14:18:01 -0400 Subject: [PATCH 04/82] refactor: change lightweight styling folder structure (#1071) --- .../Uno.Themes.WinUI.Markup/Theme.Styles.cs | 57 ------------------ .../Button.cs} | 60 ++++++++++++++++++- 2 files changed, 59 insertions(+), 58 deletions(-) rename src/library/Uno.Themes.WinUI.Markup/{Theme.LightWeight/Themes.LightWeightStyles.Button.cs => Theme/Button.cs} (88%) diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs index eb276e1dc..0c42eab43 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs @@ -7,63 +7,6 @@ public static partial class Theme { public static class Styles { - public static class Button - { - [ResourceKeyDefinition(typeof(Style), "ElevatedButtonStyle", TargetType = typeof(Button))] - public static ResourceValue - - - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:not_win="http://uno.ui/not_win" + mc:Ignorable="not_win"> + + + + + + #B8B4BC + + -7,0 + + + + + + + + + + + 4,0,0,4 + 0,0,4,4 + 4 + 6 + + + + + + 4 + 4 + 2 + 4 + 4 + 2 + 0,0,0,4 + 0,4,0,0 + 0,0,4,0 + 4,0,0,0 + + + + + 20 + 20 + 10 + -14,-6,-14,-6 + -6,-14,-6,-14 + + + + + + + #685C64 + + -7,0 + + + + + + + + + + + 4,0,0,4 + 0,0,4,4 + 4 + 6 + + + + + + 4 + 4 + 2 + 4 + 4 + 2 + 0,0,0,4 + 0,4,0,0 + 0,0,4,0 + 4,0,0,0 + + + + + 20 + 20 + 10 + + -14,-6,-14,-6 + -6,-14,-6,-14 + + + + + + + + From 135afc618c11bfc92a8af13e572a785b21660811 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Fri, 21 Jul 2023 09:13:57 +0300 Subject: [PATCH 06/82] build: Disable XAML fuzzy matching --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index d0ed1ced4..402a08424 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,6 +8,7 @@ false + false From eb0e80831310f2e482cf4ed89835635e0d3cccc0 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Fri, 21 Jul 2023 10:07:15 +0300 Subject: [PATCH 07/82] chore: Fix BindableUISwitch namespace --- .../Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml | 3 ++- src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml b/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml index 046af1367..ce930c112 100644 --- a/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml +++ b/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml @@ -10,6 +10,7 @@ xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:macos="http://uno.ui/macos" xmlns:uuc="using:Uno.UI.Controls" + xmlns:uuvc="using:Uno.UI.Views.Controls" mc:Ignorable="ios android xamarin wasm macos"> - diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml index 2792f9e66..6aa6d5ea1 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml @@ -6,6 +6,7 @@ xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:todo="what should be done" xmlns:uuc="using:Uno.UI.Controls" + xmlns:uuvc="using:Uno.UI.Views.Controls" xmlns:toolkit="using:Uno.UI.Toolkit" mc:Ignorable="ios android todo"> @@ -521,7 +522,7 @@ VerticalAlignment="{TemplateBinding VerticalContentAlignment}" /> - From 6e0f31ebbf37b64bf36d21e4f8e1ede53144af75 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Fri, 21 Jul 2023 10:50:32 +0300 Subject: [PATCH 08/82] chore: Fix for lottie namespace difference between UWP/WinUI --- src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml | 2 +- .../Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml | 4 ++-- .../Uno.Material/Styles/Controls/v1/ProgressRing.xaml | 6 +++--- .../Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml | 2 +- .../Uno.Material/Styles/Controls/v2/ProgressRing.xaml | 4 ++-- .../Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml index 419cfce3f..d6fe5261e 100644 --- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml +++ b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml @@ -6,7 +6,7 @@ xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie" - xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie" + xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie" mc:Ignorable="d not_win lottie_not_win"> @@ -16,7 +16,7 @@ - + - + - + - + + + - - + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf b/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf new file mode 100644 index 000000000..fa6c2e32b --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf @@ -0,0 +1,2 @@ +# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/ +MONO_GC_PARAMS=bridge-implementation=tarjan,nursery-size=32m,soft-heap-limit=256m \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist new file mode 100644 index 000000000..24c310368 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist new file mode 100644 index 000000000..5a4053db4 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist @@ -0,0 +1,26 @@ + + + + + UIDeviceFamily + + 2 + + LSApplicationCategoryType + public.app-category.utilities + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/iconapp.appiconset + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs new file mode 100644 index 000000000..da19896b5 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs @@ -0,0 +1,15 @@ +using UIKit; + +namespace Uno.Themes.Samples.MacCatalyst +{ + public class EntryPoint + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 000000000..69555e440 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj new file mode 100644 index 000000000..816617b62 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj @@ -0,0 +1,101 @@ + + + net7.0-ios;net7.0-maccatalyst;net7.0-android33.0 + true + Exe + + Uno.Themes.Samples + + uno.platform.themes + 11F3A2B0-B218-4AA5-BE7A-6E86E2A72297 + + 1.0 + 1 + + Android\AndroidManifest.xml + + + + + True + true + false + + + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 1.0.59 + + + 1.0.59 + + + + + + + + + + + + + + + + + + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + iossimulator-x64 + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + + false + maccatalyst-x64 + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist new file mode 100644 index 000000000..24c310368 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist new file mode 100644 index 000000000..981d8e728 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist @@ -0,0 +1,43 @@ + + + + + LSRequiresIPhoneOS + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + armv7 + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + XSAppIconAssets + Assets.xcassets/iconapp.appiconset + UIApplicationSupportsIndirectInputEvents + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs new file mode 100644 index 000000000..a4cbfb670 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs @@ -0,0 +1,15 @@ +using UIKit; + +namespace Uno.Themes.Samples.iOS +{ + public class EntryPoint + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 000000000..69555e440 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj index 1320ac969..236cf62c7 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj @@ -20,15 +20,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 594bc4898804ff6b61178b0271c4d949f2452780 Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Fri, 21 Jul 2023 11:25:20 -0400 Subject: [PATCH 11/82] refactor: fix resources for ComboBox control --- .../Uno.Material/Styles/Controls/v2/ComboBox.xaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/ComboBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/ComboBox.xaml index 5cf53257c..148a0a853 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ComboBox.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ComboBox.xaml @@ -100,13 +100,11 @@ - - - + @@ -189,14 +187,12 @@ - - - + - + @@ -516,9 +512,9 @@ - + - + From 25064ecb15ec2c9524bf4c1a8c130d0c5b39afed Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Fri, 21 Jul 2023 11:33:38 -0400 Subject: [PATCH 12/82] feat: add lightweight styling resources to ComboBox --- .../Uno.Themes.WinUI.Markup/Theme.Styles.cs | 6 - .../Uno.Themes.WinUI.Markup/Theme/ComboBox.cs | 300 ++++++++++++++++++ 2 files changed, 300 insertions(+), 6 deletions(-) create mode 100644 src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs index 0c42eab43..7fc5a3089 100644 --- a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs +++ b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs @@ -28,12 +28,6 @@ public static class CheckBox public static ResourceValue + + + - - - - - - + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml index 2c8cbd8a2..c9e537a8e 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml @@ -104,9 +104,81 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 77ec0b28204eea076cdea31a47b3f45889ba5f17 Mon Sep 17 00:00:00 2001 From: eriklimakc Date: Fri, 16 Jun 2023 18:13:35 +0100 Subject: [PATCH 17/82] chore: Adjusting width for thumb --- .../Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml | 2 +- .../Content/Controls/ToggleSwitchSamplePage.xaml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml index 152602192..6efd1870a 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml @@ -1150,7 +1150,7 @@ + + + + + + + Header="Without Icon" + IsOn="True" /> From 74515657952042cd7d05f2063baa0faa1c5df384 Mon Sep 17 00:00:00 2001 From: eriklimakc Date: Tue, 20 Jun 2023 17:15:58 +0100 Subject: [PATCH 18/82] chore: Adjusting thumb position and shadow --- .../Styles/Controls/v2/ToggleSwitch.xaml | 70 +++++++++++-------- .../Controls/ToggleSwitchSamplePage.xaml | 14 +--- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml index 6efd1870a..e541b1dc0 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml @@ -678,7 +678,7 @@ + NotNullValue="17" /> 0,0,0,1 @@ -712,7 +712,6 @@ - @@ -777,15 +776,16 @@ - + - + + @@ -818,8 +818,7 @@ - - + @@ -1104,26 +1103,8 @@ Grid.ColumnSpan="3" Margin="0,5" Control.IsTemplateFocusTarget="True" - Background="Transparent"/> - - + Background="Transparent" /> - - + + + + @@ -1166,6 +1159,7 @@ + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml index c50ba41dd..7c44f1976 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml @@ -112,27 +112,17 @@ Style="{StaticResource TitleSmall}" Text="Material 3" /> - - - - - - + Header="Without Icon" /> + Header="Icon"> From ddeda87b42e7866e0d5045ad955943033480f340 Mon Sep 17 00:00:00 2001 From: eriklimakc Date: Tue, 20 Jun 2023 18:10:13 +0100 Subject: [PATCH 19/82] chore: Removing old ToggleSwitch from M3 ToggleSwitch sample page --- .../Controls/ToggleSwitchSamplePage.xaml | 68 +------------------ 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml index 7c44f1976..9a00b9e44 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml @@ -175,73 +175,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From f440b7d4895dd4a7391d04c9ea24123d5eebed91 Mon Sep 17 00:00:00 2001 From: eriklimakc Date: Fri, 23 Jun 2023 10:37:14 +0100 Subject: [PATCH 20/82] chore: Fixing brushes, shadow and animation --- .../Styles/Controls/v2/ToggleSwitch.xaml | 197 ++++++++++++------ .../Controls/ToggleSwitchSamplePage.xaml | 8 +- 2 files changed, 143 insertions(+), 62 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml index e541b1dc0..4e04c7737 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml @@ -680,15 +680,31 @@ NullValue="12" NotNullValue="17" /> - 0,0,0,1 + 0.5,0,0.5,1 - 00:00:00.250 - 00:00:00.083 + 00:00:00.225 + 00:00:00.180 0,0,0,4 10 10 + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:muxc="using:Microsoft.UI.Xaml.Controls" + xmlns:not_win="http://uno.ui/not_win" + mc:Ignorable="d not_win"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + 12 + + 12 + 12 + + 0 + 0 + + M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z + M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z + + 40 + 40 + 4 + + 12 + 12 + + 8 + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + 12 + + 12 + 12 + + 0 + 0 + + M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z + M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z + + 40 + 40 + 4 + + 12 + 12 + + 8 + 8 + + + + + + + + + + + + + + + + From 55fcdc471fb40ce69e259f1afe28d517c206cfc2 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Soucy Date: Thu, 27 Jul 2023 11:42:03 -0400 Subject: [PATCH 46/82] chore: Uno package update --- src/library/Uno.Cupertino/Uno.Cupertino.csproj | 4 ++-- src/library/Uno.Material/Uno.Material.csproj | 4 ++-- .../Uno.Themes.Samples.Mobile.csproj | 6 +++--- .../Uno.Themes.Samples.Skia.Gtk.csproj | 6 +++--- .../Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj | 2 +- .../Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj index d393c991b..d337bc3d9 100644 --- a/src/library/Uno.Cupertino/Uno.Cupertino.csproj +++ b/src/library/Uno.Cupertino/Uno.Cupertino.csproj @@ -86,14 +86,14 @@ - + - + diff --git a/src/library/Uno.Material/Uno.Material.csproj b/src/library/Uno.Material/Uno.Material.csproj index 05661cb75..44283c9f3 100644 --- a/src/library/Uno.Material/Uno.Material.csproj +++ b/src/library/Uno.Material/Uno.Material.csproj @@ -97,14 +97,14 @@ - + - + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj index 816617b62..d2fc9be0c 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj @@ -44,11 +44,11 @@ 1.0.59 - - + + - + diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj index 236cf62c7..07135e63f 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj @@ -36,9 +36,9 @@ - - - + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj b/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj index 38f18d4fc..b98f788ad 100644 --- a/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj @@ -37,7 +37,7 @@ 1.0.59 - 5.0.0-dev.1433 + 5.0.0-dev.1634 diff --git a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj index 1e3be8cf4..f9405c7ce 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj @@ -54,9 +54,9 @@ - - - + + + From 73822ccb5ed0e21ce1a216a18315cbb6a0cfaf07 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Soucy Date: Thu, 27 Jul 2023 12:00:12 -0400 Subject: [PATCH 47/82] fix: pipspager resources not used --- .../Styles/Controls/v2/PipsPager.Base.xaml | 1458 ++++++++--------- 1 file changed, 729 insertions(+), 729 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml b/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml index f671826ff..d80dc42b0 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml @@ -1,732 +1,732 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - 12 - - 12 - 12 - - 0 - 0 - - M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z - M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z - - 40 - 40 - 4 - - 12 - 12 - - 8 - 8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - 12 - - 12 - 12 - - 0 - 0 - - M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z - M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z - - 40 - 40 - 4 - - 12 - 12 - - 8 - 8 - - - - - - - - - - - - - - - - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:muxc="using:Microsoft.UI.Xaml.Controls" + xmlns:not_win="http://uno.ui/not_win" + mc:Ignorable="d not_win"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + 12 + + 12 + 12 + + 0 + 0 + + M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z + M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z + + 40 + 40 + 4 + + 12 + 12 + + 8 + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + 12 + + 12 + 12 + + 0 + 0 + + M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z + M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z + + 40 + 40 + 4 + + 12 + 12 + + 8 + 8 + + + + + + + + + + + + + + + + From c8d62d18af764f40c12f12ae468b3a463d4f67ef Mon Sep 17 00:00:00 2001 From: Carl Mathieu Date: Thu, 3 Aug 2023 10:12:58 -0400 Subject: [PATCH 48/82] refactor(ToggleButton): lightweight styling for ToggleButton (#1113) --- .../Styles/Controls/v2/ToggleButton.xaml | 526 ++++++++++++++---- 1 file changed, 419 insertions(+), 107 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml index 2a954c908..6c1f19859 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml @@ -7,37 +7,265 @@ xmlns:xamarin="http://uno.ui/xamarin" mc:Ignorable="d xamarin"> - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - - 4 - 16,8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 4 + 16,8 + 40 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 40 + 40 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 4 + 16,8 + 40 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 40 + 40 + + @@ -701,35 +720,37 @@ + + From 017808ccb1c088724bd4e8ddca3e64e2190c5dbd Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Tue, 8 Aug 2023 15:46:17 -0400 Subject: [PATCH 54/82] fix: align lightweight styling material checkbox resources with fluent (#1140) --- .../Styles/Controls/v2/CheckBox.xaml | 267 +++++++++++++----- 1 file changed, 190 insertions(+), 77 deletions(-) diff --git a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml index 27528d220..984a8964d 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml @@ -18,15 +18,15 @@ - - - - - - - - - + + + + + + + + + @@ -47,20 +47,54 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,15 +145,15 @@ - - - - + + + + - - - - + + + + @@ -140,20 +174,54 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,7 +278,6 @@ - @@ -225,7 +292,9 @@ + Background="{TemplateBinding Background}" + BorderBrush="{TemplateBinding BorderBrush}" + BorderThickness="{TemplateBinding BorderThickness}"> @@ -281,8 +350,10 @@ - - + + + + @@ -291,8 +362,10 @@ - - + + + + @@ -301,8 +374,10 @@ - - + + + + @@ -311,8 +386,10 @@ - - + + + + @@ -321,8 +398,10 @@ - - + + + + @@ -331,8 +410,10 @@ - - + + + + @@ -342,8 +423,10 @@ - - + + + + @@ -354,16 +437,26 @@ - - + + + + + + - - + + + + @@ -392,8 +487,10 @@ - - + + + + @@ -403,8 +500,10 @@ - - + + + + @@ -415,8 +514,10 @@ - - + + + + @@ -430,14 +531,24 @@ + + + - + + + - - + + + + @@ -668,9 +781,9 @@ CornerRadius="{TemplateBinding CornerRadius}"> + Background="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}" + BorderBrush="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}" + BorderThickness="{ThemeResource CheckBoxCheckAreaBorderThickness}" /> Date: Wed, 9 Aug 2023 08:15:45 -0400 Subject: [PATCH 55/82] fix: Adjusts opacity instead of visibility --- .../Styles/Application/Common/Converters.xaml | 4 +++ .../Styles/Controls/v2/ToggleButton.xaml | 35 +++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/library/Uno.Material/Styles/Application/Common/Converters.xaml b/src/library/Uno.Material/Styles/Application/Common/Converters.xaml index abc785eb3..2c3b90773 100644 --- a/src/library/Uno.Material/Styles/Application/Common/Converters.xaml +++ b/src/library/Uno.Material/Styles/Application/Common/Converters.xaml @@ -36,6 +36,10 @@ NotNullValue="Visible" NullValue="Collapsed" /> + + diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml index 38ea9bba1..9d598b920 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml @@ -457,9 +457,6 @@ - - - @@ -473,9 +470,9 @@ - + - + @@ -484,9 +481,9 @@ - + - + @@ -495,19 +492,21 @@ - + - + + + - + - + @@ -515,9 +514,9 @@ - + - + @@ -526,9 +525,9 @@ - + - + @@ -537,9 +536,9 @@ - + - + @@ -609,7 +608,7 @@ Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" - Visibility="Collapsed" /> + Opacity="0"/> From ba7b4ef5e5d9b7d606b4554831f05c053ef28b59 Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Fri, 11 Aug 2023 12:34:57 -0400 Subject: [PATCH 56/82] style(palette): fix default color palette based on figma --- .../Styles/Application/v2/SharedColorPalette.xaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml b/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml index 8058fe341..c7baad436 100644 --- a/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml +++ b/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml @@ -52,8 +52,8 @@ #FFFFFF #1C1B1F - #F3EFF5 - #8B8494 + #F2EFF5 + #8A8494 #313033 #F4EFF4 #5946D2 @@ -83,13 +83,13 @@ #EDDFFF - #2BB27E - #9CFFDF + #441F8A + #EBE6F1 #9FCAFF #003258 - #00497E + #00497D #D1E4FF @@ -103,13 +103,13 @@ #E5E1E6 - #302D38 + #302D37 #E6E1E5 #47464F #C9C5D0 #E6E1E5 #1C1B1F - #544794 + #C7BFFF #928F99 From 8dc59295aa69e1ec3e6feef52ed97c75f15bedbb Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Mon, 14 Aug 2023 13:03:27 -0400 Subject: [PATCH 57/82] fix: disabled text visibility --- .../Uno.Material/Styles/Application/v2/SharedColors.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/library/Uno.Material/Styles/Application/v2/SharedColors.xaml b/src/library/Uno.Material/Styles/Application/v2/SharedColors.xaml index 8e26ba091..a2983b246 100644 --- a/src/library/Uno.Material/Styles/Application/v2/SharedColors.xaml +++ b/src/library/Uno.Material/Styles/Application/v2/SharedColors.xaml @@ -301,7 +301,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -1034,7 +1034,7 @@ - + From 77aa72608df456432f75badd60add9ae04e3e59b Mon Sep 17 00:00:00 2001 From: Ariel De Los Santos Date: Tue, 15 Aug 2023 10:46:55 -0400 Subject: [PATCH 58/82] chore: update Microsoft.UI.Xaml and improve Progressring and PipsPager --- .../Styles/Controls/ProgressRing.xaml | 40 +++++----- .../Styles/Controls/ProgressRingWinUI.xaml | 37 ---------- .../Uno.Cupertino/Uno.Cupertino.csproj | 7 +- .../Styles/Controls/v1/ProgressRing.xaml | 74 +++++++++---------- .../Styles/Controls/v1/ProgressRingWinUI.xaml | 60 --------------- .../Styles/Controls/v2/PipsPager.Base.xaml | 2 +- .../Styles/Controls/v2/PipsPager.UWP.xaml | 25 ------- .../Styles/Controls/v2/ProgressRing.xaml | 62 +++++++--------- .../Styles/Controls/v2/ProgressRingWinUI.xaml | 62 ---------------- src/library/Uno.Material/Uno.Material.csproj | 18 +---- .../Uno.Themes.Samples.UWP.csproj | 2 +- 11 files changed, 84 insertions(+), 305 deletions(-) delete mode 100644 src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml delete mode 100644 src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml delete mode 100644 src/library/Uno.Material/Styles/Controls/v2/PipsPager.UWP.xaml delete mode 100644 src/library/Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml index d6fe5261e..4cfbffb03 100644 --- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml +++ b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml @@ -5,32 +5,28 @@ xmlns:not_win="http://uno.ui/not_win" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" - xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie" xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie" mc:Ignorable="d not_win lottie_not_win"> + + + + - - + + - - + + + + + - + + + diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml deleted file mode 100644 index 23716ea3c..000000000 --- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj index d337bc3d9..6e8ea3274 100644 --- a/src/library/Uno.Cupertino/Uno.Cupertino.csproj +++ b/src/library/Uno.Cupertino/Uno.Cupertino.csproj @@ -89,7 +89,7 @@ - + @@ -135,11 +135,6 @@ - - - - - diff --git a/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml b/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml index c2a0a18fe..00c0dae76 100644 --- a/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml +++ b/src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml @@ -1,54 +1,48 @@  + + + + + + - - + + + + + + - - + + + + - + + + + + + - + + + + diff --git a/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml b/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml deleted file mode 100644 index 1def90a20..000000000 --- a/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml b/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml index d80dc42b0..45ec9a427 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/PipsPager.Base.xaml @@ -1,4 +1,4 @@ - - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - + + + + + + - - - + + + + + + + + + +