Skip to content

Commit afb222a

Browse files
rajamattrajamatt
authored
Merge pull request #740 from unoplatform/dev/mara/fix-home-icon
fix: updating tabbar home icon for sample app
2 parents a386132 + 9dbbc31 commit afb222a

File tree

7 files changed

+44
-29
lines changed

7 files changed

+44
-29
lines changed

‎Uno.Gallery/Uno.Gallery.UWP/App.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<ResourceDictionary Source="Views/Styles/ColorPaletteView.xaml" />
3636
<ResourceDictionary Source="Views/Styles/ContentPageLayout.xaml" />
3737
<ResourceDictionary Source="Views/Styles/FluentPaletteView.xaml" />
38+
<ResourceDictionary Source="Views/Styles/FontIcons.xaml" />
3839
<ResourceDictionary Source="Views/Styles/InfoBadge.xaml" />
3940
<ResourceDictionary Source="Views/Styles/NavigationView.xaml" />
4041
<ResourceDictionary Source="Views/Styles/NavigationViewItemHeader.xaml" />

‎Uno.Gallery/Uno.Gallery.UWP/Uno.Gallery.UWP.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,10 @@
954954
<SubType>Designer</SubType>
955955
<Generator>MSBuild:Compile</Generator>
956956
</Page>
957+
<Page Include="Views\Styles\FontIcons.xaml">
958+
<SubType>Designer</SubType>
959+
<Generator>MSBuild:Compile</Generator>
960+
</Page>
957961
<Page Include="Views\Styles\TypographyControl.xaml">
958962
<Generator>MSBuild:Compile</Generator>
959963
<SubType>Designer</SubType>

‎Uno.Gallery/Uno.Gallery.UWP/Views/NestedPages/CupertinoBottomBarSampleNestedPage.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@
3333
<Grid x:Name="Home" Visibility="Collapsed">
3434
<Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
3535
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
36-
<FontIcon Glyph="&#xE80F;" />
36+
<FontIcon Glyph="{StaticResource HomeIcon}" />
3737
<TextBlock Text="Home" TextAlignment="Center" />
3838
</StackPanel>
3939
</Border>
4040
</Grid>
4141
<Grid x:Name="Search" Visibility="Collapsed">
4242
<Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
4343
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
44-
<FontIcon Glyph="&#xe721;" />
44+
<FontIcon Glyph="{StaticResource SearchIcon}" />
4545
<TextBlock Text="Search" TextAlignment="Center" />
4646
</StackPanel>
4747
</Border>
4848
</Grid>
4949
<Grid x:Name="Support" Visibility="Collapsed">
5050
<Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
5151
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
52-
<FontIcon Glyph="&#xE8F2;" />
52+
<FontIcon Glyph="{StaticResource SupportIcon}" />
5353
<TextBlock Text="Support" TextAlignment="Center" />
5454
</StackPanel>
5555
</Border>
5656
</Grid>
5757
<Grid x:Name="About" Visibility="Collapsed">
5858
<Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
5959
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
60-
<FontIcon Glyph="&#xE946;" />
60+
<FontIcon Glyph="{StaticResource AboutIcon}" />
6161
<TextBlock Text="About" TextAlignment="Center" />
6262
</StackPanel>
6363
</Border>
@@ -72,22 +72,22 @@
7272
<utu:TabBar.Items>
7373
<utu:TabBarItem Content="Home" Tag="Home">
7474
<utu:TabBarItem.Icon>
75-
<FontIcon Glyph="&#xE80F;" />
75+
<FontIcon Glyph="{StaticResource HomeIcon}" />
7676
</utu:TabBarItem.Icon>
7777
</utu:TabBarItem>
7878
<utu:TabBarItem Content="Search" Tag="Search">
7979
<utu:TabBarItem.Icon>
80-
<FontIcon Glyph="&#xe721;" />
80+
<FontIcon Glyph="{StaticResource SearchIcon}" />
8181
</utu:TabBarItem.Icon>
8282
</utu:TabBarItem>
8383
<utu:TabBarItem Content="Support" Tag="Support">
8484
<utu:TabBarItem.Icon>
85-
<FontIcon Glyph="&#xE8F2;" />
85+
<FontIcon Glyph="{StaticResource SupportIcon}" />
8686
</utu:TabBarItem.Icon>
8787
</utu:TabBarItem>
8888
<utu:TabBarItem Content="About" Tag="About">
8989
<utu:TabBarItem.Icon>
90-
<FontIcon Glyph="&#xE946;" />
90+
<FontIcon Glyph="{StaticResource AboutIcon}" />
9191
</utu:TabBarItem.Icon>
9292
</utu:TabBarItem>
9393
</utu:TabBar.Items>

‎Uno.Gallery/Uno.Gallery.UWP/Views/NestedPages/MaterialBottomBarSampleNestedPage.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@
3333
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
3434
<Grid x:Name="Home" Visibility="Collapsed">
3535
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
36-
<FontIcon Glyph="&#xE80F;" />
36+
<FontIcon Glyph="{StaticResource HomeIcon}" />
3737
<TextBlock Text="Home" TextAlignment="Center" />
3838
</StackPanel>
3939
</Grid>
4040
<Grid x:Name="Search" Visibility="Collapsed">
4141
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
42-
<FontIcon Glyph="&#xe721;" />
42+
<FontIcon Glyph="{StaticResource SearchIcon}" />
4343
<TextBlock Text="Search" TextAlignment="Center" />
4444
</StackPanel>
4545
</Grid>
4646
<Grid x:Name="Support" Visibility="Collapsed">
4747
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
48-
<FontIcon Glyph="&#xE8F2;" />
48+
<FontIcon Glyph="{StaticResource SupportIcon}" />
4949
<TextBlock Text="Support" TextAlignment="Center" />
5050
</StackPanel>
5151
</Grid>
5252
<Grid x:Name="About" Visibility="Collapsed">
5353
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
54-
<FontIcon Glyph="&#xE946;" />
54+
<FontIcon Glyph="{StaticResource AboutIcon}" />
5555
<TextBlock Text="About" TextAlignment="Center" />
5656
</StackPanel>
5757
</Grid>
@@ -64,12 +64,12 @@
6464
<utu:TabBar.Items>
6565
<utu:TabBarItem Content="Home" Tag="Home">
6666
<utu:TabBarItem.Icon>
67-
<FontIcon Glyph="&#xE80F;" />
67+
<FontIcon Glyph="{StaticResource HomeIcon}" />
6868
</utu:TabBarItem.Icon>
6969
</utu:TabBarItem>
7070
<utu:TabBarItem Content="Search" Tag="Search">
7171
<utu:TabBarItem.Icon>
72-
<FontIcon Glyph="&#xe721;" />
72+
<FontIcon Glyph="{StaticResource SearchIcon}" />
7373
</utu:TabBarItem.Icon>
7474
</utu:TabBarItem>
7575
<d:TabBarItem Style="{StaticResource MaterialBottomTabBarItemFabStyle}">
@@ -95,12 +95,12 @@
9595
</d:TabBarItem>
9696
<utu:TabBarItem Content="Support" Tag="Support">
9797
<utu:TabBarItem.Icon>
98-
<FontIcon Glyph="&#xE8F2;" />
98+
<FontIcon Glyph="{StaticResource SupportIcon}" />
9999
</utu:TabBarItem.Icon>
100100
</utu:TabBarItem>
101101
<utu:TabBarItem Content="About" Tag="About">
102102
<utu:TabBarItem.Icon>
103-
<FontIcon Glyph="&#xE946;" />
103+
<FontIcon Glyph="{StaticResource AboutIcon}" />
104104
</utu:TabBarItem.Icon>
105105
</utu:TabBarItem>
106106
</utu:TabBar.Items>

‎Uno.Gallery/Uno.Gallery.UWP/Views/NestedPages/MaterialTopBarSampleNestedPage.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,31 @@
4242
<Grid x:Name="Home" Visibility="Collapsed">
4343
<Border Background="LightGray">
4444
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
45-
<FontIcon Glyph="&#xE80F;" />
45+
<FontIcon Glyph="{StaticResource HomeIcon}" />
4646
<TextBlock Text="Home" TextAlignment="Center" />
4747
</StackPanel>
4848
</Border>
4949
</Grid>
5050
<Grid x:Name="Search" Visibility="Collapsed">
5151
<Border Background="LightGray">
5252
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
53-
<FontIcon Glyph="&#xe721;" />
53+
<FontIcon Glyph="{StaticResource SearchIcon}" />
5454
<TextBlock Text="Search" TextAlignment="Center" />
5555
</StackPanel>
5656
</Border>
5757
</Grid>
5858
<Grid x:Name="Support" Visibility="Collapsed">
5959
<Border Background="LightGray">
6060
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
61-
<FontIcon Glyph="&#xE8F2;" />
61+
<FontIcon Glyph="{StaticResource SupportIcon}" />
6262
<TextBlock Text="Support" TextAlignment="Center" />
6363
</StackPanel>
6464
</Border>
6565
</Grid>
6666
<Grid x:Name="About" Visibility="Collapsed">
6767
<Border Background="LightGray">
6868
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
69-
<FontIcon Glyph="&#xE946;" />
69+
<FontIcon Glyph="{StaticResource AboutIcon}" />
7070
<TextBlock Text="About" TextAlignment="Center" />
7171
</StackPanel>
7272
</Border>

‎Uno.Gallery/Uno.Gallery.UWP/Views/SamplePages/TabBarSamplePage.xaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
<utu:TabBar.Items>
2020
<utu:TabBarItem Content="HOME">
2121
<utu:TabBarItem.Icon>
22-
<FontIcon Glyph="&#xE80F;" />
22+
<FontIcon Glyph="{StaticResource HomeIcon}" />
2323
</utu:TabBarItem.Icon>
2424
</utu:TabBarItem>
2525
<utu:TabBarItem Content="SUPPORT">
2626
<utu:TabBarItem.Icon>
27-
<FontIcon Glyph="&#xE8F2;" />
27+
<FontIcon Glyph="{StaticResource SupportIcon}" />
2828
</utu:TabBarItem.Icon>
2929
</utu:TabBarItem>
3030
<utu:TabBarItem Content="ABOUT">
3131
<utu:TabBarItem.Icon>
32-
<FontIcon Glyph="&#xE946;" />
32+
<FontIcon Glyph="{StaticResource AboutIcon}" />
3333
</utu:TabBarItem.Icon>
3434
</utu:TabBarItem>
3535

@@ -44,17 +44,17 @@
4444
<utu:TabBar.Items>
4545
<utu:TabBarItem Content="HOME">
4646
<utu:TabBarItem.Icon>
47-
<FontIcon Glyph="&#xE80F;" />
47+
<FontIcon Glyph="{StaticResource HomeIcon}" />
4848
</utu:TabBarItem.Icon>
4949
</utu:TabBarItem>
5050
<utu:TabBarItem Content="SUPPORT">
5151
<utu:TabBarItem.Icon>
52-
<FontIcon Glyph="&#xE8F2;" />
52+
<FontIcon Glyph="{StaticResource SupportIcon}" />
5353
</utu:TabBarItem.Icon>
5454
</utu:TabBarItem>
5555
<utu:TabBarItem Content="ABOUT">
5656
<utu:TabBarItem.Icon>
57-
<FontIcon Glyph="&#xE946;" />
57+
<FontIcon Glyph="{StaticResource AboutIcon}" />
5858
</utu:TabBarItem.Icon>
5959
</utu:TabBarItem>
6060

@@ -122,17 +122,17 @@
122122
<utu:TabBar.Items>
123123
<utu:TabBarItem Content="Home">
124124
<utu:TabBarItem.Icon>
125-
<FontIcon Glyph="&#xE80F;" />
125+
<FontIcon Glyph="{StaticResource HomeIcon}" />
126126
</utu:TabBarItem.Icon>
127127
</utu:TabBarItem>
128128
<utu:TabBarItem Content="Support">
129129
<utu:TabBarItem.Icon>
130-
<FontIcon Glyph="&#xE8F2;" />
130+
<FontIcon Glyph="{StaticResource SupportIcon}" />
131131
</utu:TabBarItem.Icon>
132132
</utu:TabBarItem>
133133
<utu:TabBarItem Content="About">
134134
<utu:TabBarItem.Icon>
135-
<FontIcon Glyph="&#xE946;" />
135+
<FontIcon Glyph="{StaticResource AboutIcon}" />
136136
</utu:TabBarItem.Icon>
137137
</utu:TabBarItem>
138138
</utu:TabBar.Items>

‎Uno.Gallery/Uno.Gallery.UWP/Views/Styles/FontIcons.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
4+
5+
<x:String x:Key="HomeIcon">&#xE10F;</x:String>
6+
<x:String x:Key="SearchIcon">&#xE721;</x:String>
7+
<x:String x:Key="SupportIcon">&#xE8F2;</x:String>
8+
<x:String x:Key="AboutIcon">&#xE946;</x:String>
9+
10+
</ResourceDictionary>

0 commit comments

Comments
 (0)