Skip to content

Commit 254fe00

Browse files
rayhannabirayhannabi
authored
Merge pull request #73 from rayhannabi/release/0.6.6.beta.1
Release/0.6.6.beta.1
2 parents f9a32f5 + c5b59ab commit 254fe00

17 files changed

+188
-74
lines changed

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ An easy-to-use alert framework for iOS written purely in Swift. With native look
1313

1414
## Features
1515

16+
* iOS 13 compatible, supports Dark Mode.
1617
* Title
1718
* Description message
1819
* Banner image below the description message
@@ -23,8 +24,8 @@ An easy-to-use alert framework for iOS written purely in Swift. With native look
2324
## Requirements
2425

2526
* iOS 9.0+
26-
* Xcode 10+
27-
* Swift 5
27+
* Xcode 11.0+
28+
* Swift 5.0
2829
* Objective-C 2.0 (ARC required)
2930

3031
## Installation

‎RNAlertController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Pod::Spec.new do |spec|
66

77
spec.name = "RNAlertController"
8-
spec.version = "0.6.5"
8+
spec.version = "0.6.6.beta.1"
99
spec.summary = "Custom Alert Framework for iOS"
1010

1111
spec.description = <<-DESC

‎RNAlertController.xcodeproj/project.pbxproj

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
E8ECFAE422772EFC00D4BA3F /* AlertButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8ECFADC22772EFB00D4BA3F /* AlertButton.swift */; };
3232
E8ECFAE622772EFC00D4BA3F /* AlertButtonStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8ECFADE22772EFB00D4BA3F /* AlertButtonStackView.swift */; };
3333
E8ECFAE722772EFC00D4BA3F /* RNAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8ECFADF22772EFB00D4BA3F /* RNAlertController.swift */; };
34+
E8F6B2E9233E32E0006A03F4 /* UIView+Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8F6B2E8233E32E0006A03F4 /* UIView+Appearance.swift */; };
3435
E8FEEE242310409200A155E2 /* AlertActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8FEEE232310409200A155E2 /* AlertActionButton.swift */; };
3536
E8FEEE2623104A9F00A155E2 /* UIColor+Extra.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8FEEE2523104A9F00A155E2 /* UIColor+Extra.swift */; };
3637
E8FF167F2282B48C00CC8807 /* RNAlertController+API.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8FF167E2282B48C00CC8807 /* RNAlertController+API.swift */; };
@@ -104,6 +105,7 @@
104105
E8ECFADC22772EFB00D4BA3F /* AlertButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertButton.swift; sourceTree = "<group>"; };
105106
E8ECFADE22772EFB00D4BA3F /* AlertButtonStackView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertButtonStackView.swift; sourceTree = "<group>"; };
106107
E8ECFADF22772EFB00D4BA3F /* RNAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNAlertController.swift; sourceTree = "<group>"; };
108+
E8F6B2E8233E32E0006A03F4 /* UIView+Appearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Appearance.swift"; sourceTree = "<group>"; };
107109
E8FEEE232310409200A155E2 /* AlertActionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertActionButton.swift; sourceTree = "<group>"; };
108110
E8FEEE2523104A9F00A155E2 /* UIColor+Extra.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extra.swift"; sourceTree = "<group>"; };
109111
E8FF167E2282B48C00CC8807 /* RNAlertController+API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RNAlertController+API.swift"; sourceTree = "<group>"; };
@@ -142,6 +144,7 @@
142144
E8ECFAD922772EFB00D4BA3F /* UIButton+Action.swift */,
143145
E8FEEE2523104A9F00A155E2 /* UIColor+Extra.swift */,
144146
E8ECFADA22772EFB00D4BA3F /* UIFont+Extra.swift */,
147+
E8F6B2E8233E32E0006A03F4 /* UIView+Appearance.swift */,
145148
);
146149
path = Extensions;
147150
sourceTree = "<group>";
@@ -295,6 +298,7 @@
295298
E8508697231E647600F0D6B3 /* Frameworks */,
296299
E8508698231E647600F0D6B3 /* Resources */,
297300
E85086C4231E656C00F0D6B3 /* Embed Frameworks */,
301+
E8F6B2EB233E4C8F006A03F4 /* ShellScript */,
298302
);
299303
buildRules = (
300304
);
@@ -314,6 +318,7 @@
314318
E8ECFAC722772ED000D4BA3F /* Sources */,
315319
E8ECFAC822772ED000D4BA3F /* Frameworks */,
316320
E8ECFAC922772ED000D4BA3F /* Resources */,
321+
E8F6B2EA233E4C77006A03F4 /* ShellScript */,
317322
);
318323
buildRules = (
319324
);
@@ -331,7 +336,7 @@
331336
isa = PBXProject;
332337
attributes = {
333338
LastSwiftUpdateCheck = 1030;
334-
LastUpgradeCheck = 1030;
339+
LastUpgradeCheck = 1100;
335340
ORGANIZATIONNAME = "Rayhan Nabi";
336341
TargetAttributes = {
337342
E8508674231E5F2100F0D6B3 = {
@@ -395,6 +400,43 @@
395400
};
396401
/* End PBXResourcesBuildPhase section */
397402

403+
/* Begin PBXShellScriptBuildPhase section */
404+
E8F6B2EA233E4C77006A03F4 /* ShellScript */ = {
405+
isa = PBXShellScriptBuildPhase;
406+
buildActionMask = 2147483647;
407+
files = (
408+
);
409+
inputFileListPaths = (
410+
);
411+
inputPaths = (
412+
);
413+
outputFileListPaths = (
414+
);
415+
outputPaths = (
416+
);
417+
runOnlyForDeploymentPostprocessing = 0;
418+
shellPath = /bin/sh;
419+
shellScript = "buildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"${INFOPLIST_FILE}\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"${INFOPLIST_FILE}\"\n";
420+
};
421+
E8F6B2EB233E4C8F006A03F4 /* ShellScript */ = {
422+
isa = PBXShellScriptBuildPhase;
423+
buildActionMask = 2147483647;
424+
files = (
425+
);
426+
inputFileListPaths = (
427+
);
428+
inputPaths = (
429+
);
430+
outputFileListPaths = (
431+
);
432+
outputPaths = (
433+
);
434+
runOnlyForDeploymentPostprocessing = 0;
435+
shellPath = /bin/sh;
436+
shellScript = "buildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"${INFOPLIST_FILE}\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"${INFOPLIST_FILE}\"\n";
437+
};
438+
/* End PBXShellScriptBuildPhase section */
439+
398440
/* Begin PBXSourcesBuildPhase section */
399441
E8508671231E5F2100F0D6B3 /* Sources */ = {
400442
isa = PBXSourcesBuildPhase;
@@ -433,6 +475,7 @@
433475
E8CE528F227B07D200466CAF /* AlertImageView.swift in Sources */,
434476
E8FEEE242310409200A155E2 /* AlertActionButton.swift in Sources */,
435477
E8CE5291227B092400466CAF /* AlertStackView.swift in Sources */,
478+
E8F6B2E9233E32E0006A03F4 /* UIView+Appearance.swift in Sources */,
436479
E8ECFAE322772EFC00D4BA3F /* AlertLabel.swift in Sources */,
437480
);
438481
runOnlyForDeploymentPostprocessing = 0;
@@ -532,6 +575,7 @@
532575
"$(inherited)",
533576
"@executable_path/Frameworks",
534577
);
578+
MARKETING_VERSION = 0.6.6;
535579
PRODUCT_BUNDLE_IDENTIFIER = com.rayhan.ios.RNAlertControllerExample;
536580
PRODUCT_NAME = "$(TARGET_NAME)";
537581
SWIFT_VERSION = 5.0;
@@ -552,6 +596,7 @@
552596
"$(inherited)",
553597
"@executable_path/Frameworks",
554598
);
599+
MARKETING_VERSION = 0.6.6;
555600
PRODUCT_BUNDLE_IDENTIFIER = com.rayhan.ios.RNAlertControllerExample;
556601
PRODUCT_NAME = "$(TARGET_NAME)";
557602
SWIFT_VERSION = 5.0;
@@ -563,6 +608,7 @@
563608
isa = XCBuildConfiguration;
564609
buildSettings = {
565610
ALWAYS_SEARCH_USER_PATHS = NO;
611+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
566612
CLANG_ANALYZER_NONNULL = YES;
567613
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
568614
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -627,6 +673,7 @@
627673
isa = XCBuildConfiguration;
628674
buildSettings = {
629675
ALWAYS_SEARCH_USER_PATHS = NO;
676+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
630677
CLANG_ANALYZER_NONNULL = YES;
631678
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
632679
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -688,6 +735,7 @@
688735
CLANG_ENABLE_MODULES = YES;
689736
CODE_SIGN_IDENTITY = "";
690737
CODE_SIGN_STYLE = Automatic;
738+
CURRENT_PROJECT_VERSION = 1001;
691739
DEFINES_MODULE = YES;
692740
DEVELOPMENT_TEAM = PCH85ZHVFN;
693741
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -701,6 +749,7 @@
701749
"@executable_path/Frameworks",
702750
"@loader_path/Frameworks",
703751
);
752+
MARKETING_VERSION = 0.6.6;
704753
PRODUCT_BUNDLE_IDENTIFIER = com.rayhan.ios.RNAlertController;
705754
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
706755
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -718,6 +767,7 @@
718767
CLANG_ENABLE_MODULES = YES;
719768
CODE_SIGN_IDENTITY = "";
720769
CODE_SIGN_STYLE = Automatic;
770+
CURRENT_PROJECT_VERSION = 1001;
721771
DEFINES_MODULE = YES;
722772
DEVELOPMENT_TEAM = PCH85ZHVFN;
723773
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -731,6 +781,7 @@
731781
"@executable_path/Frameworks",
732782
"@loader_path/Frameworks",
733783
);
784+
MARKETING_VERSION = 0.6.6;
734785
PRODUCT_BUNDLE_IDENTIFIER = com.rayhan.ios.RNAlertController;
735786
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
736787
PROVISIONING_PROFILE_SPECIFIER = "";

‎RNAlertController.xcodeproj/xcshareddata/xcschemes/RNAlertController.xcscheme

Lines changed: 10 additions & 14 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 = "1030"
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 = "E8ECFACA22772ED000D4BA3F"
34+
BuildableName = "RNAlertController.framework"
35+
BlueprintName = "RNAlertController"
36+
ReferencedContainer = "container:RNAlertController.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 = "E8ECFACA22772ED000D4BA3F"
46-
BuildableName = "RNAlertController.framework"
47-
BlueprintName = "RNAlertController"
48-
ReferencedContainer = "container:RNAlertController.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:RNAlertController.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎RNAlertController.xcodeproj/xcshareddata/xcschemes/RNAlertControllerExample.xcscheme

Lines changed: 10 additions & 14 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 = "1030"
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 = "E8508699231E647600F0D6B3"
34+
BuildableName = "RNAlertControllerExample.app"
35+
BlueprintName = "RNAlertControllerExample"
36+
ReferencedContainer = "container:RNAlertController.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 = "E8508699231E647600F0D6B3"
46-
BuildableName = "RNAlertControllerExample.app"
47-
BlueprintName = "RNAlertControllerExample"
48-
ReferencedContainer = "container:RNAlertController.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:RNAlertController.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎RNAlertController.xcodeproj/xcshareddata/xcschemes/RNAlertControllerTests.xcscheme

Lines changed: 1 addition & 5 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 = "1030"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,8 +23,6 @@
2323
</BuildableReference>
2424
</TestableReference>
2525
</Testables>
26-
<AdditionalOptions>
27-
</AdditionalOptions>
2826
</TestAction>
2927
<LaunchAction
3028
buildConfiguration = "Debug"
@@ -36,8 +34,6 @@
3634
debugDocumentVersioning = "YES"
3735
debugServiceExtension = "internal"
3836
allowLocationSimulation = "YES">
39-
<AdditionalOptions>
40-
</AdditionalOptions>
4137
</LaunchAction>
4238
<ProfileAction
4339
buildConfiguration = "Release"

‎RNAlertControllerExample/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.6.5</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
2222
<string>675</string>
2323
<key>LSRequiresIPhoneOS</key>

‎RNAlertControllerExample/Storyboards/Base.lproj/Main.storyboard

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8td-1C-4Kl">
3-
<device id="retina6_1" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="8td-1C-4Kl">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
97
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
108
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
119
</dependencies>

‎Source/Extensions/UIColor+Extra.swift

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,20 @@ extension UIColor {
1818
return UIColor(red: 255/255, green: 59/255, blue: 48/255, alpha: 1.0)
1919
}
2020

21-
static var defaultBackground: UIColor {
21+
static var defaultLightBackground: UIColor {
2222
return UIColor(white: 1, alpha: 0.75)
2323
}
2424

25-
static var highlightedBackground: UIColor {
25+
static var defaultDarkBackground: UIColor {
26+
return UIColor(white: 0, alpha: 0.40)
27+
}
28+
29+
static var highlightedLightBackground: UIColor {
2630
return UIColor(white: 1, alpha: 0.35)
2731
}
2832

33+
static var highlightedDarkBackground: UIColor {
34+
return UIColor(white: 0, alpha: 0.0)
35+
}
36+
2937
}

‎Source/Extensions/UIFont+Extra.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import UIKit
1111
extension UIFont {
1212

1313
class var alertTitleFont: UIFont {
14-
return self.systemFont(ofSize: 18, weight: .semibold)
14+
return self.systemFont(ofSize: 18, weight: .bold)
1515
}
1616

1717
class var alertMessageFont: UIFont {

0 commit comments

Comments
 (0)