Fix Self-Verification issue : Spacing between Music Player and Music List when the count of list is less than 5 (2 columns).

Change-Id: I098525e1b9c5bf36405627636ad1143b3807112b
Signed-off-by: Heonjae.Jang <Heonjae.Jang@samsung.com>

2 files changed, 39 insertions, 19 deletions

diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
index 5988045..7063a83 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml
@@ -39,6 +39,7 @@
         <StackLayout x:Name="MusicTabContents"
                      RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height, Factor=0.855}"
                      RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width, Factor=1}"
+                     HorizontalOptions="Start"
                      Orientation="Horizontal">
             <Views:MusicPlayer x:Name="MusicPlayer" />
             <ScrollView x:Name="MusicTabScrollView"
diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
index 1e7bf59..dab15e3 100755
--- a/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs
@@ -256,34 +256,53 @@ namespace TVMediaHub.Tizen.Views
                 TizenVisualElement.SetNextFocusUpView(FooterNormal.DropdownSource, MusicPlayer.GetFocusArea());
             }
 
-            for (var buttonIndex = 0; buttonIndex < list.Count; buttonIndex++)
+            if(list.Count == 1)
             {
-                var btn = list[buttonIndex].Value;
-
-                if (buttonIndex == list.Count - 1)
+                var btn = list[0].Value;
+                if (MusicTabStatus == TabStatus.Delete)
                 {
-                    if (MusicTabStatus == TabStatus.Delete)
-                    {
-                        TizenVisualElement.SetNextFocusDownView(btn, FooterDelete.GetCancelButton());
-                        TizenVisualElement.SetNextFocusUpView(FooterDelete.GetCancelButton(), btn);
-                    }
-                    else
-                    {
-                        TizenVisualElement.SetNextFocusDownView(btn, FooterNormal.ButtonOption);
-                        TizenVisualElement.SetNextFocusUpView(FooterNormal.ButtonOption, btn);
-                    }
+                    TizenVisualElement.SetNextFocusDownView(btn, FooterDelete.GetOkButton());
+                    TizenVisualElement.SetNextFocusUpView(FooterDelete.GetCancelButton(), btn);
+                    TizenVisualElement.SetNextFocusUpView(FooterDelete.GetOkButton(), btn);
                 }
                 else
                 {
-                    if (MusicTabStatus == TabStatus.Delete)
+                    TizenVisualElement.SetNextFocusDownView(btn, FooterNormal.DropdownSort);
+                    TizenVisualElement.SetNextFocusUpView(FooterNormal.ButtonOption, btn);
+                    TizenVisualElement.SetNextFocusUpView(FooterNormal.DropdownSort, btn);
+                }
+            }
+            else
+            {
+                for (var buttonIndex = 0; buttonIndex < list.Count; buttonIndex++)
+                {
+                    var btn = list[buttonIndex].Value;
+
+                    if (buttonIndex == list.Count - 1)
                     {
-                        TizenVisualElement.SetNextFocusDownView(btn, FooterDelete.GetOkButton());
-                        TizenVisualElement.SetNextFocusUpView(FooterDelete.GetOkButton(), btn);
+                        if (MusicTabStatus == TabStatus.Delete)
+                        {
+                            TizenVisualElement.SetNextFocusDownView(btn, FooterDelete.GetCancelButton());
+                            TizenVisualElement.SetNextFocusUpView(FooterDelete.GetCancelButton(), btn);
+                        }
+                        else
+                        {
+                            TizenVisualElement.SetNextFocusDownView(btn, FooterNormal.ButtonOption);
+                            TizenVisualElement.SetNextFocusUpView(FooterNormal.ButtonOption, btn);
+                        }
                     }
                     else
                     {
-                        TizenVisualElement.SetNextFocusDownView(btn, FooterNormal.DropdownSort);
-                        TizenVisualElement.SetNextFocusUpView(FooterNormal.DropdownSort, btn);
+                        if (MusicTabStatus == TabStatus.Delete)
+                        {
+                            TizenVisualElement.SetNextFocusDownView(btn, FooterDelete.GetOkButton());
+                            TizenVisualElement.SetNextFocusUpView(FooterDelete.GetOkButton(), btn);
+                        }
+                        else
+                        {
+                            TizenVisualElement.SetNextFocusDownView(btn, FooterNormal.DropdownSort);
+                            TizenVisualElement.SetNextFocusUpView(FooterNormal.DropdownSort, btn);
+                        }
                     }
                 }
             }