From 25ad34286f376a81e92d5d64040e87c60369e909 Mon Sep 17 00:00:00 2001
From: Mustafa Merza <mustafa.merza95@gmail.com>
Date: Sun, 21 Jul 2024 17:57:44 +0300
Subject: [PATCH] - Changed used initializer for images to rely on image
resource.
---
MiniScanner/Extensions/UIImage+Images.swift | 14 +++++++-------
.../CustomTabBarView/CustomTabBarView.swift | 2 +-
.../ShareSheet/ShareSheetViewController.swift | 2 +-
.../Frameworks/FSPager/FSPagerViewCell.swift | 8 +++-----
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/MiniScanner/Extensions/UIImage+Images.swift b/MiniScanner/Extensions/UIImage+Images.swift
index 4bae801..c5a50a6 100644
--- a/MiniScanner/Extensions/UIImage+Images.swift
+++ b/MiniScanner/Extensions/UIImage+Images.swift
@@ -11,17 +11,17 @@ import UIKit
// MARK: - App images and icons
extension UIImage {
- static let addDocIcon = UIImage(named: "add_doc_icon")
- static let preview = UIImage(named: "preview")
+ static let addDocIcon = UIImage(resource: .addDocIcon)
+ static let preview = UIImage(resource: .preview)
- static let tabbarIPad = UIImage(named: "tabbarIpad")
- static let tabBar = UIImage(named: "tabBar")
+ static let tabbarIPad = UIImage(resource: .tabbarIpad)
+ static let tabBar = UIImage(resource: .tabBar)
- static let settings = UIImage(named: "settings")
+ static let settings = UIImage(resource: .settings)
- static let resize = UIImage(named: "resize")
+ static let resize = UIImage(resource: .resize)
- static let close = UIImage(named: "close")
+ static let close = UIImage(resource: .close)
}
// MARK: - Common system images and icons
diff --git a/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift b/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift
index f52711d..cc3844b 100644
--- a/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift
+++ b/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift
@@ -67,7 +67,7 @@ class CustomTabBarView: UIView {
badgeView.layer.cornerRadius = 10
badgeView.backgroundColor = .red
- tabbarImage.image = UIDevice.current.userInterfaceIdiom == .pad ? .tabbarIPad?.withRenderingMode(.alwaysTemplate) : .tabBar?.withRenderingMode(.alwaysTemplate)
+ tabbarImage.image = UIDevice.current.userInterfaceIdiom == .pad ? .tabbarIPad.withRenderingMode(.alwaysTemplate) : .tabBar.withRenderingMode(.alwaysTemplate)
tabbarImage.tintColor = .mainBackground
diff --git a/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift b/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
index 61ef7c1..8e7042c 100644
--- a/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
+++ b/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
@@ -67,7 +67,7 @@ class ShareSheetViewController: UIViewController {
pdfImage.layer.cornerRadius = 10
pdfImage.clipsToBounds = true
pdfImage.contentMode = .scaleAspectFill
- previewButton.setImage(.preview?.tint(with: .mainText), for: .normal)
+ previewButton.setImage(.preview.tint(with: .mainText), for: .normal)
shareStackView.isHidden = !isShareShown
shareStack_height.constant = isShareShown ? 96 : 0
diff --git a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
index b2b792c..9a59097 100644
--- a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
+++ b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
@@ -263,11 +263,9 @@ open class FSPagerViewCell: UICollectionViewCell {
print("position: \(position)")
stickerView.center = position
stickerView.delegate = self
- if let exitIcon = UIImage.close,
- let rotateIcon = UIImage.resize {
- stickerView.setImage(exitIcon, forHandler: StickerViewHandler.close)
- stickerView.setImage(rotateIcon, forHandler: StickerViewHandler.rotate)
- }
+
+ stickerView.setImage(.close, forHandler: StickerViewHandler.close)
+ stickerView.setImage(.resize, forHandler: StickerViewHandler.rotate)
stickerView.showEditing = false
stickerView.transform = stickerView.transform.rotated(by: CGFloat(rotation))
--
GitLab