Update forked branch

ExyteMediaPicker.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "ExyteMediaPicker"
-  s.version          = "1.2.4"
+  s.version          = "2.2.3"
   s.summary          = "MediaPicker is a customizable photo/video picker for iOS written in pure SwiftUI"
 
   s.homepage         = 'https://github.com/exyte/MediaPicker.git'

Examples/Example-iOS/AppDelegate.swift → MediaPickerExample/MediaPickerExample/AppDelegate.swift

@@ -13,6 +13,7 @@ final class AppDelegate: NSObject, UIApplicationDelegate, ObservableObject {
     private var orientationLock = UIInterfaceOrientationMask.all
 
     func lockOrientationToPortrait() {
+        orientationLock = .portrait
         if #available(iOS 16, *) {
             if let scene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
                 scene.requestGeometryUpdate(.iOS(interfaceOrientations: .portrait))
@@ -21,7 +22,6 @@ final class AppDelegate: NSObject, UIApplicationDelegate, ObservableObject {
         } else {
             UIDevice.current.setValue(UIDeviceOrientation.portrait.rawValue, forKey: "orientation")
         }
-        orientationLock = .portrait
     }
 
     func unlockOrientation() {

Examples/Example-iOS/ContentView.swift → MediaPickerExample/MediaPickerExample/ContentView.swift

@@ -60,6 +60,7 @@ struct ContentView: View {
                 onChange: { medias = $0 }
             )
             .showLiveCameraCell()
+            .mediaSelectionLimit(1)
             .orientationHandler {
                 switch $0 {
                 case .lock: appDelegate.lockOrientationToPortrait()

Examples/Example-iOS/CustomizedMediaPicker.swift → MediaPickerExample/MediaPickerExample/CustomizedMediaPicker.swift

@@ -17,20 +17,23 @@ struct CustomizedMediaPicker: View {
 
     @State private var mediaPickerMode = MediaPickerMode.photos
     @State private var selectedAlbum: Album?
+    @State private var currentFullscreenMedia: Media?
     @State private var showAlbumsDropDown: Bool = false
+    @State private var videoIsBeingRecorded: Bool = false
 
     let maxCount: Int = 5
 
     var body: some View {
         MediaPicker(
             isPresented: $isPresented,
             onChange: { medias = $0 },
-            albumSelectionBuilder: { _, albumSelectionView in
+            albumSelectionBuilder: { _, albumSelectionView, _ in
                 VStack {
                     headerView
                     albumSelectionView
                     Spacer()
                     footerView
+                        .background(Color.black)
                 }
                 .background(Color.black)
             },
@@ -40,28 +43,50 @@ struct CustomizedMediaPicker: View {
                         Spacer()
                         Button("Done", action: { isPresented = false })
                     }
+                    .padding()
                     cameraSelectionView
                     HStack {
                         Button("Cancel", action: cancelClosure)
                         Spacer()
                         Button(action: addMoreClosure) {
                             Text("Take more photos")
-                                .font(.headline)
-                                .foregroundColor(.black)
-                                .padding()
-                        }
-                        .background {
-                            Color("CustomGreen")
-                                .cornerRadius(16)
+                                .greenButtonStyle()
                         }
                     }
+                    .padding()
                 }
                 .background(Color.black)
+            },
+            cameraViewBuilder: { cameraSheetView, cancelClosure, showPreviewClosure, takePhotoClosure, startVideoCaptureClosure, stopVideoCaptureClosure, _, _ in
+                cameraSheetView
+                    .overlay(alignment: .topLeading) {
+                        HStack {
+                            Button("Cancel") { cancelClosure() }
+                                .foregroundColor(Color("CustomPurple"))
+                            Spacer()
+                            Button("Done") { showPreviewClosure() }
+                                .foregroundColor(Color("CustomPurple"))
+                        }
+                        .padding()
+                    }
+                    .overlay(alignment: .bottom) {
+                        HStack {
+                            Button("Take photo") { takePhotoClosure() }
+                                .greenButtonStyle()
+                            Button(videoIsBeingRecorded ? "Stop video capture" : "Capture video") {
+                                videoIsBeingRecorded ? stopVideoCaptureClosure() : startVideoCaptureClosure()
+                                videoIsBeingRecorded.toggle()
+                            }
+                            .greenButtonStyle()
+                        }
+                        .padding()
+                    }
             }
         )
         .showLiveCameraCell()
         .albums($albums)
         .pickerMode($mediaPickerMode)
+        .currentFullscreenMedia($currentFullscreenMedia)
         .orientationHandler {
             switch $0 {
             case .lock: appDelegate.lockOrientationToPortrait()
@@ -116,13 +141,12 @@ struct CustomizedMediaPicker: View {
 
     var footerView: some View {
         HStack {
-            Button {
-                medias = []
-                isPresented = false
-            } label: {
-                Text("Cancel")
-                    .foregroundColor(.white.opacity(0.7))
-            }
+            TextField("", text: .constant(""), prompt: Text("Add a caption").foregroundColor(.gray))
+                .padding()
+                .background {
+                    Color.white.opacity(0.2)
+                        .cornerRadius(6)
+                }
 
             Spacer(minLength: 70)
 
@@ -137,18 +161,12 @@ struct CustomizedMediaPicker: View {
                         .background(Color.white)
                         .clipShape(Circle())
                 }
-                .font(.headline)
-                .foregroundColor(.black)
-                .padding(.horizontal)
-                .padding(.vertical, 15)
                 .frame(maxWidth: .infinity)
             }
-            .background {
-                Color("CustomGreen")
-                    .cornerRadius(16)
-            }
+            .greenButtonStyle()
         }
         .padding(.horizontal)
+        .padding(.vertical, 8)
     }
 
     var albumsDropdown: some View {
@@ -167,3 +185,15 @@ struct CustomizedMediaPicker: View {
         .frame(maxHeight: 300)
     }
 }
+
+extension View {
+    func greenButtonStyle() -> some View {
+        self.font(.headline)
+            .foregroundColor(.black)
+            .padding()
+            .background {
+                Color("CustomGreen")
+                    .cornerRadius(16)
+            }
+    }
+}

Package.swift

@@ -1,13 +1,12 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "ExyteMediaPicker",
     platforms: [
-        .iOS(.v15),
-        .macOS(.v11)
+        .iOS(.v15)
     ],
     products: [
         .library(

README.md

@@ -68,14 +68,16 @@ After making one photo, you see a preview of it and a little plus icon, by tappi
 `onChange` - a closure that returns the selected media every time the selection changes
 
 ### Init - optional view builders
-You can pass two view builders in order to add your own buttons and other elements to media picker screens. First screen you can customize is default photos grid view. Pass `albumSelectionBuilder` closure like this to replace the standard one with your own view:
+You can pass 1-3 view builders in order to add your own buttons and other elements to media picker screens. You can pass all, some or none of these when creating your `MediaPicker` (see the custom picker in the example project for usage example). First screen you can customize is default photos grid view. Pass `albumSelectionBuilder` closure like this to replace the standard one with your own view:
 ```swift
 MediaPicker(
     isPresented: $isPresented,
     onChange: { selectedMedia = $0 },
-    albumSelectionBuilder: { defaultHeaderView, albumSelectionView in
+    albumSelectionBuilder: { defaultHeaderView, albumSelectionView, isInFullscreen in
         VStack {
-            defaultHeaderView
+            if !isInFullscreen {
+                defaultHeaderView
+            }
             albumSelectionView
             Spacer()
             footerView
@@ -88,6 +90,7 @@ MediaPicker(
 `albumSelectionBuilder` gives you two views to work with:
 - `defaultHeaderView` - a default looking `header` with photos/albums mode switcher
 - `albumSelectionView` - the photos grid itself
+- `isInFullscreen` - is fullscreen photo details screen displayed. Use for example to hide the header while in fullscreen mode.
 
 The second customizable screen is the one you see after taking a photo. Pass `cameraSelectionBuilder` like this:
 ```swift
@@ -117,13 +120,56 @@ MediaPicker(
 - `cancelClosure` - show confirmation and return to photos grid screen if confirmed
 - `cameraSelectionView` - swipable camera photos preview collection itself
 
-You can pass one, both or none of these when creating your `MediaPicker`. (see the custom picker in the example project for usage example)
+The last one is live camera screen
+
+```swift
+MediaPicker(
+    isPresented: $isPresented,
+    onChange: { selectedMedia = $0 },
+    cameraViewBuilder: { cameraSheetView, cancelClosure, showPreviewClosure, takePhotoClosure, startVideoCaptureClosure, stopVideoCaptureClosure, toggleFlash, flipCamera in
+        cameraSheetView
+            .overlay(alignment: .topLeading) {
+                HStack {
+                    Button("Cancel") { cancelClosure() }
+                        .foregroundColor(Color("CustomPurple"))
+                    Spacer()
+                    Button("Done") { showPreviewClosure() }
+                        .foregroundColor(Color("CustomPurple"))
+                }
+                .padding()
+            }
+            .overlay(alignment: .bottom) {
+                HStack {
+                    Button("Take photo") { takePhotoClosure() }
+                        .greenButtonStyle()
+                    Button(videoIsBeingRecorded ? "Stop video capture" : "Capture video") {
+                        videoIsBeingRecorded ? stopVideoCaptureClosure() : startVideoCaptureClosure()
+                        videoIsBeingRecorded.toggle()
+                    }
+                    .greenButtonStyle()
+                }
+                .padding()
+            }
+    }
+)
+```
+
+`cameraViewBuilder` live camera capture view and a lot of closures to do with as you please:
+- `cameraSheetView` - live camera capture view
+- `cancelClosure` - if you want to display "are you sure" before closing
+- `showPreviewClosure` - shows preview of taken photos
+- `cancelClosure` - if you want to display "are you sure" before closing
+- `startVideoCaptureClosure` - starts video capture, you'll need a bollean varialbe to track recording state
+- `stopVideoCaptureClosure` - stops video capture
+- `toggleFlash` - flash off/on
+- `flipCamera` - camera back/front
 
 ## Available modifiers
 `showLiveCameraCell` - show live camera feed cell in the top left corner of the gallery grid     
 `mediaSelectionType` - limit displayed media type: .photo, .video or both   
 `mediaSelectionStyle` - a way to display selected/unselected media state: a counter or a simple checkmark   
 `mediaSelectionLimit` - the maximum selection quantity allowed, 'nil' for unlimited selection   
+`showFullscreenPreview` - if true - tap on media opens fullscreen preview, if false - tap on image immediately selects this image and closes the picker
 
 ### Available modifiers - filtering
 `applyFilter((Media) async -> Media?)` - pass a closure to apply to each of medias individually. Closures's return type is `Media?`: return `Media` the closure gives to you if you want it to be displayed on photo grid, or `nil` if you want to exclude it. The code you apply to each media can be asyncronous (using async/await syntactics, check out `FilterMediaPicker` in example project)
@@ -196,18 +242,21 @@ github "Exyte/MediaPicker"
 
 ## Requirements
 
-* iOS 15+
+* iOS 16+
 * Xcode 13+ 
 
 ## Our other open source SwiftUI libraries
 [PopupView](https://github.com/exyte/PopupView) - Toasts and popups library    
 [Grid](https://github.com/exyte/Grid) - The most powerful Grid container    
-[ScalingHeaderScrollView](https://github.com/exyte/ScalingHeaderScrollView) - A scroll view with a sticky header which shrinks as you scroll  
-[AnimatedTabBar](https://github.com/exyte/AnimatedTabBar) - A tabbar with number of preset animations      
-[Chat](https://github.com/exyte/chat) - Chat UI framework with fully customizable message cells, input view, and a built-in media picker        
+[ScalingHeaderScrollView](https://github.com/exyte/ScalingHeaderScrollView) - A scroll view with a sticky header which shrinks as you scroll    
+[AnimatedTabBar](https://github.com/exyte/AnimatedTabBar) - A tabbar with a number of preset animations   
+[Chat](https://github.com/exyte/chat) - Chat UI framework with fully customizable message cells, input view, and a built-in media picker  
+[OpenAI](https://github.com/exyte/OpenAI) Wrapper lib for [OpenAI REST API](https://platform.openai.com/docs/api-reference/introduction)    
+[AnimatedGradient](https://github.com/exyte/AnimatedGradient) - Animated linear gradient     
 [ConcentricOnboarding](https://github.com/exyte/ConcentricOnboarding) - Animated onboarding flow    
 [FloatingButton](https://github.com/exyte/FloatingButton) - Floating button menu    
 [ActivityIndicatorView](https://github.com/exyte/ActivityIndicatorView) - A number of animated loading indicators    
 [ProgressIndicatorView](https://github.com/exyte/ProgressIndicatorView) - A number of animated progress indicators    
+[FlagAndCountryCode](https://github.com/exyte/FlagAndCountryCode) - Phone codes and flags for every country    
 [SVGView](https://github.com/exyte/SVGView) - SVG parser    
 [LiquidSwipe](https://github.com/exyte/LiquidSwipe) - Liquid navigation animation