ارفع راسك فوق انته سوري حر ... :green_heart::green_heart:

Skip to content
Snippets Groups Projects
Commit 50496a56 authored by Mustafa Merza's avatar Mustafa Merza
Browse files

- Changed used icons in tab bar and scanner bottom view.

parent d149e708
Branches
No related tags found
No related merge requests found
Showing
with 74 additions and 8 deletions
...@@ -40,6 +40,9 @@ class AppTabBarController: UITabBarController, UITabBarControllerDelegate, Walkt ...@@ -40,6 +40,9 @@ class AppTabBarController: UITabBarController, UITabBarControllerDelegate, Walkt
tabBar.items?[0].title = .fileManager.localized tabBar.items?[0].title = .fileManager.localized
tabBar.items?[2].title = .studio.localized tabBar.items?[2].title = .studio.localized
tabBar.items?[0].image = .folderOpen
tabBar.items?[2].image = .gallery
} }
private func reloadLocalization() { private func reloadLocalization() {
......
...@@ -11,8 +11,7 @@ import UIKit ...@@ -11,8 +11,7 @@ import UIKit
// MARK: - App images and icons // MARK: - App images and icons
extension UIImage { extension UIImage {
static let addDocIcon = UIImage(resource: .addDocIcon) static let scanButton = UIImage(resource: .scanButtonImg)
static let scanButton = UIImage(resource: .scanButton)
static let preview = UIImage(resource: .preview) static let preview = UIImage(resource: .preview)
static let settings = UIImage(resource: .settingsIc) static let settings = UIImage(resource: .settingsIc)
...@@ -28,6 +27,9 @@ extension UIImage { ...@@ -28,6 +27,9 @@ extension UIImage {
static let search = UIImage(resource: .searchIc) static let search = UIImage(resource: .searchIc)
static let layoutGrid = UIImage(resource: .layoutGridIc) static let layoutGrid = UIImage(resource: .layoutGridIc)
static let layoutList = UIImage(resource: .layoutListIc) static let layoutList = UIImage(resource: .layoutListIc)
static let folderOpen = UIImage(resource: .folderOpenIc)
static let gallery = UIImage(resource: .galleryIc)
} }
// MARK: - Common system images and icons // MARK: - Common system images and icons
......
...@@ -30,6 +30,7 @@ class CustomTabBarView: UIView { ...@@ -30,6 +30,7 @@ class CustomTabBarView: UIView {
@IBOutlet weak var galleryButton: UIButton! @IBOutlet weak var galleryButton: UIButton!
@IBOutlet weak var shareButton: UIButton! @IBOutlet weak var shareButton: UIButton!
@IBOutlet weak var shareImage: UIImageView! @IBOutlet weak var shareImage: UIImageView!
@IBOutlet weak var scanButton: UIButton!
@IBOutlet weak var editImage_trailing: NSLayoutConstraint! @IBOutlet weak var editImage_trailing: NSLayoutConstraint!
@IBOutlet weak var editImage_width: NSLayoutConstraint! @IBOutlet weak var editImage_width: NSLayoutConstraint!
@IBOutlet weak var customtabBarLayer: CustomTabBarLayer! @IBOutlet weak var customtabBarLayer: CustomTabBarLayer!
...@@ -72,6 +73,10 @@ class CustomTabBarView: UIView { ...@@ -72,6 +73,10 @@ class CustomTabBarView: UIView {
customtabBarLayer.isHidden = isAddedToPDF customtabBarLayer.isHidden = isAddedToPDF
fileManagerButton.isHidden = isAddedToPDF fileManagerButton.isHidden = isAddedToPDF
galleryButton.isHidden = isAddedToPDF galleryButton.isHidden = isAddedToPDF
scanButton.setImage(.scanButton, for: .normal)
fileManagerButton.setImage(.folderOpen, for: .normal)
galleryButton.setImage(.gallery, for: .normal)
} }
func updateScannedView(session: MultiPageScanSession!) { func updateScannedView(session: MultiPageScanSession!) {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<outlet property="editImage_width" destination="m46-v1-cjn" id="MPr-W3-dzS"/> <outlet property="editImage_width" destination="m46-v1-cjn" id="MPr-W3-dzS"/>
<outlet property="fileManagerButton" destination="UTH-SE-R2z" id="vAx-0T-78T"/> <outlet property="fileManagerButton" destination="UTH-SE-R2z" id="vAx-0T-78T"/>
<outlet property="galleryButton" destination="Fpi-N4-SyY" id="yzt-4p-1Yw"/> <outlet property="galleryButton" destination="Fpi-N4-SyY" id="yzt-4p-1Yw"/>
<outlet property="scanButton" destination="bLE-0g-490" id="xyM-Gi-NUe"/>
<outlet property="scannedImage" destination="Yp4-oH-9PB" id="BgP-9x-8xW"/> <outlet property="scannedImage" destination="Yp4-oH-9PB" id="BgP-9x-8xW"/>
<outlet property="scannedImageView" destination="nU5-gk-PCy" id="Ufk-QS-iDQ"/> <outlet property="scannedImageView" destination="nU5-gk-PCy" id="Ufk-QS-iDQ"/>
<outlet property="shareButton" destination="ByX-8g-Wtl" id="OQ3-Ua-K07"/> <outlet property="shareButton" destination="ByX-8g-Wtl" id="OQ3-Ua-K07"/>
...@@ -46,7 +47,7 @@ ...@@ -46,7 +47,7 @@
<constraint firstAttribute="height" constant="75" id="UU8-l2-Go1"/> <constraint firstAttribute="height" constant="75" id="UU8-l2-Go1"/>
</constraints> </constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="scanButton"/> <state key="normal" image="scan-button-img"/>
<connections> <connections>
<action selector="scanButtonTapped:" destination="-1" eventType="touchUpInside" id="2Ao-UA-4uQ"/> <action selector="scanButtonTapped:" destination="-1" eventType="touchUpInside" id="2Ao-UA-4uQ"/>
</connections> </connections>
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
<constraint firstAttribute="height" constant="46" id="hki-4c-GxE"/> <constraint firstAttribute="height" constant="46" id="hki-4c-GxE"/>
</constraints> </constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="Files"/> <state key="normal" image="folder-open-ic"/>
<connections> <connections>
<action selector="filesManagerButtonTapped:" destination="-1" eventType="touchUpInside" id="Lo7-cL-u2c"/> <action selector="filesManagerButtonTapped:" destination="-1" eventType="touchUpInside" id="Lo7-cL-u2c"/>
</connections> </connections>
...@@ -70,7 +71,7 @@ ...@@ -70,7 +71,7 @@
<constraint firstAttribute="width" constant="46" id="qaz-dm-kwq"/> <constraint firstAttribute="width" constant="46" id="qaz-dm-kwq"/>
</constraints> </constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="Gallery"/> <state key="normal" image="gallery-ic"/>
</button> </button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hyG-kY-g3z"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hyG-kY-g3z">
<rect key="frame" x="30" y="34" width="140" height="57"/> <rect key="frame" x="30" y="34" width="140" height="57"/>
...@@ -193,10 +194,10 @@ ...@@ -193,10 +194,10 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="Files" width="46" height="47"/> <image name="folder-open-ic" width="36" height="36"/>
<image name="Gallery" width="35" height="34"/> <image name="gallery-ic" width="36" height="36"/>
<image name="preview" width="35" height="35"/> <image name="preview" width="35" height="35"/>
<image name="scanButton" width="77" height="75"/> <image name="scan-button-img" width="82" height="82"/>
<image name="share" width="40" height="42"/> <image name="share" width="40" height="42"/>
<systemColor name="systemBackgroundColor"> <systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......
{
"images" : [
{
"filename" : "folder-open-ic.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9 21.0001L11.25 16.6501C11.4946 16.1644 11.8667 15.7542 12.3264 15.4636C12.7861 15.1729 13.3162 15.0127 13.86 15.0001H30M30 15.0001C30.4583 14.9993 30.9107 15.1035 31.3224 15.3048C31.7342 15.506 32.0944 15.7989 32.3754 16.1609C32.6563 16.523 32.8506 16.9446 32.9433 17.3935C33.036 17.8423 33.0246 18.3064 32.91 18.7501L30.6 27.7501C30.4329 28.3975 30.0543 28.9704 29.5244 29.3781C28.9945 29.7857 28.3436 30.0047 27.675 30.0001H6C5.20435 30.0001 4.44129 29.6841 3.87868 29.1215C3.31607 28.5589 3 27.7958 3 27.0001V7.50014C3 6.70449 3.31607 5.94143 3.87868 5.37882C4.44129 4.81621 5.20435 4.50014 6 4.50014H11.85C12.3517 4.49523 12.8467 4.61623 13.2895 4.85207C13.7324 5.08792 14.1091 5.43108 14.385 5.85014L15.6 7.65014C15.8732 8.06494 16.245 8.40543 16.6823 8.64105C17.1195 8.87667 17.6083 9.00006 18.105 9.00014H27C27.7956 9.00014 28.5587 9.31621 29.1213 9.87882C29.6839 10.4414 30 11.2045 30 12.0001V15.0001Z" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
{
"images" : [
{
"filename" : "gallery-ic.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M31.5 22.4999L26.871 17.8709C26.3084 17.3085 25.5455 16.9926 24.75 16.9926C23.9545 16.9926 23.1916 17.3085 22.629 17.8709L9 31.4999M7.5 4.5H28.5C30.1569 4.5 31.5 5.84315 31.5 7.5V28.5C31.5 30.1569 30.1569 31.5 28.5 31.5H7.5C5.84315 31.5 4.5 30.1569 4.5 28.5V7.5C4.5 5.84315 5.84315 4.5 7.5 4.5ZM16.5 13.5C16.5 15.1569 15.1569 16.5 13.5 16.5C11.8431 16.5 10.5 15.1569 10.5 13.5C10.5 11.8431 11.8431 10.5 13.5 10.5C15.1569 10.5 16.5 11.8431 16.5 13.5Z" stroke="black" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
{
"images" : [
{
"filename" : "scan-button-img.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
<svg width="82" height="82" viewBox="0 0 82 82" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="82" height="82" rx="41" fill="#1F86FF"/>
<path d="M25.25 32.25V28.75C25.25 27.8217 25.6187 26.9315 26.2751 26.2751C26.9315 25.6187 27.8217 25.25 28.75 25.25H32.25M49.75 25.25H53.25C54.1783 25.25 55.0685 25.6187 55.7249 26.2751C56.3812 26.9315 56.75 27.8217 56.75 28.75V32.25M56.75 49.75V53.25C56.75 54.1783 56.3812 55.0685 55.7249 55.7249C55.0685 56.3812 54.1783 56.75 53.25 56.75H49.75M32.25 56.75H28.75C27.8217 56.75 26.9315 56.3812 26.2751 55.7249C25.6187 55.0685 25.25 54.1783 25.25 53.25V49.75M32.25 41H49.75" stroke="white" stroke-width="3.16667" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment