[TIZENIOT-2533] Fixing More button Issue

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

diff --git a/music-player/Views/AlbumDetailView.cs b/music-player/Views/AlbumDetailView.cs
index e5bbdaddb1fe73663ea4ca8b055d652d10c4afb1..50dc5ba100fd7764e675f3cfd22cc4a5e653be1d 100755 (executable)
--- a/music-player/Views/AlbumDetailView.cs
+++ b/music-player/Views/AlbumDetailView.cs
@@ -54,13 +54,13 @@ namespace MusicPlayer.Views
 \r
         public override void UpdateSubContentMoreButtonItems(Menu moreMenu)\r
         {\r
-            var addtoPlaylist = new MenuItem { Text = "Add to playlist" };\r
+            var addtoPlaylist = new MenuItem("MenuItems") { Text = "Add to playlist" };\r
             addtoPlaylist.Clicked += OnAddToPlaylistClick;\r
 \r
-            var share = new MenuItem { Text = "Share" };\r
+            var share = new MenuItem("MenuItems") { Text = "Share" };\r
             share.Clicked += OnShareClick;\r
 \r
-            var delete = new MenuItem { Text = "Delete" };\r
+            var delete = new MenuItem("MenuItems") { Text = "Delete" };\r
             delete.Clicked += OnDeleteClick;\r
 \r
             moreMenu.Items = new MenuItem[] { addtoPlaylist, share, delete };\r

diff --git a/music-player/Views/AlbumView.cs b/music-player/Views/AlbumView.cs
index c1bfa2ff7f081672a9c9b6ef221b69aaa60b7d2d..349f361b4a702c31d60affd7ff2c8189c50ae2c4 100755 (executable)
--- a/music-player/Views/AlbumView.cs
+++ b/music-player/Views/AlbumView.cs
@@ -91,9 +91,9 @@ namespace MusicPlayer.Views
         {\r
             if (isTrackListEmpty == false)\r
             {\r
-                var addToPlaylist = new MenuItem { Text = "Add to Playlist" };\r
+                var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" };\r
                 addToPlaylist.Clicked += OnAddToPlaylistClick;\r
-                var delete = new MenuItem { Text = "Delete" };\r
+                var delete = new MenuItem("MenuItems") { Text = "Delete" };\r
                 delete.Clicked += OnDeleteClick;\r
 \r
                 moreMenu.Items = new MenuItem[] { addToPlaylist, delete };\r

diff --git a/music-player/Views/ArtistDetailView.cs b/music-player/Views/ArtistDetailView.cs
index 7190cbab9687ecf47c4f3fdfc17e0b1d28441b2f..6c9ecb3420f8ef9945abd1a9a257b87b03317c0a 100755 (executable)
--- 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 7e391106c3de8c7c8f4b0fe118be8ea0c1366df2..5d9135b6564935c228b4f6e1ba19c85c374a7210 100755 (executable)
--- 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 66f472a06a37488ed439e180040382adb3b56ec7..c35110441bd225b8a3fa03ad5d9df9e4891d6c78 100755 (executable)
--- 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 582175f94860aab6f0f047c49be52f79f54e875a..39f4f4c2096d22feec22c48a42f526c4a7b870ce 100755 (executable)
--- 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 f542809ffb3cd18ffcd2798bfdd489cb6aaa7bf7..ba5966ef9197cce65140fa2ffd8634f5580c52f2 100755 (executable)
--- a/music-player/Views/PlaylistDetailView.cs
+++ b/music-player/Views/PlaylistDetailView.cs
@@ -71,18 +71,18 @@ namespace MusicPlayer.Views
             List<MenuItem> menuItemList = new List<MenuItem>();
             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 7a8aee8d9ee542dc5ec0c0926d044a64fc3b888b..8087fed50886145f126d57def952ac269af49de1 100755 (executable)
--- 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 d06a2274044f29f5a1e1efe2bf4cb5ac65ac4116..23b893d4356247a12a014d0e77c76ba14cb7e73c 100755 (executable)
--- a/music-player/Views/TrackView.cs
+++ b/music-player/Views/TrackView.cs
@@ -136,11 +136,11 @@ namespace MusicPlayer.Views
         {\r
             if (isTrackListEmpty == false)\r
             {\r
-                var addToPlaylist = new MenuItem { Text = "Add to Playlist" };\r
+                var addToPlaylist = new MenuItem("MenuItems") { Text = "Add to Playlist" };\r
                 addToPlaylist.Clicked += OnAddToPlaylistClick;\r
-                var share = new MenuItem { Text = "Share" };\r
+                var share = new MenuItem("MenuItems") { Text = "Share" };\r
                 share.Clicked += OnShareClick;\r
-                var delete = new MenuItem { Text = "Delete" };\r
+                var delete = new MenuItem("MenuItems") { Text = "Delete" };\r
                 delete.Clicked += OnDeleteClick;\r
 \r
                 moreMenu.Items = new MenuItem[] { addToPlaylist, share, delete };\r

diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj
index 960ec0a4113a0691a7dedad24f41415705f555b8..800fd7ba9a11533f60ddc25ed7239f4286f8581d 100755 (executable)
--- a/music-player/music-player.csproj
+++ b/music-player/music-player.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>\r
 \r
   <ItemGroup>\r
-    <PackageReference Include="Tizen.NET" Version="10.0.0.17150" />\r
+    <PackageReference Include="Tizen.NET" Version="10.0.0.17173" />\r
     <PackageReference Include="Tizen.NET.Sdk" Version="1.1.7" />\r
   </ItemGroup>\r
 \r

diff --git a/music-player/res/themes/dark.xaml b/music-player/res/themes/dark.xaml
index 8c061890403226f51a81074f09cfce0aef7b8d95..fd6f6b5768e65831c820d3aae303629fdb9a8919 100755 (executable)
--- a/music-player/res/themes/dark.xaml
+++ b/music-player/res/themes/dark.xaml
@@ -196,7 +196,23 @@ Id="DarkTheme">
     </c:ButtonStyle.Text>
   </c:ButtonStyle>
 
-  <c:ButtonStyle x:Key="ClearButton" Size="48sp, 48sp" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent">
+    <c:ButtonStyle x:Key="MenuItems" Size="320sp, 72sp" BackgroundColor="#000209" IsSelectable="False" >
+        <c:ButtonStyle.Text>
+            <TextLabelStyle FontFamily="BreezeSans" PixelSize="32sp" VerticalAlignment ="Center" HorizontalAlignment="Begin" >
+                <TextLabelStyle.TextColor>
+                    <Selector x:TypeArguments="Color" Normal="#FFFFFF" Pressed="#1473E6" Disabled="#B2B7BE" />
+                </TextLabelStyle.TextColor>
+            </TextLabelStyle>
+        </c:ButtonStyle.Text>
+    </c:ButtonStyle>
+
+    <c:MenuStyle x:Key="MoreMenu">
+        <c:MenuStyle.Content>
+            <ViewStyle BackgroundColor="#000209" />
+        </c:MenuStyle.Content>
+    </c:MenuStyle>
+
+    <c:ButtonStyle x:Key="ClearButton" Size="48sp, 48sp" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent">
     <c:ButtonStyle.Icon>
       <ImageViewStyle Size="48sp, 48sp">
         <ImageViewStyle.ResourceUrl>*Resource*/images/dark/cross_button.png</ImageViewStyle.ResourceUrl>

diff --git a/music-player/res/themes/light.xaml b/music-player/res/themes/light.xaml
index 410c03ef5ec0f068a8653e838b7338d1c436de79..96a382357764bfdca7ba80fa7cba0e210d0c4950 100755 (executable)
--- a/music-player/res/themes/light.xaml
+++ b/music-player/res/themes/light.xaml
@@ -196,7 +196,23 @@ Id="LightTheme">
     </c:ButtonStyle.Text>
   </c:ButtonStyle>
 
-  <c:ButtonStyle x:Key="ClearButton" Size="48sp, 48sp" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent">
+    <c:ButtonStyle x:Key="MenuItems" Size="320sp, 72sp" BackgroundColor="#FFFFFF" IsSelectable="False" >
+        <c:ButtonStyle.Text>
+            <TextLabelStyle FontFamily="BreezeSans" PixelSize="32sp" VerticalAlignment ="Center" HorizontalAlignment="Begin" >
+                <TextLabelStyle.TextColor>
+                    <Selector x:TypeArguments="Color" Normal="#001447" Pressed="#1473E6" Disabled="#B2B7BE" />
+                </TextLabelStyle.TextColor>
+            </TextLabelStyle>
+        </c:ButtonStyle.Text>
+    </c:ButtonStyle>
+
+    <c:MenuStyle x:Key="MoreMenu">
+        <c:MenuStyle.Content>
+            <ViewStyle BackgroundColor="#FFFFFF" />
+        </c:MenuStyle.Content>
+    </c:MenuStyle>
+
+    <c:ButtonStyle x:Key="ClearButton" Size="48sp, 48sp" IsSelectable="false" IsEnabled="true" BackgroundColor="Transparent">
     <c:ButtonStyle.Icon>
       <ImageViewStyle Size="48sp, 48sp">
         <ImageViewStyle.ResourceUrl>*Resource*/images/light/cross_button.png</ImageViewStyle.ResourceUrl>

diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk
index ed27737dbbd059711dcd3e9e25fdcb32127891a1..7cb082ccf3005bbe49e25b248d98a2c51fd059ea 100755 (executable)
Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ