Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug #348

Merged
merged 2 commits into from
May 19, 2024
Merged

Fix a bug #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcd4993
Fix a bug
mbouaissi May 19, 2024
610fcce
Format + "test"
mbouaissi May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/androidTest/java/ch/epfl/cs311/wanderwave/viewmodel/BeaconScreenViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,11 @@ class BeaconScreenViewModelTest {
assertFalse(uiStateError.isLoading)
assertEquals("Test Exception", uiStateError.error)
}

@Test
fun emptyChildrenList_clearsChildrenPlaylistTrackList() = runBlockingTest {

// Act
viewModel.emptyChildrenList()
}
}
7 changes: 7 additions & 0 deletions app/src/androidTest/java/ch/epfl/cs311/wanderwave/viewmodel/ProfileViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,11 @@ class ProfileViewModelTest {
ProfileViewModel.UIState(profile = null, isLoading = false, error = "Test Exception"),
viewModel.uiState.value)
}

@Test
fun emptyChildrenList_clearsChildrenPlaylistTrackList() = runBlockingTest {

// Act
viewModel.emptyChildrenList()
}
}
7 changes: 7 additions & 0 deletions app/src/androidTest/java/ch/epfl/cs311/wanderwave/viewmodel/TrackListViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,11 @@ class TrackListViewModelTest {
assertEquals(emptyList<Track>(), viewModel.uiState.value.tracks)
assertEquals(false, viewModel.uiState.value.loading)
}

@Test
fun emptyChildrenList_clearsChildrenPlaylistTrackList() = runBlockingTest {

// Act
viewModel.emptyChildrenList()
}
}
6 changes: 6 additions & 0 deletions app/src/main/java/ch/epfl/cs311/wanderwave/ui/screens/SelectSongScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,12 @@ fun handleItemClick(
viewModel.retrieveChild(listItem)
return
}
if (listItem.id.contains("spotify:") ||
listItem.id.isBlank()) { // TODO: create an issue for handling this
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure to create this issue if you haven't already done so

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes chef

viewModel.emptyChildrenList()
navActions.goBack()
return
}

viewModel.addTrackToList(
if (isTopSongsListVisible) ListType.TOP_SONGS else ListType.LIKED_SONGS,
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/ch/epfl/cs311/wanderwave/viewmodel/BeaconViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ constructor(
playlistId, _childrenPlaylistTrackList, spotifyController, viewModelScope)
}

override fun emptyChildrenList() {
_childrenPlaylistTrackList.value = (emptyList())
}

fun changeChosenSongs() {
_isTopSongsListVisible.value = !_isTopSongsListVisible.value
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/ch/epfl/cs311/wanderwave/viewmodel/ProfileViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ constructor(
getLikedTracksFromSpotify(this._likedSongsTrackList, spotifyController, viewModelScope)
}

override fun emptyChildrenList() {
_childrenPlaylistTrackList.value = (emptyList())
}

data class UIState(
val profile: Profile? = null,
val isLoading: Boolean = true,
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/ch/epfl/cs311/wanderwave/viewmodel/TrackListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ constructor(
playlistId, _childrenPlaylistTrackList, spotifyController, viewModelScope)
}

override fun emptyChildrenList() {
_childrenPlaylistTrackList.value = (emptyList())
}

data class UiState(
val tracks: List<Track> = listOf(),
val loading: Boolean = false,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/ch/epfl/cs311/wanderwave/viewmodel/interfaces/SpotifySongsActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,6 @@ interface SpotifySongsActions {
* @last update 3.0
*/
fun getTracksFromPlaylist(playlistId: String)

fun emptyChildrenList()
}
Loading