feat(scrobbles): show artist, shorter relative time

angristan · Jul 10, 2021 · e52b1db · e52b1db
1 parent 75b116a
commit e52b1db
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/firstfm/Data/Entities/Artist.swift b/firstfm/Data/Entities/Artist.swift
@@ -19,5 +19,5 @@ struct Artist: Codable, Identifiable {
 struct ScrobbledArtist: Codable {
     let mbid: String
 //    let image: [LastFMImage]
-    let name: String?
+    let name: String
 }
diff --git a/firstfm/Data/Entities/Track.swift b/firstfm/Data/Entities/Track.swift
@@ -43,7 +43,7 @@ struct LastFMDate: Codable {
         let unixTimestamp = Double(self.uts)!
         let date = Date(timeIntervalSince1970: unixTimestamp)
         let formatter = RelativeDateTimeFormatter()
-        formatter.unitsStyle = .full
+        formatter.unitsStyle = .abbreviated
         let relativeDate = formatter.localizedString(for: date, relativeTo: Date())
         return relativeDate
     }

diff --git a/firstfm/Data/ViewModel/ScrobblesViewModel.swift b/firstfm/Data/ViewModel/ScrobblesViewModel.swift
@@ -18,6 +18,7 @@ class ScrobblesViewModel: ObservableObject {
 
         LastFMAPI.request(lastFMMethod: "user.getRecentTracks", args: [
             "limit": "30",
+            "extended": "1",
             "user": storedUsername ?? "",
         ]) { (data: RecentTracksResponse?, error) -> Void in
             self.isLoading = false

diff --git a/firstfm/Views/ScrobblesView.swift b/firstfm/Views/ScrobblesView.swift
@@ -11,7 +11,6 @@ import SwiftUIRefresh
 struct Scrobbles: View {
     @ObservedObject var vm = ScrobblesViewModel()
     @State var scrobblesLoaded = false
-    @State private var selectedChartsIndex = 0
     @State private var isPullLoaderShowing = false
 
     var body: some View {

diff --git a/firstfm/Views/SubViews/ScrobbledTrackRowView.swift b/firstfm/Views/SubViews/ScrobbledTrackRowView.swift
@@ -28,11 +28,18 @@ struct ScrobbledTrackRow: View {
 
         VStack(alignment: .leading) {
             Spacer()
-            Text(track.name)
-                .font(.headline)
-                .lineLimit(1)
+            HStack {
+                Text(track.name)
+                    .font(.headline)
+                    .lineLimit(1)
+                Spacer()
+                Text(track.date?.getRelative() ?? "Now Playing")
+                    .font(.subheadline)
+                    .foregroundColor(.gray)
+                    .frame(alignment: .leading)
+            }
             Spacer()
-            Text(track.date?.getRelative() ?? "Now Playing")
+            Text(track.artist.name)
                 .font(.subheadline)
                 .foregroundColor(.gray)
         }