sarsoo/Mixonomer-iOS
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

better handling logout, clearing all of live user, closes #21

Browse Source
This commit is contained in:
andy 2022-08-11 23:13:51 +01:00
parent ad55f5b787
commit 9e3417f3fa
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mixonomer/Model/LiveUser.swift
View File

@ -50,6 +50,11 @@ class LiveUser: ObservableObject {
try keychain.remove("username") try keychain.remove("username")
try keychain.remove("jwt") try keychain.remove("jwt")
playlists.removeAll()
tags.removeAll()
username = ""
user = nil
UserDefaults.standard.removeObject(forKey: "playlists") UserDefaults.standard.removeObject(forKey: "playlists")
UserDefaults.standard.removeObject(forKey: "tags") UserDefaults.standard.removeObject(forKey: "tags")

17
Mixonomer/Views/Playlist/PlaylistList.swift
View File

@ -20,8 +20,19 @@ struct PlaylistList: View {
var body: some View { var body: some View {
NavigationView { NavigationView {
List{ List{
if(liveUser.playlists.count > 0){ if liveUser.user?.spotify_linked == false {
Text("Spotify isn't linked, login to the web client to pair")
Button(action: {
UIApplication.shared.open(URL(string: "https://mixonomer.sarsoo.xyz/")!)
}) {
Text("Go-to Mixonomer Web")
.foregroundColor(.blue)
}
}
else if liveUser.playlists.count > 0 {
ForEach(liveUser.playlists.indices, id:\.self) { idx in ForEach(liveUser.playlists.indices, id:\.self) { idx in
PlaylistRow(playlist: self.$liveUser.playlists[idx]) PlaylistRow(playlist: self.$liveUser.playlists[idx])
} }
@ -88,7 +99,11 @@ struct PlaylistList: View {
struct PlaylistList_Previews: PreviewProvider { struct PlaylistList_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
Group {
PlaylistList() PlaylistList()
.environmentObject(LiveUser(playlists: [], tags: [], username: "user", loggedIn: false)) .environmentObject(LiveUser(playlists: [], tags: [], username: "user", loggedIn: false))
PlaylistList()
.environmentObject(LiveUser(playlists: [], tags: [], username: "user", loggedIn: false, user: User(username: "user", email: nil, last_login: "", last_keygen: "", spotify_linked: false, lastfm_username: nil)))
}
} }
} }