diff --git a/ProjectClock/AlarmActivationViewController.swift b/ProjectClock/AlarmActivationViewController.swift
index 54a7f7f..4398025 100644
--- a/ProjectClock/AlarmActivationViewController.swift
+++ b/ProjectClock/AlarmActivationViewController.swift
@@ -23,6 +23,9 @@ class AlarmActivationViewController: UIViewController
@IBOutlet weak var rpsView: UIView!
@IBOutlet weak var rpsResult: UILabel!
+ //Shake Outlets
+ @IBOutlet weak var shakeView: UIView!
+
//Other Outlets
@IBOutlet weak var timeLabel: UILabel!
@IBOutlet weak var dateLabel: UILabel!
@@ -55,6 +58,7 @@ class AlarmActivationViewController: UIViewController
//Hide all inactive wakemethods
puzzleView.isHidden = true
rpsView.isHidden = true
+ shakeView.isHidden = true
timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(AlarmActivationViewController.playSound), userInfo: nil, repeats: true)
setAlarmType()
@@ -85,6 +89,9 @@ class AlarmActivationViewController: UIViewController
rpsView.isHidden = false
//Get Choice here
//rpsAction(choice: choice)
+ case "Shake":
+ shakeView.isHidden = false
+ shakeAction()
default:
print("Invalid alarm type")
}
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/120-1.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/120-1.png
new file mode 100644
index 0000000..0338e30
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/120-1.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/120.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 0000000..0338e30
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/152.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 0000000..cc25f40
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/167.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 0000000..3af8026
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/180.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 0000000..fa526ee
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/20.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 0000000..84b8b8f
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/29.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 0000000..14386dd
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/40-1.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/40-1.png
new file mode 100644
index 0000000..056a87b
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/40-1.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/40-2.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/40-2.png
new file mode 100644
index 0000000..056a87b
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/40-2.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/40.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 0000000..056a87b
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/58-1.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/58-1.png
new file mode 100644
index 0000000..c4c386e
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/58-1.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/58.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 0000000..c4c386e
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/60.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 0000000..14cd30b
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/76.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 0000000..ae7a366
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/80-1.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/80-1.png
new file mode 100644
index 0000000..bec56d7
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/80-1.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/80.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 0000000..bec56d7
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/87.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 0000000..90020bf
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/Contents.json b/ProjectClock/Assets.xcassets/AppIcon.appiconset/Contents.json
index 9221b9b..246dc81 100644
--- a/ProjectClock/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ProjectClock/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,91 +1,109 @@
{
"images" : [
{
+ "filename" : "40.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
+ "filename" : "60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
+ "filename" : "58.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
+ "filename" : "87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
+ "filename" : "80.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
+ "filename" : "120.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
+ "filename" : "120-1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
+ "filename" : "180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
+ "filename" : "20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
+ "filename" : "40-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
+ "filename" : "29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
+ "filename" : "58-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
+ "filename" : "40-2.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
+ "filename" : "80-1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
+ "filename" : "76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
+ "filename" : "152.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
+ "filename" : "167.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
+ "filename" : "appstore.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
diff --git a/ProjectClock/Assets.xcassets/AppIcon.appiconset/appstore.png b/ProjectClock/Assets.xcassets/AppIcon.appiconset/appstore.png
new file mode 100644
index 0000000..d498ac0
Binary files /dev/null and b/ProjectClock/Assets.xcassets/AppIcon.appiconset/appstore.png differ
diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard
index 8192974..1c61459 100644
--- a/ProjectClock/Base.lproj/Main.storyboard
+++ b/ProjectClock/Base.lproj/Main.storyboard
@@ -665,6 +665,20 @@
+
+
+
+
+
+
+
+
@@ -748,6 +762,7 @@
+
@@ -880,7 +895,7 @@
-
+
diff --git a/ProjectClock/MathExpressions.swift b/ProjectClock/MathExpressions.swift
index 862caa1..2461525 100644
--- a/ProjectClock/MathExpressions.swift
+++ b/ProjectClock/MathExpressions.swift
@@ -198,6 +198,7 @@ class RPS {
*/
}
+
//Reference: https://youtu.be/XDuchXYiWuE
class Shake {
var motionManager = CMMotionManager()
@@ -214,3 +215,4 @@ class Shake {
}
}
}
+
diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift
index 2705718..1fbfa82 100644
--- a/ProjectClock/Models.swift
+++ b/ProjectClock/Models.swift
@@ -40,6 +40,7 @@ struct WVM: Codable
let wvms = [
WVM(name: "Factor", desc: "Factor a binomial"),
WVM(name: "RPS", desc: "Win a game of rock paper scissors"),
+ WVM(name: "Shake", desc: "Shake your phone... aggresively!"),
//WVM(name: "Smash", desc: "It'll never turn off"),
//WVM(name: "Walk", desc: "Walk a few steps"),
//WVM(name: "Jump", desc: "Make a few jumps")
diff --git a/ProjectClock/NotificationLogic.swift b/ProjectClock/NotificationLogic.swift
index 29a620c..8f801d9 100644
--- a/ProjectClock/NotificationLogic.swift
+++ b/ProjectClock/NotificationLogic.swift
@@ -18,6 +18,10 @@ func jumpAction() {
}
+func shakeAction() {
+
+}
+
func rpsAction(choice: RPS.Choice) -> Bool? {
let rps = RPS()
return rps.playRPS(you: choice, computer: RPS.randomComputerChoice())