From 380a5a587def1cbcaf29713f5afbe781f1165a60 Mon Sep 17 00:00:00 2001 From: Kangho Hur Date: Wed, 7 Jun 2017 14:35:46 +0900 Subject: Fix Naviitem style and toolbar style/mode for given profile (TV/Mobile) - TASK=TCAPI-2463 Change-Id: Ia673842d47ca08111b2cae0bfb6a9fd1ce7b81d2 --- .../Renderers/NavigationPageRenderer.cs | 6 +++++- .../Renderers/TabbedPageRenderer.cs | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) mode change 100755 => 100644 Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs (limited to 'Xamarin.Forms.Platform.Tizen/Renderers') diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs index bc1a2cb7..d43fea8e 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs @@ -163,7 +163,11 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateHasNavigationBar(Page page) { NaviItem item = GetNaviItemForPage(page); - item.Style = page is TabbedPage ? "tabbar" : "default"; + //According to TV UX Guideline, item style should be set to "tabbar" in case of TabbedPage only for TV profile. + if (Device.Idiom == TargetIdiom.TV) + { + item.Style = page is TabbedPage ? "tabbar" : "default"; + } item.TitleBarVisible = (bool)page.GetValue(NavigationPage.HasNavigationBarProperty); UpdateToolbarItem(page, item); UpdateBarBackgroundColor(item); diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs old mode 100755 new mode 100644 index 4ca3e778..b5868669 --- a/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs @@ -48,8 +48,19 @@ namespace Xamarin.Forms.Platform.Tizen AlignmentX = -1, WeightX = 1, SelectionMode = ToolbarSelectionMode.Always, - Style = "tabbar_with_title" }; + + if (Device.Idiom == TargetIdiom.Phone) + { + //Set ShrinkMode to Expand as defauly only for Mobile profile + _toolbar.ShrinkMode = ToolbarShrinkMode.Expand; + } + else if (Device.Idiom == TargetIdiom.TV) + { + //According to TV UX Guideline, toolbar style should be set to "tabbar_with_title" in case of TabbedPage only for TV profile. + _toolbar.Style = "tabbar_with_title"; + } + _toolbar.Show(); //Add callback for Toolbar item selection _toolbar.Selected += OnToolbarItemSelected; -- cgit v1.2.3