Fixed Width for AlertDialog Popups and its buttons, MiniPlayer

Change-Id: I181dcd39a5377952ced91bc9ee9f330ae3b63f32
Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>

diff --git a/music-player/Views/MiniPlayer.cs b/music-player/Views/MiniPlayer.cs
index 4c597ff81ff2e0580cd46aff95f88baafce0e0c4..aa97e112f96ad269896bd4df58822b807e1d4244 100755 (executable)
--- a/music-player/Views/MiniPlayer.cs
+++ b/music-player/Views/MiniPlayer.cs
@@ -55,11 +55,11 @@ namespace MusicPlayer.Views
                     LinearOrientation = LinearLayout.Orientation.Horizontal,
                     VerticalAlignment = VerticalAlignment.Center,
                 },
-                Padding = new Extents(64, 64, 24, 19).SpToPx(),
+                Padding = new Extents(64, 64, 23, 19).SpToPx(),
             };
             if(DeviceInfo.IsPortrait)
             {
-                baseView.Padding = new Extents(32, 32, 24, 8).SpToPx();
+                baseView.Padding = new Extents(32, 32, 23, 8).SpToPx();
                 baseView.HeightSpecification = 108.SpToPx();
             }
             Add(baseView);
@@ -74,7 +74,7 @@ namespace MusicPlayer.Views
             View separator = new View()
             {
                 WidthSpecification = LayoutParamPolicies.MatchParent,
-                HeightSpecification = 1.SpToPx(),
+                HeightSpecification = 2.SpToPx(),
                 StyleName = "InputLine",
             };
             Add(separator);
@@ -91,7 +91,7 @@ namespace MusicPlayer.Views
                 },
                 BackgroundColor = Color.Transparent,
                 HeightSpecification = 76.SpToPx(),
-                WidthSpecification = DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64 : (int)((Window.Instance.Size.Width - 128) * 0.65f),
+                WidthSpecification = DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64.SpToPx() : (int)((Window.Instance.Size.Width - 128.SpToPx()) * 0.65f),
             };
             baseView.Add(leftView);
         }
@@ -363,7 +363,7 @@ namespace MusicPlayer.Views
                 ThemeChangeSensitive = true,
                 MinValue = 0.0f,
                 MaxValue = 1.0f,
-                WidthSpecification = (int)((Window.Instance.Size.Width - 128) * 0.35),
+                WidthSpecification = (int)((Window.Instance.Size.Width - 128.SpToPx()) * 0.35),
                 HeightSpecification = SliderHeight.SpToPx(),
                 ThumbSize = new Size(30, 30).SpToPx(),
                 Direction = Slider.DirectionType.Horizontal,

diff --git a/music-player/Views/PlayerView.cs b/music-player/Views/PlayerView.cs
index 39f4f4c2096d22feec22c48a42f526c4a7b870ce..4563ac70a2f186d973fbba4cf94936e7ac565b9a 100755 (executable)
--- a/music-player/Views/PlayerView.cs
+++ b/music-player/Views/PlayerView.cs
@@ -393,7 +393,7 @@ namespace MusicPlayer.Views
             {
                 ThemeChangeSensitive = true,
                 StyleName = "Dialogs",
-                WidthSpecification = (DeviceInfo.IsPortrait ? 952 : 1184).SpToPx(),
+                WidthSpecification = DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64.SpToPx() : (int)(Window.Instance.Size.Width * 0.6f),
                 HeightSpecification = 368.SpToPx(),
                 Layout = new LinearLayout()
                 {
@@ -407,6 +407,11 @@ namespace MusicPlayer.Views
                 Content = CreateAlertDialogMessage(),
                 ActionContent = buttonArea,
             };
+            if (cancelButton.SizeWidth > alertDialog.SizeWidth / 2 - 40.SpToPx())
+            {
+                cancelButton.SizeWidth = alertDialog.SizeWidth / 2 - 40.SpToPx();
+                deleteButton.SizeWidth = alertDialog.SizeWidth / 2 - 40.SpToPx();
+            }
 
             cancelButton.Clicked += (object o, ClickedEventArgs e) =>
             {

diff --git a/music-player/Views/PlaylistSelectorView.cs b/music-player/Views/PlaylistSelectorView.cs
index f4a9fbdb9dc238d876e85e6001cdbf59b2309e6a..318717e7feb450629683a19888826086a4ed6ad3 100755 (executable)
--- a/music-player/Views/PlaylistSelectorView.cs
+++ b/music-player/Views/PlaylistSelectorView.cs
@@ -53,7 +53,8 @@ namespace MusicPlayer.Views
             AddSelectPlaylistCancelButton();
             selectPlaylistDialog = new AlertDialog()
             {
-                WidthSpecification = (DeviceInfo.IsPortrait ? 1016 : 1184).SpToPx(),
+                StyleName = "Dialogs",
+                WidthSpecification = DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64.SpToPx() : (int)(Window.Instance.Size.Width * 0.6f),
                 HeightSpecification = (needShrinkedSize ? 544 : 652).SpToPx(),
                 Layout = new LinearLayout()
                 {
@@ -161,7 +162,8 @@ namespace MusicPlayer.Views
             AddCreatePlaylistButtons();
             createPlaylistDialog = new AlertDialog()
             {
-                WidthSpecification = (DeviceInfo.IsPortrait ? 1016 : 1184).SpToPx(),
+                StyleName = "Dialogs",
+                WidthSpecification = DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64.SpToPx() : (int)(Window.Instance.Size.Width * 0.6f),
                 HeightSpecification = 465.SpToPx(),
                 Layout = new LinearLayout()
                 {
@@ -175,6 +177,11 @@ namespace MusicPlayer.Views
                 Content = createPlaylistContentArea,
                 ActionContent = createPlaylistButtonArea,
             };
+            if (createPlaylistCancelButton.SizeWidth > createPlaylistDialog.SizeWidth / 2 - 40.SpToPx())
+            {
+                createPlaylistCancelButton.SizeWidth = createPlaylistDialog.SizeWidth / 2 - 40.SpToPx();
+                createPlaylistCreateButton.SizeWidth = createPlaylistDialog.SizeWidth / 2 - 40.SpToPx();
+            }
             Window.Instance.Add(createPlaylistDialog);
             createPlaylistDialog.BackKeyPressed += OnPlaylistCreateDialogBackKey;
         }

diff --git a/music-player/Views/PlaylistView.cs b/music-player/Views/PlaylistView.cs
index 8087fed50886145f126d57def952ac269af49de1..4586f63fa8eed4555b23c713dd6a771a2cb9c4cc 100755 (executable)
--- a/music-player/Views/PlaylistView.cs
+++ b/music-player/Views/PlaylistView.cs
@@ -338,7 +338,7 @@ namespace MusicPlayer.Views
             {
                 ThemeChangeSensitive = true,
                 StyleName = "Dialogs",
-                WidthSpecification = (DeviceInfo.IsPortrait ? 1016 : 1184).SpToPx(),
+                WidthSpecification = DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64.SpToPx() : (int)(Window.Instance.Size.Width * 0.6f),
                 HeightSpecification = 466.SpToPx(),
                 Layout = new LinearLayout()
                 {
@@ -352,6 +352,11 @@ namespace MusicPlayer.Views
                 Content = contentArea,
                 ActionContent = buttonArea,
             };
+            if (cancelButton.SizeWidth > alertDialog.SizeWidth / 2 - 40.SpToPx())
+            {
+                cancelButton.SizeWidth = alertDialog.SizeWidth / 2 - 40.SpToPx();
+                createButton.SizeWidth = alertDialog.SizeWidth / 2 - 40.SpToPx();
+            }
             Window.Instance.Add(alertDialog);
 
             cancelButton.Clicked += (object o, ClickedEventArgs e) =>

diff --git a/music-player/Views/Utils/ErrorPopup.cs b/music-player/Views/Utils/ErrorPopup.cs
index 8da2cc0f80137876303cfa4f2fb35e1abea23c6d..2eec93138570bbd80ab8cdf965001d515155c8eb 100755 (executable)
--- a/music-player/Views/Utils/ErrorPopup.cs
+++ b/music-player/Views/Utils/ErrorPopup.cs
@@ -15,7 +15,7 @@ namespace MusicPlayer.Views.Utils
             AddOkButton();
             errorDialog = new AlertDialog()
             {
-                Size2D = new Size2D((DeviceInfo.IsPortrait ? 1016 : 1184), 368).SpToPx(),
+                Size2D = new Size2D(DeviceInfo.IsPortrait ? Window.Instance.Size.Width - 64.SpToPx() : (int)(Window.Instance.Size.Width * 0.6f), 368).SpToPx(),
                 Title = "Unable to play track",
                 Message = "",
                 Actions = new List<View> { okButton },

diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk
index 927c81f46f0cd310c3b5e4e7e2c992cf6f2cdeba..64a07af24c31cb3ca69cf3d811438cf124e6ac3e 100755 (executable)
Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ