Skip to content

Convert to Swift 4.2 #16

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
vkaramov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert to Swift 4.2 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions Example/ExpandableTableViewController.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,11 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1000;
TestTargetID = 607FACCF1AFB9204008FA782;
};
};
Expand Down Expand Up @@ -534,7 +534,8 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -549,7 +550,8 @@
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -566,7 +568,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -579,7 +582,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions Example/ExpandableTableViewController.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>
2 changes: 1 addition & 1 deletion Example/ExpandableTableViewController/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
6 changes: 3 additions & 3 deletions Example/ExpandableTableViewController/DemoCells/CommonTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ class CommonTableViewCell: UITableViewCell {

func openArrow(){
UIView.animate(withDuration: 0.25, animations: {
self.arrowIndicatorImageView.transform = CGAffineTransform(rotationAngle: (CGFloat(M_PI) / 180.0)*0.0);
self.arrowIndicatorImageView.transform = CGAffineTransform(rotationAngle: (CGFloat.pi / 180.0)*0.0);
})
}

func closeArrow(){
UIView.animate(withDuration: 0.25, animations: {
self.arrowIndicatorImageView.transform = CGAffineTransform(rotationAngle: (CGFloat(M_PI) / 180.0)*180.0);
self.arrowIndicatorImageView.transform = CGAffineTransform(rotationAngle: (CGFloat.pi / 180.0)*180.0);
})
}

func showSeparator(){
self.separatorInset = UIEdgeInsetsMake(0, self.frame.width, 0, 0);
self.separatorInset = UIEdgeInsets.init(top: 0, left: self.frame.width, bottom: 0, right: 0);
}

func hideSeparator(){
Expand Down
2 changes: 1 addition & 1 deletion Example/ExpandableTableViewController/DemoTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class DemoTableViewController: ExpandableTableViewController, ExpandableTableVie
func expandableTableView(_ expandableTableView: ExpandableTableView, heightForSubRowAtExpandableIndexPath expandableIndexPath: ExpandableIndexPath) -> CGFloat {
switch(expandableIndexPath.row){
case TableViewRows.text.rawValue:
return UITableViewAutomaticDimension
return UITableView.automaticDimension
case TableViewRows.datePicker.rawValue:
return 163.0
case TableViewRows.list.rawValue:
Expand Down
27 changes: 16 additions & 11 deletions Example/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ExpandableTableViewController/Classes/ExpandableTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ open class ExpandableTableViewController: UITableViewController {
}

tableView.beginUpdates()
tableView.insertRows(at: indexesArray, with: UITableViewRowAnimation.middle)
tableView.insertRows(at: indexesArray, with: UITableView.RowAnimation.middle)
tableView.endUpdates()

// Avoids an old-fashioned scrolling to the top when inserting cells and the table view is scrolled.
Expand All @@ -238,7 +238,7 @@ open class ExpandableTableViewController: UITableViewController {
}

tableView.beginUpdates()
tableView.deleteRows(at: indexesArray, with: UITableViewRowAnimation.middle)
tableView.deleteRows(at: indexesArray, with: UITableView.RowAnimation.middle)
tableView.endUpdates()

// Avoids an old-fashioned scrolling to the top when deleting cells and the table view is scrolled.
Expand Down