Skip to content

Commit 094924a

Browse files
committed
refactor(DataTemplates): Move TabBarItem Template to Generic.xaml
refactor(DataTemplates): Move Expander Content Template to Generic.xaml
1 parent 27edf31 commit 094924a

File tree

1 file changed

+32
-16
lines changed

1 file changed

+32
-16
lines changed

src/DevTKSS.Uno.Samples.MvuxGallery/Styles/Generic.xaml

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,29 +53,30 @@
5353

5454
<!--#endregion-->
5555
<!--#endregion Card Template -->
56-
56+
5757
<!--#region ListView and GridView Header Template binding to a FeedView to Refresh-->
5858
<DataTemplate x:Key="ViewHeaderTemplate" x:DataType="models:HeaderContent">
5959
<Grid Background="{ThemeResource SurfaceInverseBrush}"
6060
CornerRadius="10,10,0,0"
6161
Padding="10">
6262
<Grid.ColumnDefinitions>
63-
<ColumnDefinition Width="Auto"/>
64-
<ColumnDefinition Width="*" MinWidth="100"/>
65-
<ColumnDefinition Width="Auto"/>
63+
<ColumnDefinition Width="Auto" />
64+
<ColumnDefinition Width="*"
65+
MinWidth="100" />
66+
<ColumnDefinition Width="Auto" />
6667
</Grid.ColumnDefinitions>
6768
<PersonPicture ProfilePicture="{Binding ImageLocation}"
68-
Width="60"
69-
Style="{StaticResource DefaultPersonPictureStyle}"
70-
Grid.Column="0"/>
69+
Width="60"
70+
Style="{StaticResource DefaultPersonPictureStyle}"
71+
Grid.Column="0" />
7172
<TextBlock Text="{Binding Caption}"
72-
Style="{ThemeResource TitleMedium}"
73-
Foreground="{ThemeResource OnSurfaceInverseBrush}"
74-
VerticalAlignment="Center"
75-
HorizontalAlignment="Center"
76-
TextAlignment="Center"
77-
Grid.Column="1"
78-
TextWrapping="WrapWholeWords"/>
73+
Style="{ThemeResource TitleMedium}"
74+
Foreground="{ThemeResource OnSurfaceInverseBrush}"
75+
VerticalAlignment="Center"
76+
HorizontalAlignment="Center"
77+
TextAlignment="Center"
78+
Grid.Column="1"
79+
TextWrapping="WrapWholeWords" />
7980
<AppBarButton Style="{StaticResource FilledButtonStyle}"
8081
Command="{utu:AncestorBinding AncestorType=mvux:FeedView, Path=Refresh}"
8182
HorizontalAlignment="Center"
@@ -85,9 +86,8 @@
8586
</AppBarButton>
8687
</Grid>
8788
</DataTemplate>
88-
8989
<!--#endregion ListView and GridView Header Template-->
90-
90+
9191
<!--#region Grid Template aka GalleryImageOverlay -->
9292
<!-- This Sample is a simplifyed Template using a regular Grid with a unified Layout-->
9393
<!-- Reference used: WinUi 3 Gallery GridView "ItemOverlayTemplate" winui3gallery://item/GridView -->
@@ -126,4 +126,20 @@
126126
</DataTemplate>
127127
<!--#endregion Grid Template aka GalleryImageOverlay-->
128128

129+
<!--#region Code Sample Expander Content-->
130+
<DataTemplate x:Key="CodeSampleWrappedTextblock">
131+
<ScrollViewer>
132+
<TextBlock Text="{Binding }"
133+
TextWrapping="WrapWholeWords"
134+
HorizontalAlignment="Center" />
135+
</ScrollViewer>
136+
</DataTemplate>
137+
<!--#endregion-->
138+
139+
<!--#region TabBarItem Template-->
140+
<DataTemplate x:Key="BottomTabBarItemTemplate">
141+
<utu:TabBarItem Content="{Binding }"
142+
Style="{StaticResource BottomTabBarItemStyle}" />
143+
</DataTemplate>
144+
<!--#endregion-->
129145
</ResourceDictionary>

0 commit comments

Comments
 (0)