From: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics Date: Wed, 11 May 2022 05:31:28 +0000 (+0530) Subject: Fixed Width for AlertDialog Popups and its buttons, MiniPlayer X-Git-Tag: submit/tizen/20220513.103126~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61ed8aaf88b405c7ceb1ce07ea0aa98837b8070d;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git 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 --- diff --git a/music-player/Views/MiniPlayer.cs b/music-player/Views/MiniPlayer.cs index 4c597ff..aa97e11 100755 --- 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 39f4f4c..4563ac7 100755 --- 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 f4a9fbd..318717e 100755 --- 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 8087fed..4586f63 100755 --- 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 8da2cc0..2eec931 100755 --- 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 { okButton }, diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk index 927c81f..64a07af 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ