Change Apps Layout

Change-Id: Ic9e1ef201a26d7806267376a132cc32a48b24b12
Signed-off-by: Heonjae Jang <heonjae.jang@samsung.com>

diff --git a/TVApps/TVApps/Views/FooterDeleteStatus.xaml.cs b/TVApps/TVApps/Views/FooterDeleteStatus.xaml.cs
index 48ba769..de06fdc 100755 (executable)
--- a/TVApps/TVApps/Views/FooterDeleteStatus.xaml.cs
+++ b/TVApps/TVApps/Views/FooterDeleteStatus.xaml.cs
@@ -46,7 +46,7 @@ namespace TVApps.Views
             this.Children.Add(CancelButton,
                 heightConstraint: Constraint.Constant(SizeUtils.GetHeightSize(80)),
                 widthConstraint: Constraint.Constant(SizeUtils.GetWidthSize(300)),
-                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(762)),
+                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(662)),
                 xConstraint: Constraint.Constant(SizeUtils.GetWidthSize(96 + 1130 + 300 + 2)));
         }
 

diff --git a/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs b/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs
index 7170608..7258f50 100755 (executable)
--- a/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs
+++ b/TVApps/TVApps/Views/FooterNormalStatus.xaml.cs
@@ -91,7 +91,7 @@ namespace TVApps.Views
             this.Children.Add(OptionButton,
                 heightConstraint: Constraint.Constant(SizeUtils.GetHeightSize(80)),
                 widthConstraint: Constraint.Constant(SizeUtils.GetWidthSize(300)),
-                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(762)),
+                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(662)),
                 xConstraint: Constraint.Constant(SizeUtils.GetWidthSize(96 + 1130 + 300 + 2)));
         }
 
@@ -114,7 +114,7 @@ namespace TVApps.Views
             this.Children.Add(SortButton,
                 heightConstraint: Constraint.Constant(SizeUtils.GetHeightSize(80)),
                 widthConstraint: Constraint.Constant(SizeUtils.GetWidthSize(300)),
-                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(762)),
+                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(662)),
                 xConstraint: Constraint.Constant(SizeUtils.GetWidthSize(96 + 1130)));
         }
 

diff --git a/TVApps/TVApps/Views/FooterPinStatus.xaml.cs b/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
index 267a1fc..d4b8248 100755 (executable)
--- a/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
+++ b/TVApps/TVApps/Views/FooterPinStatus.xaml.cs
@@ -101,7 +101,7 @@ namespace TVApps.Views
             this.Children.Add(additionalInfo,
                 heightConstraint: Constraint.Constant(SizeUtils.GetHeightSize(128)),
                 widthConstraint: Constraint.Constant(SizeUtils.GetWidthSize(600)),
-                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(762)),
+                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(662)),
                 xConstraint: Constraint.Constant(SizeUtils.GetWidthSize(96)));
 
             additionalInfo.IsVisible = false;
@@ -145,7 +145,7 @@ namespace TVApps.Views
             this.Children.Add(DoneButton,
                 heightConstraint: Constraint.Constant(SizeUtils.GetHeightSize(80)),
                 widthConstraint: Constraint.Constant(SizeUtils.GetWidthSize(300)),
-                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(762)),
+                yConstraint: Constraint.Constant(SizeUtils.GetHeightSize(662)),
                 xConstraint: Constraint.Constant(SizeUtils.GetWidthSize(96 + 1332 + 96)));
        }
 

diff --git a/TVApps/TVApps/Views/MainPage.xaml b/TVApps/TVApps/Views/MainPage.xaml
index 6da560f..62a9fcf 100755 (executable)
--- a/TVApps/TVApps/Views/MainPage.xaml
+++ b/TVApps/TVApps/Views/MainPage.xaml
@@ -31,42 +31,54 @@
 
   <Grid>
     <Grid.RowDefinitions>
-      <RowDefinition Height="95*" />
-      <RowDefinition Height="329*" />
-      <RowDefinition Height="52*" />
-      <RowDefinition Height="64*" />
+      <RowDefinition Height="224*" />
+      <RowDefinition Height="66*" />
+      <RowDefinition Height="34*" />
+      <RowDefinition Height="498*" />
+      <RowDefinition Height="16*" />
+      <RowDefinition Height="114*" />
+      <RowDefinition Height="128*" />
     </Grid.RowDefinitions>
     <Grid.RowSpacing>0</Grid.RowSpacing>
     <Grid.ColumnSpacing>0</Grid.ColumnSpacing>
 
-    <Views:FooterNormalStatus Grid.Row="1"
-                              Grid.RowSpan="3"
+    <Views:FooterNormalStatus Grid.Row="2"
+                              Grid.RowSpan="5"
                               x:Name="FooterNormal"
                               IsVisible="true" />
 
-    <Views:FooterPinStatus Grid.Row="1"
-                           Grid.RowSpan="3"
+    <Views:FooterPinStatus Grid.Row="2"
+                           Grid.RowSpan="5"
                            x:Name="FooterPin"
                            IsVisible="false"
                            PinnedAppName="{Binding PinnedAppName}"
                            UnpinnedAppName="{Binding UnpinnedAppName}"
                            SumOfCheckedApp="{Binding SumOfCheckedApp}"/>
 
-    <Views:FooterDeleteStatus Grid.Row="1"
-                              Grid.RowSpan="3"
+    <Views:FooterDeleteStatus Grid.Row="2"
+                              Grid.RowSpan="5"
                               x:Name="FooterDelete"
                               IsVisible="false" />
+      <Grid Grid.Row="0"
+               Grid.RowSpan="2">
+          <Grid.RowDefinitions>
+              <RowDefinition Height="108*" />
+              <RowDefinition Height="96*" />
+              <RowDefinition Height="86*" />
+          </Grid.RowDefinitions>
+          <Label Grid.Row="1"
+                 Style="{StaticResource titleText}"
+                 HorizontalTextAlignment="Center"
+                 VerticalOptions="CenterAndExpand"
+                 HorizontalOptions="CenterAndExpand"
+                 FontSize="{Binding TitleTextSize}"
+                 Text="APPS"
+                 x:Name="TitleLabel"/>
+      </Grid>
 
-    <Label Grid.Row="0"
-           Style="{StaticResource titleText}"
-           HorizontalTextAlignment="Center"
-           VerticalOptions="CenterAndExpand"
-           HorizontalOptions="CenterAndExpand"
-           FontSize="{Binding TitleTextSize}"
-           Text="APPS"
-           x:Name="TitleLabel"/>
-
-    <Grid Grid.Row="0" x:Name="Header">
+    <Grid Grid.Row="0"
+          Grid.RowSpan="2"
+          x:Name="Header">
       <Grid.RowDefinitions>
         <RowDefinition Height="37*" />
         <RowDefinition Height="34*" />
@@ -98,6 +110,7 @@
 
     <Controls:AppListView x:Name="AppList"
                           Grid.Row="1"
+                          Grid.RowSpan="4"
                           ItemsSource="{Binding InstalledAppList}">
       <Controls:AppListView.ItemTemplate>
         <DataTemplate>
@@ -109,7 +122,7 @@
     <BoxView x:Name="PageDimBox"
              Color="Black"
              Grid.Row="0"
-             Grid.RowSpan="4"
+             Grid.RowSpan="7"
              Grid.Column="0"
              Opacity="0.99"/>
   </Grid>

diff --git a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
index 5488d3c..e67244d 100755 (executable)
--- a/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelThumbnailButton.xaml.cs
@@ -120,19 +120,6 @@ namespace TVHome.Controls
             {
                 OnFocusedCommand.Execute("");
             }
-            // Height, Width 확장 Animiation
-            //var Animation = new Animation();
-            //var viewHeightAnimation = new Animation(v => View.HeightRequest = v, 180, 216);
-            //var viewWidthAnimation = new Animation(v => View.WidthRequest = v, 320, 384);
-            //var imageWidthAnimation = new Animation(v => ThumbnailImage.Scale = v, 1, 1.2);
-            //var imagePositionAnimation = new Animation(v => ThumbnailImage.TranslationX = v, 0, 32);
-            //var titleAnimation = new Animation(v => ThumbnailTitle.Opacity = v, 0, 0.99);
-            //Animation.Add(0, 1, viewHeightAnimation);
-            //Animation.Add(0, 1, viewWidthAnimation);
-            //Animation.Add(0, 1, imageWidthAnimation);
-            //Animation.Add(0, 1, imagePositionAnimation);
-            //Animation.Add(0, 1, titleAnimation);
-            //Animation.Commit(ThumbnailTitle, "FocusedAnimation", 16, 300);
 
 #pragma warning disable CS4014
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_focused.9.png";
@@ -151,20 +138,6 @@ namespace TVHome.Controls
         public override async void OnUnfocused(object sender, FocusEventArgs e)
         {
             isFocused = false;
-            // Height, Width 확장 Animiation
-            //var Animation = new Animation();
-            //var viewHeightAnimation = new Animation(v => View.HeightRequest = v, 216, 180);
-            //var viewWidthAnimation = new Animation(v => View.WidthRequest = v, 384, 320);
-            //var imageWidthAnimation = new Animation(v => ThumbnailImage.Scale = v, 1.2, 1);
-            //var imagePositionAnimation = new Animation(v => ThumbnailImage.TranslationX = v, 32, 0);
-            //var titleAnimation = new Animation(v => ThumbnailTitle.Opacity = v, 0.99, 0);
-            //Animation.Add(0, 1, viewHeightAnimation);
-            //Animation.Add(0, 1, viewWidthAnimation);
-            //Animation.Add(0, 1, imageWidthAnimation);
-            //Animation.Add(0, 1, imagePositionAnimation);
-            //Animation.Add(0, 1, titleAnimation);
-            //Animation.Commit(ThumbnailTitle, "UnfocusedAnimation", 16, 300);
-
 #pragma warning disable CS4014
             //ThumbnailTitle.FadeTo(0.3, 300);
             ThumbnailGradient.Source = "ic_list_thumbnail_gradient_normal.9.png";