Избавляюсь от негибких габаритов (#289)

При повороте экрана эти габариты ломали UI

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -874,7 +874,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -926,7 +926,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;

SwiftUI-WorkoutApp/Screens/Common/ImagePicker/ImagePickerViews.swift

@@ -33,10 +33,7 @@ extension ImagePickerViews {
     ) -> some View {
         LazyVGrid(
             columns: .init(
-                repeating: .init(
-                    .flexible(minimum: UIScreen.main.bounds.size.width * 0.287),
-                    spacing: 11
-                ),
+                repeating: .init(.flexible(minimum: 50), spacing: 11),
                 count: 3
             ),
             spacing: 12

SwiftUI-WorkoutApp/Screens/Common/ParkLocation/MapSnapshotView.swift

@@ -6,16 +6,19 @@ import SwiftUI
 /// Снапшот карты
 struct MapSnapshotView: View {
     let mapModel: MapModel
-    let size: CGSize
+    private let height: CGFloat = 153
     @State private var snapshotImage: UIImage?
 
     var body: some View {
-        contentView
-            .animation(.easeInOut, value: snapshotImage)
-            .onAppear(perform: generateSnapshot)
-            .onChange(of: mapModel) { _ in
-                generateSnapshot()
-            }
+        GeometryReader { geo in
+            makeContentView(width: geo.size.width)
+                .animation(.easeInOut, value: snapshotImage)
+                .clipShape(.rect(cornerRadius: 8))
+                .onAppear { generateSnapshot(size: geo.size) }
+                .onChange(of: mapModel) { _ in generateSnapshot(size: geo.size) }
+                .onChange(of: geo.size, perform: generateSnapshot)
+        }
+        .frame(height: height)
     }
 }
 
@@ -35,25 +38,28 @@ extension MapSnapshotView {
 }
 
 private extension MapSnapshotView {
-    var contentView: some View {
+    func makeContentView(width: CGFloat) -> some View {
         ZStack {
             if let image = snapshotImage {
                 Image(uiImage: image)
-                    .transition(.scale)
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: width, height: height)
+                    .transition(.opacity.combined(with: .scale))
             } else {
                 Image.defaultWorkout
                     .resizable()
                     .scaledToFit()
-                    .frame(width: size.width, height: size.height)
+                    .frame(width: width, height: height)
                     .background(.black)
-                    .cornerRadius(12)
+                    .clipShape(.rect(cornerRadius: 12))
                     .transition(.opacity.combined(with: .scale))
             }
         }
     }
 
     @MainActor
-    func generateSnapshot() {
+    func generateSnapshot(size: CGSize) {
         guard mapModel.isComplete else { return }
         let regionRadius: CLLocationDistance = 1000
         let options = MKMapSnapshotter.Options()
@@ -105,8 +111,7 @@ private extension MapSnapshotView {
             mapModel: .init(
                 latitude: 55.687001,
                 longitude: 37.504467
-            ),
-            size: .init(width: 350, height: 150)
+            )
         )
     }
 }

SwiftUI-WorkoutApp/Screens/Common/ParkLocation/ParkLocationInfoView.swift

@@ -5,22 +5,13 @@ import SWUtils
 
 /// Содержит снапшот карты, адрес и ссылку на построение маршрута в `Apple Maps`
 struct ParkLocationInfoView: View {
-    @MainActor
-    private var screenWidth: CGFloat { UIScreen.main.bounds.size.width }
     let snapshotModel: MapSnapshotView.MapModel
     let address: String
     let appleMapsURL: URL?
 
     var body: some View {
         VStack(spacing: 12) {
-            MapSnapshotView(
-                mapModel: snapshotModel,
-                size: .init(
-                    width: screenWidth - 24 - 32, // 2 * 12 и 2 * 16 - отступы по бокам в фигме
-                    height: 153
-                )
-            )
-            .cornerRadius(8)
+            MapSnapshotView(mapModel: snapshotModel)
             if !address.isEmpty {
                 Text(address)
                     .font(.headline)

SwiftUI-WorkoutApp/Screens/Common/PhotoSection/PhotoSectionView.swift

@@ -5,7 +5,6 @@ import SWModels
 /// Галерея с фотографиями
 @MainActor
 struct PhotoSectionView: View {
-    private var screenWidth: CGFloat { UIScreen.main.bounds.size.width }
     private let photos: [Photo]
     /// `true` - есть доступ на удаление фото, `false` - нет доступа
     ///
@@ -69,10 +68,7 @@ private extension PhotoSectionView {
     var gridView: some View {
         LazyVGrid(
             columns: .init(
-                repeating: .init(
-                    .flexible(minimum: screenWidth * 0.282),
-                    spacing: 2
-                ),
+                repeating: .init(.flexible(minimum: 50), spacing: 2),
                 count: columns
             ),
             spacing: 2