From: shivamv Date: Fri, 25 Feb 2022 08:56:06 +0000 (+0530) Subject: 1. Fixed click issue of Play/Pause Icon X-Git-Tag: submit/tizen/20220405.085546~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1be9f9e0b3177380f0ad29a7bc3fd1a7e04aa2ba;p=profile%2Fiot%2Fapps%2Fdotnet%2Fmusic-player.git 1. Fixed click issue of Play/Pause Icon 2. Fixed Favorite List Updation Issue 3. Added scalable UI featues to PlaylistSelectorView Change-Id: Ib70c7a54220fd464b5e1b750da965798273af728 Signed-off-by: shivamv --- diff --git a/music-player/ViewModels/PlaylistDetailViewModel.cs b/music-player/ViewModels/PlaylistDetailViewModel.cs index 4ce3281..f07fc22 100755 --- a/music-player/ViewModels/PlaylistDetailViewModel.cs +++ b/music-player/ViewModels/PlaylistDetailViewModel.cs @@ -16,10 +16,10 @@ namespace MusicPlayer.ViewModels playlist = PlaylistManager.Instance.GetPlaylist(playlistId); PlaylistId = playlistId; PlaylistName = playlist.Name; - IsNotDefaultPlaylist = true; + IsDefaultPlaylist = false; if(PlaylistName == AppConstants.RecentlyAddedPlaylist || PlaylistName == AppConstants.FavouritePlaylist) { - IsNotDefaultPlaylist = false; + IsDefaultPlaylist = true; } listViewModel = new ListViewModel(); UpdatePlaylistDetails(); @@ -73,12 +73,12 @@ namespace MusicPlayer.ViewModels } } - private bool isNotDefaultPlaylist; + private bool isDefaultPlaylist; - public bool IsNotDefaultPlaylist + public bool IsDefaultPlaylist { - get => isNotDefaultPlaylist; - set => isNotDefaultPlaylist = value; + get => isDefaultPlaylist; + set => isDefaultPlaylist = value; } public Track PlayingTrack { get; set; } @@ -129,7 +129,7 @@ namespace MusicPlayer.ViewModels private void UpdatePlaylistDetails() { // This is required because we delete and recreate default playlists on every database change event - if(IsNotDefaultPlaylist) + if(IsDefaultPlaylist) { Playlist updatedPlaylist = PlaylistManager.Instance.GetPlaylist(PlaylistName); playlist = updatedPlaylist; @@ -155,6 +155,7 @@ namespace MusicPlayer.ViewModels { if (oldTrackId == item.Id) { + item.PlayingStatus = false; item.IsPlaying = false; } if (currentTrackId == item.Id) diff --git a/music-player/ViewModels/TrackViewModel.cs b/music-player/ViewModels/TrackViewModel.cs index 39eb881..2469037 100755 --- a/music-player/ViewModels/TrackViewModel.cs +++ b/music-player/ViewModels/TrackViewModel.cs @@ -95,6 +95,7 @@ namespace MusicPlayer.ViewModels { if (PlayingTrack != null) { + PlayingTrack.PlayingStatus = false; PlayingTrack.IsPlaying = false; } PlayingTrack = null; diff --git a/music-player/Views/ListItemLayout.cs b/music-player/Views/ListItemLayout.cs index 5842484..e94d886 100755 --- a/music-player/Views/ListItemLayout.cs +++ b/music-player/Views/ListItemLayout.cs @@ -296,8 +296,12 @@ defaultValueCreator: (bindable) => ((ListItemLayout)bindable).playingStatus); { ResourceUrl = Resources.GetImagePath() + "play_icon.png", }, + IsEnabled = true, + IsSelectable = true, }; playPauseIcon = new Button(buttonStyle); + playPauseIcon.WidthSpecification = IconSize; + playPauseIcon.HeightSpecification = IconSize; playPauseIcon.Clicked += (object sender, ClickedEventArgs e) => { PlaybackHelper.Instance.ChangePlayingStatus(); diff --git a/music-player/Views/LyricsView.cs b/music-player/Views/LyricsView.cs index 7ecf43a..af95a05 100755 --- a/music-player/Views/LyricsView.cs +++ b/music-player/Views/LyricsView.cs @@ -26,7 +26,7 @@ namespace MusicPlayer.Views { this.lyricsViewModel = lyricsViewModel; BindingContext = lyricsViewModel.lyricsModel; - Size2D = new Size2D(ViewSize, ViewSize); + Size2D = new Size2D(ViewSize, ViewSize).DpToPx(); isAnimating = false; AddThumbnail(); AddLyricsView(); @@ -108,8 +108,8 @@ namespace MusicPlayer.Views { scrollView = new ScrollableBase() { - Position2D = new Position2D(LyricsViewMargin, LyricsViewMargin), - Size2D = new Size2D(LyricsViewSize, LyricsViewSize), + Position2D = new Position2D(LyricsViewMargin, LyricsViewMargin).DpToPx(), + Size2D = new Size2D(LyricsViewSize, LyricsViewSize).DpToPx(), ScrollingDirection = ScrollableBase.Direction.Vertical, BackgroundColor = Color.Transparent, }; @@ -123,7 +123,7 @@ namespace MusicPlayer.Views TextColor = Color.White, MultiLine = true, LineWrapMode = LineWrapMode.Word, - PointSize = 25.0f, + PointSize = 25.DpToPx(), HorizontalAlignment = HorizontalAlignment.Center, }; lyricsLabel.BindingContext = lyricsViewModel.lyricsModel; diff --git a/music-player/Views/PlaylistDetailView.cs b/music-player/Views/PlaylistDetailView.cs index aa84874..e2f3bd5 100755 --- a/music-player/Views/PlaylistDetailView.cs +++ b/music-player/Views/PlaylistDetailView.cs @@ -70,7 +70,7 @@ namespace MusicPlayer.Views share.Clicked += OnShareClick; menuItemList.Add(share); } - if (viewModel.IsNotDefaultPlaylist) + if (viewModel.IsDefaultPlaylist == false) { var add = new MenuItem { Text = "Add" }; add.Clicked += OnAddClick; diff --git a/music-player/Views/PlaylistSelectorView.cs b/music-player/Views/PlaylistSelectorView.cs index cd29472..c954f3e 100755 --- a/music-player/Views/PlaylistSelectorView.cs +++ b/music-player/Views/PlaylistSelectorView.cs @@ -49,12 +49,12 @@ namespace MusicPlayer.Views AddSelectPlaylistCancelButton(); selectPlaylistDialog = new AlertDialog() { - Size2D = new Size2D(1184, 660).DpToPx(), + Size2D = new Size2D((DeviceInfo.IsPortrait ? 1016 : 1184), 660).DpToPx(), Title = "Add to playlist", Content = selectPlaylistContentArea, Actions = new List { selectPlaylistCancelButton }, Padding = new Extents(0, 0, 0, 0).DpToPx(), - Margin = new Extents(0, 0, 0, 0).DpToPx(), + Margin = new Extents(32, 32, 0, 0).DpToPx(), }; TextLabel textLabel = (TextLabel)selectPlaylistDialog.TitleContent; textLabel.FontStyle = UIFontStyles.AllNormal; @@ -97,7 +97,7 @@ namespace MusicPlayer.Views WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 108.DpToPx(), TextAlignment = HorizontalAlignment.Begin, - Padding = new Extents(64, 64, 0, 0).DpToPx(), + Padding = (DeviceInfo.IsPortrait ? new Extents(80, 80, 0, 0) : new Extents(64, 64, 0, 0)).DpToPx(), IsEnabled = true, IsSelectable = false, ItemAlignment = LinearLayout.Alignment.CenterVertical, @@ -111,7 +111,7 @@ namespace MusicPlayer.Views WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 2.DpToPx(), BackgroundColor = UIColors.ItemSeperator, - Margin = new Extents(64, 64, 0, 0).DpToPx(), + Margin = (DeviceInfo.IsPortrait ? new Extents(80, 80, 0, 0) : new Extents(64, 64, 0, 0)).DpToPx(), }; selectPlaylistContentArea.Add(itemSeperator); createNewPlaylistButton.Clicked += CreateNewPlaylistButtonClicked; @@ -124,12 +124,12 @@ namespace MusicPlayer.Views AddCreatePlaylistButtons(); createPlaylistDialog = new AlertDialog() { - Size2D = new Size2D(1184, 465).DpToPx(), + Size2D = new Size2D((DeviceInfo.IsPortrait ? 1016 : 1184), 465).DpToPx(), Title = "Create playlist", Content = createPlaylistContentArea, Actions = new List { createPlaylistCancelButton, createPlaylistCreateButton }, Padding = new Extents(0, 0, 0, 0).DpToPx(), - Margin = new Extents(0, 0, 0, 0).DpToPx(), + Margin = new Extents(32, 32, 0, 0).DpToPx(), }; TextLabel textLabel = (TextLabel)selectPlaylistDialog.TitleContent; textLabel.FontStyle = UIFontStyles.AllNormal; @@ -148,7 +148,7 @@ namespace MusicPlayer.Views { ThemeChangeSensitive = true, StyleName = "ListBackground", - Size2D = new Size2D(1184, 108).DpToPx(), + Size2D = new Size2D((DeviceInfo.IsPortrait ? 1016 : 1184), 108).DpToPx(), ItemsLayouter = new LinearLayouter(), ScrollingDirection = ScrollableBase.Direction.Vertical, HeightSpecification = LayoutParamPolicies.WrapContent, @@ -231,7 +231,7 @@ namespace MusicPlayer.Views VerticalAlignment = VerticalAlignment.Center, FontFamily = "BreezeSans", FontStyle = UIFontStyles.NormalLight, - Padding = new Extents(64, 64, 0, 0).DpToPx(), + Padding = (DeviceInfo.IsPortrait ? new Extents(80, 80, 0, 0) : new Extents(64, 64, 0, 0)).DpToPx(), }; selectPlaylistContentArea.Add(noListText); } @@ -271,12 +271,12 @@ namespace MusicPlayer.Views Direction = FlexLayout.FlexDirection.Column, ItemsAlignment = FlexLayout.AlignmentType.FlexStart, Justification = FlexLayout.FlexJustification.FlexStart, - Padding = new Extents(64, 64, 0, 0).DpToPx(), + Padding = (DeviceInfo.IsPortrait ? new Extents(80, 80, 0, 0) : new Extents(64, 64, 0, 0)).DpToPx(), }, }; TextLabel textLabel = new TextLabel() { - StyleName = "ItemLabel", + StyleName = "TitleText", ThemeChangeSensitive = true, WidthSpecification = LayoutParamPolicies.MatchParent, HeightSpecification = 40.DpToPx(), @@ -317,7 +317,7 @@ namespace MusicPlayer.Views { inputArea = new View() { - Size2D = new Size2D(1024, 48).DpToPx(), + Size2D = new Size2D((DeviceInfo.IsPortrait ? 856 : 1024), 48).DpToPx(), Layout = new FlexLayout() { Direction = FlexLayout.FlexDirection.Row, @@ -330,9 +330,9 @@ namespace MusicPlayer.Views ThemeChangeSensitive = true, StyleName = "TextField", PixelSize = 32.DpToPx(), - Size2D = new Size2D(928, 48).DpToPx(), + Size2D = new Size2D((DeviceInfo.IsPortrait ? 808 : 928), 48).DpToPx(), Position2D = new Position2D(0, 0).DpToPx(), - Margin = new Extents(0, 48, 0, 0).DpToPx(), + Margin = new Extents(0, (ushort)(DeviceInfo.IsPortrait ? 0 : 48), 0, 0).DpToPx(), FontStyle = UIFontStyles.NormalLight, MaxLength = 65, }; @@ -342,7 +342,7 @@ namespace MusicPlayer.Views crossButton = new Button("ClearButton") { ThemeChangeSensitive = true, - Position2D = new Position2D(976, 6).DpToPx(), + Position2D = new Position2D((DeviceInfo.IsPortrait ? 808 : 976), 6).DpToPx(), }; crossButton.Clicked += (object o, ClickedEventArgs e) => { diff --git a/music-player/Views/PlaylistView.cs b/music-player/Views/PlaylistView.cs index b4657cd..504423e 100755 --- a/music-player/Views/PlaylistView.cs +++ b/music-player/Views/PlaylistView.cs @@ -267,7 +267,7 @@ namespace MusicPlayer.Views { Name = "InputLineView", StyleName = "InputLine", - HeightSpecification = 2, + HeightSpecification = 2.DpToPx(), WidthSpecification = LayoutParamPolicies.MatchParent, }; return view; diff --git a/music-player/Views/SelectListLayout.cs b/music-player/Views/SelectListLayout.cs index c76adab..c83fb9f 100755 --- a/music-player/Views/SelectListLayout.cs +++ b/music-player/Views/SelectListLayout.cs @@ -35,12 +35,6 @@ namespace MusicPlayer.Views // to show the rounded rect of the bg BackgroundColor = Color.Transparent; - StringSelector iconURL = new StringSelector() - { - Disabled = Resources.GetImagePath() + "check_off.png", - DisabledSelected = Resources.GetImagePath() + "check_on.png", - }; - checkBox = new CheckBox("CheckBox") { Position2D = new Position2D(x, BoxSize).DpToPx(), diff --git a/music-player/Views/Utils/ErrorPopup.cs b/music-player/Views/Utils/ErrorPopup.cs index 4858578..846bf42 100755 --- a/music-player/Views/Utils/ErrorPopup.cs +++ b/music-player/Views/Utils/ErrorPopup.cs @@ -15,10 +15,11 @@ namespace MusicPlayer.Views.Utils AddOkButton(); errorDialog = new AlertDialog() { - Size2D = new Size2D(1184, 368), + Size2D = new Size2D((DeviceInfo.IsPortrait ? 1016 : 1184), 368).DpToPx(), Title = "Unable to play track", Message = "", Actions = new List { okButton }, + Margin = new Extents(32, 32, 0, 0).DpToPx(), }; TextLabel textLabel = (TextLabel)errorDialog.TitleContent; diff --git a/music-player/music-player.csproj b/music-player/music-player.csproj index 4929997..55b1c15 100755 --- a/music-player/music-player.csproj +++ b/music-player/music-player.csproj @@ -19,7 +19,7 @@ - + Runtime diff --git a/music-player/res/themes/dark.xaml b/music-player/res/themes/dark.xaml index c10e78b..0b0213c 100755 --- a/music-player/res/themes/dark.xaml +++ b/music-player/res/themes/dark.xaml @@ -188,7 +188,7 @@ Id="DarkTheme"> - + diff --git a/music-player/res/themes/light.xaml b/music-player/res/themes/light.xaml index 893046b..5e24408 100755 --- a/music-player/res/themes/light.xaml +++ b/music-player/res/themes/light.xaml @@ -188,7 +188,7 @@ Id="LightTheme"> - + diff --git a/packaging/org.tizen.MusicPlayer-1.0.0.tpk b/packaging/org.tizen.MusicPlayer-1.0.0.tpk index 9105d9b..ab90b74 100755 Binary files a/packaging/org.tizen.MusicPlayer-1.0.0.tpk and b/packaging/org.tizen.MusicPlayer-1.0.0.tpk differ