Merge pull request #210 from makinosp/develop

update: bump up to 0.10.0
makinosp · Nov 15, 2024 · c61bb78 · c61bb78
2 parents ab40564 + e54bdaa
commit c61bb78
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 19 deletions.
diff --git a/Harmonie.xcodeproj/project.pbxproj b/Harmonie.xcodeproj/project.pbxproj
@@ -474,7 +474,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.10;
+				MARKETING_VERSION = 0.10.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -510,7 +510,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.10;
+				MARKETING_VERSION = 0.10.0;
 				PRODUCT_BUNDLE_IDENTIFIER = jp.mknn.harmonie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/harmonie/ViewModels/FavoriteViewModel.swift b/harmonie/ViewModels/FavoriteViewModel.swift
@@ -15,6 +15,7 @@ final class FavoriteViewModel {
     var favoriteGroups: [FavoriteGroup] = []
     var favoriteFriends: [FavoriteFriend] = []
     var favoriteWorlds: [FavoriteWorld] = []
+    var isFetchingFavoriteFriends = true
 
     /// Filters and returns the favorite groups of a specific type.
     /// - Parameter type: The `FavoriteType` to filter the favorite groups by.
@@ -66,6 +67,8 @@ final class FavoriteViewModel {
     ///     if a corresponding friend is found; returns `nil` otherwise.
     /// - Throws: An error if the service encounters an issue while fetching favorite groups or favorite details.
     func fetchFavoriteFriends(service: FavoriteServiceProtocol, friendFinder: (Favorite) -> Friend?) async throws {
+        defer { isFetchingFavoriteFriends = false }
+        isFetchingFavoriteFriends = true
         favoriteGroups = try await service.listFavoriteGroups()
         let favoriteDetails = try await service.fetchFavoriteList(favoriteGroups: favoriteGroups, type: .friend)
         let favoriteDetailsOfFriends = favoriteDetails.filter { $0.allFavoritesAre(.friend) }

diff --git a/harmonie/Views/ContentView.swift b/harmonie/Views/ContentView.swift
@@ -18,20 +18,20 @@ struct ContentView: View {
             switch appVM.step {
             case .initializing:
                 ProgressScreen()
-                    .task {
-                        appVM.step = await appVM.setup(service: appVM.services.authenticationService)
-                    }
-                    .errorAlert()
+                    .task { await setUpTask() }
             case .loggingIn:
                 LoginView()
-                    .errorAlert()
             case .done:
                 MainTabView()
-                    .errorAlert()
             }
         } action: { geometry in
             setScreenSize(geometry)
         }
+        .errorAlert()
+    }
+
+    private func setUpTask() async {
+        appVM.step = await appVM.setup(service: appVM.services.authenticationService)
     }
 
     private func setScreenSize(_ geometry: GeometryProxy) {

diff --git a/harmonie/Views/Favorite/FavoritesView.swift b/harmonie/Views/Favorite/FavoritesView.swift
@@ -28,7 +28,9 @@ struct FavoritesView: View {
                 }
             }
             .overlay {
-                if isSelectedEmpty {
+                if isFetching {
+                    ProgressView()
+                } else if isSelectedEmpty {
                     ContentUnavailableView {
                         Label("No Favorites", systemImage: IconSet.favorite.systemName)
                     }
@@ -47,6 +49,10 @@ struct FavoritesView: View {
         }
     }
 
+    private var isFetching: Bool {
+        friendVM.isFetchingAllFriends || favoriteVM.isFetchingFavoriteFriends
+    }
+
     @ViewBuilder private var toolbarTitleMenu: some View {
         Picker("", selection: $segment) {
             Label("All", systemImage: IconSet.favoriteSquares.systemName)

diff --git a/harmonie/Views/Friend/FriendsListView.swift b/harmonie/Views/Friend/FriendsListView.swift
@@ -43,7 +43,7 @@ struct FriendsListView: View {
     }
 
     @ViewBuilder private var overlayView: some View {
-        if friendVM.isProcessingFilter {
+        if isProcessing {
             ProgressView()
         } else if friendVM.filterResultFriends.isEmpty {
             if friendVM.isEmptyAllFilters {
@@ -59,4 +59,8 @@ struct FriendsListView: View {
             }
         }
     }
+
+    private var isProcessing: Bool {
+        friendVM.isProcessingFilter || friendVM.isFetchingAllFriends
+    }
 }
diff --git a/harmonie/Views/Location/LocationsView.swift b/harmonie/Views/Location/LocationsView.swift
@@ -39,7 +39,6 @@ struct LocationsView: View {
                 inPrivateInstance
             }
         }
-        .environment(\.defaultMinListRowHeight, 80)
         .overlay {
             if friendVM.isContentUnavailable {
                 ContentUnavailableView {
@@ -86,7 +85,6 @@ struct LocationsView: View {
                 }
             }
         }
-        .safeAreaPadding(.top, 20)
         .background(Color(.systemGroupedBackground))
         .setColumn(appVM.screenSize)
     }

diff --git a/harmonie/Views/MainTabView.swift b/harmonie/Views/MainTabView.swift
@@ -30,8 +30,8 @@ struct MainTabView: View {
             Task { await fetchFriendsTask() }
             Task { await fetchFavoritesTask() }
         }
-        .onChange(of: scenePhase) {
-            scenePhaseHandler(scenePhase)
+        .onChange(of: scenePhase) { before, after in
+            changedScenePhaseHandler(before, after)
         }
         .onChange(of: favoriteVM.favoriteFriends) {
             friendVM.favoriteFriends = favoriteVM.favoriteFriends
@@ -51,15 +51,15 @@ extension MainTabViewSegment {
     }
 }
 
-@MainActor
 extension MainTabView {
-    private func scenePhaseHandler(_ scenePhase: ScenePhase) {
-        switch scenePhase {
-        case .active:
+    private func changedScenePhaseHandler(_ before: ScenePhase, _ after: ScenePhase) {
+        switch (before, after) {
+        case (.background, .inactive):
+            print("Restoring Data")
             restoreUserData()
             Task { await fetchFriendsTask() }
             Task { await fetchFavoritesTask() }
-        case .background, .inactive:
+        case (.active, .inactive):
             guard let user = appVM.user else { return }
             userData = user.rawValue
         default: break
@@ -70,7 +70,10 @@ extension MainTabView {
         guard let user = User(rawValue: userData) else { return }
         appVM.user = user
     }
+}
 
+@MainActor
+extension MainTabView {
     private var tabViewLegacy: some View {
         TabView(selection: $selection) {
             ForEach(MainTabViewSegment.allCases) { tabSegment in