diff --git a/Sources/justMUSIC/lib/model/User.dart b/Sources/justMUSIC/lib/model/User.dart index 8ee6e5e..bb19d2b 100644 --- a/Sources/justMUSIC/lib/model/User.dart +++ b/Sources/justMUSIC/lib/model/User.dart @@ -6,13 +6,13 @@ class User { String _pp; String _token; List _followers; - List _musics_likes; + List _musicsLikes; int _capsules; List _followed; // Constructor User(this._id, this._pseudo, this._uniquePseudo, this._mail, this._pp, this._token, this._followers, - this._musics_likes, this._capsules, this._followed); + this._musicsLikes, this._capsules, this._followed); //Getters and setters String get id => _id; @@ -23,10 +23,10 @@ class User { _pseudo = value; } - List get musics_likes => _musics_likes; + List get musicsLikes => _musicsLikes; - set musics_likes(List value) { - _musics_likes = value; + set musicsLikes(List value) { + _musicsLikes = value; } String get uniquePseudo => _uniquePseudo; diff --git a/Sources/justMUSIC/lib/screens/detail_post_screen.dart b/Sources/justMUSIC/lib/screens/detail_post_screen.dart index b05fa16..34c6dcb 100644 --- a/Sources/justMUSIC/lib/screens/detail_post_screen.dart +++ b/Sources/justMUSIC/lib/screens/detail_post_screen.dart @@ -46,7 +46,7 @@ class _DetailPostScreenState extends State { } bool isSaved() { - return MyApp.userViewModel.userCurrent.musics_likes.contains(widget.post.music.id); + return MyApp.userViewModel.userCurrent.musicsLikes.contains(widget.post.music.id); } bool isLiked() { diff --git a/Sources/justMUSIC/lib/screens/search_song_screen.dart b/Sources/justMUSIC/lib/screens/search_song_screen.dart index 7b2136e..a20355c 100644 --- a/Sources/justMUSIC/lib/screens/search_song_screen.dart +++ b/Sources/justMUSIC/lib/screens/search_song_screen.dart @@ -327,7 +327,7 @@ class _SearchSongScreenState extends State { Navigator.pop(context); await MyApp.musicViewModel .addOrDeleteFavoriteMusic((snapshot.data?[index])!.id); - MyApp.userViewModel.userCurrent.musics_likes + MyApp.userViewModel.userCurrent.musicsLikes .remove((snapshot.data?[index])!.id); MyApp.audioPlayer.release(); @@ -381,7 +381,7 @@ class _SearchSongScreenState extends State { Navigator.pop(context); await MyApp.musicViewModel .addOrDeleteFavoriteMusic((snapshot.data?[index])!.id); - MyApp.userViewModel.userCurrent.musics_likes + MyApp.userViewModel.userCurrent.musicsLikes .remove((snapshot.data?[index])!.id); setState(() {}); }, diff --git a/Sources/justMUSIC/lib/services/MusicService.dart b/Sources/justMUSIC/lib/services/MusicService.dart index d1fd832..09d1cf9 100644 --- a/Sources/justMUSIC/lib/services/MusicService.dart +++ b/Sources/justMUSIC/lib/services/MusicService.dart @@ -23,12 +23,12 @@ class MusicService { if (!musicFavorite.contains(id)) { musicFavorite.add(id); await userRef.update({"musics_likes": musicFavorite}); - MyApp.userViewModel.userCurrent.musics_likes.add(id); + MyApp.userViewModel.userCurrent.musicsLikes.add(id); return false; } else { musicFavorite.remove(id); await userRef.update({"musics_likes": musicFavorite}); - MyApp.userViewModel.userCurrent.musics_likes.remove(id); + MyApp.userViewModel.userCurrent.musicsLikes.remove(id); return true; } } diff --git a/Sources/justMUSIC/lib/view_model/MusicViewModel.dart b/Sources/justMUSIC/lib/view_model/MusicViewModel.dart index 3695244..c3a1618 100644 --- a/Sources/justMUSIC/lib/view_model/MusicViewModel.dart +++ b/Sources/justMUSIC/lib/view_model/MusicViewModel.dart @@ -213,7 +213,7 @@ class MusicViewModel { try { List idMusics = []; if (id == MyApp.userViewModel.userCurrent.id) { - idMusics = MyApp.userViewModel.userCurrent.musics_likes; + idMusics = MyApp.userViewModel.userCurrent.musicsLikes; } else { idMusics = await _musicService.getFavoriteMusicsByUserId(id); }