Skip to content

Commit c99de23

Browse files
kazo0kazo0
committed
fix: adjust for themes breaking changes
1 parent ceb1cb1 commit c99de23

File tree

15 files changed

+104
-101
lines changed

15 files changed

+104
-101
lines changed

‎samples/Directory.Packages.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
2424
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
2525
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
26-
<PackageVersion Include="Uno.Cupertino" Version="4.1.0-dev.39" />
27-
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.1.0-dev.39" />
26+
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.6" />
27+
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.6" />
2828
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.8.0-dev.1" />
2929
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.8.0-dev.1" />
30-
<PackageVersion Include="Uno.Material" Version="4.1.0-dev.39" />
31-
<PackageVersion Include="Uno.Material.WinUI" Version="4.1.0-dev.39" />
30+
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.6" />
31+
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.6" />
3232
<PackageVersion Include="Uno.UI" Version="5.1.0-dev.975" />
3333
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.0-dev.975" />
3434
<PackageVersion Include="Uno.UI.RemoteControl" Version="5.1.0-dev.975" />

‎samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
99
xmlns:toolkit="using:Uno.UI.Toolkit"
1010
xmlns:utu="using:Uno.Toolkit.UI"
11+
xmlns:ut="using:Uno.Themes"
1112
Background="Green"
1213
mc:Ignorable="d">
1314
<Grid AutomationProperties.AutomationId="WrappingGrid"
@@ -26,9 +27,9 @@
2627
Content="Exit Sample"
2728
HorizontalAlignment="Center"
2829
Click="ExitSample">
29-
<um:ControlExtensions.Icon>
30+
<ut:ControlExtensions.Icon>
3031
<SymbolIcon Symbol="Cancel" />
31-
</um:ControlExtensions.Icon>
32+
</ut:ControlExtensions.Icon>
3233
</Button>
3334
<muxc:RadioButtons HorizontalAlignment="Center"
3435
Header="Inset Mode:">

‎samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeArea_Control_NestedPage.xaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
99
xmlns:toolkit="using:Uno.UI.Toolkit"
1010
xmlns:utu="using:Uno.Toolkit.UI"
11+
xmlns:ut="using:Uno.Themes"
1112
Background="Green"
1213
mc:Ignorable="d">
1314
<Grid AutomationProperties.AutomationId="WrappingGrid"
@@ -26,9 +27,9 @@
2627
Content="Exit Sample"
2728
HorizontalAlignment="Center"
2829
Click="ExitSample">
29-
<um:ControlExtensions.Icon>
30+
<ut:ControlExtensions.Icon>
3031
<SymbolIcon Symbol="Cancel" />
31-
</um:ControlExtensions.Icon>
32+
</ut:ControlExtensions.Icon>
3233
</Button>
3334
<muxc:RadioButtons HorizontalAlignment="Center"
3435
Header="Inset Mode:">

‎src/Directory.Packages.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<PackageVersion Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
1616
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
1717
<PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
18-
<PackageVersion Include="Uno.Cupertino" Version="4.1.0-dev.39" />
19-
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.1.0-dev.39" />
18+
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.6" />
19+
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.6" />
2020
<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.1.0-dev.78" />
2121
<PackageVersion Include="Uno.SourceGenerationTasks" Version="4.2.0" />
2222
<PackageVersion Include="Uno.WinUI.Markup" Version="5.1.0-dev.78" />
23-
<PackageVersion Include="Uno.Material" Version="4.1.0-dev.39" />
24-
<PackageVersion Include="Uno.Material.WinUI" Version="4.1.0-dev.39" />
23+
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.6" />
24+
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.6" />
2525
<PackageVersion Include="Uno.UI" Version="5.0.19" />
2626
<PackageVersion Include="Uno.WinUI" Version="5.0.19" />
2727
<PackageVersion Include="Uno.XamlMerge.Task" Version="1.32.0-dev.61" />

‎src/Uno.Toolkit.UI/Controls/Chips/Chip.xaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
Content="{TemplateBinding Icon}"
256256
ContentTemplate="{TemplateBinding IconTemplate}"
257257
Foreground="{ThemeResource ChipIconForeground}"
258-
Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToCollapsed}, FallbackValue=Collapsed}" />
258+
Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToCollapsedConverter}, FallbackValue=Collapsed}" />
259259

260260
<Grid
261261
x:Name="CheckGlyphElement"
@@ -272,7 +272,7 @@
272272
Data="{StaticResource CheckGlyphPathData}"
273273
Fill="{TemplateBinding Foreground}"
274274
Stretch="Uniform"
275-
Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToVisible}, FallbackValue=Collapsed}" />
275+
Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToVisibleConverter}, FallbackValue=Collapsed}" />
276276
</Grid>
277277
<!-- C1: Content -->
278278
<ContentPresenter
@@ -293,7 +293,7 @@
293293
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
294294
Foreground="{TemplateBinding Foreground}"
295295
Style="{StaticResource ChipDeleteIconButtonStyle}"
296-
Visibility="{Binding CanRemove, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource FalseToCollapsed}, FallbackValue=Collapsed}" />
296+
Visibility="{Binding CanRemove, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource FalseToCollapsedConverter}, FallbackValue=Collapsed}" />
297297
</Grid>
298298
</Grid>
299299
</toolkit:ElevatedView>

‎src/Uno.Toolkit.UI/Controls/DrawerControl/DrawerControl.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- see: https://github.com/unoplatform/nventive-private/issues/271 -->
5555
<Border x:Name="GestureInterceptor"
5656
Background="Transparent"
57-
Visibility="{Binding IsGestureEnabled, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialTrueToVisible}}" />
57+
Visibility="{Binding IsGestureEnabled, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TrueToVisibleConverter}}" />
5858
</Grid>
5959
</ControlTemplate>
6060
</Setter.Value>

‎src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
</Viewbox>
156156

157157
<!-- Icon/Content spacing -->
158-
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
158+
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
159159
<Border Width="{StaticResource MaterialFabIconTextPadding}"
160160
Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
161161
</Border>
@@ -485,7 +485,7 @@
485485
</Viewbox>
486486

487487
<!-- Icon/Content spacing -->
488-
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
488+
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
489489
<Border Width="{StaticResource MaterialFabIconTextPadding}"
490490
Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
491491
</Border>

0 commit comments

Comments
 (0)