Merge pull request #191 from makinosp/develop

Develop
makinosp · Nov 11, 2024 · e61055d · e61055d
2 parents 7dd1ba5 + 4237027
commit e61055d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/harmonie/Components/URLImage/URLImage.swift b/harmonie/Components/URLImage/URLImage.swift
@@ -28,15 +28,20 @@ struct URLImage<S>: View where S: Shape {
 
     private func lazyImage(url: URL?, placeholder: @escaping () -> some View) -> some View {
         LazyImage(url: url) { state in
-            if let image = state.image {
-                image
-                    .resizable()
-                    .scaledToFill()
-            } else if url != nil && state.error != nil {
-                placeholder()
-                    .overlay(IconSet.photo.icon)
-            } else {
-                placeholder()
+            Group {
+                if let image = state.image {
+                    image
+                        .resizable()
+                        .scaledToFill()
+                } else {
+                    placeholder()
+                }
+            }
+            .overlay {
+                if url != nil && state.error != nil {
+                    IconSet.photo.icon
+                        .foregroundStyle(.gray)
+                }
             }
         }
         .onCompletion { _ in

diff --git a/harmonie/Views/MainTabView.swift b/harmonie/Views/MainTabView.swift
@@ -64,10 +64,12 @@ extension MainTabView {
         switch scenePhase {
         case .active:
             restoreUserData()
+            Task { await fetchFriendsTask() }
+            Task { await fetchFavoritesTask() }
         case .background, .inactive:
             guard let user = appVM.user else { return }
             userData = user.rawValue
-        @unknown default: break
+        default: break
         }
     }