Merge pull request #1 from KhubaibKhan4/clean

-Features Cleanup Impl
KhubaibKhan4 · Jan 25, 2025 · 46dd5eb · 46dd5eb
2 parents 2167e0c + d3aa428
commit 46dd5eb
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Notes.xcodeproj/project.pbxproj b/Notes.xcodeproj/project.pbxproj
@@ -23,6 +23,8 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		49B7C3BC2D00D8E900FE8DE5 /* Resources */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Resources;
 			sourceTree = "<group>";
 		};
@@ -47,12 +49,20 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3622B93368E04F3CCE63554D /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		49BA1F7D2CBD8E700099CDCB = {
 			isa = PBXGroup;
 			children = (
 				49B7C3BC2D00D8E900FE8DE5 /* Resources */,
 				49BA1F882CBD8E700099CDCB /* Notes */,
 				49BA1F872CBD8E700099CDCB /* Products */,
+				3622B93368E04F3CCE63554D /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -84,8 +94,6 @@
 				49BA1F882CBD8E700099CDCB /* Notes */,
 			);
 			name = Notes;
-			packageProductDependencies = (
-			);
 			productName = Notes;
 			productReference = 49BA1F862CBD8E700099CDCB /* Notes.app */;
 			productType = "com.apple.product-type.application";

diff --git a/...roj/project.xcworkspace/xcuserdata/rabeetahmad.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/rabeetahmad.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Notes.xcworkspace/contents.xcworkspacedata b/Notes.xcworkspace/contents.xcworkspacedata
diff --git a/Notes/AddNotes.swift b/Notes/AddNotes.swift
@@ -63,7 +63,7 @@ struct AddNotes: View {
                     )
                 }
 
-                Section("Photos") {
+                Section("Media") {
                     Button("Add Media", systemImage: "photo.on.rectangle.angled.fill") {
                         locationManager.checkLocationAuthorization()
                     }

diff --git a/Notes/ContentView.swift b/Notes/ContentView.swift
@@ -13,9 +13,6 @@ struct ContentView: View {
     @State private var isSelected : Int = 0
     @AppStorage("isPermissionGranted") var isPermissionGranted = false
     var body: some View {
-        if !isPermissionGranted {
-            PermissionScreen()
-        }else {
             TabView(selection:$isSelected) {
                 Tab("Home", systemImage: "house",value: 0) {
                     HomeScreen()
@@ -31,7 +28,6 @@ struct ContentView: View {
                 }
 
             }
-        }
     }
 }
 

diff --git a/Notes/permissions_handler/PermissionScreen.swift b/Notes/permissions_handler/PermissionScreen.swift
@@ -16,6 +16,9 @@ struct PermissionScreen: View {
     @State var locationPermissionText: String = "Allow Location"
 
     @AppStorage("isPermissionGranted") private var isPermissionGranted = false
+    @State var isCroppingEnabled: Bool = false
+
+    @State var capturedImage: UIImage? = nil
 
     var body: some View {
         VStack(alignment: .center, spacing: CGFloat(6)) {
@@ -32,9 +35,13 @@ struct PermissionScreen: View {
 
             Button {
                 requestCameraPermission()
-               if cameraPermission == .authorized {
+                if cameraPermission == .authorized {
                     //isPermissionGranted = true
-                    cameraPermissionText = "Camera Permission Granted"
+
+                    ImagePicker(sourceType: .camera, completion: { image in
+                        capturedImage = image
+                    }, isCropping: $isCroppingEnabled)
+
                 } else {
                     cameraPermissionText = "Allow Camera"
                 }
@@ -53,7 +60,8 @@ struct PermissionScreen: View {
             } label: {
                 Label("Allow Location", systemImage: "location")
             }
-        }.onAppear {
+        }
+        .onAppear {
             cameraPermission = AVCaptureDevice.authorizationStatus(for: .video)
         }
     }
@@ -65,4 +73,46 @@ struct PermissionScreen: View {
             }
         }
     }
+
 }
+
+struct ImagePicker: UIViewControllerRepresentable {
+    var sourceType: UIImagePickerController.SourceType
+    var completion: (UIImage) -> Void
+    @Binding var isCropping: Bool
+
+    func makeUIViewController(context: Context) -> UIImagePickerController {
+        let picker = UIImagePickerController()
+        picker.sourceType = sourceType
+        picker.delegate = context.coordinator
+        return picker
+    }
+
+    func updateUIViewController(_ uiViewController: UIImagePickerController, context: Context) {}
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+
+    class Coordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+        let parent: ImagePicker
+
+        init(_ parent: ImagePicker) {
+            self.parent = parent
+        }
+
+        func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
+            if let image = info[.originalImage] as? UIImage {
+                parent.completion(image)
+                parent.isCropping = true
+            }
+            picker.dismiss(animated: true)
+        }
+
+        func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+            picker.dismiss(animated: true)
+        }
+    }
+}
+
+