From ec25616af49395536d7a030f8be70541e5703cc4 Mon Sep 17 00:00:00 2001
From: Mustafa Merza <mustafa.merza95@gmail.com>
Date: Tue, 13 Aug 2024 19:03:45 +0300
Subject: [PATCH] - Added initializing share type value from user settings.
---
.../DocumentPreviewViewController.swift | 4 +++-
.../ShareSheet/ShareSheetViewController.swift | 14 +++++++++-----
.../EditViewController/EditViewController.swift | 4 +++-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift b/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
index 1b5039b..f64676d 100644
--- a/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
+++ b/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
@@ -47,6 +47,8 @@ final class DocumentPreviewViewController: UIViewController, ScanSessionSharable
@Inject var moveScanSessionUseCase: MoveScanSessionUseCase
@Inject var deleteScanSessionUseCase: DeleteScanSessionUseCase
+ @Inject var userSettings: UserSettings
+
var session: ScanSession!
var selectedFolder: Folder!
var _navigationController: UINavigationController?
@@ -127,7 +129,7 @@ final class DocumentPreviewViewController: UIViewController, ScanSessionSharable
updateCurrentPageLabel()
- shareType = .pdf
+ shareType = userSettings.defaultFileType.shareType
setupMenu()
diff --git a/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift b/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
index b17008d..d80f0bc 100644
--- a/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
+++ b/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
@@ -50,6 +50,8 @@ class ShareSheetViewController: UIViewController {
@IBOutlet weak var printLabel: UILabel!
@IBOutlet weak var moreLabel: UILabel!
+ @Inject var userSettings: UserSettings
+
// MARK: - Properties
var session: ScanSession!
@@ -64,10 +66,6 @@ class ShareSheetViewController: UIViewController {
}
}
- private func handleShareTypeChanged() {
- shareTypeLabel.set(localized: shareType.displayName)
- }
-
// MARK: - LifeCycle
override func viewDidLoad() {
super.viewDidLoad()
@@ -119,6 +117,8 @@ class ShareSheetViewController: UIViewController {
shareStackBottomConstraint.constant = 0
}
+ shareType = userSettings.defaultFileType.shareType
+
setupMenu()
}
@@ -132,7 +132,11 @@ class ShareSheetViewController: UIViewController {
pagesCountLabel.set(text: text)
}
- func setupMenu() {
+ private func handleShareTypeChanged() {
+ shareTypeLabel.set(localized: shareType.displayName)
+ }
+
+ private func setupMenu() {
shareTypeButton.showsMenuAsPrimaryAction = true
diff --git a/MiniScanner/Modules/EditViewController/EditViewController.swift b/MiniScanner/Modules/EditViewController/EditViewController.swift
index 9444d8c..42384be 100644
--- a/MiniScanner/Modules/EditViewController/EditViewController.swift
+++ b/MiniScanner/Modules/EditViewController/EditViewController.swift
@@ -52,6 +52,8 @@ public class EditViewController: UIViewController, ScanSessionSharable, ScanSess
@Inject var addScanSessionUseCase: AddScanSessionUseCase
@Inject var updateScanSessionUseCase: UpdateScanSessionUseCase
+ @Inject var userSettings: UserSettings
+
weak public var delegate:EditViewControllerDelegate?
var selectedFolder: Folder?
@@ -144,7 +146,7 @@ public class EditViewController: UIViewController, ScanSessionSharable, ScanSess
shareTypeLabel.set(font: .regular(15))
shareTypeLabel.set(color: .mainText)
- shareType = .pdf
+ shareType = userSettings.defaultFileType.shareType
setupMenu()
--
GitLab