Added License notice, changed project file.

remove unused xaml file and fix binding context for selector view

Change-Id: Ifd2d5b91bd43f986bf3ee984929f92945e90fad2
Signed-off-by: aman.jeph <aman.jeph@samsung.com>

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..8a7dca8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+music-player/.vs/
+music-player/bin/
+music-player/obj/

diff --git a/NOTICE b/NOTICE
new file mode 100755 (executable)
index 0000000..4649903
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) 2020 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Apache License, Version 2.
+Please, see the LICENSE file for Apache License terms and conditions.
\ No newline at end of file

diff --git a/music-player/Core/PlayerController.cs b/music-player/Core/PlayerController.cs
old mode 100644 (file)
new mode 100755 (executable)
index 4cd4a80..e0894a9
--- a/music-player/Core/PlayerController.cs
+++ b/music-player/Core/PlayerController.cs
@@ -7,7 +7,7 @@ namespace MusicPlayer.Core
     class PlayerController
     {
         private readonly MusicPlayer musicPlayer;
-        private static PlayerController instance = instance ??= new PlayerController();
+        private static PlayerController instance = new PlayerController();
 
         private PlayerController()
         {

diff --git a/music-player/ViewModels/PlayingListViewModel.cs b/music-player/ViewModels/PlayingListViewModel.cs
index fa683da46b4fbd23775045c74cf81887055b1190..4bc0db07db35b579cf88787c4fb0aa88f7a38c23 100755 (executable)
--- a/music-player/ViewModels/PlayingListViewModel.cs
+++ b/music-player/ViewModels/PlayingListViewModel.cs
@@ -16,7 +16,14 @@ namespace MusicPlayer.ViewModels
 
         public static Random ThisThreadsRandom
         {
-            get { return Local ??= new Random(unchecked(Environment.TickCount * 31 + Thread.CurrentThread.ManagedThreadId)); }
+            get
+            {
+                if(Local == null)
+                {
+                    Local = new Random(unchecked(Environment.TickCount * 31 + Thread.CurrentThread.ManagedThreadId));
+                }
+                return Local;
+            }
         }
     }
 

diff --git a/music-player/Views/PlaylistView.cs b/music-player/Views/PlaylistView.cs
index c274d19b29620e30aeae8180d4ea709c552e0eef..c4f4372dc9eac715e466e2b4772a342a6960b008 100755 (executable)
--- a/music-player/Views/PlaylistView.cs
+++ b/music-player/Views/PlaylistView.cs
@@ -74,7 +74,7 @@ namespace MusicPlayer.Views
 
         private void OnPlaylistCreate(object sender, ClickedEventArgs e)
         {
-            CreatePlaylistPopup();
+           // CreatePlaylistPopup();
         }
 
         private void OnPlaylistSelectionChange(object sender, SelectionChangedEventArgs e)
@@ -108,7 +108,7 @@ namespace MusicPlayer.Views
                 PixelSize = 32,
                 FontFamily = "BreezeSans",
                 FontStyle = UIFontStyles.NormalLight,
-                Text = "Allow AMAN to mirror on this device",
+                Text = "Create a playlist",
                 WidthResizePolicy = ResizePolicyType.FillToParent,
                 HorizontalAlignment = HorizontalAlignment.Begin,
                 PositionY = 40,

diff --git a/music-player/Views/SelectorView.cs b/music-player/Views/SelectorView.cs
index db4b5ad981d2c63210c4855a3acb03f4d57c33fb..903cd30f696f4a55b7596e2a929a545efa1fe185 100755 (executable)
--- a/music-player/Views/SelectorView.cs
+++ b/music-player/Views/SelectorView.cs
@@ -44,7 +44,6 @@ namespace MusicPlayer.Views
             currentViewType = viewType;
             selectedItemList = new List<string>();
             this.viewModel = viewModel;
-            BindingContext = viewModel;
             BackgroundColor = UIColors.HEXEEEFF1;
             WidthResizePolicy = ResizePolicyType.FillToParent;
             HeightResizePolicy = ResizePolicyType.FillToParent;
@@ -124,6 +123,7 @@ namespace MusicPlayer.Views
                 VerticalAlignment = VerticalAlignment.Center,
                 Ellipsis = true,
             };
+            selectedCountLabel.BindingContext = viewModel;
             selectedCountLabel.SetBinding(TextLabel.TextProperty, "SelectedCount");
             topView.Add(selectedCountLabel);
         }

diff --git a/music-player/XamlPage.xaml.cs b/music-player/XamlPage.xaml.cs
deleted file mode 100644 (file)
index 8a08eb7..0000000
--- a/music-player/XamlPage.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;\r
-using Tizen.NUI;\r
-using Tizen.NUI.BaseComponents;\r
-\r
-namespace MusicPlayer\r
-{\r
-    public partial class XamlPage : View\r
-    {\r
-        public XamlPage()\r
-        {\r
-            InitializeComponent();\r
-        }\r
-    }\r
-}\r

diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj
index d9ebc62a73082d0a1271adc31ef7c9e111ca51a6..70c4094a2f2eecac605e3d6cdb02dbc0baf2e0b3 100755 (executable)
--- a/music-player/music-player.csproj
+++ b/music-player/music-player.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">\r
+<Project Sdk="Tizen.NET.Sdk/1.1.7">\r
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
-    <TargetFramework>netcoreapp3.1</TargetFramework>\r
+    <TargetFramework>tizen90</TargetFramework>\r
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>\r
       <AssemblyName>MusicPlayer</AssemblyName>\r
   </PropertyGroup>\r
@@ -20,15 +20,7 @@
   </ItemGroup>\r
   \r
     <ItemGroup>\r
-    <EmbeddedResource Include="res\layout\XamlPage.xaml">\r
-      <Generator>MSBuild:Compile</Generator>\r
-    </EmbeddedResource>\r
-  </ItemGroup>\r
-  \r
-    <ItemGroup>\r
-      <PackageReference Include="Tizen.NET" Version="9.0.0.16617" />\r
-      <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />\r
-      <PackageReference Include="Tizen.NUI.XamlBuild" Version="1.0.31" />\r
+      <PackageReference Include="Tizen.NET" Version="9.0.0.16707" />\r
     </ItemGroup>\r
 \r
 </Project>\r

diff --git a/music-player/res/layout/XamlPage.xaml b/music-player/res/layout/XamlPage.xaml
deleted file mode 100644 (file)
index 7a54808..0000000
--- a/music-player/res/layout/XamlPage.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<b:View x:Class="MusicPlayer.XamlPage"\r
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"\r
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"\r
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">\r
-\r
-    <b:TextLabel x:Name="text"  Text="Hello, NUI XAML APP!" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center" Size="700,300,0" PointSize="17" TextColor="Yellow"/>\r
-\r
-</b:View>\r