Merge pull request #183 from makinosp/feature/screen-size

Feature/screen-size

Author: makinosp

harmonie/Components/GradientOverlayImageView.swift

@@ -14,7 +14,7 @@ struct GradientOverlayImageView<TopContent, BottomContent>: View where TopConten
     @Init(.internal) private let imageUrl: URL?
     @Init(.internal, default: nil) private let thumbnailImageUrl: URL?
     @Init(.internal) private let height: CGFloat
-    @Init(.internal, default: WindowUtil.width) private let maxWidth: CGFloat
+    @Init(.internal) private let maxWidth: CGFloat
     @Init(.internal, default: Gradient(colors: [.black.opacity(0.5), .clear])) private let gradient: Gradient
     @Init(.internal, default: { EmptyView() }, escaping: true) private let topContent: () -> TopContent
     @Init(.internal, default: { EmptyView() }, escaping: true) private let bottomContent: () -> BottomContent

harmonie/Extensions/GeometryProxy+Equatable.swift

@@ -0,0 +1,14 @@
+//
+//  GeometryProxy+Equatable.swift
+//  Harmonie
+//
+//  Created by makinosp on 2024/11/04.
+//
+
+import SwiftUICore
+
+extension GeometryProxy: @retroactive Equatable {
+    public static func == (lhs: GeometryProxy, rhs: GeometryProxy) -> Bool {
+        lhs.size == rhs.size && lhs.safeAreaInsets == rhs.safeAreaInsets
+    }
+}

harmonie/Utils/WindowUtil.swift

@@ -17,6 +17,7 @@ final class AppViewModel {
     var applicationError: ApplicationError?
     var services: APIServiceUtil
     var verifyType: VerifyType?
+    var screenSize: CGSize = .zero
     @ObservationIgnored var client: APIClient
     @ObservationIgnored let userDefaults: UserDefaults
 

harmonie/ViewModels/AppViewModel.swift

@@ -12,21 +12,28 @@ struct ContentView: View {
     @Environment(AppViewModel.self) var appVM
 
     var body: some View {
-        switch appVM.step {
-        case .initializing:
-            ProgressScreen()
-                .task {
-                    appVM.step = await appVM.setup(service: appVM.services.authenticationService)
+        GeometryReader { geometry in
+            Group {
+                switch appVM.step {
+                case .initializing:
+                    ProgressScreen()
+                        .task {
+                            appVM.step = await appVM.setup(service: appVM.services.authenticationService)
+                        }
+                        .errorAlert()
+                case .loggingIn:
+                    LoginView()
+                        .errorAlert()
+                case .done:
+                    MainTabView()
+                        .environment(FriendViewModel(appVM: appVM))
+                        .environment(FavoriteViewModel())
+                        .errorAlert()
                 }
-                .errorAlert()
-        case .loggingIn:
-            LoginView()
-                .errorAlert()
-        case .done:
-            MainTabView()
-                .environment(FriendViewModel(appVM: appVM))
-                .environment(FavoriteViewModel())
-                .errorAlert()
+            }
+            .onChange(of: geometry) {
+                appVM.screenSize = geometry.size
+            }
         }
     }
 }

harmonie/Views/ContentView.swift

@@ -50,7 +50,7 @@ struct LocationsView: View {
             }
         }
         .navigationTitle("Social")
-        .setColumn()
+        .setColumn(appVM.screenSize)
     }
 
     private var content: some View {
@@ -67,7 +67,7 @@ struct LocationsView: View {
             }
         }
         .background(Color(.systemGroupedBackground))
-        .setColumn()
+        .setColumn(appVM.screenSize)
     }
 
     private var detail: some View {
@@ -89,7 +89,7 @@ struct LocationsView: View {
             }
         }
         .background(Color(.systemGroupedBackground))
-        .setColumn()
+        .setColumn(appVM.screenSize)
     }
 
     private var friendLocations: some View {
@@ -154,11 +154,11 @@ extension Location {
 }
 
 private extension View {
-    func setColumn() -> some View {
+    func setColumn(_ screenSize: CGSize) -> some View {
         navigationSplitViewColumnWidth(
-            min: WindowUtil.width * 1 / 3,
-            ideal: WindowUtil.width * 1 / 3,
-            max: WindowUtil.width / 2
+            min: screenSize.width * 1 / 3,
+            ideal: screenSize.width * 1 / 3,
+            max: screenSize.width / 2
         )
     }
 }

harmonie/Views/Location/LocationsView.swift

@@ -31,6 +31,7 @@ struct UserDetailView: View {
                     imageUrl: user.imageUrl(.x1024),
                     thumbnailImageUrl: user.imageUrl(.x256),
                     height: 250,
+                    maxWidth: appVM.screenSize.width,
                     topContent: { topOverlay },
                     bottomContent: { bottomOverlay }
                 )

harmonie/Views/UserDetail/UserDetailView.swift

@@ -22,6 +22,7 @@ struct WorldView: View {
                     imageUrl: world.imageUrl(.x1024),
                     thumbnailImageUrl: world.imageUrl(.x256),
                     height: 250,
+                    maxWidth: appVM.screenSize.width,
                     topContent: { topOverlay },
                     bottomContent: { bottomOverlay }
                 )