From: aman.jeph Date: Mon, 9 May 2022 15:22:13 +0000 (+0530) Subject: [TIZENIOT-2533] Fixing More button Issue X-Git-Tag: submit/tizen/20220509.153423^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcb994ea55e193ae6f06a67ca67e73e9419db86d;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git [TIZENIOT-2533] Fixing More button Issue Change-Id: Ib1aa447c8b1caa19fa12b73aa49b62906810edc0 Signed-off-by: aman.jeph --- diff --git a/music-player/Views/AlbumDetailView.cs b/music-player/Views/AlbumDetailView.cs index e5bbdad..50dc5ba 100755 --- a/music-player/Views/AlbumDetailView.cs +++ b/music-player/Views/AlbumDetailView.cs @@ -54,13 +54,13 @@ namespace MusicPlayer.Views public override void UpdateSubContentMoreButtonItems(Menu moreMenu) { - var addtoPlaylist = new MenuItem { Text = "Add to playlist" }; + var addtoPlaylist = new MenuItem("MenuItems") { Text = "Add to playlist" }; addtoPlaylist.Clicked += OnAddToPlaylistClick; - var share = new MenuItem { Text = "Share" }; + var share = new MenuItem("MenuItems") { Text = "Share" }; share.Clicked += OnShareClick; - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { Text = "Delete" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addtoPlaylist, share, delete }; diff --git a/music-player/Views/AlbumView.cs b/music-player/Views/AlbumView.cs index c1bfa2f..349f361 100755 --- a/music-player/Views/AlbumView.cs +++ b/music-player/Views/AlbumView.cs @@ -91,9 +91,9 @@ namespace MusicPlayer.Views { if (isTrackListEmpty == false) { - var addToPlaylist = new MenuItem { Text = "Add to Playlist" }; + var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" }; addToPlaylist.Clicked += OnAddToPlaylistClick; - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { Text = "Delete" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addToPlaylist, delete }; diff --git a/music-player/Views/ArtistDetailView.cs b/music-player/Views/ArtistDetailView.cs index 7190cba..6c9ecb3 100755 --- a/music-player/Views/ArtistDetailView.cs +++ b/music-player/Views/ArtistDetailView.cs @@ -29,13 +29,13 @@ namespace MusicPlayer.Views public override void UpdateSubContentMoreButtonItems(Menu moreMenu) { - var addtoPlaylist = new MenuItem { Text = "Add to playlist" }; + var addtoPlaylist = new MenuItem("MenuItems") { Text = "Add to playlist" }; addtoPlaylist.Clicked += OnAddToPlaylistClick; - var share = new MenuItem { Text = "Share" }; + var share = new MenuItem("MenuItems") { Text = "Share" }; share.Clicked += OnShareClick; - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { Text = "Delete" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addtoPlaylist, share, delete }; diff --git a/music-player/Views/ArtistView.cs b/music-player/Views/ArtistView.cs index 7e39110..5d9135b 100755 --- a/music-player/Views/ArtistView.cs +++ b/music-player/Views/ArtistView.cs @@ -78,9 +78,9 @@ namespace MusicPlayer.Views { if (isTrackListEmpty == false) { - var addToPlaylist = new MenuItem { Text = "Add to Playlist" }; + var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" }; addToPlaylist.Clicked += OnAddToPlaylistClick; - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { Text = "Delete" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addToPlaylist, delete }; diff --git a/music-player/Views/BaseView.cs b/music-player/Views/BaseView.cs index 66f472a..c351104 100755 --- a/music-player/Views/BaseView.cs +++ b/music-player/Views/BaseView.cs @@ -319,7 +319,7 @@ namespace MusicPlayer.Views Menu moreMenu = new Menu() { Anchor = moreButton, - HorizontalPositionToAnchor = Menu.RelativePosition.End, + HorizontalPositionToAnchor = Menu.RelativePosition.Center, VerticalPositionToAnchor = Menu.RelativePosition.End, }; return moreMenu; diff --git a/music-player/Views/PlayerView.cs b/music-player/Views/PlayerView.cs index 582175f..39f4f4c 100755 --- a/music-player/Views/PlayerView.cs +++ b/music-player/Views/PlayerView.cs @@ -274,7 +274,7 @@ namespace MusicPlayer.Views Menu moreMenu = new Menu() { Anchor = moreButton, - HorizontalPositionToAnchor = Menu.RelativePosition.End, + HorizontalPositionToAnchor = Menu.RelativePosition.Center, VerticalPositionToAnchor = Menu.RelativePosition.End, }; return moreMenu; @@ -283,21 +283,21 @@ namespace MusicPlayer.Views private void OnMoreButtonClicked(object sender, ClickedEventArgs e) { Menu moreMenu = CreateMenu(); - var share = new MenuItem { Text = "Share" }; + var share = new MenuItem("MenuItems") { Text = "Share" }; share.Clicked += (object o, ClickedEventArgs e) => { moreMenu?.Dismiss(); viewModel.OnCurrentTrackShare(); }; - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { Text = "Delete" }; delete.Clicked += (object o, ClickedEventArgs e) => { moreMenu?.Dismiss(); OnDeleteClicked(); }; - var details = new MenuItem { Text = "Details" }; + var details = new MenuItem("MenuItems") { Text = "Details" }; details.Clicked += (object o, ClickedEventArgs e) => { moreMenu?.Dismiss(); diff --git a/music-player/Views/PlaylistDetailView.cs b/music-player/Views/PlaylistDetailView.cs index f542809..ba5966e 100755 --- a/music-player/Views/PlaylistDetailView.cs +++ b/music-player/Views/PlaylistDetailView.cs @@ -71,18 +71,18 @@ namespace MusicPlayer.Views List menuItemList = new List(); if (isTrackListEmpty == false) { - var share = new MenuItem { Text = "Share" }; + var share = new MenuItem("MenuItems") { Text = "Share" }; share.Clicked += OnShareClick; menuItemList.Add(share); } if (viewModel.IsDefaultPlaylist == false) { - var add = new MenuItem { Text = "Add" }; + var add = new MenuItem("MenuItems") { Text = "Add" }; add.Clicked += OnAddClick; menuItemList.Add(add); if (isTrackListEmpty == false) { - var delete = new MenuItem { Text = "Remove" }; + var delete = new MenuItem("MenuItems") { Text = "Remove" }; delete.Clicked += OnDeleteClick; menuItemList.Add(delete); } diff --git a/music-player/Views/PlaylistView.cs b/music-player/Views/PlaylistView.cs index 7a8aee8..8087fed 100755 --- a/music-player/Views/PlaylistView.cs +++ b/music-player/Views/PlaylistView.cs @@ -91,7 +91,7 @@ namespace MusicPlayer.Views protected override void UpdateContentMoreButtonItems(Menu moreMenu) { - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems"){ Text = "Delete", }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { delete }; } diff --git a/music-player/Views/TrackView.cs b/music-player/Views/TrackView.cs index d06a227..23b893d 100755 --- a/music-player/Views/TrackView.cs +++ b/music-player/Views/TrackView.cs @@ -136,11 +136,11 @@ namespace MusicPlayer.Views { if (isTrackListEmpty == false) { - var addToPlaylist = new MenuItem { Text = "Add to Playlist" }; + var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" }; addToPlaylist.Clicked += OnAddToPlaylistClick; - var share = new MenuItem { Text = "Share" }; + var share = new MenuItem("MenuItems") { Text = "Share" }; share.Clicked += OnShareClick; - var delete = new MenuItem { Text = "Delete" }; + var delete = new MenuItem("MenuItems") { Text = "Delete" }; delete.Clicked += OnDeleteClick; moreMenu.Items = new MenuItem[] { addToPlaylist, share, delete }; diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj index 960ec0a..800fd7b 100755 --- a/music-player/music-player.csproj +++ b/music-player/music-player.csproj @@ -19,7 +19,7 @@ - + diff --git a/music-player/res/themes/dark.xaml b/music-player/res/themes/dark.xaml index 8c06189..fd6f6b5 100755 --- a/music-player/res/themes/dark.xaml +++ b/music-player/res/themes/dark.xaml @@ -196,7 +196,23 @@ Id="DarkTheme"> - + + + + + + + + + + + + + + + + + *Resource*/images/dark/cross_button.png diff --git a/music-player/res/themes/light.xaml b/music-player/res/themes/light.xaml index 410c03e..96a3823 100755 --- a/music-player/res/themes/light.xaml +++ b/music-player/res/themes/light.xaml @@ -196,7 +196,23 @@ Id="LightTheme"> - + + + + + + + + + + + + + + + + + *Resource*/images/light/cross_button.png diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk index ed27737..7cb082c 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ