Skip to content

Commit 5af4ee1

Browse files
authored
Merge pull request #487 from jorgeblacio/ios_13_support
Build for iOS 13
2 parents 347ea4f + 6b2d2bc commit 5af4ee1

File tree

8 files changed

+45
-36
lines changed

8 files changed

+45
-36
lines changed

Cartfile.resolved

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
binary "./realm-cocoa.json" "3.17.1"
1+
binary "./realm-cocoa.json" "3.18.0"
22
github "1024jp/GzipSwift" "5.0.0"
3-
github "Alamofire/Alamofire" "4.8.2"
3+
github "Alamofire/Alamofire" "4.9.0"
44
github "CosmicMind/Material" "3.1.1"
5-
github "CosmicMind/Motion" "3.1.1"
5+
github "CosmicMind/Motion" "3.1.3"
66
github "Criptext/MIBadgeButton-Swift" "0.8"
77
github "Criptext/SignalProtocolSwift" "0.8"
88
github "Criptext/UIImageView-Letters" "1.1.5"
@@ -12,13 +12,13 @@ github "Hirobreak/CLTokenInputView" "3.0.3"
1212
github "Hirobreak/SwiftPasscodeLock" "2.2.8"
1313
github "Marxon13/M13Checkbox" "3.4.0"
1414
github "SwiftyJSON/SwiftyJSON" "5.0.0"
15-
github "airbnb/lottie-ios" "ed31b9f14e1dbe27f5569f982c0a85ec95ebfbf7"
15+
github "airbnb/lottie-ios" "860124f1e8fe2163a87c225a931132fc57324b26"
1616
github "cjwirth/RichEditorView" "5.0.0"
1717
github "daltoniam/Starscream" "3.1.0"
1818
github "ephread/Instructions" "ab42e21382b571d43839a2c7187647e59c6cae55"
19-
github "hackiftekhar/IQKeyboardManager" "v6.4.0"
19+
github "hackiftekhar/IQKeyboardManager" "v6.4.2"
2020
github "malcommac/UIWindowTransitions" "0.2.0"
2121
github "misterwell/MMMaterialDesignSpinner" "0.2.5"
22-
github "rs/SDWebImage" "5.0.6"
23-
github "scinfu/SwiftSoup" "2.2.0"
24-
github "tilltue/TLPhotoPicker" "1.8.9"
22+
github "rs/SDWebImage" "5.1.1"
23+
github "scinfu/SwiftSoup" "2.2.1"
24+
github "tilltue/TLPhotoPicker" "1.9.9"

iOS-Email-Client.xcodeproj/project.pbxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@
16821682
isa = PBXProject;
16831683
attributes = {
16841684
LastSwiftUpdateCheck = 1010;
1685-
LastUpgradeCheck = 1020;
1685+
LastUpgradeCheck = 1100;
16861686
ORGANIZATIONNAME = "Criptext Inc.";
16871687
TargetAttributes = {
16881688
41B6AAAB2017987500D428B7 = {
@@ -2740,6 +2740,7 @@
27402740
MTL_ENABLE_DEBUG_INFO = NO;
27412741
ONLY_ACTIVE_ARCH = NO;
27422742
SDKROOT = iphoneos;
2743+
SWIFT_COMPILATION_MODE = wholemodule;
27432744
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
27442745
TARGETED_DEVICE_FAMILY = 1;
27452746
VALIDATE_PRODUCT = YES;

iOS-Email-Client.xcodeproj/xcshareddata/xcschemes/NotificationExtension.xcscheme

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction
@@ -42,8 +42,6 @@
4242
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4343
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4444
shouldUseLaunchSchemeArgsEnv = "YES">
45-
<Testables>
46-
</Testables>
4745
<MacroExpansion>
4846
<BuildableReference
4947
BuildableIdentifier = "primary"
@@ -53,14 +51,15 @@
5351
ReferencedContainer = "container:iOS-Email-Client.xcodeproj">
5452
</BuildableReference>
5553
</MacroExpansion>
56-
<AdditionalOptions>
57-
</AdditionalOptions>
54+
<Testables>
55+
</Testables>
5856
</TestAction>
5957
<LaunchAction
6058
buildConfiguration = "Release"
6159
selectedDebuggerIdentifier = ""
6260
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
6361
launchStyle = "0"
62+
askForAppToLaunch = "Yes"
6463
useCustomWorkingDirectory = "NO"
6564
ignoresPersistentStateOnLaunch = "NO"
6665
debugDocumentVersioning = "YES"
@@ -81,8 +80,6 @@
8180
ReferencedContainer = "container:iOS-Email-Client.xcodeproj">
8281
</BuildableReference>
8382
</MacroExpansion>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8683
</LaunchAction>
8784
<ProfileAction
8885
buildConfiguration = "Release"

iOS-Email-Client.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction
@@ -42,8 +42,6 @@
4242
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4343
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4444
shouldUseLaunchSchemeArgsEnv = "YES">
45-
<Testables>
46-
</Testables>
4745
<MacroExpansion>
4846
<BuildableReference
4947
BuildableIdentifier = "primary"
@@ -53,14 +51,15 @@
5351
ReferencedContainer = "container:iOS-Email-Client.xcodeproj">
5452
</BuildableReference>
5553
</MacroExpansion>
56-
<AdditionalOptions>
57-
</AdditionalOptions>
54+
<Testables>
55+
</Testables>
5856
</TestAction>
5957
<LaunchAction
6058
buildConfiguration = "Release"
6159
selectedDebuggerIdentifier = ""
6260
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
6361
launchStyle = "0"
62+
askForAppToLaunch = "Yes"
6463
useCustomWorkingDirectory = "NO"
6564
ignoresPersistentStateOnLaunch = "NO"
6665
debugDocumentVersioning = "YES"
@@ -77,8 +76,6 @@
7776
ReferencedContainer = "container:iOS-Email-Client.xcodeproj">
7877
</BuildableReference>
7978
</BuildableProductRunnable>
80-
<AdditionalOptions>
81-
</AdditionalOptions>
8279
</LaunchAction>
8380
<ProfileAction
8481
buildConfiguration = "Release"

iOS-Email-Client.xcodeproj/xcshareddata/xcschemes/iOS-Email-Client.xcscheme

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "41B6AAAB2017987500D428B7"
34+
BuildableName = "iOS-Email-Client.app"
35+
BlueprintName = "iOS-Email-Client"
36+
ReferencedContainer = "container:iOS-Email-Client.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "41B6AAAB2017987500D428B7"
46-
BuildableName = "iOS-Email-Client.app"
47-
BlueprintName = "iOS-Email-Client"
48-
ReferencedContainer = "container:iOS-Email-Client.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"

iOS-Email-Client/Controllers/ComposeViewController.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,9 @@ class ComposeViewController: UIViewController {
616616
configure.allowedVideoRecording = false
617617
picker.configure = configure
618618
self.present(picker, animated: true, completion: nil)
619+
let isSystemDarkMode = UIUtils.isSystemDarlkModeEnabled(controller: self)
620+
picker.doneButton.tintColor = isSystemDarkMode ? .white : .black
621+
picker.cancelButton.tintColor = isSystemDarkMode ? .white : .black
619622
break
620623
default:
621624
self.showAlert(String.localize("ACCESS_DENIED"), message: String.localize("NEED_ENABLE_ACCESS"), style: .alert)

iOS-Email-Client/Libs/UIUtils.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,17 @@ class UIUtils {
163163
button.addTarget(target, action: action, for: .touchUpInside)
164164
return UIBarButtonItem(customView: button)
165165
}
166+
167+
class func isSystemDarlkModeEnabled(controller: UIViewController) -> Bool {
168+
if #available(iOS 12.0, *) {
169+
switch controller.traitCollection.userInterfaceStyle {
170+
case .dark:
171+
return true
172+
default:
173+
return false
174+
}
175+
} else {
176+
return false
177+
}
178+
}
166179
}

realm-cocoa.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"3.17.1": "https://github.com/realm/realm-cocoa/releases/download/v3.17.1/Carthage.framework.zip"
2+
"3.18.0": "https://github.com/realm/realm-cocoa/releases/download/v3.18.0/Carthage.framework.zip"
33
}

0 commit comments

Comments
 (0)