Skip to content

Commit fa7acb6

Browse files
Guerra24Guerra24
committed
Test TemplateBinding
1 parent 63e5fc9 commit fa7acb6

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎LRReader.UWP.ModernInstaller/LRReader.UWP.ModernInstaller.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
</PropertyGroup>
3333

3434
<PropertyGroup>
35-
<ApplicationIcon>logo.ico</ApplicationIcon>
35+
<ApplicationIcon>icon.ico</ApplicationIcon>
3636
<Title>LRReader Installer</Title>
3737
<Description>LRReader Sideload Installer</Description>
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<EmbeddedResource Include="logo.ico" />
41+
<EmbeddedResource Include="icon.ico" />
4242
</ItemGroup>
4343

4444
<ItemGroup>
4545
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
4646
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
4747
<PackageReference Include="Mile.Xaml" Version="2.5.1250" GeneratePathProperty="true" IncludeAssets="none" />
48-
<PackageReference Include="Modern.UI.Xaml" Version="0.0.0-alpha.0.5" />
48+
<PackageReference Include="Modern.UI.Xaml" Version="0.0.0-alpha.0.6" />
4949
<PackageReference Include="PublishAotCompressed" Version="1.0.5" Condition="'$(Platform)' == 'x64'" />
5050
</ItemGroup>
5151

‎LRReader.UWP.ModernInstaller/Views/InstallerPage.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public InstallerPage()
2828

2929
private async void UserControl_Loaded(object sender, RoutedEventArgs e)
3030
{
31-
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("LRReader.UWP.ModernInstaller.logo.ico"))
31+
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("LRReader.UWP.ModernInstaller.icon.ico"))
3232
{
3333
var bitmap = new BitmapImage();
3434
await bitmap.SetSourceAsync(stream.AsRandomAccessStream());

LRReader.UWP.ModernInstaller/logo.ico renamed to LRReader.UWP.ModernInstaller/icon.ico

File renamed without changes.

‎LRReader.UWP/Resources/Templates.xaml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -690,33 +690,33 @@
690690
<FontIcon
691691
x:Name="LeftFontIcon" Margin="0,0,16,0"
692692
FontFamily="{StaticResource SymbolThemeFontFamily}"
693-
Glyph="{x:Bind Glyph, Mode=OneWay}"
694-
Visibility="{x:Bind Glyph, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
693+
Glyph="{TemplateBinding Glyph}"
694+
Visibility="{Binding Glyph, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource StringVisibilityConverter}}" />
695695
<ContentPresenter
696696
x:Name="LeftIcon" Margin="0,0,16,0"
697-
Content="{x:Bind Icon, Mode=OneWay}"
698-
Visibility="{x:Bind Icon, Mode=OneWay, Converter={StaticResource EmptyObjectToObjectConverter}}" />
697+
Content="{TemplateBinding Icon}"
698+
Visibility="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyObjectToObjectConverter}}" />
699699
<StackPanel Grid.Column="1" Margin="{TemplateBinding TextMargin}" VerticalAlignment="Center">
700-
<TextBlock x:Name="TitleBlock" Text="{x:Bind Title, Mode=OneWay}" />
700+
<TextBlock x:Name="TitleBlock" Text="{TemplateBinding Title}" />
701701
<TextBlock
702702
x:Name="DescriptionBlock" FontSize="12"
703703
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
704-
Text="{x:Bind Description, Mode=OneWay}"
704+
Text="{TemplateBinding Description}"
705705
TextWrapping="WrapWholeWords"
706-
Visibility="{x:Bind Description, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
706+
Visibility="{Binding Description, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource StringVisibilityConverter}}" />
707707
</StackPanel>
708708
<ContentPresenter
709709
Grid.Column="2" Margin="0,0,16,0"
710-
HorizontalAlignment="{x:Bind InputHorizontalAlignment, Mode=OneWay}"
710+
HorizontalAlignment="{TemplateBinding InputHorizontalAlignment}"
711711
VerticalAlignment="Center"
712-
Content="{x:Bind Control, Mode=OneWay}" />
712+
Content="{TemplateBinding Control}" />
713713
<FontIcon
714714
x:Name="RightFontIcon" Grid.Column="2" Margin="0,0,16,0"
715715
HorizontalAlignment="Right" VerticalAlignment="Center"
716716
FontFamily="{StaticResource SymbolThemeFontFamily}"
717717
FontSize="14"
718-
Glyph="{x:Bind RightGlyph, Mode=OneWay}"
719-
Visibility="{x:Bind IsButton}" />
718+
Glyph="{TemplateBinding RightGlyph}"
719+
Visibility="{TemplateBinding IsButton}" />
720720

721721
<VisualStateManager.VisualStateGroups>
722722
<VisualStateGroup x:Name="CommonStates">
@@ -813,7 +813,7 @@
813813
<Grid.ColumnDefinitions>
814814
<ColumnDefinition Width="Auto" />
815815
<ColumnDefinition />
816-
<ColumnDefinition MaxWidth="400" Width="{x:Bind RightColumnWidth, Mode=OneWay}" />
816+
<ColumnDefinition MaxWidth="400" Width="{TemplateBinding RightColumnWidth}" />
817817
</Grid.ColumnDefinitions>
818818

819819
<Grid.BackgroundTransition>
@@ -822,33 +822,33 @@
822822
<FontIcon
823823
x:Name="LeftFontIcon" Margin="0,0,16,0"
824824
FontFamily="{StaticResource SymbolThemeFontFamily}"
825-
Glyph="{x:Bind Glyph, Mode=OneWay}"
826-
Visibility="{x:Bind Glyph, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
825+
Glyph="{TemplateBinding Glyph}"
826+
Visibility="{Binding Glyph, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource StringVisibilityConverter}}" />
827827
<ContentPresenter
828828
x:Name="LeftIcon" Margin="0,0,16,0"
829-
Content="{x:Bind Icon, Mode=OneWay}"
830-
Visibility="{x:Bind Icon, Mode=OneWay, Converter={StaticResource EmptyObjectToObjectConverter}}" />
829+
Content="{TemplateBinding Icon}"
830+
Visibility="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyObjectToObjectConverter}}" />
831831
<StackPanel Grid.Column="1" Margin="{TemplateBinding TextMargin}" VerticalAlignment="Center">
832-
<TextBlock x:Name="TitleBlock" Text="{x:Bind Title, Mode=OneWay}" />
832+
<TextBlock x:Name="TitleBlock" Text="{TemplateBinding Title}" />
833833
<TextBlock
834834
x:Name="DescriptionBlock" FontSize="12"
835835
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
836-
Text="{x:Bind Description, Mode=OneWay}"
836+
Text="{TemplateBinding Description}"
837837
TextWrapping="WrapWholeWords"
838-
Visibility="{x:Bind Description, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
838+
Visibility="{Binding Description, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource StringVisibilityConverter}}" />
839839
</StackPanel>
840840
<ContentPresenter
841841
Grid.Column="2" Margin="0,0,16,0"
842-
HorizontalAlignment="{x:Bind InputHorizontalAlignment, Mode=OneWay}"
842+
HorizontalAlignment="{TemplateBinding InputHorizontalAlignment}"
843843
VerticalAlignment="Center"
844-
Content="{x:Bind Control, Mode=OneWay}" />
844+
Content="{TemplateBinding Control}" />
845845
<FontIcon
846846
x:Name="RightFontIcon" Grid.Column="2" Margin="0,0,16,0"
847847
HorizontalAlignment="Right" VerticalAlignment="Center"
848848
FontFamily="{StaticResource SymbolThemeFontFamily}"
849849
FontSize="14"
850-
Glyph="{x:Bind RightGlyph, Mode=OneWay}"
851-
Visibility="{x:Bind IsButton}" />
850+
Glyph="{TemplateBinding RightGlyph}"
851+
Visibility="{TemplateBinding IsButton}" />
852852

853853
<VisualStateManager.VisualStateGroups>
854854
<VisualStateGroup x:Name="CommonStates">
@@ -922,9 +922,9 @@
922922
<StackPanel>
923923
<TextBlock
924924
Margin="1,0,0,8" FontWeight="Bold"
925-
Text="{x:Bind Title, Mode=OneWay}"
926-
Visibility="{x:Bind Title, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
927-
<muxc:ItemsRepeater ItemsSource="{x:Bind Content, Mode=OneWay}">
925+
Text="{TemplateBinding Title}"
926+
Visibility="{Binding Title, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource StringVisibilityConverter}}" />
927+
<muxc:ItemsRepeater ItemsSource="{TemplateBinding Content}">
928928
<muxc:ItemsRepeater.Layout>
929929
<muxc:StackLayout DisableVirtualization="True" Spacing="3" />
930930
</muxc:ItemsRepeater.Layout>

0 commit comments

Comments
 (0)