Merge branch 'develop'

HorusSoftwareUY · Oct 13, 2023 · aa4abf0 · aa4abf0
2 parents a0c84c5 + 41f9421
commit aa4abf0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 11 deletions.
diff --git a/MaterialDesignControls.nuspec b/MaterialDesignControls.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata minClientVersion="2.8.1">
        <id>Plugin.MaterialDesignControls</id>
-       <version>3.0.2-alpha</version>
+       <version>3.0.3-alpha</version>
        <title>MaterialDesignControls Plugin for Xamarin Forms</title>
        <authors>Horus</authors>
        <owners>AgustinBonillaHorus</owners>

diff --git a/src/MaterialDesignControls/ControlsMaterial3/MaterialDialog.cs b/src/MaterialDesignControls/ControlsMaterial3/MaterialDialog.cs
@@ -1012,10 +1012,8 @@ private static void SelectionCommand(MaterialDialog materialDialog, MaterialChec
 
         private void OnSearchCommand()
         {
-            Device.BeginInvokeOnMainThread(async () =>
+            Device.BeginInvokeOnMainThread(() =>
             {
-                RefreshItemList(new List<MaterialDialogItem>());
-                await Task.Delay(500);
                 if (string.IsNullOrWhiteSpace(_materialSearch.Text))
                     RefreshItemList(new List<MaterialDialogItem>(_fullItems));
                 else

diff --git a/src/MaterialDesignControls/Styles/MaterialColor.cs b/src/MaterialDesignControls/Styles/MaterialColor.cs
@@ -12,26 +12,60 @@ public static class MaterialColor
 
         public static Color OnPrimaryContainer { get; set; } = Color.FromHex("#21005D");
 
-        public static Color Text { get; set; } = Color.FromHex("#1D1B20");
+        public static Color Secondary { get; set; } = Color.FromHex("#625B71");
+
+        public static Color OnSecondary { get; set; } = Color.FromHex("#FFFFFF");
+
+        public static Color SecondaryContainer { get; set; } = Color.FromHex("#E8DEF8");
+
+        public static Color OnSecondaryContainer { get; set; } = Color.FromHex("#1D192B");
+
+        public static Color Error { get; set; } = Color.FromHex("#B3261E");
+
+        public static Color OnError { get; set; } = Color.FromHex("#FFFFFF");
+
+        public static Color ErrorContainer { get; set; } = Color.FromHex("#F9DEDC");
+
+        public static Color OnErrorContainer { get; set; } = Color.FromHex("#410E0B");
+
+        public static Color SurfaceDim { get; set; } = Color.FromHex("#DED8E1");
+
+        public static Color Surface { get; set; } = Color.FromHex("#FEF7FF");
+
+        public static Color SurfaceBright { get; set; } = Color.FromHex("#FEF7FF");
+
+        public static Color SurfaceContainerLowest { get; set; } = Color.FromHex("#FFFFFF");
+
+        public static Color SurfaceContainerLow { get; set; } = Color.FromHex("#F7F2FA");
+
+        public static Color SurfaceContainer { get; set; } = Color.FromHex("#F3EDF7");
+
+        public static Color SurfaceContainerHigh { get; set; } = Color.FromHex("#ECE6F0");
 
         public static Color SurfaceContainerHighest { get; set; } = Color.FromHex("#E6E0E9");
 
         public static Color OnSurface { get; set; } = Color.FromHex("#1D1B20");
 
         public static Color OnSurfaceVariant { get; set; } = Color.FromHex("#49454F");
 
-        public static Color Error{ get; set; } = Color.FromHex("#B3261E");
+        public static Color Outline { get; set; } = Color.FromHex("#79747E");
 
-        public static Color Disable { get; set; } = Color.FromHex("#9791A1");
+        public static Color OutlineVariant { get; set; } = Color.FromHex("#CAC4D0");
 
-        public static Color DisableContainer { get; set; } = Color.FromHex("#E5E3E8");
+        public static Color InverseSurface { get; set; } = Color.FromHex("#322F35");
 
-        public static Color Outline { get; set; } = Color.FromHex("#79747E");
+        public static Color InverseOnSurface { get; set; } = Color.FromHex("#F5EFF7");
 
-        public static Color OutlineVariant { get; set; } = Color.FromHex("#CAC4D0");
+        public static Color InversePrimary { get; set; } = Color.FromHex("#D0BCFF");
+
+        public static Color Scrim { get; set; } = Color.FromHex("#000000");
 
         public static Color Shadow { get; set; } = Color.FromHex("#000000");
 
-        public static Color InverseSurface { get; set; } = Color.FromHex("#322F35");
+        public static Color Text { get; set; } = Color.FromHex("#1D1B20");
+
+        public static Color Disable { get; set; } = Color.FromHex("#9791A1");
+
+        public static Color DisableContainer { get; set; } = Color.FromHex("#E5E3E8");
     }
 }