fix: adjust for themes breaking changes (#1028)

* fix: adjust for themes breaking changes * chore: update themes
unoplatform · Feb 2, 2024 · 572c921 · 572c921
1 parent a23b54a
commit 572c921
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 94 deletions.
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -23,12 +23,12 @@
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
     <PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.6" />
-    <PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.6" />
+    <PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.9" />
+    <PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.9" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.8.0-dev.1" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.8.0-dev.1" />
-    <PackageVersion Include="Uno.Material" Version="4.2.0-dev.6" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.6" />
+    <PackageVersion Include="Uno.Material" Version="4.2.0-dev.9" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.9" />
     <PackageVersion Include="Uno.UI" Version="5.1.0-dev.975" />
     <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.0-dev.975" />
     <PackageVersion Include="Uno.UI.RemoteControl" Version="5.1.0-dev.975" />

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -15,13 +15,13 @@
     <PackageVersion Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
-    <PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.6" />
-    <PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.6" />
+    <PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.9" />
+    <PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.9" />
     <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.1.4" />
     <PackageVersion Include="Uno.SourceGenerationTasks" Version="4.2.0" />
     <PackageVersion Include="Uno.WinUI.Markup" Version="5.1.4" />
-    <PackageVersion Include="Uno.Material" Version="4.2.0-dev.6" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.6" />
+    <PackageVersion Include="Uno.Material" Version="4.2.0-dev.9" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.9" />
     <PackageVersion Include="Uno.UI" Version="5.0.19" />
     <PackageVersion Include="Uno.WinUI" Version="5.0.19" />
     <PackageVersion Include="Uno.XamlMerge.Task" Version="1.32.0-dev.61" />

diff --git a/src/Uno.Toolkit.UI/Controls/Chips/Chip.xaml b/src/Uno.Toolkit.UI/Controls/Chips/Chip.xaml
@@ -250,7 +250,7 @@
                                         Content="{TemplateBinding Icon}"
                                         ContentTemplate="{TemplateBinding IconTemplate}"
                                         Foreground="{ThemeResource ChipIconForeground}"
-                                        Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToCollapsed}, FallbackValue=Collapsed}" />
+                                        Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToCollapsedConverter}, FallbackValue=Collapsed}" />
 
                                     <!--  C1: Content  -->
                                     <ContentPresenter
@@ -271,7 +271,7 @@
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                         Foreground="{TemplateBinding Foreground}"
                                         Style="{StaticResource ChipDeleteIconButtonStyle}"
-                                        Visibility="{Binding CanRemove, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource FalseToCollapsed}, FallbackValue=Collapsed}" />
+                                        Visibility="{Binding CanRemove, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource FalseToCollapsedConverter}, FallbackValue=Collapsed}" />
                                 </Grid>
                             </Grid>
                         </toolkit:ElevatedView>

diff --git a/src/Uno.Toolkit.UI/Controls/DrawerControl/DrawerControl.xaml b/src/Uno.Toolkit.UI/Controls/DrawerControl/DrawerControl.xaml
@@ -54,7 +54,7 @@
 						<!-- see: https://github.com/unoplatform/nventive-private/issues/271 -->
 						<Border x:Name="GestureInterceptor"
 								Background="Transparent"
-								Visibility="{Binding IsGestureEnabled, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialTrueToVisible}}" />
+								Visibility="{Binding IsGestureEnabled, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TrueToVisibleConverter}}" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml
@@ -155,7 +155,7 @@
                                         </Viewbox>
 
                                         <!-- Icon/Content spacing -->
-                                        <Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                                        <Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
                                             <Border Width="{StaticResource MaterialFabIconTextPadding}"
 													Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
                                         </Border>
@@ -485,7 +485,7 @@
 										</Viewbox>
 
 										<!-- Icon/Content spacing -->
-										<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+										<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
 											<Border Width="{StaticResource MaterialFabIconTextPadding}"
 													Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
 										</Border>