Merge pull request #38 from OlegEremenko991/develop/updatePhotoSection

Обновил секцию с фотографиями

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -50,7 +50,6 @@
 		675462FB282F8CBF005BC86A /* ChatBubble.swift in Sources */ = {isa = PBXBuildFile; fileRef = 675462FA282F8CBF005BC86A /* ChatBubble.swift */; };
 		675462FF282FC6E6005BC86A /* MainUserForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 675462FE282FC6E6005BC86A /* MainUserForm.swift */; };
 		6758463B2965B0F6000BA5E0 /* UIImage+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6758463A2965B0F6000BA5E0 /* UIImage+.swift */; };
-		6758463D2965B74A000BA5E0 /* FullscreenImageSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6758463C2965B74A000BA5E0 /* FullscreenImageSheet.swift */; };
 		6758463F2965B7F2000BA5E0 /* ImageDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6758463E2965B7F2000BA5E0 /* ImageDetailView.swift */; };
 		675846422965CC55000BA5E0 /* ContentInSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 675846412965CC55000BA5E0 /* ContentInSheet.swift */; };
 		6758B92A281D8FD7001D83D8 /* SportsGroundDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6758B929281D8FD7001D83D8 /* SportsGroundDetailViewModel.swift */; };
@@ -211,7 +210,6 @@
 		675462FA282F8CBF005BC86A /* ChatBubble.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatBubble.swift; sourceTree = "<group>"; };
 		675462FE282FC6E6005BC86A /* MainUserForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainUserForm.swift; sourceTree = "<group>"; };
 		6758463A2965B0F6000BA5E0 /* UIImage+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+.swift"; sourceTree = "<group>"; };
-		6758463C2965B74A000BA5E0 /* FullscreenImageSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullscreenImageSheet.swift; sourceTree = "<group>"; };
 		6758463E2965B7F2000BA5E0 /* ImageDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDetailView.swift; sourceTree = "<group>"; };
 		675846412965CC55000BA5E0 /* ContentInSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentInSheet.swift; sourceTree = "<group>"; };
 		6758B929281D8FD7001D83D8 /* SportsGroundDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundDetailViewModel.swift; sourceTree = "<group>"; };
@@ -818,7 +816,6 @@
 			children = (
 				67BAF3F328361BC400DB40D9 /* PhotoSectionView.swift */,
 				67C87FD52843892D00D6377D /* DeletablePhotoCell.swift */,
-				6758463C2965B74A000BA5E0 /* FullscreenImageSheet.swift */,
 				6758463E2965B7F2000BA5E0 /* ImageDetailView.swift */,
 			);
 			path = PhotoSection;
@@ -1100,7 +1097,6 @@
 				674D0625282AB832007E75C6 /* SearchUsersViewModel.swift in Sources */,
 				67B78718281D8792008B104F /* ChangePasswordViewModel.swift in Sources */,
 				6798AA3E280AEDC900DB76F1 /* SwiftUI_WorkoutAppApp.swift in Sources */,
-				6758463D2965B74A000BA5E0 /* FullscreenImageSheet.swift in Sources */,
 				6798AA57280AF48C00DB76F1 /* JournalsScreen.swift in Sources */,
 				67B7871A281D88CB008B104F /* ProfileSettingsViewModel.swift in Sources */,
 				67E4266F28218B6E00DF82A7 /* ShortAddressService.swift in Sources */,
@@ -1343,7 +1339,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1379,7 +1375,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;

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

@@ -2,6 +2,7 @@ import SwiftUI
 import PDFKit
 
 struct ImageDetailView: UIViewRepresentable {
+    @Environment(\.colorScheme) private var colorScheme
     let image: UIImage
 
     func makeUIView(context: Context) -> PDFView {
@@ -13,7 +14,9 @@ struct ImageDetailView: UIViewRepresentable {
         return view
     }
 
-    func updateUIView(_ uiView: PDFView, context: Context) {}
+    func updateUIView(_ view: PDFView, context: Context) {
+        view.backgroundColor = colorScheme == .dark ? .black : .white
+    }
 }
 
 #if DEBUG

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

@@ -24,32 +24,32 @@ struct PhotoSectionView: View {
 
     var body: some View {
         Section("Фотографии") {
-            ScrollView {
-                LazyVGrid(
-                    columns: .init(
-                        repeating: .init(
-                            .flexible(minimum: 150, maximum: .infinity),
-                            spacing: 12,
-                            alignment: .top
-                        ),
-                        count: columns
+            LazyVGrid(
+                columns: .init(
+                    repeating: .init(
+                        .flexible(minimum: 150, maximum: .infinity),
+                        spacing: 12,
+                        alignment: .top
                     ),
-                    spacing: 12
-                ) {
-                    ForEach(items) { photo in
-                        DeletablePhotoCell(
-                            photo: photo,
-                            canDelete: canDelete,
-                            reportClbk: reportPhotoClbk,
-                            onTapClbk: openImage,
-                            deleteClbk: deletePhotoClbk
-                        )
-                    }
+                    count: columns
+                ),
+                spacing: 12
+            ) {
+                ForEach(items) { photo in
+                    DeletablePhotoCell(
+                        photo: photo,
+                        canDelete: canDelete,
+                        reportClbk: reportPhotoClbk,
+                        onTapClbk: openImage,
+                        deleteClbk: deletePhotoClbk
+                    )
                 }
-                .fullScreenCover(item: $fullscreenImage) {
-                    fullscreenImage = nil
-                } content: {
-                    FullScreenImageSheet(image: $0)
+            }
+            .fullScreenCover(item: $fullscreenImage) {
+                fullscreenImage = nil
+            } content: { image in
+                ContentInSheet(title: "Фото") {
+                    ImageDetailView(image: image)
                 }
             }
         }
@@ -65,7 +65,7 @@ private extension PhotoSectionView {
 #if DEBUG
 struct PhotoSectionView_Previews: PreviewProvider {
     static var previews: some View {
-        Form {
+        List {
             PhotoSectionView(
                 with: [.preview, .preview, .preview],
                 canDelete: true,