Merge pull request #239 from Marton-Zeisler/UploadUI

Upload UI for videos and documents

AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "document.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "video.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

AmahiAnywhere/AmahiAnywhere/Info.plist

@@ -29,6 +29,8 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>Please allow access to your camera to take pictures for your HDA server</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Please allow access to your microphone to record a video for upload</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>Please allow access to your photo library to select photos for upload</string>
 	<key>UIBackgroundModes</key>

AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController.swift

@@ -11,6 +11,7 @@ import Lightbox
 import AVFoundation
 import GoogleCast
 import Floaty
+import MobileCoreServices
 
 class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
 
@@ -90,6 +91,9 @@ class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
 
     let interactor = Interactor()
 
+    let documentUploadTypes = [kUTTypePDF as String, kUTTypeText as String, kUTTypeImage as String]
+    var documentPicker: UIDocumentPickerViewController!
+
     override func viewDidLoad() {
         super.viewDidLoad()
         setupNotifications()
@@ -111,11 +115,30 @@ class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
         imagePicker.delegate = self
     }
 
+    func setupDocumentPicker(){
+        documentPicker = UIDocumentPickerViewController(documentTypes: documentUploadTypes, in: .import)
+        documentPicker.delegate = self
+        documentPicker.allowsMultipleSelection = false
+        documentPicker.modalPresentationStyle = .formSheet
+    }
+
     func setupFloaty(){
-
         floaty.addItem("Upload an image", icon: UIImage(named: "camera")) { (item) in
-            self.uploadImageTapped()
+            self.uploadImageVideoTapped(isTypePhoto: true)
+        }
+
+        floaty.addItem("Upload a video", icon: UIImage(named: "videoFloaty")) { (item) in
+            self.uploadImageVideoTapped(isTypePhoto: false)
         }
+
+        floaty.addItem("Upload a document", icon: UIImage(named: "document")) { (item) in
+            self.uploadDocumentTapped()
+        }
+
+    }
+
+    @objc func uploadDocumentTapped(){
+        self.present(documentPicker, animated: true, completion: nil)
     }
 
     @objc func expiredAuthTokenHDA(){
@@ -129,15 +152,18 @@ class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
         self.present(alertVC, animated: true, completion: nil)
     }
 
-    func uploadImageTapped(){
+    func uploadImageVideoTapped(isTypePhoto: Bool){
+        imagePicker.mediaTypes = isTypePhoto ? [kUTTypeImage as String] : [kUTTypeMovie as String]
+        let libraryTitle = isTypePhoto ? "Photo Library" : "Video Library"
+
         let alertVC = UIAlertController(title: "Select your source", message: nil, preferredStyle: .actionSheet)
 
         alertVC.addAction(UIAlertAction(title: "Camera", style: .default, handler: { (_) in
             self.imagePicker.sourceType = .camera
             self.present(self.imagePicker, animated: true, completion: nil)
         }))
 
-        alertVC.addAction(UIAlertAction(title: "Photo Library", style: .default, handler: { (_) in
+        alertVC.addAction(UIAlertAction(title: libraryTitle, style: .default, handler: { (_) in
             self.imagePicker.sourceType = .photoLibrary
             self.present(self.imagePicker, animated: true, completion: nil)
         }))
@@ -204,6 +230,10 @@ class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
         if imagePicker == nil{
             setupImagePicker()
         }
+
+        if documentPicker == nil{
+            setupDocumentPicker()
+        }
     }
 
     func setupNotifications(){
@@ -556,3 +586,14 @@ extension FilesViewController: UIViewControllerTransitioningDelegate {
         return interactor.hasStarted ? interactor : nil
     }
 }
+
+extension FilesViewController: UIDocumentPickerDelegate{
+    func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+        guard let myURL = urls.first else {
+            return
+        }
+
+        print("selected document url : \(myURL)")
+    }
+
+}