From 6ab9b7ffd9795d0f4313e9707e4bf98152607213 Mon Sep 17 00:00:00 2001 From: "jjie.choi" Date: Wed, 12 Apr 2017 19:24:29 +0900 Subject: [PATCH] 1. GroupView Name changed. 2. Get Image data from ContentProvider 3. Add Privileges MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ieb73d98756f2c9d2dc336019764bf0736b42424d Signed-off-by: jjie.cOAhoi --- .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj | 12 ++-- .../ViewModels/ImageTabViewModel.cs | 19 ++++++ .../Views/Gallery3ColumnGroupView.xaml.cs | 36 ----------- ...allery3ColumnGroupView.xaml => ImageGroup.xaml} | 4 +- .../TVMediaHub.Tizen/Views/ImageGroup.xaml.cs | 71 ++++++++++++++++++++++ .../{GalleryImageContent.xaml => ImageItem.xaml} | 7 ++- ...lleryImageContent.xaml.cs => ImageItem.xaml.cs} | 51 +++++++++++----- TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml | 3 +- TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs | 45 ++++++++++---- .../TVMediaHub.Tizen/Views/MediaHubMainPage.xaml | 3 +- TVMediaHub/TVMediaHub.Tizen/tizen-manifest.xml | 1 + 11 files changed, 177 insertions(+), 75 deletions(-) delete mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml.cs rename TVMediaHub/TVMediaHub.Tizen/Views/{Gallery3ColumnGroupView.xaml => ImageGroup.xaml} (80%) create mode 100644 TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs rename TVMediaHub/TVMediaHub.Tizen/Views/{GalleryImageContent.xaml => ImageItem.xaml} (88%) rename TVMediaHub/TVMediaHub.Tizen/Views/{GalleryImageContent.xaml.cs => ImageItem.xaml.cs} (63%) diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj index 6c074ad..6524de5 100755 --- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj +++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj @@ -74,11 +74,11 @@ FooterSelectedStatus.xaml - - Gallery3ColumnGroupView.xaml + + ImageGroup.xaml - - GalleryImageContent.xaml + + ImageItem.xaml ImageTab.xaml @@ -181,7 +181,7 @@ - + MSBuild:UpdateDesignTimeXaml @@ -201,7 +201,7 @@ - + MSBuild:UpdateDesignTimeXaml diff --git a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs index 43670c6..8a77b16 100644 --- a/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs +++ b/TVMediaHub/TVMediaHub.Tizen/ViewModels/ImageTabViewModel.cs @@ -14,7 +14,10 @@ * limitations under the License. */ +using System.Collections.Generic; using System.ComponentModel; +using Tizen.Content.MediaContent; +using TVMediaHub.Tizen.Models; using Xamarin.Forms; namespace TVMediaHub.Tizen.ViewModels @@ -28,8 +31,16 @@ namespace TVMediaHub.Tizen.ViewModels public event PropertyChangedEventHandler PropertyChanged; + public IEnumerable ImageList { get; set; } + public Command DeleteModeChangeCommand { get; set; } + + public Command SetSelectedImageCommand { get; set; } + + public MediaInformation currentimage { get; set; } + + public bool IsDeleteMode { set @@ -91,8 +102,16 @@ namespace TVMediaHub.Tizen.ViewModels { OnDeleteModeChanged(); }); + + ReadImageList(); } + + void ReadImageList() + { + ImageList = MediaHubImpl.GetInstance.ImageProviderInstance.Read(SortOption.Title); + OnPropertyChanged("ImageList"); + } } diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml.cs deleted file mode 100644 index 76a715e..0000000 --- a/TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -namespace TVMediaHub.Tizen.Views -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class Gallery3ColumnGroupView : StackLayout - { - static int Column = 3; - int ContentsSize = 10; - - - public Gallery3ColumnGroupView() - { - InitializeComponent(); - InitializeSize(); - AddContentsView(); - } - - private void InitializeSize() - { - Margin = new Thickness(0, 0, Utils.SizeUtils.GetWidthSize(60), 0); - groupTitle.FontSize = Utils.SizeUtils.GetFontSize(30); - } - - void AddContentsView() - { - - for (int i = 0; i < ContentsSize; i++) - { - var imgContent = new GalleryImageContent(); - GroupContentArea.Children.Add(imgContent, i / Column, i % Column); - } - } - } -} diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml b/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml similarity index 80% rename from TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml rename to TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml index 574e0a1..7d69057 100644 --- a/TVMediaHub/TVMediaHub.Tizen/Views/Gallery3ColumnGroupView.xaml +++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml @@ -1,7 +1,7 @@  + x:Class="TVMediaHub.Tizen.Views.ImageGroup"> -