From fb31339992f925a27af05edebfb63f6a3b206b69 Mon Sep 17 00:00:00 2001 From: "Heonjae.Jang" Date: Fri, 1 Sep 2017 12:12:34 +0900 Subject: [PATCH] Migrates to CPS Change-Id: If375e5c9f5735462d6df04e44c3f8ab2e7f7ad6f Signed-off-by: Heonjae.Jang --- TVMediaHub.sln | 7 +- .../TVMediaHub.Tizen/Properties/AssemblyInfo.cs | 36 --- .../TVMediaHub.Tizen/TVMediaHub.Tizen.csproj | 318 +++------------------ .../TVMediaHub.Tizen.nuget.targets | 9 - .../TVMediaHub.Tizen/TVMediaHub.Tizen.project.json | 27 -- .../Views/FooterDeleteStatus.xaml.cs | 4 +- .../Views/FooterNormalStatus.xaml.cs | 1 - .../TVMediaHub.Tizen/Views/ImageGroup.xaml.cs | 12 +- TVMediaHub/TVMediaHub.Tizen/Views/ImageTab.xaml.cs | 10 +- .../TVMediaHub.Tizen/Views/ImageViewer.xaml.cs | 8 +- .../TVMediaHub.Tizen/Views/MusicGroup.xaml.cs | 85 +++--- .../TVMediaHub.Tizen/Views/MusicItem.xaml.cs | 24 +- TVMediaHub/TVMediaHub.Tizen/Views/MusicTab.xaml.cs | 17 +- .../Views/SimpleImageViewer.xaml.cs | 7 +- .../TVMediaHub.Tizen/Views/VideoGroup.xaml.cs | 8 +- .../TVMediaHub.Tizen/Views/VideoPlayer.xaml.cs | 33 ++- TVMediaHub/TVMediaHub.Tizen/Views/VideoTab.xaml.cs | 10 +- TVMediaHub/TVMediaHub.Tizen/tizen-manifest.xml | 2 +- 18 files changed, 171 insertions(+), 447 deletions(-) delete mode 100644 TVMediaHub/TVMediaHub.Tizen/Properties/AssemblyInfo.cs delete mode 100644 TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.nuget.targets delete mode 100755 TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json diff --git a/TVMediaHub.sln b/TVMediaHub.sln index e0b36ff..73d10f9 100644 --- a/TVMediaHub.sln +++ b/TVMediaHub.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TVMediaHub.Tizen", "TVMediaHub\TVMediaHub.Tizen\TVMediaHub.Tizen.csproj", "{2C968D00-4043-4202-9060-36C831AE6784}" EndProject @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {41764591-2375-476F-A664-7DA9F077C762} + EndGlobalSection EndGlobal diff --git a/TVMediaHub/TVMediaHub.Tizen/Properties/AssemblyInfo.cs b/TVMediaHub/TVMediaHub.Tizen/Properties/AssemblyInfo.cs deleted file mode 100644 index 0395115..0000000 --- a/TVMediaHub/TVMediaHub.Tizen/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("xamediahub")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Samsung")] -[assembly: AssemblyProduct("xamediahub")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2c968d00-4043-4202-9060-36c831ae6784")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj index 202b85b..1ce68cf 100755 --- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj +++ b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.csproj @@ -1,172 +1,40 @@ - - + + + + + $(MSBuildExtensionsPath)\Tizen\VisualStudio\ + + + + + + - 14.0 - Debug - AnyCPU - 8.0.30703 - 2.0 - {2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {2C968D00-4043-4202-9060-36C831AE6784} Exe - Properties - TVMediaHub.Tizen - TVMediaHub.Tizen - 512 - en-US + netcoreapp2.0 + + - DNXCore - v5.0 - false - .NETCoreApp,Version=v1.0 - true - $(NoWarn);1701 - false + true + $(PackageTargetFallback);portable-net45+wp80+win81+wpa81 + - true portable - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - portable - true - bin\Release\ - TRACE - prompt - 4 + None + - - - - ZoomNaviButton.xaml - - - - MediaHubButton.xaml - - - - - - - - - - - - - - - - - - - - - - - - - NinePatch.xaml - - - - - - - - - - - - - - - - - - FooterNormalStatus.xaml - - - FooterDeleteStatus.xaml - - - ImageGroup.xaml - - - ImageItem.xaml - - - ImageTab.xaml - - - MusicGroup.xaml - - - MusicItem.xaml - - - SimpleImageViewer.xaml - - - ImageViewer.xaml - - - ImageViewerSlideShow.xaml - - - ImageViewerZoom.xaml - - - MediaHubMainPage.xaml - - - MusicTab.xaml - - - VideoGroup.xaml - - - VideoItem.xaml - - - MusicPlayer.xaml - - - VideoPlayer.xaml - - - VideoTab.xaml - - + - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - + @@ -244,130 +112,22 @@ - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - - - - - MSBuild:UpdateDesignTimeXaml - Designer - - - - - MSBuild:UpdateDesignTimeXaml - Designer - - - - - MSBuild:UpdateDesignTimeXaml - Designer - - - - - MSBuild:UpdateDesignTimeXaml - Designer - - - - - - - - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) - true - - - - - - True - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.nuget.targets b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.nuget.targets deleted file mode 100644 index e114c4d..0000000 --- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.nuget.targets +++ /dev/null @@ -1,9 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - \ No newline at end of file diff --git a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json b/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json deleted file mode 100755 index 55be44b..0000000 --- a/TVMediaHub/TVMediaHub.Tizen/TVMediaHub.Tizen.project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "debugType": "portable", - "platform": "AnyCPU", - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.2", - "Tizen.NET": "4.0.0-preview1-00115", - "Tizen.Xamarin.Forms.Extension": "2.4.0-v00002", - "Xamarin.Forms": "2.4.0-r266-001", - "Xamarin.Forms.Platform.Tizen": "2.4.0-r266-005" - }, - "runtimes": { - "win": {}, - "linux": {} - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "portable-net45+wp80+win81+wpa81", - "netstandard1.6" - ] - } - } -} \ No newline at end of file diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/FooterDeleteStatus.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/FooterDeleteStatus.xaml.cs index 1422f39..65b586d 100755 --- a/TVMediaHub/TVMediaHub.Tizen/Views/FooterDeleteStatus.xaml.cs +++ b/TVMediaHub/TVMediaHub.Tizen/Views/FooterDeleteStatus.xaml.cs @@ -17,7 +17,6 @@ using System; using Xamarin.Forms; using Xamarin.Forms.Xaml; -using Xamarin.Forms.PlatformConfiguration.TizenSpecific; using TVMediaHub.Tizen.Utils; namespace TVMediaHub.Tizen.Views @@ -173,8 +172,11 @@ namespace TVMediaHub.Tizen.Views /// private void InitializeLabel() { + /// TODO : Check This Part(Nuget Package Issue) + /* LabelCount.On().SetFontWeight(FontWeight.Medium); LabelText.On().SetFontWeight(FontWeight.Light); + */ LabelCount.Text = "0 " + ContentType; LabelText.Text = "is Selected"; diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/FooterNormalStatus.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/FooterNormalStatus.xaml.cs index de5a12e..ec93810 100755 --- a/TVMediaHub/TVMediaHub.Tizen/Views/FooterNormalStatus.xaml.cs +++ b/TVMediaHub/TVMediaHub.Tizen/Views/FooterNormalStatus.xaml.cs @@ -223,7 +223,6 @@ namespace TVMediaHub.Tizen.Views ContextPopup popup = new ContextPopup { IsAutoHidingEnabled = true, - Orientation = ContextPopupOrientation.Vertical, DirectionPriorities = new ContextPopupDirectionPriorities(ContextPopupDirection.Up, ContextPopupDirection.Right, ContextPopupDirection.Left, ContextPopupDirection.Down), }; diff --git a/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs b/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs index c09f90a..94419ae 100755 --- a/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs +++ b/TVMediaHub/TVMediaHub.Tizen/Views/ImageGroup.xaml.cs @@ -23,7 +23,6 @@ using TVMediaHub.Tizen.DataModels; using TVMediaHub.Tizen.Models; using TVMediaHub.Tizen.Utils; using Xamarin.Forms; -using Xamarin.Forms.PlatformConfiguration.TizenSpecific; using Xamarin.Forms.Xaml; using static TVMediaHub.Tizen.Views.ImageItem; @@ -95,7 +94,8 @@ namespace TVMediaHub.Tizen.Views { TitleFocusArea.Clicked += (e, v) => { - TitleFocusArea.On().MoveFocusDown(); + /// TODO : Check This Part(Nuget Package Issue) + //TitleFocusArea.On().MoveFocusDown(); }; ChildrenFocusList = new List