diff --git a/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/project.xcworkspace/xcuserdata/jinhuanli.xcuserdatad/UserInterfaceState.xcuserstate b/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/project.xcworkspace/xcuserdata/jinhuanli.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..c181833
Binary files /dev/null and b/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/project.xcworkspace/xcuserdata/jinhuanli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/StopWatch.xcscheme b/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/StopWatch.xcscheme
new file mode 100644
index 0000000..92cca97
--- /dev/null
+++ b/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/StopWatch.xcscheme
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/xcschememanagement.plist b/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..f56998a
--- /dev/null
+++ b/Project 01 - SimpleStopWatch/StopWatch.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,32 @@
+
+
+
+
+ SchemeUserState
+
+ StopWatch.xcscheme
+
+ orderHint
+ 0
+
+
+ SuppressBuildableAutocreation
+
+ 9FEF1CF51C3A23BC00B2C64E
+
+ primary
+
+
+ 9FEF1D0C1C3A23BC00B2C64E
+
+ primary
+
+
+ 9FEF1D171C3A23BC00B2C64E
+
+ primary
+
+
+
+
+
diff --git a/Project 01 - SimpleStopWatch/StopWatch/Base.lproj/Main.storyboard b/Project 01 - SimpleStopWatch/StopWatch/Base.lproj/Main.storyboard
index 9dc7605..1e33abb 100644
--- a/Project 01 - SimpleStopWatch/StopWatch/Base.lproj/Main.storyboard
+++ b/Project 01 - SimpleStopWatch/StopWatch/Base.lproj/Main.storyboard
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
+
+=======
+>>>>>>> allenwong/master
diff --git a/Project 02 - CustomFont/CustomFont.xcodeproj/project.xcworkspace/xcuserdata/jinhuanli.xcuserdatad/UserInterfaceState.xcuserstate b/Project 02 - CustomFont/CustomFont.xcodeproj/project.xcworkspace/xcuserdata/jinhuanli.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..d299f2f
Binary files /dev/null and b/Project 02 - CustomFont/CustomFont.xcodeproj/project.xcworkspace/xcuserdata/jinhuanli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..79216f4
--- /dev/null
+++ b/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/CustomFont.xcscheme b/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/CustomFont.xcscheme
new file mode 100644
index 0000000..05fcc12
--- /dev/null
+++ b/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/CustomFont.xcscheme
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/xcschememanagement.plist b/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..e864785
--- /dev/null
+++ b/Project 02 - CustomFont/CustomFont.xcodeproj/xcuserdata/jinhuanli.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,32 @@
+
+
+
+
+ SchemeUserState
+
+ CustomFont.xcscheme
+
+ orderHint
+ 0
+
+
+ SuppressBuildableAutocreation
+
+ 9F5C11F71C3E58C50047AC8A
+
+ primary
+
+
+ 9F5C120E1C3E58C60047AC8A
+
+ primary
+
+
+ 9F5C12191C3E58C60047AC8A
+
+ primary
+
+
+
+
+
diff --git a/Project 02 - CustomFont/CustomFont/Base.lproj/Main.storyboard b/Project 02 - CustomFont/CustomFont/Base.lproj/Main.storyboard
index 507b01d..d09989b 100644
--- a/Project 02 - CustomFont/CustomFont/Base.lproj/Main.storyboard
+++ b/Project 02 - CustomFont/CustomFont/Base.lproj/Main.storyboard
@@ -1,8 +1,9 @@
-
+
+
@@ -66,14 +67,24 @@
+
+
+
+
+
@@ -87,6 +98,7 @@
+
diff --git a/Project 02 - CustomFont/CustomFont/ViewController.swift b/Project 02 - CustomFont/CustomFont/ViewController.swift
index b92021f..8324359 100644
--- a/Project 02 - CustomFont/CustomFont/ViewController.swift
+++ b/Project 02 - CustomFont/CustomFont/ViewController.swift
@@ -18,9 +18,11 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
@IBOutlet weak var changeFontButton: UIButton!
@IBOutlet weak var fontTableView: UITableView!
+ @IBOutlet weak var currentFontLabel: UILabel!
@IBAction func changeFontDidTouch(sender: AnyObject) {
- fontRowIndex = (fontRowIndex + 1) % 3
+ fontRowIndex = (fontRowIndex + 1) % fontNames.count
+ currentFontLabel.text = "Current Font: \(fontNames[fontRowIndex]); (\(fontRowIndex)/\(fontNames.count))"
fontTableView.reloadData()
}
@@ -38,11 +40,11 @@ class ViewController: UIViewController, UITableViewDelegate, UITableViewDataSour
for family in UIFont.familyNames() {
for font in UIFont.fontNamesForFamilyName(family){
print(font)
+ fontNames.append(font)
}
}
-
changeFontButton.layer.cornerRadius = 55
-
+ currentFontLabel.text = "Current Font: \(fontNames[0]); (0/\(fontNames.count))"
}
func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {