diff options
author | jjie.choi <jjie.choi@samsung.com> | 2017-04-27 14:17:46 +0900 |
---|---|---|
committer | ChulSeung Kim <charles0.kim@samsung.com> | 2017-06-08 18:34:53 +0900 |
commit | e482c9f0fb9da6236bf6c2a373807868f75d183b (patch) | |
tree | 5c55e284bad126b512c41fa71027b3283544b66a /TVHome | |
parent | 7a6a85eb8a095bc7214dcff7370a337f36c88a5c (diff) | |
download | home-e482c9f0fb9da6236bf6c2a373807868f75d183b.tar.gz home-e482c9f0fb9da6236bf6c2a373807868f75d183b.tar.bz2 home-e482c9f0fb9da6236bf6c2a373807868f75d183b.zip |
Update image resources, Set font style.
Change-Id: I2be2eaea04944d3ee8937f341f23295aeeb4c3d5
Signed-off-by: jjie.choi <jjie.choi@samsung.com>
Diffstat (limited to 'TVHome')
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_apps_focused.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_focused.png) | bin | 1758 -> 1758 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_apps_normal.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_normal.png) | bin | 3419 -> 3419 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_apps_selected.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_selected.png) | bin | 1742 -> 1742 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_apps_unselected.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselected.png) | bin | 3483 -> 3483 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_recent_focused.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_focused.png) | bin | 1622 -> 1622 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_recent_normal.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_normal.png) | bin | 2521 -> 2521 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_recent_selected.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_selected.png) | bin | 1604 -> 1604 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_recent_unselected.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselected.png) | bin | 2530 -> 2530 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_settings_focused.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_focused.png) | bin | 1729 -> 1729 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_settings_normal.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_normal.png) | bin | 3808 -> 3808 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_settings_selected.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_selected.png) | bin | 1764 -> 1764 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/ic_home_menu_settings_unselected.png (renamed from TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselected.png) | bin | 3864 -> 3864 bytes | |||
-rwxr-xr-x | TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselect.png | bin | 3486 -> 0 bytes | |||
-rwxr-xr-x | TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselect.png | bin | 2530 -> 0 bytes | |||
-rwxr-xr-x | TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselect.png | bin | 3897 -> 0 bytes | |||
-rw-r--r-- | TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_75.png | bin | 0 -> 3079 bytes | |||
-rw-r--r--[-rwxr-xr-x] | TVHome/TVHome.TizenTV/res/img_home_menu_focused_bg.png (renamed from TVHome/TVHome.TizenTV/res/img_tizen_home_menu_focused_bg.png) | bin | 32129 -> 32129 bytes | |||
-rw-r--r-- | TVHome/TVHome.TizenTV/res/img_tizen_home_list_dimmed_apps.png | bin | 3040 -> 0 bytes | |||
-rwxr-xr-x | TVHome/TVHome/Controls/MainPanelButton.xaml | 3 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/MainPanelButton.xaml.cs | 2 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml | 1 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs | 4 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelButton.xaml | 3 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelButton.xaml.cs | 4 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelReservedButton.xaml | 3 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs | 4 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelSettingButton.xaml | 1 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs | 4 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml | 1 | ||||
-rwxr-xr-x | TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs | 4 | ||||
-rwxr-xr-x | TVHome/TVHome/ViewModels/MainPageViewModel.cs | 8 |
31 files changed, 35 insertions, 7 deletions
diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_focused.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_focused.png Binary files differindex 62e87d0..62e87d0 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_focused.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_focused.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_normal.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_normal.png Binary files differindex f0070b1..f0070b1 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_normal.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_normal.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_selected.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_selected.png Binary files differindex d7aa3f3..d7aa3f3 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_selected.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_selected.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselected.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_unselected.png Binary files differindex 4370b01..4370b01 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselected.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_apps_unselected.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_focused.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_focused.png Binary files differindex d5a3229..d5a3229 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_focused.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_focused.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_normal.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_normal.png Binary files differindex 37fc8c4..37fc8c4 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_normal.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_normal.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_selected.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_selected.png Binary files differindex 804ee13..804ee13 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_selected.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_selected.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselected.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_unselected.png Binary files differindex afe3e23..afe3e23 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselected.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_recent_unselected.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_focused.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_focused.png Binary files differindex f0dd0d8..f0dd0d8 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_focused.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_focused.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_normal.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_normal.png Binary files differindex 9c44527..9c44527 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_normal.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_normal.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_selected.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_selected.png Binary files differindex b87fad3..b87fad3 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_selected.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_selected.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselected.png b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_unselected.png Binary files differindex 865186e..865186e 100755..100644 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselected.png +++ b/TVHome/TVHome.TizenTV/res/ic_home_menu_settings_unselected.png diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselect.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselect.png Binary files differdeleted file mode 100755 index fd6146e..0000000 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_apps_unselect.png +++ /dev/null diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselect.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselect.png Binary files differdeleted file mode 100755 index 3095730..0000000 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_recent_unselect.png +++ /dev/null diff --git a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselect.png b/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselect.png Binary files differdeleted file mode 100755 index 658e3bd..0000000 --- a/TVHome/TVHome.TizenTV/res/ic_tizen_home_menu_settings_unselect.png +++ /dev/null diff --git a/TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_75.png b/TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_75.png Binary files differnew file mode 100644 index 0000000..ae321e2 --- /dev/null +++ b/TVHome/TVHome.TizenTV/res/img_home_list_dimmed_apps_75.png diff --git a/TVHome/TVHome.TizenTV/res/img_tizen_home_menu_focused_bg.png b/TVHome/TVHome.TizenTV/res/img_home_menu_focused_bg.png Binary files differindex 2a8216c..2a8216c 100755..100644 --- a/TVHome/TVHome.TizenTV/res/img_tizen_home_menu_focused_bg.png +++ b/TVHome/TVHome.TizenTV/res/img_home_menu_focused_bg.png diff --git a/TVHome/TVHome.TizenTV/res/img_tizen_home_list_dimmed_apps.png b/TVHome/TVHome.TizenTV/res/img_tizen_home_list_dimmed_apps.png Binary files differdeleted file mode 100644 index 4f5ac7c..0000000 --- a/TVHome/TVHome.TizenTV/res/img_tizen_home_list_dimmed_apps.png +++ /dev/null diff --git a/TVHome/TVHome/Controls/MainPanelButton.xaml b/TVHome/TVHome/Controls/MainPanelButton.xaml index 1731e4a..0468c7d 100755 --- a/TVHome/TVHome/Controls/MainPanelButton.xaml +++ b/TVHome/TVHome/Controls/MainPanelButton.xaml @@ -9,7 +9,7 @@ <Image x:Name="ButtonBgImage" RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=1}" RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}" - Source="img_tizen_home_menu_focused_bg.png" + Source="img_home_menu_focused_bg.png" Opacity="0" Scale="0" /> <Image x:Name="ButtonBlurImage" @@ -31,6 +31,7 @@ RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0.85}" Opacity="0" TextColor="White" + FontFamily="BreezeSans" LineBreakMode="TailTruncation" HorizontalTextAlignment="Center" Text="{Binding CurrentStateDescription.Label}" /> diff --git a/TVHome/TVHome/Controls/MainPanelButton.xaml.cs b/TVHome/TVHome/Controls/MainPanelButton.xaml.cs index 2cc64ae..17eee40 100755 --- a/TVHome/TVHome/Controls/MainPanelButton.xaml.cs +++ b/TVHome/TVHome/Controls/MainPanelButton.xaml.cs @@ -17,6 +17,7 @@ using LibTVRefCommonPortable.Utils; using System; using Xamarin.Forms; +using Xamarin.Forms.PlatformConfiguration.TizenSpecific; namespace TVHome.Controls { @@ -49,6 +50,7 @@ namespace TVHome.Controls ButtonBox.WidthRequest = SizeUtils.GetWidthSize(236); ButtonBox.HeightRequest = SizeUtils.GetHeightSize(260); ButtonTitle.FontSize = SizeUtils.GetFontSize(26); + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium); PropertyChanged += MainPanelButton_PropertyChanged; } diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml index 3ecf50d..f12a969 100755 --- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml +++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml @@ -25,6 +25,7 @@ Opacity="0.6" TextColor="White" LineBreakMode="TailTruncation" + FontFamily="BreezeSans" HorizontalTextAlignment="Center" Text="{Binding CurrentStateDescription.Label}" /> <Button x:Name = "ButtonFocusArea" diff --git a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs index 12aa055..94b1844 100755 --- a/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs +++ b/TVHome/TVHome/Controls/SubPanelAllAppsButton.xaml.cs @@ -17,6 +17,7 @@ using System; using LibTVRefCommonPortable.Utils; using Xamarin.Forms; +using Xamarin.Forms.PlatformConfiguration.TizenSpecific; namespace TVHome.Controls { @@ -40,6 +41,7 @@ namespace TVHome.Controls ButtonBox.WidthRequest = SizeUtils.GetWidthSize(182); ButtonBox.HeightRequest = SizeUtils.GetHeightSize(230); ButtonTitle.FontSize = SizeUtils.GetFontSize(26); + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); } /// <summary> @@ -70,6 +72,7 @@ namespace TVHome.Controls } #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium); ButtonTitle.FadeTo(0.99, 300); ButtonTitle.TranslateTo(0, selectTransitionHeight, 300); #pragma warning restore CS4014 @@ -84,6 +87,7 @@ namespace TVHome.Controls public override async void OnUnfocused(object sender, FocusEventArgs e) { #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); ButtonTitle.FadeTo(0.5, 300); ButtonTitle.TranslateTo(0, 0, 300); #pragma warning restore CS4014 diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml b/TVHome/TVHome/Controls/SubPanelButton.xaml index ca75f41..b3aff64 100755 --- a/TVHome/TVHome/Controls/SubPanelButton.xaml +++ b/TVHome/TVHome/Controls/SubPanelButton.xaml @@ -16,7 +16,7 @@ RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}" RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}" RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}" - Source="img_tizen_home_list_dim_apps.png" /> + Source="img_home_list_dimmed_apps_60.png" /> <Label x:Name="ButtonTitle" RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}" RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.77391}" @@ -24,6 +24,7 @@ RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.758241}" Opacity="0.6" TextColor="White" + FontFamily="BreezeSans" LineBreakMode="TailTruncation" HorizontalTextAlignment="Center" Text="{Binding CurrentStateDescription.Label}" /> diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs index 002ef9d..38727b1 100755 --- a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs +++ b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs @@ -18,6 +18,7 @@ using System; using LibTVRefCommonPortable.Utils; using Xamarin.Forms; using Tizen.Xamarin.Forms.Extension; +using Xamarin.Forms.PlatformConfiguration.TizenSpecific; namespace TVHome.Controls { @@ -51,6 +52,7 @@ namespace TVHome.Controls ButtonBox.WidthRequest = SizeUtils.GetWidthSize(182); ButtonBox.HeightRequest = SizeUtils.GetHeightSize(230); ButtonTitle.FontSize = SizeUtils.GetFontSize(26); + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); MessagingCenter.Subscribe<App, string>(this, "NavigationKeyPressed", (sender, e) => { @@ -224,6 +226,7 @@ namespace TVHome.Controls } #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium); ButtonTitle.FadeTo(0.99, 300); ButtonTitle.TranslateTo(0, selectTransitionHeight, 300); #pragma warning restore CS4014 @@ -242,6 +245,7 @@ namespace TVHome.Controls if (!isMoveMode) { #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); ButtonTitle.FadeTo(0.5, 300); ButtonTitle.TranslateTo(0, 0, 300); #pragma warning restore CS4014 diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml index f76bd73..da458dd 100755 --- a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml +++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml @@ -16,7 +16,7 @@ RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.095652}" RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.6}" RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75824}" - Source="img_home_list_dimmed_apps_60.png" /> + Source="img_home_list_dimmed_apps_75.png" /> <Label x:Name="ButtonTitle" RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.120879}" RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.77391}" @@ -24,6 +24,7 @@ RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.758241}" Opacity="0.6" TextColor="White" + FontFamily="BreezeSans" LineBreakMode="TailTruncation" HorizontalTextAlignment="Center" Text="{Binding CurrentStateDescription.Label}" /> diff --git a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs index b1962e0..89e44a1 100755 --- a/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs +++ b/TVHome/TVHome/Controls/SubPanelReservedButton.xaml.cs @@ -18,6 +18,7 @@ using System; using System.Windows.Input; using LibTVRefCommonPortable.Utils; using Xamarin.Forms; +using Xamarin.Forms.PlatformConfiguration.TizenSpecific; namespace TVHome.Controls { @@ -41,6 +42,7 @@ namespace TVHome.Controls ButtonBox.WidthRequest = SizeUtils.GetWidthSize(182); ButtonBox.HeightRequest = SizeUtils.GetHeightSize(230); ButtonTitle.FontSize = SizeUtils.GetFontSize(26); + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); } /// <summary> @@ -71,6 +73,7 @@ namespace TVHome.Controls } #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium); ButtonTitle.FadeTo(0.99, 300); ButtonTitle.TranslateTo(0, selectTransitionHeight, 300); #pragma warning restore CS4014 @@ -85,6 +88,7 @@ namespace TVHome.Controls public override async void OnUnfocused(object sender, FocusEventArgs e) { #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); ButtonTitle.FadeTo(0.5, 300); ButtonTitle.TranslateTo(0, 0, 300); #pragma warning restore CS4014 diff --git a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml index 8b974cd..27f7c73 100755 --- a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml +++ b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml @@ -24,6 +24,7 @@ RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.758241}" Opacity="0.6" TextColor="White" + FontFamily="BreezeSans" LineBreakMode="TailTruncation" HorizontalTextAlignment="Center" Text="{Binding CurrentStateDescription.Label}"/> diff --git a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs index 632d8d8..3070a5a 100755 --- a/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs +++ b/TVHome/TVHome/Controls/SubPanelSettingButton.xaml.cs @@ -17,6 +17,7 @@ using LibTVRefCommonPortable.Utils; using System; using Xamarin.Forms; +using Xamarin.Forms.PlatformConfiguration.TizenSpecific; namespace TVHome.Controls { @@ -40,6 +41,7 @@ namespace TVHome.Controls ButtonBox.WidthRequest = SizeUtils.GetWidthSize(182); ButtonBox.HeightRequest = SizeUtils.GetHeightSize(230); ButtonTitle.FontSize = SizeUtils.GetFontSize(26); + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); } /// <summary> @@ -70,6 +72,7 @@ namespace TVHome.Controls } #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium); ButtonTitle.FadeTo(0.99, 300); ButtonTitle.TranslateTo(0, selectTransitionHeight, 300); #pragma warning restore CS4014 @@ -84,6 +87,7 @@ namespace TVHome.Controls public override async void OnUnfocused(object sender, FocusEventArgs e) { #pragma warning disable CS4014 + ButtonTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); ButtonTitle.FadeTo(0.5, 300); ButtonTitle.TranslateTo(0, 0, 300); #pragma warning restore CS4014 diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml index 3b22242..234040f 100755 --- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml +++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml @@ -34,6 +34,7 @@ RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Width, Factor=0.75}" RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToView, ElementName=ButtonBox, Property=Height, Factor=0.166}" LineBreakMode="TailTruncation" + FontFamily="BreezeSans" Text="{Binding CurrentStateDescription.Label}" TextColor="#FFFFFF"/> <Button x:Name="ButtonFocusArea" diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs index 571a615..f0a0055 100755 --- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs +++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs @@ -17,6 +17,7 @@ using LibTVRefCommonPortable.Utils; using System; using Tizen.Xamarin.Forms.Extension; using Xamarin.Forms; +using Xamarin.Forms.PlatformConfiguration.TizenSpecific; namespace TVHome.Controls { @@ -40,6 +41,7 @@ namespace TVHome.Controls ButtonBox.WidthRequest = SizeUtils.GetWidthSize(320); ButtonBox.HeightRequest = SizeUtils.GetHeightSize(180); ThumbnailTitle.FontSize = SizeUtils.GetFontSize(26); + ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); //InitializeLongTapGesture(); } @@ -133,6 +135,7 @@ namespace TVHome.Controls //Animation.Commit(ThumbnailTitle, "FocusedAnimation", 16, 300); #pragma warning disable CS4014 + ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Medium); //ThumbnailTitle.FadeTo(0.8, 300); ThumnailDimLayer.FadeTo(0.0, 300); #pragma warning restore CS4014 @@ -163,6 +166,7 @@ namespace TVHome.Controls #pragma warning disable CS4014 //ThumbnailTitle.FadeTo(0.3, 300); + ThumbnailTitle.On<Xamarin.Forms.PlatformConfiguration.Tizen>().SetFontWeight(FontWeight.Normal); ThumnailDimLayer.FadeTo(0.99, 300); #pragma warning restore CS4014 await View.ScaleTo(1.0, 300); diff --git a/TVHome/TVHome/ViewModels/MainPageViewModel.cs b/TVHome/TVHome/ViewModels/MainPageViewModel.cs index f4d4480..0168f48 100755 --- a/TVHome/TVHome/ViewModels/MainPageViewModel.cs +++ b/TVHome/TVHome/ViewModels/MainPageViewModel.cs @@ -278,10 +278,10 @@ namespace TVHome.ViewModels string[] AppControlID = { ManagedApps.TVAppsAppID, ManagedApps.TVAppsAppID, ManagedApps.SettingsAppID }; string[] AppIconPath = { - "ic_tizen_home_menu_{0}_normal.png", - "ic_tizen_home_menu_{0}_focused.png", - "ic_tizen_home_menu_{0}_selected.png", - "ic_tizen_home_menu_{0}_unselect.png" + "ic_home_menu_{0}_normal.png", + "ic_home_menu_{0}_focused.png", + "ic_home_menu_{0}_selected.png", + "ic_home_menu_{0}_unselected.png" }; List<ShortcutInfo> TempList = new List<ShortcutInfo>(); |