diff --git a/MiniScanner.xcodeproj/project.pbxproj b/MiniScanner.xcodeproj/project.pbxproj
index b1dbb7e61e5eef6429ea5ae633a8f2f31689341b..2324012bdf39a8d288b32e0062ad1a5fa3399206 100644
--- a/MiniScanner.xcodeproj/project.pbxproj
+++ b/MiniScanner.xcodeproj/project.pbxproj
@@ -59,9 +59,6 @@
535983ED2C142B49003EB6ED /* UIFont+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535983EC2C142B49003EB6ED /* UIFont+Extensions.swift */; };
535983EF2C142C9F003EB6ED /* Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535983EE2C142C9F003EB6ED /* Localization.swift */; };
535983F22C144E87003EB6ED /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535983F12C144E87003EB6ED /* Keys.swift */; };
- 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 */; };
5359841E2C14B835003EB6ED /* SearchFilesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5359841D2C14B835003EB6ED /* SearchFilesView.swift */; };
@@ -161,13 +158,6 @@
53F21F8C2C1246AF00172BFC /* AllFolderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F8A2C1246AF00172BFC /* AllFolderTableViewCell.xib */; };
53F21F912C1248EC00172BFC /* FolderCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53F21F8F2C1248EC00172BFC /* FolderCollectionViewCell.swift */; };
53F21F922C1248EC00172BFC /* FolderCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F902C1248EC00172BFC /* FolderCollectionViewCell.xib */; };
- 53F21F9B2C1377B900172BFC /* Tajawal-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F942C1377B900172BFC /* Tajawal-ExtraBold.ttf */; };
- 53F21F9C2C1377B900172BFC /* Tajawal-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F952C1377B900172BFC /* Tajawal-Light.ttf */; };
- 53F21F9D2C1377B900172BFC /* Tajawal-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F962C1377B900172BFC /* Tajawal-Bold.ttf */; };
- 53F21F9E2C1377B900172BFC /* Tajawal-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F972C1377B900172BFC /* Tajawal-ExtraLight.ttf */; };
- 53F21F9F2C1377B900172BFC /* Tajawal-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F982C1377B900172BFC /* Tajawal-Regular.ttf */; };
- 53F21FA02C1377B900172BFC /* Tajawal-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F992C1377B900172BFC /* Tajawal-Medium.ttf */; };
- 53F21FA12C1377B900172BFC /* Tajawal-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 53F21F9A2C1377B900172BFC /* Tajawal-Black.ttf */; };
6708A6042C50FCA50036805D /* EPSignature in Frameworks */ = {isa = PBXBuildFile; productRef = 6708A6032C50FCA50036805D /* EPSignature */; };
67106C942C4EAC0100874BFC /* CustomTabBarLayerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67106C922C4EAC0000874BFC /* CustomTabBarLayerProtocol.swift */; };
67106C952C4EAC0100874BFC /* CustomTabBarLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67106C932C4EAC0000874BFC /* CustomTabBarLayer.swift */; };
@@ -204,6 +194,20 @@
676C30652C6CA49B00C29A43 /* UIView+CustomColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 676C30642C6CA49B00C29A43 /* UIView+CustomColor.swift */; };
676C30682C6CA6D200C29A43 /* UIButton+CustomColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 676C30672C6CA6D200C29A43 /* UIButton+CustomColor.swift */; };
676C306A2C6CBF4100C29A43 /* UIDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 676C30692C6CBF4100C29A43 /* UIDivider.swift */; };
+ 676C30752C6CDD6400C29A43 /* Metropolis-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C306C2C6CDD6400C29A43 /* Metropolis-Medium.otf */; };
+ 676C30762C6CDD6400C29A43 /* Metropolis-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C306D2C6CDD6400C29A43 /* Metropolis-Bold.otf */; };
+ 676C30772C6CDD6400C29A43 /* Metropolis-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C306E2C6CDD6400C29A43 /* Metropolis-Regular.otf */; };
+ 676C30782C6CDD6400C29A43 /* Metropolis-ExtraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C306F2C6CDD6400C29A43 /* Metropolis-ExtraLight.otf */; };
+ 676C30792C6CDD6400C29A43 /* Metropolis-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30702C6CDD6400C29A43 /* Metropolis-SemiBold.otf */; };
+ 676C307A2C6CDD6400C29A43 /* Metropolis-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30712C6CDD6400C29A43 /* Metropolis-Light.otf */; };
+ 676C307C2C6CDD6400C29A43 /* Metropolis-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30732C6CDD6400C29A43 /* Metropolis-Thin.otf */; };
+ 676C30842C6CDDAE00C29A43 /* IBMPlexSansArabic-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C307D2C6CDDAD00C29A43 /* IBMPlexSansArabic-Regular.ttf */; };
+ 676C30852C6CDDAE00C29A43 /* IBMPlexSansArabic-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C307E2C6CDDAD00C29A43 /* IBMPlexSansArabic-Light.ttf */; };
+ 676C30862C6CDDAE00C29A43 /* IBMPlexSansArabic-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C307F2C6CDDAD00C29A43 /* IBMPlexSansArabic-Bold.ttf */; };
+ 676C30872C6CDDAE00C29A43 /* IBMPlexSansArabic-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30802C6CDDAD00C29A43 /* IBMPlexSansArabic-SemiBold.ttf */; };
+ 676C30882C6CDDAE00C29A43 /* IBMPlexSansArabic-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30812C6CDDAE00C29A43 /* IBMPlexSansArabic-Medium.ttf */; };
+ 676C30892C6CDDAE00C29A43 /* IBMPlexSansArabic-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30822C6CDDAE00C29A43 /* IBMPlexSansArabic-ExtraLight.ttf */; };
+ 676C308A2C6CDDAE00C29A43 /* IBMPlexSansArabic-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 676C30832C6CDDAE00C29A43 /* IBMPlexSansArabic-Thin.ttf */; };
677E65AE2C5A10C20039E2C5 /* PersistentContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 677E65AD2C5A10C20039E2C5 /* PersistentContainer.swift */; };
677E65B02C5A11800039E2C5 /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 677E65AF2C5A11800039E2C5 /* CoreDataManager.swift */; };
677E65B62C5A13F00039E2C5 /* ScanSessionDependencyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 677E65B52C5A13F00039E2C5 /* ScanSessionDependencyManager.swift */; };
@@ -374,9 +378,6 @@
535983EC2C142B49003EB6ED /* UIFont+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extensions.swift"; sourceTree = "<group>"; };
535983EE2C142C9F003EB6ED /* Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localization.swift; sourceTree = "<group>"; };
535983F12C144E87003EB6ED /* Keys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = "<group>"; };
- 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>"; };
5359841D2C14B835003EB6ED /* SearchFilesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchFilesView.swift; sourceTree = "<group>"; };
@@ -482,13 +483,6 @@
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>"; };
53F21F902C1248EC00172BFC /* FolderCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FolderCollectionViewCell.xib; sourceTree = "<group>"; };
- 53F21F942C1377B900172BFC /* Tajawal-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-ExtraBold.ttf"; sourceTree = "<group>"; };
- 53F21F952C1377B900172BFC /* Tajawal-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-Light.ttf"; sourceTree = "<group>"; };
- 53F21F962C1377B900172BFC /* Tajawal-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-Bold.ttf"; sourceTree = "<group>"; };
- 53F21F972C1377B900172BFC /* Tajawal-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-ExtraLight.ttf"; sourceTree = "<group>"; };
- 53F21F982C1377B900172BFC /* Tajawal-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-Regular.ttf"; sourceTree = "<group>"; };
- 53F21F992C1377B900172BFC /* Tajawal-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-Medium.ttf"; sourceTree = "<group>"; };
- 53F21F9A2C1377B900172BFC /* Tajawal-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Tajawal-Black.ttf"; sourceTree = "<group>"; };
67106C922C4EAC0000874BFC /* CustomTabBarLayerProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTabBarLayerProtocol.swift; sourceTree = "<group>"; };
67106C932C4EAC0000874BFC /* CustomTabBarLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTabBarLayer.swift; sourceTree = "<group>"; };
672C46432C47B1F300497EF0 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
@@ -524,6 +518,20 @@
676C30642C6CA49B00C29A43 /* UIView+CustomColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+CustomColor.swift"; sourceTree = "<group>"; };
676C30672C6CA6D200C29A43 /* UIButton+CustomColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CustomColor.swift"; sourceTree = "<group>"; };
676C30692C6CBF4100C29A43 /* UIDivider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIDivider.swift; sourceTree = "<group>"; };
+ 676C306C2C6CDD6400C29A43 /* Metropolis-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-Medium.otf"; sourceTree = "<group>"; };
+ 676C306D2C6CDD6400C29A43 /* Metropolis-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-Bold.otf"; sourceTree = "<group>"; };
+ 676C306E2C6CDD6400C29A43 /* Metropolis-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-Regular.otf"; sourceTree = "<group>"; };
+ 676C306F2C6CDD6400C29A43 /* Metropolis-ExtraLight.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-ExtraLight.otf"; sourceTree = "<group>"; };
+ 676C30702C6CDD6400C29A43 /* Metropolis-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-SemiBold.otf"; sourceTree = "<group>"; };
+ 676C30712C6CDD6400C29A43 /* Metropolis-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-Light.otf"; sourceTree = "<group>"; };
+ 676C30732C6CDD6400C29A43 /* Metropolis-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Metropolis-Thin.otf"; sourceTree = "<group>"; };
+ 676C307D2C6CDDAD00C29A43 /* IBMPlexSansArabic-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-Regular.ttf"; sourceTree = "<group>"; };
+ 676C307E2C6CDDAD00C29A43 /* IBMPlexSansArabic-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-Light.ttf"; sourceTree = "<group>"; };
+ 676C307F2C6CDDAD00C29A43 /* IBMPlexSansArabic-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-Bold.ttf"; sourceTree = "<group>"; };
+ 676C30802C6CDDAD00C29A43 /* IBMPlexSansArabic-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-SemiBold.ttf"; sourceTree = "<group>"; };
+ 676C30812C6CDDAE00C29A43 /* IBMPlexSansArabic-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-Medium.ttf"; sourceTree = "<group>"; };
+ 676C30822C6CDDAE00C29A43 /* IBMPlexSansArabic-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-ExtraLight.ttf"; sourceTree = "<group>"; };
+ 676C30832C6CDDAE00C29A43 /* IBMPlexSansArabic-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IBMPlexSansArabic-Thin.ttf"; sourceTree = "<group>"; };
677E65AD2C5A10C20039E2C5 /* PersistentContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistentContainer.swift; sourceTree = "<group>"; };
677E65AF2C5A11800039E2C5 /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = "<group>"; };
677E65B52C5A13F00039E2C5 /* ScanSessionDependencyManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanSessionDependencyManager.swift; sourceTree = "<group>"; };
@@ -781,13 +789,13 @@
535983F32C14505E003EB6ED /* Arabic */ = {
isa = PBXGroup;
children = (
- 53F21F942C1377B900172BFC /* Tajawal-ExtraBold.ttf */,
- 53F21F952C1377B900172BFC /* Tajawal-Light.ttf */,
- 53F21F962C1377B900172BFC /* Tajawal-Bold.ttf */,
- 53F21F972C1377B900172BFC /* Tajawal-ExtraLight.ttf */,
- 53F21F982C1377B900172BFC /* Tajawal-Regular.ttf */,
- 53F21F992C1377B900172BFC /* Tajawal-Medium.ttf */,
- 53F21F9A2C1377B900172BFC /* Tajawal-Black.ttf */,
+ 676C307F2C6CDDAD00C29A43 /* IBMPlexSansArabic-Bold.ttf */,
+ 676C30802C6CDDAD00C29A43 /* IBMPlexSansArabic-SemiBold.ttf */,
+ 676C30812C6CDDAE00C29A43 /* IBMPlexSansArabic-Medium.ttf */,
+ 676C307D2C6CDDAD00C29A43 /* IBMPlexSansArabic-Regular.ttf */,
+ 676C307E2C6CDDAD00C29A43 /* IBMPlexSansArabic-Light.ttf */,
+ 676C30822C6CDDAE00C29A43 /* IBMPlexSansArabic-ExtraLight.ttf */,
+ 676C30832C6CDDAE00C29A43 /* IBMPlexSansArabic-Thin.ttf */,
);
path = Arabic;
sourceTree = "<group>";
@@ -795,9 +803,13 @@
535983F42C145069003EB6ED /* English */ = {
isa = PBXGroup;
children = (
- 535983F82C145083003EB6ED /* Poppins-Bold.ttf */,
- 535984012C145083003EB6ED /* Poppins-Medium.ttf */,
- 535984022C145083003EB6ED /* Poppins-Regular.ttf */,
+ 676C306D2C6CDD6400C29A43 /* Metropolis-Bold.otf */,
+ 676C30702C6CDD6400C29A43 /* Metropolis-SemiBold.otf */,
+ 676C306C2C6CDD6400C29A43 /* Metropolis-Medium.otf */,
+ 676C306E2C6CDD6400C29A43 /* Metropolis-Regular.otf */,
+ 676C30712C6CDD6400C29A43 /* Metropolis-Light.otf */,
+ 676C306F2C6CDD6400C29A43 /* Metropolis-ExtraLight.otf */,
+ 676C30732C6CDD6400C29A43 /* Metropolis-Thin.otf */,
);
path = English;
sourceTree = "<group>";
@@ -1882,46 +1894,50 @@
53014FB02C11A8E80071CE39 /* flashUnavailable@2x.png in Resources */,
53EDED9F2C183CEB00DB8DF9 /* BannerView.xib in Resources */,
EC702543254E1E7500BE1958 /* WalkthroughViewController.xib in Resources */,
- 535984072C145083003EB6ED /* Poppins-Bold.ttf in Resources */,
539D1C872C164F92009DB24A /* CustomTabBarView.xib in Resources */,
- 53F21FA12C1377B900172BFC /* Tajawal-Black.ttf in Resources */,
+ 676C30752C6CDD6400C29A43 /* Metropolis-Medium.otf in Resources */,
+ 676C307A2C6CDD6400C29A43 /* Metropolis-Light.otf in Resources */,
+ 676C30762C6CDD6400C29A43 /* Metropolis-Bold.otf in Resources */,
+ 676C307C2C6CDD6400C29A43 /* Metropolis-Thin.otf in Resources */,
53F21F8C2C1246AF00172BFC /* AllFolderTableViewCell.xib in Resources */,
- 53F21FA02C1377B900172BFC /* Tajawal-Medium.ttf in Resources */,
53BEB1432C2967E0005A3567 /* FoldersViewController.xib in Resources */,
53014FAC2C11A8E80071CE39 /* rotate@3x.png in Resources */,
- 535984112C145083003EB6ED /* Poppins-Regular.ttf in Resources */,
+ 676C30842C6CDDAE00C29A43 /* IBMPlexSansArabic-Regular.ttf in Resources */,
67A2AF6F2C6B46D100039F30 /* ScanSessionPreviewViewController.xib in Resources */,
53CD5F532C15022E0010424B /* KNAlertViewController.xib in Resources */,
+ 676C30792C6CDD6400C29A43 /* Metropolis-SemiBold.otf in Resources */,
+ 676C308A2C6CDDAE00C29A43 /* IBMPlexSansArabic-Thin.ttf in Resources */,
EC0CF20A254D8BC000888722 /* LaunchScreen.storyboard in Resources */,
+ 676C30782C6CDD6400C29A43 /* Metropolis-ExtraLight.otf in Resources */,
+ 676C30882C6CDDAE00C29A43 /* IBMPlexSansArabic-Medium.ttf in Resources */,
53014FAB2C11A8E80071CE39 /* flash.png in Resources */,
+ 676C30892C6CDDAE00C29A43 /* IBMPlexSansArabic-ExtraLight.ttf in Resources */,
539D1C8C2C16E97F009DB24A /* ShareSheetViewController.xib in Resources */,
535984202C14B8C5003EB6ED /* SearchFilesView.xib in Resources */,
- 53F21F9B2C1377B900172BFC /* Tajawal-ExtraBold.ttf in Resources */,
EC0CF218254D8DF200888722 /* Documents.storyboard in Resources */,
- 53F21F9C2C1377B900172BFC /* Tajawal-Light.ttf in Resources */,
53014FB52C11A8E80071CE39 /* enhance@2x.png in Resources */,
- 535984102C145083003EB6ED /* Poppins-Medium.ttf in Resources */,
53014FAE2C11A8E80071CE39 /* rotate@2x.png in Resources */,
53014FB32C11A8E80071CE39 /* flash@3x.png in Resources */,
672C46442C47B1F300497EF0 /* Localizable.xcstrings in Resources */,
539EF14E2C2AA43B0041AE1F /* ara.traineddata in Resources */,
- 53F21F9E2C1377B900172BFC /* Tajawal-ExtraLight.ttf in Resources */,
+ 676C30852C6CDDAE00C29A43 /* IBMPlexSansArabic-Light.ttf in Resources */,
539996352C26D41300671340 /* OCRViewController.xib in Resources */,
53014FB22C11A8E80071CE39 /* flashUnavailable@3x.png in Resources */,
+ 676C30862C6CDDAE00C29A43 /* IBMPlexSansArabic-Bold.ttf in Resources */,
53BAE0EE2C15E0890072189E /* EditViewController.xib in Resources */,
53014FAF2C11A8E80071CE39 /* flash@2x.png in Resources */,
53BEB1482C2968F8005A3567 /* FolderSelectCollectionViewCell.xib in Resources */,
- 53F21F9F2C1377B900172BFC /* Tajawal-Regular.ttf in Resources */,
53014FB12C11A8E80071CE39 /* flashUnavailable.png in Resources */,
67D714B52C5161A30065E6F4 /* Images.xcassets in Resources */,
EC702541254E1E7500BE1958 /* ClassicWalkthroughViewController.xib in Resources */,
53F21F922C1248EC00172BFC /* FolderCollectionViewCell.xib in Resources */,
+ 676C30872C6CDDAE00C29A43 /* IBMPlexSansArabic-SemiBold.ttf in Resources */,
ECA1FAA1254DEA6A0081F00B /* DocumentPreview.storyboard in Resources */,
67959CC42C566B7A00CAB102 /* Icons.xcassets in Resources */,
53014FB62C11A8E80071CE39 /* enhance.png in Resources */,
+ 676C30772C6CDD6400C29A43 /* Metropolis-Regular.otf in Resources */,
53EDEDA42C183FFF00DB8DF9 /* PagerImageCollectionViewCell.xib in Resources */,
53014FB42C11A8E80071CE39 /* enhance@3x.png in Resources */,
- 53F21F9D2C1377B900172BFC /* Tajawal-Bold.ttf in Resources */,
EC0CF207254D8BC000888722 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/MiniScanner/Extensions/UIFont+Extensions.swift b/MiniScanner/Extensions/UIFont+Extensions.swift
index be5be8a48dca22cd42c37264658426dd210ba33b..4324df757fc4940abec77f0d006246a0a39d3fae 100644
--- a/MiniScanner/Extensions/UIFont+Extensions.swift
+++ b/MiniScanner/Extensions/UIFont+Extensions.swift
@@ -12,79 +12,61 @@ extension UIFont {
// MARK: - Font Name
enum AppFont {
- case extrabold
+
case bold
- case black
+ case semibold
case medium
case regular
case light
- case extralight
+ case extraLight
+ case thin
enum English: String {
- case bold = "Poppins-Bold"
- case medium = "Poppins-Medium"
- case regular = "Poppins-Regular"
+
+ case bold
+ case semibold
+ case medium
+ case regular
+ case light
+ case extraLight
+ case thin
}
- enum Arabic: String {
- case extrabold = "Tajawal-ExtraBold"
- case bold = "Tajawal-Bold"
- case black = "Tajawal-Black"
- case medium = "Tajawal-Medium"
- case regular = "Tajawal-Regular"
- case light = "Tajawal-Light"
- case extralight = "Tajawal-ExtraLight"
+ private var weight: String {
+ switch self {
+ case .bold:
+ "Bold"
+ case .semibold:
+ "SemiBold"
+ case .medium:
+ "Medium"
+ case .regular:
+ "Regular"
+ case .light:
+ "Light"
+ case .extraLight:
+ "ExtraLight"
+ case .thin:
+ "Thin"
+ }
}
- static let fonts: [SupportedLanguage: [UIFont.AppFont: String]] = {
- let arabic = UIFont.AppFont.Arabic.self
- let english = UIFont.AppFont.English.self
-
- var fonts: [SupportedLanguage: [UIFont.AppFont: String]] = [:]
-
- fonts[.english] = [.extrabold: english.bold.rawValue,
- .bold: english.bold.rawValue,
- .black: english.bold.rawValue,
- .medium: english.medium.rawValue,
- .regular: english.regular.rawValue,
- .light: english.regular.rawValue,
- .extralight: english.regular.rawValue]
-
- fonts[.arabic] = [.extrabold: arabic.extrabold.rawValue,
- .bold: arabic.bold.rawValue,
- .black: arabic.black.rawValue,
- .medium: arabic.medium.rawValue,
- .regular: arabic.regular.rawValue,
- .light: arabic.light.rawValue,
- .extralight: arabic.extralight.rawValue]
- return fonts
- }()
+ private var fontName: String {
+ SupportedLanguage.currentLanguage == .english ? "Metropolis" : "IBMPlexSansArabic"
+ }
func font() -> String {
- return UIFont.AppFont.fonts[SupportedLanguage.currentLanguage]![self]!
-
-// switch self {
-// case .bold:
-// return lang == .english ? English.bold.rawValue : Arabic.bold.rawValue
-// case .regular:
-// return lang == .english ? English.regular.rawValue : Arabic.regular.rawValue
-// case .medium:
-// return lang == .english ? English.medium.rawValue : Arabic.medium.rawValue
-// case .light:
-// return lang == .english ? English.regular.rawValue : Arabic.light.rawValue
-// case .extrabold:
-// return lang == .english ? English.bold.rawValue : Arabic.extrabold.rawValue
-// case .black:
-// return lang == .english ? English.bold.rawValue : Arabic.black.rawValue
-// case .extralight:
-// return lang == .english ? English.regular.rawValue : Arabic.extralight.rawValue
-// }
+ "".appendingFormat("%@-%@",
+ fontName,
+ weight)
}
}
}
extension UIFont {
+
// MARK: - Get Font
+
static func getFont(_ name: UIFont.AppFont, size: CGFloat) -> UIFont {
return getFont(name: name.font(), size: size)
}
@@ -98,9 +80,6 @@ extension UIFont {
}
// MARK: - Font Styles
- class func light(_ size: CGFloat) -> UIFont {
- getFont(.light, size: size)
- }
class func regular(_ size: CGFloat) -> UIFont {
getFont(.regular, size: size)
@@ -109,21 +88,12 @@ extension UIFont {
class func medium(_ size: CGFloat) -> UIFont {
getFont(.medium, size: size)
}
-
- class func bold(_ size: CGFloat) -> UIFont {
- getFont(.bold, size: size)
- }
- class func extraBold(_ size: CGFloat) -> UIFont {
- getFont(.extrabold, size: size)
+ class func semibold(_ size: CGFloat) -> UIFont {
+ getFont(.semibold, size: size)
}
- class func extraLight(_ size: CGFloat) -> UIFont {
- getFont(.extralight, size: size)
- }
-
- class func black(_ size: CGFloat) -> UIFont {
- getFont(.black, size: size)
+ class func bold(_ size: CGFloat) -> UIFont {
+ getFont(.bold, size: size)
}
}
-
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Bold.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..f0c64e112f8bce3989c497e36523d2ddad6bf20e
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Bold.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-ExtraLight.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-ExtraLight.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..687b80693bea76e2d58aceb3e36304714ce4ac13
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-ExtraLight.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Light.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Light.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0534b7b1406de4372975be02d6e2539bcbe65bf3
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Light.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Medium.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6bb973b421acf0be1cc7ae7b5399b2700a17bcd4
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Medium.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Regular.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..da3eba1caf65af6877313ab64d94dcee408eec82
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Regular.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-SemiBold.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-SemiBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..764b0079f09b4e8da4647b2160edab5536f6eddb
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-SemiBold.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Thin.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Thin.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e50d71eafd1d0c50f59a1d5e5d7bbdd60c722797
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/Arabic/IBMPlexSansArabic-Thin.ttf differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Black.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Black.ttf
deleted file mode 100644
index bf86d5ee5dbee9822852b192c2b47150b5e36a5a..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Black.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Bold.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Bold.ttf
deleted file mode 100644
index 706526a97cb032af29c43237c9d2a6b554edb2da..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Bold.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-ExtraBold.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-ExtraBold.ttf
deleted file mode 100644
index f3aa896861fac05d5538d7880ceac5d867ee9c6e..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-ExtraBold.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-ExtraLight.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-ExtraLight.ttf
deleted file mode 100644
index 801c8c1e0bf19c45ae77e843c5fd1a59442bf1b0..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-ExtraLight.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Light.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Light.ttf
deleted file mode 100644
index 1e9896c5797733ab41598637f9ac3b5a1a66bffa..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Light.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Medium.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Medium.ttf
deleted file mode 100644
index 79fc885559c36b28c46551ae81ebbd590d0ff4f2..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Medium.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Regular.ttf b/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Regular.ttf
deleted file mode 100644
index a6d0e10247858c69fb119d7131da9519a2021f72..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/Arabic/Tajawal-Regular.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-Bold.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..a42b9410fc295d09056573a49358cc9851b28602
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Bold.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-ExtraLight.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-ExtraLight.otf
new file mode 100644
index 0000000000000000000000000000000000000000..b02e041812a521f1aae284c1bfa573ac078cc3c7
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-ExtraLight.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-Light.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Light.otf
new file mode 100644
index 0000000000000000000000000000000000000000..b8b917c154d67a5cd3678506e7cc05541b9ca585
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Light.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-Medium.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Medium.otf
new file mode 100644
index 0000000000000000000000000000000000000000..239d69dc23299efaf89c57c0879b9c18a56919ed
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Medium.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-Regular.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..737760b5df73bf4e48e8d17146a574e8deabc80d
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Regular.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-SemiBold.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-SemiBold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..f9889d0a16ede57dd48a1e868ec2782f9d65fbf5
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-SemiBold.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Metropolis-Thin.otf b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Thin.otf
new file mode 100644
index 0000000000000000000000000000000000000000..f969dcc3a48c2e9bc956c1d547bc79de2ae2edb6
Binary files /dev/null and b/MiniScanner/Supporting Files/Fonts/English/Metropolis-Thin.otf differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Poppins-Bold.ttf b/MiniScanner/Supporting Files/Fonts/English/Poppins-Bold.ttf
deleted file mode 100644
index 00559eeb290fb8036f10633ff0640447d827b27c..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/English/Poppins-Bold.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Poppins-Medium.ttf b/MiniScanner/Supporting Files/Fonts/English/Poppins-Medium.ttf
deleted file mode 100644
index 6bcdcc27f22e001e46defdfd9e23f224ff65dd67..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/English/Poppins-Medium.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Fonts/English/Poppins-Regular.ttf b/MiniScanner/Supporting Files/Fonts/English/Poppins-Regular.ttf
deleted file mode 100644
index 9f0c71b70a49664ced448c63edc9c4ff2bf8cf4a..0000000000000000000000000000000000000000
Binary files a/MiniScanner/Supporting Files/Fonts/English/Poppins-Regular.ttf and /dev/null differ
diff --git a/MiniScanner/Supporting Files/Info.plist b/MiniScanner/Supporting Files/Info.plist
index 7648ba4f28faf911acce826c4c1f60d66ca46c07..4b0a74450bd321829d929127c3438adc34c5e050 100644
--- a/MiniScanner/Supporting Files/Info.plist
+++ b/MiniScanner/Supporting Files/Info.plist
@@ -28,16 +28,20 @@
<string>Let the $(PRODUCT_NAME) use device photo library in order to scan your documents</string>
<key>UIAppFonts</key>
<array>
- <string>Tajawal-ExtraBold.ttf</string>
- <string>Tajawal-Light.ttf</string>
- <string>Tajawal-Bold.ttf</string>
- <string>Tajawal-ExtraLight.ttf</string>
- <string>Tajawal-Regular.ttf</string>
- <string>Tajawal-Medium.ttf</string>
- <string>Tajawal-Black.ttf</string>
- <string>Poppins-Regular.ttf</string>
- <string>Poppins-Medium.ttf</string>
- <string>Poppins-Bold.ttf</string>
+ <string>IBMPlexSansArabic-Bold.ttf</string>
+ <string>IBMPlexSansArabic-SemiBold.ttf</string>
+ <string>IBMPlexSansArabic-Medium.ttf</string>
+ <string>IBMPlexSansArabic-Regular.ttf</string>
+ <string>IBMPlexSansArabic-Light.ttf</string>
+ <string>IBMPlexSansArabic-ExtraLight.ttf</string>
+ <string>IBMPlexSansArabic-Thin.ttf</string>
+ <string>Metropolis-Bold.ttf</string>
+ <string>Metropolis-SemiBold.ttf</string>
+ <string>Metropolis-Medium.ttf</string>
+ <string>Metropolis-Regular.ttf</string>
+ <string>Metropolis-Light.ttf</string>
+ <string>Metropolis-ExtraLight.ttf</string>
+ <string>Metropolis-Thin.ttf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>