diff --git a/Mear/Mear.Android/MainActivity.cs b/Mear/Mear.Android/MainActivity.cs index 240c888..04d0575 100644 --- a/Mear/Mear.Android/MainActivity.cs +++ b/Mear/Mear.Android/MainActivity.cs @@ -42,13 +42,10 @@ namespace Mear.Droid { if (Popup.SendBackPressed(base.OnBackPressed)) { - var demo = 0; } else { - var demo = 0; } - base.OnBackPressed(); } } } \ No newline at end of file diff --git a/Mear/Mear/Playback/MearPlayer.cs b/Mear/Mear/Playback/MearPlayer.cs index adfb5c6..ef0f20b 100644 --- a/Mear/Mear/Playback/MearPlayer.cs +++ b/Mear/Mear/Playback/MearPlayer.cs @@ -81,8 +81,7 @@ namespace Mear.Playback switch (control) { case PlayControls.PLAYOFFLINE: - var songPath = song.SongPath; - await PlaySong(songPath); + await PlaySong(song); var plyCountRepo = new DBPlayCountRepository(); plyCountRepo.AffectPlayCount(song); InitializeRepeatMode(); diff --git a/Mear/Mear/Repositories/Database/DBPlayCountRepository.cs b/Mear/Mear/Repositories/Database/DBPlayCountRepository.cs index 0d10881..7729ed7 100644 --- a/Mear/Mear/Repositories/Database/DBPlayCountRepository.cs +++ b/Mear/Mear/Repositories/Database/DBPlayCountRepository.cs @@ -70,6 +70,7 @@ namespace Mear.Repositories.Database } else { + plyCount.PlayCounter++; _Db.Update(plyCount); } } diff --git a/Mear/Mear/ViewModels/AlbumViewModel.cs b/Mear/Mear/ViewModels/AlbumViewModel.cs index 61bfc66..61ea989 100644 --- a/Mear/Mear/ViewModels/AlbumViewModel.cs +++ b/Mear/Mear/ViewModels/AlbumViewModel.cs @@ -17,6 +17,7 @@ namespace Mear.ViewModels #region Fields private ObservableCollection _albumItems; private Command _refreshAlbums; + private Command _searchAlbumCommand; #endregion @@ -30,6 +31,11 @@ namespace Mear.ViewModels { get => _refreshAlbums; } + public Command SearchAlbumCommand + { + get => _searchAlbumCommand; + set => _searchAlbumCommand = value; + } #endregion @@ -38,6 +44,7 @@ namespace Mear.ViewModels { _albumItems = new ObservableCollection(); _refreshAlbums = new Command(async () => await PopulateAlbumsAsync()); + _searchAlbumCommand = new Command(async () => await SearchAlbum()); PopulateAlbumsAsync(); } @@ -66,6 +73,9 @@ namespace Mear.ViewModels IsRefreshing = false; } + private async Task SearchAlbum() + { + } #endregion } } diff --git a/Mear/Mear/ViewModels/ArtistViewModel.cs b/Mear/Mear/ViewModels/ArtistViewModel.cs index b1507c4..df8be7a 100644 --- a/Mear/Mear/ViewModels/ArtistViewModel.cs +++ b/Mear/Mear/ViewModels/ArtistViewModel.cs @@ -17,6 +17,7 @@ namespace Mear.ViewModels #region Fields private ObservableCollection _artistItems; private Command _refreshArtists; + private Command _searchArtistCommand; #endregion @@ -30,6 +31,11 @@ namespace Mear.ViewModels { get => _refreshArtists; } + public Command SearchArtistCommand + { + get => _searchArtistCommand; + set => _searchArtistCommand = value; + } #endregion @@ -38,6 +44,7 @@ namespace Mear.ViewModels { _artistItems = new ObservableCollection(); _refreshArtists = new Command(async () => await PopulateArtistsAsync()); + _searchArtistCommand = new Command(async () => await SearchArtists()); PopulateArtistsAsync(); } @@ -66,6 +73,9 @@ namespace Mear.ViewModels IsRefreshing = false; } + private async Task SearchArtists() + { + } #endregion } } diff --git a/Mear/Mear/ViewModels/BaseViewModel.cs b/Mear/Mear/ViewModels/BaseViewModel.cs index 2f8b671..1f7fa0d 100644 --- a/Mear/Mear/ViewModels/BaseViewModel.cs +++ b/Mear/Mear/ViewModels/BaseViewModel.cs @@ -13,6 +13,7 @@ namespace Mear.ViewModels #region INotifyPropertyChanged public event PropertyChangedEventHandler PropertyChanged; #endregion + protected string _searchedText; private bool _isRefreshing; #endregion @@ -27,6 +28,17 @@ namespace Mear.ViewModels NotifyPropertyChanged("IsRefreshing"); } } + + public string SearchedText + { + get => _searchedText; + set + { + _searchedText = value; + NotifyPropertyChanged("SearchSong"); + //SearchSongText(_searchedText); + } + } #endregion diff --git a/Mear/Mear/ViewModels/SongViewModel.cs b/Mear/Mear/ViewModels/SongViewModel.cs index 8f363a0..7d8cf68 100644 --- a/Mear/Mear/ViewModels/SongViewModel.cs +++ b/Mear/Mear/ViewModels/SongViewModel.cs @@ -19,7 +19,6 @@ namespace Mear.ViewModels private ObservableCollection _songItems; private Command _refreshSongs; private Command _searchSongsCommand; - private string _searchedText; #endregion @@ -41,16 +40,6 @@ namespace Mear.ViewModels set => _searchSongsCommand = value; } - public string SearchedText - { - get => _searchedText; - set - { - _searchedText = value; - NotifyPropertyChanged("SearchSong"); - //SearchSongText(_searchedText); - } - } #endregion diff --git a/Mear/Mear/Views/AlbumView.xaml b/Mear/Mear/Views/AlbumView.xaml index 07e3528..6cad220 100644 --- a/Mear/Mear/Views/AlbumView.xaml +++ b/Mear/Mear/Views/AlbumView.xaml @@ -12,7 +12,12 @@ - + - + diff --git a/Mear/Mear/Views/SettingsPage.xaml.cs b/Mear/Mear/Views/SettingsPage.xaml.cs index d0b3a75..43653b9 100644 --- a/Mear/Mear/Views/SettingsPage.xaml.cs +++ b/Mear/Mear/Views/SettingsPage.xaml.cs @@ -55,6 +55,8 @@ namespace Mear.Views { var msg = ex.Message; } + + (sender as ListView).SelectedItem = null; } #endregion #endregion