Modifies image tab's default sort option to Date.

Modifies NinePatch's ElmSharp.Color value.
Adds image tab's option menu action - slide show

Change-Id: Ie475076081d85825c5b31ddc50189cc72d10a5ea
Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>

diff --git a/TVMediaHub/TVMediaHub.Tizen/Utils/NinePatchImageRenderer.cs b/TVMediaHub/TVMediaHub.Tizen/Utils/NinePatchImageRenderer.cs
index a13ad2ff8844ca2e6d198805c92ca8fadee69b69..b494f0a154cc1a968f664b0659530d1baa270555 100755 (executable)
--- a/TVMediaHub/TVMediaHub.Tizen/Utils/NinePatchImageRenderer.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Utils/NinePatchImageRenderer.cs
@@ -66,7 +66,7 @@ namespace TVMediaHub.Tizen.Utils
         private void UpdateImageColor()
         {
             var img = Element as NinePatch;
-            Control.Color = new ElmSharp.Color(Convert.ToInt32(img.ImageColor.R), Convert.ToInt32(img.ImageColor.G), Convert.ToInt32(img.ImageColor.B));
+            Control.Color = new ElmSharp.Color(Convert.ToInt32(img.ImageColor.R * 255), Convert.ToInt32(img.ImageColor.G * 255), Convert.ToInt32(img.ImageColor.B * 255), Convert.ToInt32(img.ImageColor.A * 255));
         }
 
         /// <summary>

diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
index 8981e87fba970db92021148290326c51431a551e..1b6c541ea3c961fdbaf3145e2a3e92e4e5023d88 100755 (executable)
--- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs
@@ -47,7 +47,7 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         private int displayingImageIndex;
 
-        private SortOption option = SortOption.Title;
+        private SortOption option = SortOption.Date;
 
         /// <summary>
         /// Gets or sets the displayingImageIndex
@@ -525,7 +525,7 @@ namespace TVMediaHub.Tizen.ViewModels
         /// </summary>
         private void CreateImageInfoList()
         {
-            IEnumerable<MediaInformation> MediaInfoList = MediaHubImpl.GetInstance.ImageProviderInstance.ReadWithoutGroup(SortOption.Title);
+            IEnumerable<MediaInformation> MediaInfoList = MediaHubImpl.GetInstance.ImageProviderInstance.ReadWithoutGroup(option);
             imagePlayList = new List<ImageViewerInfomation>();
 
             foreach (var item in MediaInfoList)
@@ -550,9 +550,9 @@ namespace TVMediaHub.Tizen.ViewModels
 
             list = new List<string>
             {
-                "NAME",
                 "EVENT",
                 "FILE FORMAT",
+                "NAME",
             };
             SortOptions = list;
             OnPropertyChanged("SortOptions");

diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
index fcd5b103f67a0aea4fc64c03a250b18d36c35488..501869b8ecb0ce5baf189ba489c750cf5818f44d 100755 (executable)
--- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs
@@ -558,7 +558,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A SelectedItemChanged event's argument</param>
         private void OnOptionSelected(object sender, ContextPopupSelectedEventArgs e)
         {
-            var label = e.Item.Label.ToLower();
+            var label = e.Item.Label.Trim().ToLower();
             if (label.Equals("delete"))
             {
                 DeleteModeChangeCommand?.Execute("");
@@ -566,6 +566,14 @@ namespace TVMediaHub.Tizen.Views
                 FooterDelete.IsVisible = true;
                 SetFooterFocusChain(ImageTabScrollView.ScrollX);
             }
+            else if (label.Equals("slide show"))
+            {
+                Program.TransitionTo(new ImageViewerSlideShow());
+            }
+            else if (label.Equals("detail info"))
+            {
+                // TODO : Display the alerty popup
+            }
         }
 
         /// <summary>

diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
index 5460f56b3ad49f7cd253674509938745bb11d42d..b41c008c4c3e7d23728e4b1adefd983be8aa6e44 100755 (executable)
--- a/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
+++ b/TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs
@@ -549,7 +549,7 @@ namespace TVMediaHub.Tizen.Views
         /// <param name="e">A SelectedItemChanged event's argument</param>
         private void OnOptionSelected(object sender, ContextPopupSelectedEventArgs e)
         {
-            var label = e.Item.Label.ToLower();
+            var label = e.Item.Label.Trim().ToLower();
             if (label.Equals("delete"))
             {
                 ChangeTabStatusCommand?.Execute("");
@@ -557,6 +557,10 @@ namespace TVMediaHub.Tizen.Views
                 FooterDelete.IsVisible = true;
                 SetFooterFocusChain(VideoTabScrollView.ScrollX);
             }
+            else if (label.Equals("disk info"))
+            {
+                // TODO : Display the alerty popup
+            }
         }
 
         /// <summary>