From 0c472e5ef221bf822c8286b9bad64f6dd9ce835e Mon Sep 17 00:00:00 2001
From: Marton Zeisler <marton.zeisler@gmail.com>
Date: Wed, 14 Aug 2019 13:23:27 +0200
Subject: [PATCH] Upload UI for video and documents

---
 .../document.imageset/Contents.json           |  21 ++++++++
 .../document.imageset/document.png            | Bin 0 -> 748 bytes
 .../videoFloaty.imageset/Contents.json        |  21 ++++++++
 .../videoFloaty.imageset/video.png            | Bin 0 -> 1869 bytes
 AmahiAnywhere/AmahiAnywhere/Info.plist        |   2 +
 .../Files/FilesViewController.swift           |  49 ++++++++++++++++--
 6 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/Contents.json
 create mode 100644 AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/document.png
 create mode 100644 AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/Contents.json
 create mode 100644 AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/video.png

diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/Contents.json
new file mode 100644
index 00000000000..1774ab0aa42
--- /dev/null
+++ b/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"
+  }
+}
\ No newline at end of file
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/document.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/document.imageset/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0d1a28908fd0c5aa419c52640b0593caed3e2e8
GIT binary patch
literal 748
zcmV<I0u%j-P)<h;3K|Lk000e1NJLTq001Ze001%w1^@s7S+uDJ00001b5ch_0Itp)
z=>Px%rb$FWR9Fe^SvyVyF$@i#k^)3SK|=)%B{T>M4zP$DASgKkCxAO}1PZROD{2lv
zOF@GK0@0zxFB)4JuQQX(X2ld^DdWU(o?o0~CJW9vHx0@?)!i~4N~TL>fM-ostJYP`
zN)7Gl+uG<%OhCbt%P|a==ZR%>79~HcFuKRq(*&Fu2zH^vv{(Zhbx)InW55|6l{{7&
zwhbyHlX~S;Q<`M0Gi;Q1Y~tv1#o^mRBRyW)9O2}hIrKFdUj0z#E=ZqKLEngq7k1=!
zRHuaYgLw&WsPz_s^ZO||G(a$`-3S``d?|*AKzWGC=@DoSk)VCLDnEZr0K$?LnFj@W
zOm)mvfae8dYysAQd*p$o(&dgv23q@|J;4K%i;7=wLWGX(w6=hPQJf*4DrWFZl^<@j
z=p(DYI77Y4R?uvlB$P(>Z&5IvkYP$4V@~m~q-ze>2<)pQAh1l(t_+#n4CuUoGfYbW
z)<E@13GXF5Eoi=@ppG$HR1VQl@~r{UwglUWCFbM%H6Rb_tV`uk2owhda(LV%Qbq+Y
z6v5Ch*vkwccEyT|^nX$Gl%Irqb7hmd@eMac5^DC^M%+fjaZ>Mp4*S2ci!&S+#ony3
zO`K@wOFoVW4g|jEawmteNs2FWQ?RNJpYk!4B%=R8kmry@^gjtE5$yxPMxuQp7$qv7
z7V-$|xj!y$)p*7VPcf57)=h8L2SWKwMsn_eeD@9i7qU$Zdy=V%U=qNho%*;3Yjf6j
zuCNn(=RGtmu#P+2%paXO9&cu?a}NpQb<wrUIROZlVGnjmXE>(!hXiD0y;Xe?docR@
zL&X+OO{aJV><i0wF5YlRax<p=heM(>5@~mOQGXEFZv?Qkd4&MiEzseRSXs%jA%o_B
e7ji%r>H7!Flk+Wj?pJL90000<MNUMnLSTXnw?gIs

literal 0
HcmV?d00001

diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/Contents.json b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/Contents.json
new file mode 100644
index 00000000000..f31abe901b1
--- /dev/null
+++ b/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"
+  }
+}
\ No newline at end of file
diff --git a/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/video.png b/AmahiAnywhere/AmahiAnywhere/Assets.xcassets/videoFloaty.imageset/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..e19159939c80c1cbf5b2543eb052bd12419c217e
GIT binary patch
literal 1869
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

literal 0
HcmV?d00001

diff --git a/AmahiAnywhere/AmahiAnywhere/Info.plist b/AmahiAnywhere/AmahiAnywhere/Info.plist
index 610cb8b0ebf..2773c857286 100644
--- a/AmahiAnywhere/AmahiAnywhere/Info.plist
+++ b/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>
diff --git a/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController.swift b/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController.swift
index d891aa71eae..29aae385603 100644
--- a/AmahiAnywhere/AmahiAnywhere/Presentation/Files/FilesViewController.swift
+++ b/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()
@@ -112,11 +116,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(){
@@ -130,7 +153,10 @@ 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
@@ -138,7 +164,7 @@ class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
             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)
         }))
@@ -201,6 +227,10 @@ class FilesViewController: BaseUIViewController, GCKRemoteMediaClientListener {
         if imagePicker == nil{
             setupImagePicker()
         }
+        
+        if documentPicker == nil{
+            setupDocumentPicker()
+        }
     }
     
     func setupNotifications(){
@@ -553,3 +583,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)")
+    }
+    
+}