Skip to content

Commit 320b4b2

Browse files
committed
static framework support
1 parent 7e7f7f0 commit 320b4b2

File tree

11 files changed

+269
-43
lines changed

11 files changed

+269
-43
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1+
.*
12
xcuserdata/
23
Assets/
3-
TODO.md

AutoLayoutSwiftExample/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
1515
var window: UIWindow?
1616

1717

18-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
18+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1919
// Override point for customization after application launch.
2020
let splitViewController = self.window!.rootViewController as! UISplitViewController
2121
let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.count-1] as! UINavigationController

AutoLayoutSwiftExample/MasterViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class MasterViewController: UITableViewController {
7575
return true
7676
}
7777

78-
override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
78+
override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
7979
if editingStyle == .delete {
8080
objects.remove(at: indexPath.row)
8181
tableView.deleteRows(at: [indexPath], with: .fade)

AutoLayoutSwiftExample/Views/BasicFlowLayoutExample.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ class BasicFlowLayoutExample: UIView {
3131
self.addSubview(rightView)
3232

3333
let minusButton = UIButton(type: .custom)
34-
minusButton.setTitle("-", for:UIControlState())
35-
minusButton.setTitleColor(RGB(0x0000FF), for:UIControlState())
34+
minusButton.setTitle("-", for:UIControl.State())
35+
minusButton.setTitleColor(RGB(0x0000FF), for:UIControl.State())
3636
minusButton.backgroundColor = UIColor.white
3737
minusButton.addTarget(self, action:#selector(BasicFlowLayoutExample.clickMinusButton), for:.touchUpInside)
3838
leftView.addSubview(minusButton)
3939

4040
let plusButton = UIButton(type: .custom)
41-
plusButton.setTitle("+", for:UIControlState())
42-
plusButton.setTitleColor(RGB(0x0000FF), for:UIControlState())
41+
plusButton.setTitle("+", for:UIControl.State())
42+
plusButton.setTitleColor(RGB(0x0000FF), for:UIControl.State())
4343
plusButton.backgroundColor = UIColor.white
4444
plusButton.addTarget(self, action:#selector(BasicFlowLayoutExample.clickPlusButton), for:.touchUpInside)
4545
rightView.addSubview(plusButton)

AutoLayoutSwiftExample/Views/SwitchLayoutExample.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class SwitchLayoutExample: UIView {
4242
}
4343

4444
let button = UIButton(type: .custom)
45-
button.setTitleColor(UIColor.blue, for:UIControlState())
45+
button.setTitleColor(UIColor.blue, for:UIControl.State())
4646
button.setTitleColor(UIColor.white, for:.highlighted)
47-
button.setTitle("Touch Me", for:UIControlState())
47+
button.setTitle("Touch Me", for:UIControl.State())
4848
button.addTarget(self, action:#selector(SwitchLayoutExample.touchButton), for:.touchUpInside)
4949
yellowView.addSubview(button)
5050
button.VFLFullInstall("X,Y") // center button in superview

AutoLayoutSwiftExample/Views/SystemVisualLayoutExample.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ class SystemVisualLayoutExample: UIView {
6262

6363
func firstExampleView() -> UIView {
6464
let view = UIView()
65-
let button = UIButton(type: UIButtonType.custom)
65+
let button = UIButton(type: UIButton.ButtonType.custom)
6666
button.layer.borderWidth = 1;
6767
button.layer.cornerRadius = 5;
6868
button.backgroundColor = UIColor.blue
6969

7070
let textField = UITextField()
71-
textField.borderStyle = UITextBorderStyle.bezel
71+
textField.borderStyle = UITextField.BorderStyle.bezel
7272
view.addSubview(button)
7373
view.addSubview(textField)
7474

@@ -110,9 +110,9 @@ class SystemVisualLayoutExample: UIView {
110110
func completeLineView() -> UIView {
111111
let view = UIView()
112112
let find = UIButton(type: .system)
113-
find.setTitle("Find", for: UIControlState());
113+
find.setTitle("Find", for: UIControl.State());
114114
let findNext = UIButton(type: .system)
115-
findNext.setTitle("Find Next", for: UIControlState())
115+
findNext.setTitle("Find Next", for: UIControl.State())
116116
let textField = UITextField()
117117
textField.borderStyle = .bezel
118118
view.addSubview(find)

0 commit comments

Comments
 (0)