Apps In vi changed.

Itme Selected/UnSelected Vi changed.
Add animation at additionalinfo.
No contents layout added.

Change-Id: Ia609a32af2b32262305cea18cc55a6e04733141a
Signed-off-by: jjie.choi <jjie.choi@samsung.com>

diff --git a/TVApps/TVApps/Controls/AppItemCell.xaml b/TVApps/TVApps/Controls/AppItemCell.xaml
index 2bf1a01..3317ab1 100755 (executable)
--- a/TVApps/TVApps/Controls/AppItemCell.xaml
+++ b/TVApps/TVApps/Controls/AppItemCell.xaml
@@ -18,8 +18,7 @@
     <Image x:Name="DimImage"
            VerticalOptions="Start"
            Source="img_apps_list_dimmed_75.png"
-           Opacity="0"
-           Scale="0" />
+           Opacity="0"/>
     <Image x:Name="StrokeImage"
            VerticalOptions="Start"
            Source="img_apps_list_stroke.png"
@@ -43,13 +42,13 @@
             <Image x:Name="PinnedIcon"
                    Grid.Row="1"
                    Grid.Column="1"
-                   Source="ic_apps_launcher_checkmark.png"
+                   Source="ic_apps_pinmark.png"
                    Opacity="0"/>
             <Label x:Name="ButtonTitle"
                    Grid.Row="0"
                    Grid.RowSpan="3"
                    Grid.Column="2"
-                   Opacity="1"
+                   Opacity="0.6"
                    TextColor="White"
                    LineBreakMode="TailTruncation"
                    HorizontalTextAlignment="Center"

diff --git a/TVApps/TVApps/Controls/AppItemCell.xaml.cs b/TVApps/TVApps/Controls/AppItemCell.xaml.cs
index b7a2167..3c8afa5 100755 (executable)
--- a/TVApps/TVApps/Controls/AppItemCell.xaml.cs
+++ b/TVApps/TVApps/Controls/AppItemCell.xaml.cs
@@ -185,6 +185,7 @@ namespace TVApps.Controls
 
             ButtonTitle.PropertyChanged += ButtonTitlePropertyChanged;
             PropertyChanged += AppItemCellPropertyChanged;
+            ButtonTitle.On<Tizen>().SetFontWeight(FontWeight.Normal);
 
         }
 
@@ -245,23 +246,35 @@ namespace TVApps.Controls
                         var translationY = height300 - height16 * v;
                         ButtonImage.Scale = scale;
                         TextArea.TranslationY = translationY;
+                        if (!IsChecked)
+                        {
+                            var imgOpacity = 0.99 - 0.99 * v;
+                            StrokeImage.Opacity = imgOpacity;
+                            DimImage.Opacity = imgOpacity;
+                            StrokeImage.Scale = scale;
+                            DimImage.Scale = scale;
+                        }
                     },
-                    length: 150,
+                    length: 167,
                     finished: (a, b) =>
                     {
-                        ButtonImage.ScaleTo(1.195, 150);
-                        TextArea.TranslateTo(0.0, height300, 150);
-                        StrokeImage.FadeTo((IsChecked) ? 0.99 : 0.0, 150);
-                        DimImage.FadeTo((IsChecked) ? 0.99 : 0.0, 150);
-                        StrokeImage.ScaleTo((IsChecked) ? 1.195 : 0.0, 300);
-                        DimImage.ScaleTo((IsChecked) ? 1.195 : 0.0, 300);
+                        if (IsChecked) {
+                            StrokeImage.FadeTo(0.99, 167);
+                            DimImage.FadeTo(0.99, 167);
+                            StrokeImage.ScaleTo(1.195, 167);
+                            DimImage.ScaleTo(1.195, 167);
+                        }
+                        ButtonImage.ScaleTo(1.195, 167);
+                        TextArea.TranslateTo(0.0, height300, 167);
                     });
+
+
                 }
                 else
                 {
                     StrokeImage.FadeTo((IsChecked) ? 0.99 : 0.0, 300);
                     DimImage.FadeTo((IsChecked) ? 0.99 : 0.0, 300);
-                    DimImage.ScaleTo((IsChecked) ? 1.195 : 0.0, 300);
+                    DimImage.ScaleTo((IsChecked) ? 1.195 : 1.0, 300);
                     TextArea.TranslateTo(0.0, height284, 300);
                 }
 
@@ -410,8 +423,8 @@ namespace TVApps.Controls
             OnPropertyChanged("IsFocused");
 
             OnFocusedCommand?.Execute("");
-            ButtonTitle.On<Tizen>().SetFontWeight(FontWeight.Medium);
 
+            ButtonTitle.FadeTo(1.0, 167);
             if (IsChecked)
             {
                 DimImage.ScaleTo(1.195, 167);
@@ -433,7 +446,7 @@ namespace TVApps.Controls
         {
             IsItemFocused = false;
             OnPropertyChanged("IsFocused");
-            ButtonTitle.On<Tizen>().SetFontWeight(FontWeight.Normal);
+            ButtonTitle.FadeTo(0.6, 167);
 
             if (!IsShowOptions)
             {

diff --git a/TVApps/TVApps/Controls/AppListView.xaml b/TVApps/TVApps/Controls/AppListView.xaml
index ddb51ca..ec0576c 100755 (executable)
--- a/TVApps/TVApps/Controls/AppListView.xaml
+++ b/TVApps/TVApps/Controls/AppListView.xaml
@@ -13,6 +13,7 @@
                     RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0}">
 
         <StackLayout x:Name="AppUpperList"
+                     IsVisible="False"
                      RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.541}"
                      RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0}"
                      RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0}"
@@ -20,11 +21,23 @@
                      HorizontalOptions="Start"/>
 
         <StackLayout x:Name="AppLowerList"
+                     IsVisible="False"
                      RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.541}"
                      RelativeLayout.YConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.459}"
                      RelativeLayout.XConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=0}"
                      Orientation="Horizontal"
                      HorizontalOptions="Start"/>
+        <StackLayout x:Name="NoContentsView"
+                     IsVisible="True"
+                     RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+                     HorizontalOptions="Center"
+                     Orientation="Vertical" >
+            <Image Source="img_apps_no_contents.png"/>
+            <Label x:Name="LabelNoContents"
+                   Text="No content"
+                   TextColor="#33FFFFFF"
+                   FontFamily="BreezeSans"/>
+        </StackLayout>
 
     </RelativeLayout>
 </ScrollView>

diff --git a/TVApps/TVApps/Controls/AppListView.xaml.cs b/TVApps/TVApps/Controls/AppListView.xaml.cs
index 8646996..49f7323 100755 (executable)
--- a/TVApps/TVApps/Controls/AppListView.xaml.cs
+++ b/TVApps/TVApps/Controls/AppListView.xaml.cs
@@ -125,6 +125,10 @@ namespace TVApps.Controls
             AppLowerList.Padding = padding;
             AppLowerList.Spacing = spacing;
 
+            NoContentsView.Padding = new Thickness(0.0, SizeUtils.GetHeightSize(242), 0.0, 0.0);
+            LabelNoContents.Margin = new Thickness(0.0, SizeUtils.GetHeightSize(28), 0.0, 0.0);
+            LabelNoContents.FontSize = SizeUtils.GetFontSize(28);
+
             AppCount = 0;
             PropertyChanged += AppListViewPropertyChanged;
         }
@@ -199,6 +203,18 @@ namespace TVApps.Controls
                 AppCount = AppCount + 1;
             }
 
+            if (AppCount > 0)
+            {
+                AppUpperList.IsVisible = true;
+                AppLowerList.IsVisible = true;
+                NoContentsView.IsVisible = false;
+            }
+            else
+            {
+                AppUpperList.IsVisible = false;
+                AppLowerList.IsVisible = false;
+                NoContentsView.IsVisible = true;
+            }
             if (OnChangeFocusChainingCommand != null)
             {
                 OnChangeFocusChainingCommand.Execute("");

diff --git a/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs b/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs
index 155aa3f..da65aaa 100755 (executable)
--- a/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs
+++ b/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs
@@ -113,7 +113,7 @@ namespace TVApps.Views
         /// </summary>
         private void CreateSortButton()
         {
-            List<string> SortList = new List<string> { "Newest", "A - Z", "Z - A" };
+            List<string> SortList = new List<string> { "NEWEST", "A - Z", "Z - A" };
 
             SortButton = new DropdownList();
             SortButton.ItemsSource = SortList;

diff --git a/TVApps/TVApps/Views/FooterPinStatus.xaml.cs b/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
index d192857..feb070f 100755 (executable)
--- a/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
+++ b/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
@@ -122,7 +122,8 @@ namespace TVApps.Views
             {
                 Orientation = StackOrientation.Horizontal,
                 Spacing = SizeUtils.GetWidthSize(8),
-                HorizontalOptions = LayoutOptions.Start
+                HorizontalOptions = LayoutOptions.Start,
+                Opacity = 0.0
             };
 
             this.Children.Add(additionalInfo,
@@ -203,10 +204,13 @@ namespace TVApps.Views
                     pinnedAppCount = SumOfCheckedApp;
                     return;
                 }
-
+                additionalInfo.Opacity = 0;
                 additionalInfo.Children.Add(AppNameLabel);
                 additionalInfo.Children.Add(AfterLabel);
                 additionalInfo.IsVisible = true;
+                var animation = new Animation();
+
+                additionalInfo.FadeTo(1, 334);
                 pinnedAppCount = SumOfCheckedApp;
             }
         }

diff --git a/TVHome/TVHome.TizenTV/res/ic_apps_launcher_checkmark.png b/TVHome/TVHome.TizenTV/res/ic_apps_pinmark.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from TVHome/TVHome.TizenTV/res/ic_apps_launcher_checkmark.png
rename to TVHome/TVHome.TizenTV/res/ic_apps_pinmark.png

diff --git a/TVHome/TVHome.TizenTV/res/img_apps_no_contents.png b/TVHome/TVHome.TizenTV/res/img_apps_no_contents.png
new file mode 100644 (file)
index 0000000..7f4b618
Binary files /dev/null and b/TVHome/TVHome.TizenTV/res/img_apps_no_contents.png differ