From a37c2ef55ca75b0e1042500eba4e451cbaf17b15 Mon Sep 17 00:00:00 2001 From: "aman.jeph" Date: Thu, 16 Sep 2021 16:07:28 +0530 Subject: [PATCH] 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 --- .gitignore | 3 +++ NOTICE | 3 +++ music-player/Core/PlayerController.cs | 2 +- music-player/ViewModels/PlayingListViewModel.cs | 9 ++++++++- music-player/Views/PlaylistView.cs | 4 ++-- music-player/Views/SelectorView.cs | 2 +- music-player/XamlPage.xaml.cs | 14 -------------- music-player/music-player.csproj | 14 +++----------- music-player/res/layout/XamlPage.xaml | 9 --------- 9 files changed, 21 insertions(+), 39 deletions(-) create mode 100644 .gitignore create mode 100755 NOTICE mode change 100644 => 100755 music-player/Core/PlayerController.cs delete mode 100644 music-player/XamlPage.xaml.cs delete mode 100644 music-player/res/layout/XamlPage.xaml diff --git a/.gitignore b/.gitignore new file mode 100644 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 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 new mode 100755 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 fa683da..4bc0db0 100755 --- 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 c274d19..c4f4372 100755 --- 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 db4b5ad..903cd30 100755 --- a/music-player/Views/SelectorView.cs +++ b/music-player/Views/SelectorView.cs @@ -44,7 +44,6 @@ namespace MusicPlayer.Views currentViewType = viewType; selectedItemList = new List(); 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 index 8a08eb7..0000000 --- a/music-player/XamlPage.xaml.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Tizen.NUI; -using Tizen.NUI.BaseComponents; - -namespace MusicPlayer -{ - public partial class XamlPage : View - { - public XamlPage() - { - InitializeComponent(); - } - } -} diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj index d9ebc62..70c4094 100755 --- a/music-player/music-player.csproj +++ b/music-player/music-player.csproj @@ -1,8 +1,8 @@ - + Exe - netcoreapp3.1 + tizen90 Tizen MusicPlayer @@ -20,15 +20,7 @@ - - MSBuild:Compile - - - - - - - + diff --git a/music-player/res/layout/XamlPage.xaml b/music-player/res/layout/XamlPage.xaml deleted file mode 100644 index 7a54808..0000000 --- a/music-player/res/layout/XamlPage.xaml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - -- 2.34.1