removed tab bar and minor ui tweaks..

Author: ankityddv

DocScan.xcodeproj/xcuserdata/ankit.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>DocScan.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>22</integer>
 		</dict>
 	</dict>
 </dict>

DocScan/Storyboards/Base.lproj/Main.storyboard

@@ -10,27 +10,42 @@ import PDFKit
 import Vision
 import VisionKit
 
-class ScanVC: UIViewController, UIImagePickerControllerDelegate & UINavigationControllerDelegate,UICollectionViewDelegate,UICollectionViewDataSource{
+class ScanVC: UIViewController, UIImagePickerControllerDelegate & UINavigationControllerDelegate,UICollectionViewDelegate,UICollectionViewDataSource, UIGestureRecognizerDelegate{
 
     var workingDirectory : URL?
     var allFiles : [File] = []
+    var storedBarItem : UIBarButtonItem?
 
+    @IBOutlet weak var backBttn: UIBarButtonItem!
     @IBOutlet var InstructionView: UIView!
     @IBOutlet weak var collectionView: UICollectionView!
     @IBOutlet var emptyView: UIView!
     @IBOutlet weak var addBttn: UIBarButtonItem!
+    @IBAction func backBttnTapped(_ sender: Any) {
+        returnToPreviousDirectory()
+    }
 
     //MARK: - Create directory
     func gotoDirectory(directory:URL) {
         if(directory.lastPathComponent == "DocScanner"){
             self.navigationItem.leftBarButtonItem = nil
             self.title = "HOME"
         }else{
-            //self.navigationItem.leftBarButtonItem = self.barBackButton
+            self.navigationItem.leftBarButtonItem = self.backBttn
             self.title = directory.lastPathComponent.uppercased()
         }
         self.workingDirectory = directory
         reloadTableData()
+        self.tabBarController?.tabBar.isHidden = true
+    }
+    func returnToPreviousDirectory(){
+        if(self.workingDirectory?.lastPathComponent == "DocScanner"){
+        }else{
+            self.workingDirectory?.deleteLastPathComponent()
+            self.title = workingDirectory!.lastPathComponent.uppercased()
+        }
+        self.gotoDirectory(directory: self.workingDirectory!)
+        self.tabBarController?.tabBar.isHidden = false
     }
 
     //MARK: -
@@ -57,6 +72,7 @@ class ScanVC: UIViewController, UIImagePickerControllerDelegate & UINavigationCo
             self.allFiles = FileUtility.shared.scanDirectory(directory: self.workingDirectory!)
         }
         self.collectionView.reloadData()
+        
     }
 
     func reloadTableData() {
@@ -79,7 +95,7 @@ class ScanVC: UIViewController, UIImagePickerControllerDelegate & UINavigationCo
         //cell.dateLabel.text = dateArr[indexPath.row]
         //cell.documentName.text = nameArr[indexPath.row]
 
-        //cell.imageView?.image = self.allFiles[indexPath.row].image
+        cell.imageView?.image = self.allFiles[indexPath.row].image
         cell.documentName?.text = self.allFiles[indexPath.row].name
         cell.dateLabel?.text = self.allFiles[indexPath.row].size
 
@@ -131,14 +147,52 @@ class ScanVC: UIViewController, UIImagePickerControllerDelegate & UINavigationCo
     override func viewDidLoad() {
         super.viewDidLoad()
         // To hide the top line
+        self.storedBarItem = self.backBttn
+        self.navigationItem.leftBarButtonItem = nil
         self.navigationController?.navigationBar.shadowImage = UIImage()
-        // To hide the top line
-        //self.tabBarController?.tabBar.shadowImage = UIImage()
-        //self.tabBarController?.tabBar.backgroundImage = UIImage()
-        setUpMenu()
+        let longPressGR = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPress(longPressGR:)))
+            longPressGR.minimumPressDuration = 0.5
+            longPressGR.delaysTouchesBegan = true
+            self.collectionView.addGestureRecognizer(longPressGR)
+        //setUpMenu()
+    }
+    
+    @objc
+    func handleLongPress(longPressGR: UILongPressGestureRecognizer) {
+        if longPressGR.state != .ended {
+            return
+        }
+        
+        let point = longPressGR.location(in: self.collectionView)
+        let indexPath = self.collectionView.indexPathForItem(at: point)
+        
+        if let indexPath = indexPath {
+            var cell = self.collectionView.cellForItem(at: indexPath)
+            let deleteAction = self.contextualDeleteAction(forRowAt: indexPath)
+        } else {
+            print("Could not find index path")
+        }
     }
 
-   
+    func contextualDeleteAction(forRowAt indexPath : IndexPath) -> UIContextualAction {
+        let action = UIContextualAction(style: .normal, title: "Delete") { (contextAction, sourceView, completionHandler) in
+            let errorMessage = FileUtility.shared.deleteFile(url: self.allFiles[indexPath.row].url)
+            if(errorMessage == ""){
+                self.reloadTableData()
+                completionHandler(true)
+            }else{
+                self.presentAlert(title: "Failed", message: errorMessage)
+                completionHandler(false)
+            }
+        }
+        action.image = UIImage(named: "delete_forever")
+        action.title = "Delete"
+        action.backgroundColor = UIColor.red
+        return action
+    }
+    
+    
+    
     //MARK:- Set up uimenu Button
 
     @objc func setUpMenu(){

DocScan/VCs/1ScanSubVC/ScanVC.swift

@@ -326,7 +326,7 @@ struct File {
     let name : String!
     let type : FileType!
     let size : String!
-    //let image : UIImage!
+    let image : UIImage!
     let path : String!
     let url : URL!
     init(fileUrl:URL) {
@@ -337,28 +337,28 @@ struct File {
         case "":
             name = fileUrl.lastPathComponent
             type = .folder
-            //image = UIImage(named: "FolderIconPink")                //?.tint(with: Theme.folderColor)
+            self.image = UIImage(named: "FolderIconPink")                //?.tint(with: Theme.folderColor)
             size = FileUtility.shared.getSize(ofDirectory: self.url)
         case "pdf":
             name = fileUrl.deletingPathExtension().lastPathComponent
             type = .pdf
             self.size = FileUtility.shared.fileSize(fileAt: self.url)
-            //image = UIImage(named: "pictureAsPdf")?.tint(with:Theme.pdfIconColor)
+            image = UIImage(named: "pictureAsPdf") //?.tint(with:Theme.pdfIconColor)
         case "jpg":
             name = fileUrl.deletingPathExtension().lastPathComponent
             type = .jpg
             self.size = FileUtility.shared.fileSize(fileAt: self.url)
-            //image = UIImage(named: "pictureAsPdf")
+            image = UIImage(named: "pictureAsPdf")
         case "png":
             name = fileUrl.deletingPathExtension().lastPathComponent
             type = .png
             self.size = FileUtility.shared.fileSize(fileAt: self.url)
-            //image = UIImage(named: "pictureAsPdf")
+            image = UIImage(named: "pictureAsPdf")
         default:
             name = fileUrl.lastPathComponent
             type = .folder
             size = FileUtility.shared.getFileSize(ofFolder: self.url)
-            //image = UIImage(named: "folder")
+            image = UIImage(named: "folder")
         }
     }
 }

DocScan/VCs/Custom Files/FileUtility.swift

@@ -6,7 +6,6 @@ target 'DocScan' do
 
   # Pods for DocScan
     pod 'TDCRoundButton'
-    pod 'CBFlashyTabBarController'
     pod 'Firebase'
     pod 'Firebase/Auth'
     pod 'Firebase/Storage'

Podfile

@@ -4,7 +4,6 @@ PODS:
     - AppAuth/ExternalUserAgent (= 1.4.0)
   - AppAuth/Core (1.4.0)
   - AppAuth/ExternalUserAgent (1.4.0)
-  - CBFlashyTabBarController (0.8.3)
   - Firebase (6.34.0):
     - Firebase/Core (= 6.34.0)
   - Firebase/Auth (6.34.0):
@@ -104,7 +103,6 @@ PODS:
   - TDCRoundButton (0.1.4)
 
 DEPENDENCIES:
-  - CBFlashyTabBarController
   - Firebase
   - Firebase/Auth
   - Firebase/Database
@@ -115,7 +113,6 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - AppAuth
-    - CBFlashyTabBarController
     - Firebase
     - FirebaseAnalytics
     - FirebaseAuth
@@ -137,7 +134,6 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
-  CBFlashyTabBarController: bc6b11dd4cbc9b54785c8944156e2f4d4f03b088
   Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999
   FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f
   FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3
@@ -157,6 +153,6 @@ SPEC CHECKSUMS:
   PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
   TDCRoundButton: e62175861daca33f6d780f3718505747fe4db70a
 
-PODFILE CHECKSUM: f3d6ed65f0da829aba5a70f77469c3b3048c599d
+PODFILE CHECKSUM: f6e21c487d184f030da668b19a648a4834c1b5a9
 
 COCOAPODS: 1.9.3