Skip to content

Please add latest fixes to swift4 branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Photogad wants to merge 25 commits into
base: swift-4
Choose a base branch
from
Open

Please add latest fixes to swift4 branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
15c8f82
Merge pull request #24 from PhilippeBoisney/swift-4
PhilippeBoisney Oct 5, 2017
a72a35c
Update README.md
PhilippeBoisney Oct 5, 2017
a8bcedb
Fixing multi-line title.
benguild Dec 6, 2017
c0a82f3
Fixing jagged aliasing when scaling-down large images.
benguild Dec 6, 2017
6c849cf
Providing basic Objective-C compatibility.
benguild Dec 6, 2017
bb2767b
Increasing padding on text.
benguild Dec 7, 2017
b84f611
Removing increased padding on top/bottom constraints.
benguild Dec 7, 2017
29392f2
Adding support for configurable "Next" button instead of "Skip" butto…
benguild Dec 7, 2017
45f4053
Adding support for changing fonts.
benguild Dec 8, 2017
a3a0140
Removing problematic line count limitation.
benguild Dec 8, 2017
f814bac
Enabling a couple more properties for Objective-C.
benguild Dec 8, 2017
a7e958d
Adding optional delegate method for when displaying steps.
benguild Dec 8, 2017
5e15861
use uitextview for description
gilthonweapps Aug 26, 2018
42322d2
use array of uiimage
gilthonweapps Aug 26, 2018
7290944
refactored architecture
gilthonweapps Aug 26, 2018
e244bbb
fixes iOS 12 layout
gilthonweapps Aug 27, 2018
ec9b4b0
put minimum ios version to 9
gilthonweapps Aug 27, 2018
55ef072
update to swift 5
gilthonweapps Apr 6, 2019
e20b58e
update to swift 5
gilthonweapps Apr 6, 2019
6dcccf8
Create custom branch
gabmarfer May 24, 2019
ea1b0bc
Add imageContentMode property
gabmarfer May 24, 2019
c0fa044
Remove duplicated classes
gabmarfer May 24, 2019
d191087
Add improvements
gabmarfer Jun 3, 2019
ef64518
Make public alert properties
gabmarfer Jun 3, 2019
54e1910
Merge pull request #1 from gabmarfer/improvements
gilthonweapps Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
5.0
2 changes: 1 addition & 1 deletion AlertOnboarding.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ s.homepage = "https://github.com/PhilippeBoisney/AlertOnboarding"
s.license = 'MIT'
s.author = { "PhilippeBoisney" => "phil.boisney@gmail.com" }
s.source = { :git => "https://github.com/PhilippeBoisney/AlertOnboarding.git", :tag => s.version }
s.platform = :ios, '8.0'
s.platform = :ios, '9.0'
s.requires_arc = true

# If more than one source file: https://guides.cocoapods.org/syntax/podspec.html#source_files
Expand Down
64 changes: 44 additions & 20 deletions AlertOnboarding.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
37845A6E1D994CBA009B3734 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 37845A6C1D994CBA009B3734 /* Main.storyboard */; };
37845A701D994CBA009B3734 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 37845A6F1D994CBA009B3734 /* Assets.xcassets */; };
37845A731D994CBA009B3734 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 37845A711D994CBA009B3734 /* LaunchScreen.storyboard */; };
37845A7C1D994D65009B3734 /* AlertOnboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37845A7B1D994D65009B3734 /* AlertOnboarding.swift */; };
37845A7E1D994D87009B3734 /* AlertChildPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37845A7D1D994D87009B3734 /* AlertChildPageViewController.swift */; };
37845A801D994DA6009B3734 /* AlertPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37845A7F1D994DA6009B3734 /* AlertPageViewController.swift */; };
37845A821D994DE6009B3734 /* AlertChildPageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 37845A811D994DE6009B3734 /* AlertChildPageViewController.xib */; };
568AB1512298215E00C06C37 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 568AB14D2298215E00C06C37 /* Alert.swift */; };
568AB1522298215E00C06C37 /* AlertChildPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 568AB14E2298215E00C06C37 /* AlertChildPageViewController.swift */; };
568AB1532298215E00C06C37 /* AlertPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 568AB14F2298215E00C06C37 /* AlertPageViewController.swift */; };
568AB1542298215E00C06C37 /* AlertOnboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 568AB1502298215E00C06C37 /* AlertOnboarding.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -26,10 +27,11 @@
37845A6F1D994CBA009B3734 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
37845A721D994CBA009B3734 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
37845A741D994CBA009B3734 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
37845A7B1D994D65009B3734 /* AlertOnboarding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertOnboarding.swift; sourceTree = "<group>"; };
37845A7D1D994D87009B3734 /* AlertChildPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertChildPageViewController.swift; sourceTree = "<group>"; };
37845A7F1D994DA6009B3734 /* AlertPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertPageViewController.swift; sourceTree = "<group>"; };
37845A811D994DE6009B3734 /* AlertChildPageViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AlertChildPageViewController.xib; sourceTree = "<group>"; };
568AB14D2298215E00C06C37 /* Alert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = "<group>"; };
568AB14E2298215E00C06C37 /* AlertChildPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertChildPageViewController.swift; sourceTree = "<group>"; };
568AB14F2298215E00C06C37 /* AlertPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertPageViewController.swift; sourceTree = "<group>"; };
568AB1502298215E00C06C37 /* AlertOnboarding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertOnboarding.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -62,7 +64,7 @@
37845A671D994CBA009B3734 /* AlertOnboarding */ = {
isa = PBXGroup;
children = (
37845A7A1D994D51009B3734 /* Alert */,
568AB14C2298215E00C06C37 /* Classes */,
37845A681D994CBA009B3734 /* AppDelegate.swift */,
37845A6A1D994CBA009B3734 /* ViewController.swift */,
37845A6C1D994CBA009B3734 /* Main.storyboard */,
Expand All @@ -74,15 +76,17 @@
path = AlertOnboarding;
sourceTree = "<group>";
};
37845A7A1D994D51009B3734 /* Alert */ = {
568AB14C2298215E00C06C37 /* Classes */ = {
isa = PBXGroup;
children = (
37845A7B1D994D65009B3734 /* AlertOnboarding.swift */,
37845A7D1D994D87009B3734 /* AlertChildPageViewController.swift */,
37845A7F1D994DA6009B3734 /* AlertPageViewController.swift */,
568AB14D2298215E00C06C37 /* Alert.swift */,
568AB14E2298215E00C06C37 /* AlertChildPageViewController.swift */,
568AB14F2298215E00C06C37 /* AlertPageViewController.swift */,
568AB1502298215E00C06C37 /* AlertOnboarding.swift */,
);
name = Alert;
sourceTree = "<group>";
name = Classes;
path = Pod/Classes;
sourceTree = SOURCE_ROOT;
};
/* End PBXGroup section */

Expand Down Expand Up @@ -111,18 +115,19 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0800;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = CookMinute;
TargetAttributes = {
37845A641D994CBA009B3734 = {
CreatedOnToolsVersion = 8.0;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 37845A601D994CBA009B3734 /* Build configuration list for PBXProject "AlertOnboarding" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -157,10 +162,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
37845A801D994DA6009B3734 /* AlertPageViewController.swift in Sources */,
568AB1532298215E00C06C37 /* AlertPageViewController.swift in Sources */,
568AB1542298215E00C06C37 /* AlertOnboarding.swift in Sources */,
568AB1512298215E00C06C37 /* Alert.swift in Sources */,
568AB1522298215E00C06C37 /* AlertChildPageViewController.swift in Sources */,
37845A6B1D994CBA009B3734 /* ViewController.swift in Sources */,
37845A7E1D994D87009B3734 /* AlertChildPageViewController.swift in Sources */,
37845A7C1D994D65009B3734 /* AlertOnboarding.swift in Sources */,
37845A691D994CBA009B3734 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -196,15 +202,24 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -247,15 +262,24 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -291,7 +315,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cookminute.AlertOnboarding;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -304,7 +328,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.cookminute.AlertOnboarding;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions AlertOnboarding.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file added ...eproj/project.xcworkspace/xcuserdata/gabmarfer.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions ...tOnboarding.xcodeproj/xcuserdata/gabmarfer.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>AlertOnboarding.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
</dict>
</plist>
26 changes: 0 additions & 26 deletions AlertOnboarding/AlertChildPageViewController.swift
View file
Open in desktop

This file was deleted.

Loading