diff --git a/MiniScanner.xcodeproj/project.pbxproj b/MiniScanner.xcodeproj/project.pbxproj
index 0f7a7a3359007cf6a8297aaf7a952c197413003f..3240794acac925012867876a22e4a6a2ca22684c 100644
--- a/MiniScanner.xcodeproj/project.pbxproj
+++ b/MiniScanner.xcodeproj/project.pbxproj
@@ -63,6 +63,8 @@
535984072C145083003EB6ED /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 535983F82C145083003EB6ED /* Poppins-Bold.ttf */; };
535984102C145083003EB6ED /* Poppins-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 535984012C145083003EB6ED /* Poppins-Medium.ttf */; };
535984112C145083003EB6ED /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 535984022C145083003EB6ED /* Poppins-Regular.ttf */; };
+ 5359841A2C145E55003EB6ED /* DocumentsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535984182C145E55003EB6ED /* DocumentsTableViewCell.swift */; };
+ 5359841B2C145E55003EB6ED /* DocumentsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 535984192C145E55003EB6ED /* DocumentsTableViewCell.xib */; };
53F21F8B2C1246AF00172BFC /* AllFolderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F21F892C1246AF00172BFC /* AllFolderTableViewCell.swift */; };
53F21F8C2C1246AF00172BFC /* AllFolderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F8A2C1246AF00172BFC /* AllFolderTableViewCell.xib */; };
53F21F912C1248EC00172BFC /* FolderCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F21F8F2C1248EC00172BFC /* FolderCollectionViewCell.swift */; };
@@ -101,7 +103,6 @@
EC8A9B17254DCC2900F9AF99 /* URL+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8A9B16254DCC2900F9AF99 /* URL+Extensions.swift */; };
EC8A9B1A254DCE3E00F9AF99 /* UIImage+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8A9B19254DCE3E00F9AF99 /* UIImage+Extensions.swift */; };
EC8A9B1D254DCEC600F9AF99 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8A9B1C254DCEC600F9AF99 /* File.swift */; };
- EC8A9B20254DDC3400F9AF99 /* DocumentsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8A9B1F254DDC3400F9AF99 /* DocumentsTableViewCell.swift */; };
EC8A9B24254DE72F00F9AF99 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8A9B23254DE72F00F9AF99 /* UIView+Extensions.swift */; };
EC8A9B27254DE91B00F9AF99 /* DocumentPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC8A9B26254DE91B00F9AF99 /* DocumentPreviewViewController.swift */; };
ECA1FAA1254DEA6A0081F00B /* DocumentPreview.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ECA1FAA0254DEA6A0081F00B /* DocumentPreview.storyboard */; };
@@ -187,6 +188,8 @@
535983F82C145083003EB6ED /* Poppins-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Bold.ttf"; sourceTree = "<group>"; };
535984012C145083003EB6ED /* Poppins-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Medium.ttf"; sourceTree = "<group>"; };
535984022C145083003EB6ED /* Poppins-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Poppins-Regular.ttf"; sourceTree = "<group>"; };
+ 535984182C145E55003EB6ED /* DocumentsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentsTableViewCell.swift; sourceTree = "<group>"; };
+ 535984192C145E55003EB6ED /* DocumentsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DocumentsTableViewCell.xib; sourceTree = "<group>"; };
53F21F892C1246AF00172BFC /* AllFolderTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllFolderTableViewCell.swift; sourceTree = "<group>"; };
53F21F8A2C1246AF00172BFC /* AllFolderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AllFolderTableViewCell.xib; sourceTree = "<group>"; };
53F21F8F2C1248EC00172BFC /* FolderCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -229,7 +232,6 @@
EC8A9B16254DCC2900F9AF99 /* URL+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Extensions.swift"; sourceTree = "<group>"; };
EC8A9B19254DCE3E00F9AF99 /* UIImage+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Extensions.swift"; sourceTree = "<group>"; };
EC8A9B1C254DCEC600F9AF99 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
- EC8A9B1F254DDC3400F9AF99 /* DocumentsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentsTableViewCell.swift; sourceTree = "<group>"; };
EC8A9B23254DE72F00F9AF99 /* UIView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; };
EC8A9B26254DE91B00F9AF99 /* DocumentPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPreviewViewController.swift; sourceTree = "<group>"; };
ECA1FAA0254DEA6A0081F00B /* DocumentPreview.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = DocumentPreview.storyboard; sourceTree = "<group>"; };
@@ -402,6 +404,15 @@
path = English;
sourceTree = "<group>";
};
+ 535984132C145E22003EB6ED /* DocumentsTableViewCell */ = {
+ isa = PBXGroup;
+ children = (
+ 535984182C145E55003EB6ED /* DocumentsTableViewCell.swift */,
+ 535984192C145E55003EB6ED /* DocumentsTableViewCell.xib */,
+ );
+ path = DocumentsTableViewCell;
+ sourceTree = "<group>";
+ };
53AF29712C1098AC0046E9C1 /* Frameworks */ = {
isa = PBXGroup;
children = (
@@ -413,6 +424,7 @@
53F21F862C12468900172BFC /* CustomCells */ = {
isa = PBXGroup;
children = (
+ 535984132C145E22003EB6ED /* DocumentsTableViewCell */,
53F21F8D2C1248C400172BFC /* AllFolderTableViewCell */,
);
path = CustomCells;
@@ -512,7 +524,6 @@
53F21F862C12468900172BFC /* CustomCells */,
EC8A9B1C254DCEC600F9AF99 /* File.swift */,
EC0CF217254D8DF200888722 /* Documents.storyboard */,
- EC8A9B1F254DDC3400F9AF99 /* DocumentsTableViewCell.swift */,
EC0CF214254D8DE900888722 /* DocumentsTableViewController.swift */,
);
path = Documents;
@@ -662,6 +673,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 5359841B2C145E55003EB6ED /* DocumentsTableViewCell.xib in Resources */,
53014FAD2C11A8E80071CE39 /* rotate.png in Resources */,
53014FB02C11A8E80071CE39 /* flashUnavailable@2x.png in Resources */,
EC702543254E1E7500BE1958 /* WalkthroughViewController.xib in Resources */,
@@ -746,7 +758,6 @@
buildActionMask = 2147483647;
files = (
53014FA02C11A8E80071CE39 /* MultiPageScanSession.swift in Sources */,
- EC8A9B20254DDC3400F9AF99 /* DocumentsTableViewCell.swift in Sources */,
53014F9A2C11A8E80071CE39 /* CIImage+Utils.swift in Sources */,
EC8A9B17254DCC2900F9AF99 /* URL+Extensions.swift in Sources */,
535983F22C144E87003EB6ED /* Keys.swift in Sources */,
@@ -782,6 +793,7 @@
53014F982C11A8E80071CE39 /* URL+Utils.swift in Sources */,
EC8A9B00254DBFC700F9AF99 /* UserDefaults+Extensions.swift in Sources */,
EC8A9B03254DC08800F9AF99 /* NSNotification+Extensions.swift in Sources */,
+ 5359841A2C145E55003EB6ED /* DocumentsTableViewCell.swift in Sources */,
EC702522254DF13200BE1958 /* PencilKitViewController.swift in Sources */,
53014F902C11A8E80071CE39 /* CaptureSessionManager.swift in Sources */,
ECA1FAA4254DEB140081F00B /* CustomPDFView.swift in Sources */,
diff --git a/MiniScanner.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate b/MiniScanner.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate
index c83cbd686e70a40c569e572512ce3e778d3c0159..2650ace59b825022427085332ee8bc820d14776d 100644
Binary files a/MiniScanner.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate and b/MiniScanner.xcworkspace/xcuserdata/g.makhoul.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/MiniScanner/Extensions/UIColor+Extensions.swift b/MiniScanner/Extensions/UIColor+Extensions.swift
index d851c563eb2aac8ed9c911f010f8b881b3ef5873..93395b7e6a6d0c6a955c69f2470e02ceefdb20ee 100644
--- a/MiniScanner/Extensions/UIColor+Extensions.swift
+++ b/MiniScanner/Extensions/UIColor+Extensions.swift
@@ -14,6 +14,7 @@ extension UIColor {
static let buttonsBlue = hex("#1F86FF")
static let mainText = hex("#505050")
static let titlesText = hex("#888888")
+ static let cellBackground = hex("#F4F4F4")
}
extension UIColor {
diff --git a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.swift b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.swift
index bd730315d1c0f46c50f9244388d35f1b9154465c..d52dbd724c29197d74d8b5a462cb764e8ce9bdd0 100644
--- a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.swift
+++ b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.swift
@@ -14,6 +14,7 @@ protocol AllFolderTableViewCellDelegate {
final class AllFolderTableViewCell: UIView {
// MARK: - Outlets
+ @IBOutlet private weak var view: UIView!
@IBOutlet weak var collectionView: UICollectionView!
// MARK: - Properties
@@ -21,10 +22,28 @@ final class AllFolderTableViewCell: UIView {
var delegate: AllFolderTableViewCellDelegate?
// MARK: - LifeCycle
- override func awakeFromNib() {
- super.awakeFromNib()
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ setupNib()
+ }
+
+ required init?(coder aDecoder: NSCoder) {
+ super.init(coder: aDecoder)
+
+ setupNib()
+ }
+
+ private func setupNib() {
+ Bundle.main.loadNibNamed("AllFolderTableViewCell", owner: self, options: nil)
+
+ view.frame = bounds
+ view.autoresizingMask = [.flexibleHeight, .flexibleWidth]
+
+ addSubview(view)
setupCollectionView()
}
+
private func setupCollectionView() {
let layout = UICollectionViewFlowLayout()
@@ -78,8 +97,8 @@ extension AllFolderTableViewCell: UICollectionViewDelegate, UICollectionViewData
folders[index].isSelected = false
}
folders[indexPath.row].isSelected = true
- collectionView.reloadData()
delegate?.cellTapped(folder: folders[indexPath.row])
+
}
diff --git a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.xib b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.xib
index fcafa1a6012f85f9013c5b52e0eff56a6f965a43..919a9b78255c45b86fb73bb6807c749bf6682888 100644
--- a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.xib
+++ b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/AllFolderTableViewCell.xib
@@ -9,9 +9,14 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
- <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AllFolderTableViewCell" customModule="MiniScanner" customModuleProvider="target">
+ <connections>
+ <outlet property="collectionView" destination="ATv-Qf-nQ6" id="tpu-Qf-4th"/>
+ <outlet property="view" destination="IMm-Qg-H9R" id="eqa-cf-UOK"/>
+ </connections>
+ </placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
- <view contentMode="scaleToFill" id="IMm-Qg-H9R" customClass="AllFolderTableViewCell" customModule="MiniScanner" customModuleProvider="target">
+ <view contentMode="scaleToFill" id="IMm-Qg-H9R">
<rect key="frame" x="0.0" y="0.0" width="335" height="323"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
@@ -54,9 +59,6 @@
<constraint firstItem="dvn-eZ-g5z" firstAttribute="trailing" secondItem="ATv-Qf-nQ6" secondAttribute="trailing" id="esV-e5-Agm"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
- <connections>
- <outlet property="collectionView" destination="ATv-Qf-nQ6" id="b8i-fA-6g6"/>
- </connections>
<point key="canvasLocation" x="148.85496183206106" y="308.80281690140845"/>
</view>
</objects>
diff --git a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.swift b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.swift
index c8c458e217993e07c7be3c24aaa121182f1594b2..0ff692a1c4efc1fb1bf50d3ff3ffeca33a4f34d4 100644
--- a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.swift
+++ b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.swift
@@ -34,14 +34,12 @@ class FolderCollectionViewCell: UICollectionViewCell {
}
private func setSelected() {
-
- self.titleLabel.textColor = isFolderSelected ? .white : .mainText
self.boxView.backgroundColor = isFolderSelected ? .mainBlue : .white
}
func set(folder: AppConfigurator.Folder) {
- self.titleLabel.set(text: folder.name, color: isFolderSelected ? .white : .mainText, font: isFolderSelected ? .bold(18) : .medium(18))
isFolderSelected = folder.isSelected
+ self.titleLabel.set(text: folder.name, color: isFolderSelected ? .white : .mainText, font: isFolderSelected ? .bold(18) : .medium(18))
setSelected()
}
}
diff --git a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.xib b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.xib
index 947984f807410311c2c73446c830d6d1b6434756..e47425ebd62723e07983b268e2c93f4dd73e7fe8 100644
--- a/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.xib
+++ b/MiniScanner/Modules/Documents/CustomCells/AllFolderTableViewCell/CustomCells/FolderCollectionViewCell.xib
@@ -22,18 +22,27 @@
<rect key="frame" x="5" y="5" width="208" height="41"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D7K-ZB-UlJ">
- <rect key="frame" x="5" y="5" width="198" height="31"/>
+ <rect key="frame" x="50" y="5" width="153" height="31"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="folder.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="Yfc-8h-AJQ">
+ <rect key="frame" x="20" y="12.33333333333333" width="20" height="17.000000000000007"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="20" id="EHi-ns-gJn"/>
+ <constraint firstAttribute="height" constant="20" id="coK-nt-C2h"/>
+ </constraints>
+ </imageView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="D7K-ZB-UlJ" secondAttribute="bottom" constant="5" id="24v-2D-M4k"/>
<constraint firstItem="D7K-ZB-UlJ" firstAttribute="top" secondItem="yLC-Fk-FwR" secondAttribute="top" constant="5" id="61w-s3-ojR"/>
- <constraint firstItem="D7K-ZB-UlJ" firstAttribute="leading" secondItem="yLC-Fk-FwR" secondAttribute="leading" constant="5" id="EIl-rx-0Rh"/>
+ <constraint firstItem="Yfc-8h-AJQ" firstAttribute="centerY" secondItem="yLC-Fk-FwR" secondAttribute="centerY" id="8vQ-gL-EM1"/>
+ <constraint firstItem="Yfc-8h-AJQ" firstAttribute="leading" secondItem="yLC-Fk-FwR" secondAttribute="leading" constant="20" id="Ai9-CN-Ddd"/>
<constraint firstAttribute="trailing" secondItem="D7K-ZB-UlJ" secondAttribute="trailing" constant="5" id="Vjk-bg-gFN"/>
+ <constraint firstItem="D7K-ZB-UlJ" firstAttribute="leading" secondItem="Yfc-8h-AJQ" secondAttribute="trailing" constant="10" id="cmu-uH-mE3"/>
</constraints>
</view>
</subviews>
@@ -55,6 +64,7 @@
</collectionViewCell>
</objects>
<resources>
+ <image name="folder.fill" catalog="system" width="128" height="96"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
diff --git a/MiniScanner/Modules/Documents/CustomCells/DocumentsTableViewCell/DocumentsTableViewCell.swift b/MiniScanner/Modules/Documents/CustomCells/DocumentsTableViewCell/DocumentsTableViewCell.swift
new file mode 100644
index 0000000000000000000000000000000000000000..e3456ff855ffcde62ab3a723de1b6e1e16808844
--- /dev/null
+++ b/MiniScanner/Modules/Documents/CustomCells/DocumentsTableViewCell/DocumentsTableViewCell.swift
@@ -0,0 +1,32 @@
+//
+// DocumentsTableViewCell.swift
+// MiniScanner
+//
+// Created by George Makhoul on 08/06/2024.
+// Copyright © 2024 AppsNectar. All rights reserved.
+//
+
+import UIKit
+
+final class DocumentsTableViewCell: UITableViewCell {
+
+ @IBOutlet private weak var thumbnailImageView: UIImageView!
+ @IBOutlet private weak var containerImageView: UIView!
+ @IBOutlet private weak var nameLabel: UILabel!
+ @IBOutlet private weak var dateLabel: UILabel!
+
+ override func awakeFromNib() {
+ super.awakeFromNib()
+ // Initialization code
+ containerImageView.layer.cornerRadius = 10
+ containerImageView.backgroundColor = .cellBackground
+ }
+
+ func configure(with viewModel: File, image: UIImage?) {
+ nameLabel.set(text: viewModel.displayName, color: .mainText, font: .medium(16))
+ let description = "\(viewModel.date.description) | \(viewModel.pagesCount)"
+ dateLabel.set(text: description, color: .titlesText, font: .regular(16))
+ }
+}
+
+
diff --git a/MiniScanner/Modules/Documents/CustomCells/DocumentsTableViewCell/DocumentsTableViewCell.xib b/MiniScanner/Modules/Documents/CustomCells/DocumentsTableViewCell/DocumentsTableViewCell.xib
new file mode 100644
index 0000000000000000000000000000000000000000..0fba204f35c90fbd4902790eda6d9a015103d079
--- /dev/null
+++ b/MiniScanner/Modules/Documents/CustomCells/DocumentsTableViewCell/DocumentsTableViewCell.xib
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+ <device id="retina6_12" orientation="portrait" appearance="light"/>
+ <dependencies>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+ <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+ <capability name="System colors in document resources" minToolsVersion="11.0"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+ <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="112" id="KGk-i7-Jjw" customClass="DocumentsTableViewCell" customModule="MiniScanner" customModuleProvider="target">
+ <rect key="frame" x="0.0" y="0.0" width="461" height="112"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+ <rect key="frame" x="0.0" y="0.0" width="461" height="112"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9jY-la-tAi">
+ <rect key="frame" x="22" y="0.0" width="417" height="90"/>
+ <subviews>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pdf" translatesAutoresizingMaskIntoConstraints="NO" id="yhv-d6-g9l">
+ <rect key="frame" x="13" y="21" width="42" height="48"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="48" id="Dgb-9N-LV5"/>
+ <constraint firstAttribute="width" constant="42" id="lrI-UH-V22"/>
+ </constraints>
+ </imageView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wTO-Bt-204">
+ <rect key="frame" x="61" y="21" width="42" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3OF-PU-MhH">
+ <rect key="frame" x="61" y="48" width="42" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ <constraints>
+ <constraint firstItem="wTO-Bt-204" firstAttribute="top" secondItem="yhv-d6-g9l" secondAttribute="top" id="4YX-tU-c1S"/>
+ <constraint firstItem="3OF-PU-MhH" firstAttribute="leading" secondItem="yhv-d6-g9l" secondAttribute="trailing" constant="6" id="ByU-je-oE6"/>
+ <constraint firstItem="yhv-d6-g9l" firstAttribute="leading" secondItem="9jY-la-tAi" secondAttribute="leading" constant="13" id="aNj-P1-zyx"/>
+ <constraint firstItem="wTO-Bt-204" firstAttribute="leading" secondItem="yhv-d6-g9l" secondAttribute="trailing" constant="6" id="ajo-nB-Nso"/>
+ <constraint firstItem="3OF-PU-MhH" firstAttribute="bottom" secondItem="yhv-d6-g9l" secondAttribute="bottom" id="yXl-6A-BjK"/>
+ <constraint firstItem="yhv-d6-g9l" firstAttribute="centerY" secondItem="9jY-la-tAi" secondAttribute="centerY" id="yce-BL-zsG"/>
+ </constraints>
+ </view>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <constraints>
+ <constraint firstItem="9jY-la-tAi" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="9fl-U9-HTd"/>
+ <constraint firstAttribute="trailing" secondItem="9jY-la-tAi" secondAttribute="trailing" constant="22" id="IH3-bE-7hc"/>
+ <constraint firstItem="9jY-la-tAi" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="22" id="eJC-fS-LLm"/>
+ <constraint firstAttribute="bottom" secondItem="9jY-la-tAi" secondAttribute="bottom" constant="22" id="lZ8-RL-lX1"/>
+ </constraints>
+ </tableViewCellContentView>
+ <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <connections>
+ <outlet property="containerImageView" destination="9jY-la-tAi" id="tg1-KQ-tIL"/>
+ <outlet property="dateLabel" destination="3OF-PU-MhH" id="f5w-1J-QYC"/>
+ <outlet property="nameLabel" destination="wTO-Bt-204" id="x5A-vj-LSr"/>
+ <outlet property="thumbnailImageView" destination="yhv-d6-g9l" id="vc2-QX-EF1"/>
+ </connections>
+ <point key="canvasLocation" x="245.03816793893128" y="32.394366197183103"/>
+ </tableViewCell>
+ </objects>
+ <resources>
+ <image name="pdf" width="42" height="48"/>
+ <systemColor name="systemBackgroundColor">
+ <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </systemColor>
+ </resources>
+</document>
diff --git a/MiniScanner/Modules/Documents/Documents.storyboard b/MiniScanner/Modules/Documents/Documents.storyboard
index be47af22eaa1890876faa3ad84c62c7aed6b02a4..392273d1ac7368693c78d2f9f3fad8f80aa82e1d 100644
--- a/MiniScanner/Modules/Documents/Documents.storyboard
+++ b/MiniScanner/Modules/Documents/Documents.storyboard
@@ -9,94 +9,15 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
- <!--Documents Table View Controller-->
+ <!--Table View Controller-->
<scene sceneID="H5o-MQ-blf">
<objects>
- <tableViewController storyboardIdentifier="DocumentsTableViewController" id="gvn-iJ-Pzo" customClass="DocumentsTableViewController" customModule="MiniScanner" customModuleProvider="target" sceneMemberID="viewController">
+ <placeholder placeholderIdentifier="IBFirstResponder" id="zgv-ee-Jgu" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+ <tableViewController id="gvn-iJ-Pzo" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="bPB-U2-F5q">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
- <prototypes>
- <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="DocumentsTableViewCell" rowHeight="89" id="Mdk-jc-rWc" customClass="DocumentsTableViewCell" customModule="MiniScanner" customModuleProvider="target">
- <rect key="frame" x="0.0" y="50" width="414" height="89"/>
- <autoresizingMask key="autoresizingMask"/>
- <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mdk-jc-rWc" id="4dt-n0-cfY">
- <rect key="frame" x="0.0" y="0.0" width="414" height="89"/>
- <autoresizingMask key="autoresizingMask"/>
- <subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hd6-uF-a8b">
- <rect key="frame" x="16" y="6" width="48" height="77"/>
- <subviews>
- <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CuC-8c-4CN">
- <rect key="frame" x="0.0" y="0.0" width="48" height="77"/>
- </imageView>
- </subviews>
- <color key="backgroundColor" systemColor="systemBackgroundColor"/>
- <constraints>
- <constraint firstAttribute="width" constant="48" id="3Og-y0-ibV"/>
- <constraint firstItem="CuC-8c-4CN" firstAttribute="top" secondItem="hd6-uF-a8b" secondAttribute="top" id="ARZ-24-m8n"/>
- <constraint firstAttribute="bottom" secondItem="CuC-8c-4CN" secondAttribute="bottom" id="SDz-pF-ke6"/>
- <constraint firstItem="CuC-8c-4CN" firstAttribute="leading" secondItem="hd6-uF-a8b" secondAttribute="leading" id="cDJ-41-VQu"/>
- <constraint firstAttribute="trailing" secondItem="CuC-8c-4CN" secondAttribute="trailing" id="kWY-D6-ax9"/>
- </constraints>
- </view>
- <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="RiV-3W-swR">
- <rect key="frame" x="88" y="21.5" width="298" height="46.5"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mlw-gT-fds">
- <rect key="frame" x="0.0" y="0.0" width="41.5" height="20.5"/>
- <fontDescription key="fontDescription" type="system" pointSize="17"/>
- <nil key="textColor"/>
- <nil key="highlightedColor"/>
- </label>
- <stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="caq-2S-jTm">
- <rect key="frame" x="0.0" y="28.5" width="298" height="18"/>
- <subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fzb-F4-kyO">
- <rect key="frame" x="0.0" y="0.0" width="206" height="18"/>
- <fontDescription key="fontDescription" type="system" pointSize="13"/>
- <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <nil key="highlightedColor"/>
- </label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mYh-EP-J1M">
- <rect key="frame" x="218" y="0.0" width="80" height="18"/>
- <constraints>
- <constraint firstAttribute="width" constant="80" id="dqX-5n-raZ"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="15"/>
- <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <nil key="highlightedColor"/>
- </label>
- </subviews>
- </stackView>
- </subviews>
- <constraints>
- <constraint firstItem="caq-2S-jTm" firstAttribute="top" secondItem="mlw-gT-fds" secondAttribute="bottom" constant="8" symbolic="YES" id="6Cz-vI-cSS"/>
- <constraint firstItem="caq-2S-jTm" firstAttribute="leading" secondItem="RiV-3W-swR" secondAttribute="leading" id="DV7-WZ-I6W"/>
- <constraint firstAttribute="trailing" secondItem="caq-2S-jTm" secondAttribute="trailing" id="LCF-1Q-5GG"/>
- <constraint firstAttribute="bottom" secondItem="caq-2S-jTm" secondAttribute="bottom" id="RyY-NZ-qQ4"/>
- </constraints>
- </stackView>
- </subviews>
- <constraints>
- <constraint firstAttribute="bottom" secondItem="hd6-uF-a8b" secondAttribute="bottom" constant="6" id="6zL-tZ-glX"/>
- <constraint firstItem="hd6-uF-a8b" firstAttribute="top" secondItem="4dt-n0-cfY" secondAttribute="top" constant="6" id="Me5-HG-S2S"/>
- <constraint firstItem="hd6-uF-a8b" firstAttribute="leading" secondItem="4dt-n0-cfY" secondAttribute="leading" constant="16" id="NWg-3T-4Dn"/>
- <constraint firstItem="RiV-3W-swR" firstAttribute="centerY" secondItem="4dt-n0-cfY" secondAttribute="centerY" id="e7P-0q-ZbH"/>
- <constraint firstAttribute="trailingMargin" secondItem="RiV-3W-swR" secondAttribute="trailing" constant="8" id="e7f-gh-csV"/>
- <constraint firstItem="RiV-3W-swR" firstAttribute="leading" secondItem="hd6-uF-a8b" secondAttribute="trailing" constant="24" id="sWX-qu-VvC"/>
- </constraints>
- </tableViewCellContentView>
- <connections>
- <outlet property="containerImageView" destination="hd6-uF-a8b" id="X6Y-sj-Oyz"/>
- <outlet property="dateLabel" destination="fzb-F4-kyO" id="Yh9-WJ-7TN"/>
- <outlet property="nameLabel" destination="mlw-gT-fds" id="7Am-gP-ljS"/>
- <outlet property="pageLabel" destination="mYh-EP-J1M" id="I7V-sG-yVv"/>
- <outlet property="thumbnailImageView" destination="CuC-8c-4CN" id="gzw-0w-ObB"/>
- </connections>
- </tableViewCell>
- </prototypes>
<connections>
<outlet property="dataSource" destination="gvn-iJ-Pzo" id="2VH-HZ-OWN"/>
<outlet property="delegate" destination="gvn-iJ-Pzo" id="AJK-Md-5RF"/>
@@ -104,9 +25,71 @@
</tableView>
<navigationItem key="navigationItem" id="eDl-rz-mCg"/>
</tableViewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="zgv-ee-Jgu" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="2034.7826086956522" y="-98.4375"/>
+ <point key="canvasLocation" x="1999" y="-614"/>
+ </scene>
+ <!--Documents Table View Controller-->
+ <scene sceneID="c4X-Ck-iAQ">
+ <objects>
+ <viewController storyboardIdentifier="DocumentsTableViewController" id="i6c-SO-Y9e" customClass="DocumentsTableViewController" customModule="MiniScanner" customModuleProvider="target" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="AqX-gp-eq1">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7uR-kU-jQL" customClass="AllFolderTableViewCell" customModule="MiniScanner" customModuleProvider="target">
+ <rect key="frame" x="0.0" y="92" width="414" height="240"/>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="240" id="qZv-Hx-LJ7"/>
+ </constraints>
+ </view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="27n-zM-bE7">
+ <rect key="frame" x="0.0" y="342" width="414" height="554"/>
+ <subviews>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="60c-jY-XTk">
+ <rect key="frame" x="0.0" y="80" width="414" height="450"/>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ </tableView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yDO-Jh-xQu">
+ <rect key="frame" x="22" y="33" width="42" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ <constraints>
+ <constraint firstItem="60c-jY-XTk" firstAttribute="top" secondItem="27n-zM-bE7" secondAttribute="top" constant="80" id="FBD-jw-cc7"/>
+ <constraint firstItem="60c-jY-XTk" firstAttribute="leading" secondItem="27n-zM-bE7" secondAttribute="leading" id="MOu-65-XoB"/>
+ <constraint firstItem="60c-jY-XTk" firstAttribute="top" secondItem="yDO-Jh-xQu" secondAttribute="bottom" constant="26" id="cjQ-4R-Uh2"/>
+ <constraint firstAttribute="bottom" secondItem="60c-jY-XTk" secondAttribute="bottom" constant="24" id="hxd-n2-r1v"/>
+ <constraint firstAttribute="trailing" secondItem="60c-jY-XTk" secondAttribute="trailing" id="odE-ga-ZOX"/>
+ <constraint firstItem="yDO-Jh-xQu" firstAttribute="leading" secondItem="27n-zM-bE7" secondAttribute="leading" constant="22" id="x0T-fP-0hf"/>
+ </constraints>
+ </view>
+ </subviews>
+ <viewLayoutGuide key="safeArea" id="25x-fL-RaH"/>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ <constraints>
+ <constraint firstItem="27n-zM-bE7" firstAttribute="leading" secondItem="25x-fL-RaH" secondAttribute="leading" id="1Fc-0a-Oke"/>
+ <constraint firstAttribute="bottom" secondItem="27n-zM-bE7" secondAttribute="bottom" id="5Gr-Rf-G4q"/>
+ <constraint firstItem="25x-fL-RaH" firstAttribute="trailing" secondItem="27n-zM-bE7" secondAttribute="trailing" id="66a-p7-lIs"/>
+ <constraint firstItem="25x-fL-RaH" firstAttribute="trailing" secondItem="7uR-kU-jQL" secondAttribute="trailing" id="JNq-Mn-67z"/>
+ <constraint firstItem="7uR-kU-jQL" firstAttribute="top" secondItem="25x-fL-RaH" secondAttribute="top" id="gta-UC-b37"/>
+ <constraint firstItem="7uR-kU-jQL" firstAttribute="leading" secondItem="25x-fL-RaH" secondAttribute="leading" id="hSn-vU-z7I"/>
+ <constraint firstItem="27n-zM-bE7" firstAttribute="top" secondItem="7uR-kU-jQL" secondAttribute="bottom" constant="10" id="j7y-rm-G2Z"/>
+ </constraints>
+ </view>
+ <navigationItem key="navigationItem" id="rJm-3G-CYc"/>
+ <connections>
+ <outlet property="AllFolderView" destination="7uR-kU-jQL" id="fWz-Eg-JcR"/>
+ <outlet property="fixedTableSheet" destination="27n-zM-bE7" id="5zJ-W1-AKn"/>
+ <outlet property="tableView" destination="60c-jY-XTk" id="ck5-Mw-NDZ"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="SsQ-by-Voz" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="2767" y="-98"/>
</scene>
<!--View Controller-->
<scene sceneID="3WQ-hx-1mu">
@@ -225,7 +208,7 @@
</navigationBar>
<nil name="viewControllers"/>
<connections>
- <segue destination="gvn-iJ-Pzo" kind="relationship" relationship="rootViewController" id="l3w-A7-Zzs"/>
+ <segue destination="i6c-SO-Y9e" kind="relationship" relationship="rootViewController" id="eWD-UC-OI4"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ExG-BB-XYZ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
diff --git a/MiniScanner/Modules/Documents/DocumentsTableViewCell.swift b/MiniScanner/Modules/Documents/DocumentsTableViewCell.swift
deleted file mode 100644
index 9e11239774ebb4d93bb3c6b4bb724309f1e5a2ef..0000000000000000000000000000000000000000
--- a/MiniScanner/Modules/Documents/DocumentsTableViewCell.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-import UIKit
-
-final class DocumentsTableViewCell: UITableViewCell {
-
- @IBOutlet private weak var thumbnailImageView: UIImageView!
- @IBOutlet private weak var containerImageView: UIView!
- @IBOutlet private weak var nameLabel: UILabel!
- @IBOutlet private weak var dateLabel: UILabel!
- @IBOutlet private weak var pageLabel: UILabel!
-
- struct Constants {
- static let cornerRadius: CGFloat = 6
- static let separatorInset: CGFloat = 76
- }
-
- override func awakeFromNib() {
- super.awakeFromNib()
- // Initialization code
-
- containerImageView.addShadowView(shadowRadius: Constants.cornerRadius)
- thumbnailImageView.layer.cornerRadius = Constants.cornerRadius
- thumbnailImageView.clipsToBounds = true
- containerImageView.layer.cornerRadius = Constants.cornerRadius
- separatorInset.left = Constants.separatorInset
- separatorInset.right = Constants.separatorInset
- }
-
- func configure(with viewModel: File, image: UIImage?) {
- thumbnailImageView.image = image
- nameLabel.text = viewModel.displayName
- dateLabel.text = viewModel.date
- pageLabel.text = viewModel.pagesCount
- }
-}
diff --git a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
index e8617d4b93b194b0501ff0c41670694809107e9d..cbf4b61ac272c711b0f05ce97cbbc11012cd18b6 100644
--- a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
+++ b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
@@ -1,12 +1,12 @@
import UIKit
import VisionKit
-final class DocumentsTableViewController: UITableViewController {
+final class DocumentsTableViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
struct Constants {
static let reuseIdentifier = String(describing: DocumentsTableViewController.self)
static let storyboardName = "Documents"
- static let rowHeight: CGFloat = 96
+ static let rowHeight: CGFloat = 112
static let cellReuseIdentifier = String(describing: DocumentsTableViewCell.self)
static let topBottom: CGFloat = 120
@@ -19,6 +19,10 @@ final class DocumentsTableViewController: UITableViewController {
return controller as! DocumentsTableViewController
}
+ @IBOutlet weak var tableView: UITableView!
+ @IBOutlet weak var AllFolderView: AllFolderTableViewCell!
+ @IBOutlet weak var fixedTableSheet: UIView!
+
private var viewModels: [File] = []
private var localFileManager: LocalFileManager?
private var sortType: SortyFileType = .date
@@ -32,6 +36,21 @@ final class DocumentsTableViewController: UITableViewController {
super.viewDidLoad()
navigationItem.title = "File Manager"
tableView.tableFooterView = UIView()
+ tableView.delegate = self
+ tableView.dataSource = self
+
+ tableView.register(UINib(nibName: "DocumentsTableViewCell", bundle: nil), forCellReuseIdentifier: "DocumentsTableViewCell")
+
+ let savedFolders = AppConfigurator().getFolders()
+ for item in savedFolders {
+ if item.isSelected == true {
+ selectedFolder = item
+ }
+ }
+
+ if let folder = selectedFolder {
+ AllFolderView?.set(selectedFolder: folder, delegate: self)
+ }
localFileManager = LocalFileManager()
@@ -46,17 +65,20 @@ final class DocumentsTableViewController: UITableViewController {
if UserDefaults.standard.startsAppWithCamera {
openCamera()
}
+
+ fixedTableSheet.layer.cornerRadius = 30
+ fixedTableSheet.layer.shadowColor = UIColor.gray.cgColor
+ fixedTableSheet.layer.shadowOffset = CGSize(width: 0, height: 2) // Shadow position
+ fixedTableSheet.layer.shadowOpacity = 0.7 // Shadow opacity
+ fixedTableSheet.layer.shadowRadius = 4.0
+ fixedTableSheet.backgroundColor = .white // or any non-clear color
+ fixedTableSheet.clipsToBounds = false
+ fetchViewModels()
+
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
- let savedFolders = AppConfigurator().getFolders()
- for item in savedFolders {
- if item.isSelected == true {
- selectedFolder = item
- }
- }
- fetchViewModels()
}
deinit {
@@ -68,37 +90,24 @@ final class DocumentsTableViewController: UITableViewController {
guard let directoryURL = localFileManager?.getFolderUrl(folder: folder),
let viewModels = localFileManager?.filesForDirectory(directoryURL, sortType: sortType) else { return }
self.viewModels = viewModels
+ AllFolderView?.set(selectedFolder: folder, delegate: self)
tableView.reloadData()
}
}
// MARK: - Table view data source
- override func numberOfSections(in tableView: UITableView) -> Int {
+ func numberOfSections(in tableView: UITableView) -> Int {
// #warning Incomplete implementation, return the number of sections
return 1
}
- override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+ func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
// #warning Incomplete implementation, return the number of rows
return viewModels.count
}
- override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
- let nib = UINib(nibName: "AllFolderTableViewCell", bundle: nil)
- let header = nib.instantiate(withOwner: nil, options: nil).first as? AllFolderTableViewCell
- if let folder = selectedFolder {
- header?.set(selectedFolder: folder, delegate: self)
- }
- return header
- }
-
- override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
- 240
- }
-
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
guard let cell = tableView.dequeueReusableCell(withIdentifier: Constants.cellReuseIdentifier,
for: indexPath) as? DocumentsTableViewCell else { return UITableViewCell() }
@@ -110,11 +119,19 @@ final class DocumentsTableViewController: UITableViewController {
}
- override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+ func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return Constants.rowHeight
}
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+ func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+ return UIView()
+ }
+
+ func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+ 20
+ }
+
+ func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let viewModel = viewModels[indexPath.row]
let controller = DocumentPreviewViewController.buildViewController()
controller.file = viewModel
@@ -122,12 +139,12 @@ final class DocumentsTableViewController: UITableViewController {
navigationController?.pushViewController(controller, animated: true)
}
- override func tableView(_ tableView: UITableView,
+ func tableView(_ tableView: UITableView,
editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle {
return .none
}
- override func tableView(_ tableView: UITableView,
+ func tableView(_ tableView: UITableView,
trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
// Trash action
@@ -265,18 +282,11 @@ final class DocumentsTableViewController: UITableViewController {
} catch {
return
}
- // if self.viewModels.isEmpty {
- // self.noDocumentsimageView.isHidden = false
- // }
}
}
/// Tells the delegate that the user picked a still image.
extension DocumentsTableViewController: UINavigationControllerDelegate, UIImagePickerControllerDelegate {
- /// Your delegate object’s implementation of this method should pass the specified media on to any custom code that needs it, and should then dismiss the picker view.
- /// When editing is enabled, the image picker view presents the user with a preview of the currently selected image or movie along with controls for modifying it.
- /// (This behavior is managed by the picker view prior to calling this method.) If the user modifies the image or movie, the editing information is available in the info parameter.
- /// The original image is also returned in the info parameter.
func imagePickerController(_ picker: UIImagePickerController,
didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
picker.dismiss(animated: true) { [weak self] in
diff --git a/MiniScanner/Supporting Files/Assets.xcassets/pdf.imageset/Contents.json b/MiniScanner/Supporting Files/Assets.xcassets/pdf.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..9a315c95bb20ceb42b5d6a65c1f51b492e706039
--- /dev/null
+++ b/MiniScanner/Supporting Files/Assets.xcassets/pdf.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "Group.svg",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/MiniScanner/Supporting Files/Assets.xcassets/pdf.imageset/Group.svg b/MiniScanner/Supporting Files/Assets.xcassets/pdf.imageset/Group.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d258b6f6d11966e5f47afc65905d9f8eee06bf71
--- /dev/null
+++ b/MiniScanner/Supporting Files/Assets.xcassets/pdf.imageset/Group.svg
@@ -0,0 +1,5 @@
+<svg width="42" height="48" viewBox="0 0 42 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.99997 0H28.4894L41.9999 13.458V45C41.9999 46.6575 40.656 48 38.9999 48H2.99997C1.34393 48 0 46.6575 0 45V2.99997C0 1.34253 1.34408 0 2.99997 0Z" fill="#E2574C"/>
+<path d="M41.9565 13.4998H31.5C29.8439 13.4998 28.5 12.1559 28.5 10.4998V0.0297852L41.9565 13.4998Z" fill="#B53629"/>
+<path d="M30.7471 22.7446C31.2497 22.7446 31.4957 22.3066 31.4957 21.8821C31.4957 21.4426 31.2391 21.0181 30.7471 21.0181H27.8851C27.3256 21.0181 27.0137 21.4815 27.0137 21.9931V29.0265C27.0137 29.6536 27.3706 30.0015 27.8536 30.0015C28.3337 30.0015 28.6922 29.6536 28.6922 29.0265V27.0961H30.4232C30.9602 27.0961 31.2287 26.6565 31.2287 26.2201C31.2287 25.7927 30.9602 25.368 30.4232 25.368H28.6922V22.7446H30.7471ZM21.0736 21.0181H18.9796C18.4111 21.0181 18.0075 21.4081 18.0075 21.987V29.0326C18.0075 29.751 18.588 29.9761 19.0035 29.9761H21.201C23.802 29.9761 25.5195 28.2646 25.5195 25.623C25.5181 22.8301 23.9012 21.0181 21.0736 21.0181ZM21.1742 28.2392H19.8976V22.7551H21.0482C22.7897 22.7551 23.5471 23.9237 23.5471 25.5361C23.5471 27.0452 22.8031 28.2392 21.1742 28.2392ZM13.5032 21.0181H11.4287C10.8422 21.0181 10.5151 21.405 10.5151 21.9931V29.0265C10.5151 29.6536 10.8901 30.0015 11.3941 30.0015C11.898 30.0015 12.273 29.6536 12.273 29.0265V26.973H13.5735C15.1784 26.973 16.503 25.836 16.503 24.0075C16.5031 22.2181 15.2252 21.0181 13.5032 21.0181ZM13.4687 25.3232H12.2732V22.6696H13.4687C14.2067 22.6696 14.6762 23.2456 14.6762 23.9971C14.6746 24.7472 14.2067 25.3232 13.4687 25.3232Z" fill="white"/>
+</svg>
diff --git a/MiniScanner/Supporting Files/Fonts/English/.DS_Store b/MiniScanner/Supporting Files/Fonts/English/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7fd783f572a4ab06f5f6e47d0818c74df55dce26
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/.DS_Store differ