From: Heonjae Jang Date: Thu, 23 Mar 2017 06:24:13 +0000 (+0900) Subject: TV Apps - App In Animation X-Git-Tag: submit/tizen/20170808.015446~171 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e30aca994d911c57c5c576602137efb93b60bf53;p=profile%2Ftv%2Fapps%2Fdotnet%2Fhome.git TV Apps - App In Animation 1. Add App In Animation 2. Check StyleCop Change-Id: Id4a029d64729a81403c2f7da2935792691ba929c --- diff --git a/LibTVRefCommonPortable/DataModels/AppShortcutInfo.cs b/LibTVRefCommonPortable/DataModels/AppShortcutInfo.cs index 8652033..2e369c2 100644 --- a/LibTVRefCommonPortable/DataModels/AppShortcutInfo.cs +++ b/LibTVRefCommonPortable/DataModels/AppShortcutInfo.cs @@ -90,7 +90,7 @@ namespace LibTVRefCommonPortable.DataModels } [XmlIgnore] - private bool isFocused { get; set; } + private bool isFocused; [XmlIgnore] public bool IsFocused diff --git a/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs b/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs index 4830e32..64a325f 100755 --- a/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs +++ b/LibTVRefCommonPortable/Models/SettingShortcutFactory.cs @@ -43,7 +43,8 @@ namespace LibTVRefCommonPortable.Models { Label = "Settings", IconPath = "ic_tizen_home_menu_settings_selected.png", - Action = new AppControlAction() { + Action = new AppControlAction() + { AppID = "org.tizen.settings" }, } diff --git a/LibTVRefCommonTizen/Ports/ElmPort.cs b/LibTVRefCommonTizen/Ports/ElmPort.cs index d1b5510..46eb65e 100644 --- a/LibTVRefCommonTizen/Ports/ElmPort.cs +++ b/LibTVRefCommonTizen/Ports/ElmPort.cs @@ -26,30 +26,30 @@ namespace LibTVRefCommonTizen.Ports internal delegate bool EcoreEventHanlderCallback(IntPtr data, int type, IntPtr ei); [DllImport("libelementary.so.1", EntryPoint = "elm_win_keygrab_set", CallingConvention = CallingConvention.Cdecl)] - internal static extern IntPtr elm_win_keygrab_set(IntPtr obj, string key, ulong modifiers, ulong not_modifiers, int proirity, int grab_mode); + internal static extern IntPtr Elm_win_keygrab_set(IntPtr obj, string key, ulong modifiers, ulong not_modifiers, int proirity, int grab_mode); [DllImport("libelementary.so.1", EntryPoint = "elm_win_iconified_set", CallingConvention = CallingConvention.Cdecl)] - internal static extern void elm_win_iconified_set(IntPtr obj, bool iconified); + internal static extern void Elm_win_iconified_set(IntPtr obj, bool iconified); [DllImport("libelementary.so.1", EntryPoint = "elm_win_iconified_get", CallingConvention = CallingConvention.Cdecl)] - internal static extern bool elm_win_iconified_get(IntPtr obj); + internal static extern bool Elm_win_iconified_get(IntPtr obj); } public static void SetKeyGrabExclusively(IntPtr window, string key) { DebuggingPort.D("Grab Key Event for :" + key); - Elm.elm_win_keygrab_set(window, key, 0, 0, 0, 1024); + Elm.Elm_win_keygrab_set(window, key, 0, 0, 0, 1024); } public static void SetIconified(IntPtr window, bool iconified) { DebuggingPort.D("Iconified :" + iconified); - Elm.elm_win_iconified_set(window, iconified); + Elm.Elm_win_iconified_set(window, iconified); } public static bool GetIconified(IntPtr window) { - return Elm.elm_win_iconified_get(window); + return Elm.Elm_win_iconified_get(window); } } } diff --git a/TVApps/TVApps.TizenTV/TVApps.TizenTV.cs b/TVApps/TVApps.TizenTV/TVApps.TizenTV.cs index 050b7e5..5e60de0 100644 --- a/TVApps/TVApps.TizenTV/TVApps.TizenTV.cs +++ b/TVApps/TVApps.TizenTV/TVApps.TizenTV.cs @@ -39,6 +39,7 @@ namespace TVApps.TizenTV get; private set; } + private void CallbackForKeyGrab(Object state) { MainWindow.KeyGrab(ElmSharp.EvasKeyEventArgs.PlatformMenuButtonName, true); diff --git a/TVApps/TVApps/Controls/AppItemCell.xaml.cs b/TVApps/TVApps/Controls/AppItemCell.xaml.cs index 0016b6a..eefe437 100755 --- a/TVApps/TVApps/Controls/AppItemCell.xaml.cs +++ b/TVApps/TVApps/Controls/AppItemCell.xaml.cs @@ -112,7 +112,7 @@ namespace TVApps.Controls } else if (e.PropertyName.CompareTo("IsShowOptions") == 0) { - changeDefaultIconSize(); + ChangeDefaultIconSize(); if (IsShowOptions) { @@ -142,7 +142,7 @@ namespace TVApps.Controls } } - public void changeDefaultIconSize() + public void ChangeDefaultIconSize() { ButtonImage.ScaleTo(1.0, 50); ButtonImage.TranslateTo(0.0, 0.0, 100); @@ -151,7 +151,7 @@ namespace TVApps.Controls public void ShowOptionMenu() { - changeDefaultIconSize(); + ChangeDefaultIconSize(); ButtonImage.TranslateTo(0, -90, 100); TextArea.TranslateTo(0, -90, 100); @@ -161,7 +161,7 @@ namespace TVApps.Controls public void HideOptionMenu() { - changeDefaultIconSize(); + ChangeDefaultIconSize(); ButtonImage.TranslateTo(0, 0, 100); TextArea.TranslateTo(0, 0, 100); diff --git a/TVApps/TVApps/Controls/AppListView.xaml.cs b/TVApps/TVApps/Controls/AppListView.xaml.cs index e607abc..b977692 100644 --- a/TVApps/TVApps/Controls/AppListView.xaml.cs +++ b/TVApps/TVApps/Controls/AppListView.xaml.cs @@ -128,8 +128,6 @@ namespace TVApps.Controls AppCount = AppCount + 1; } //} - - InitializeFocus(); } private async void ScrollToIndex(int index) diff --git a/TVApps/TVApps/TVApps.csproj b/TVApps/TVApps/TVApps.csproj index ddb6249..e0f8edb 100644 --- a/TVApps/TVApps/TVApps.csproj +++ b/TVApps/TVApps/TVApps.csproj @@ -106,12 +106,6 @@ - - - {67F9D3A8-F71E-4428-913F-C37AE82CDB24} - LibTVRefCommonPortable - - MSBuild:UpdateDesignTimeXaml @@ -132,6 +126,12 @@ Designer + + + {67f9d3a8-f71e-4428-913f-c37ae82cdb24} + LibTVRefCommonPortable + + diff --git a/TVApps/TVApps/ViewModels/AppsHolder.cs b/TVApps/TVApps/ViewModels/AppsHolder.cs index fd46813..2cb4e09 100644 --- a/TVApps/TVApps/ViewModels/AppsHolder.cs +++ b/TVApps/TVApps/ViewModels/AppsHolder.cs @@ -221,6 +221,7 @@ namespace TVApps.ViewModels { item.IsDim = true; } + break; case AppsStatus.Delete: item.IsChecked = false; diff --git a/TVApps/TVApps/Views/MainPage.xaml b/TVApps/TVApps/Views/MainPage.xaml index 459ccd9..143fa9e 100755 --- a/TVApps/TVApps/Views/MainPage.xaml +++ b/TVApps/TVApps/Views/MainPage.xaml @@ -7,129 +7,136 @@ x:Class="TVApps.Views.MainPage" BackgroundColor="#000000" CurrentStatus="{Binding CurrentStatus}"> - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - 0 - 0 + + + + + + + + 0 + 0 -