Skip to content
This repository has been archived by the owner on Oct 15, 2018. It is now read-only.

Added optional functionality for the user to enter a custom gulp - issue #10 #13

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Added optional functionality for the user to enter a custom gulp - issue #10 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
64e1519
Configured build settings for local environment. Changed the bundle i…
Ross-Gibson Jan 28, 2016
107bc72
Corrected tab bar highlight states in the Sketch file.
Ross-Gibson Feb 1, 2016
43c513f
Added initial UI design for a custom Gulp size to the Sketch document.
Ross-Gibson Feb 1, 2016
0eb69e0
Added custom Gulp button to the Storyboard and linked up to the add b…
Ross-Gibson Feb 1, 2016
fb79f35
Made custom-icon exportable as a PDF from the Sketch document.
Ross-Gibson Feb 1, 2016
fd2ce32
Added custom-icon to the asset catalogue and linked to the customButt…
Ross-Gibson Feb 1, 2016
ab10622
Added the key “Constants.Gulp.Custom.key”.
Ross-Gibson Feb 1, 2016
1d0f601
Added comments around the logic of the new “Constants.Gulp.Custom.key”.
Ross-Gibson Feb 1, 2016
d327b1e
Added CustomViewController and UI, to enable custom gulp size entry w…
Ross-Gibson Feb 1, 2016
3206b70
Added CustomViewController class.
Ross-Gibson Feb 1, 2016
b21ab6e
Added a switch to the preferences to enable the custom gulp feature. …
Ross-Gibson Feb 1, 2016
8aa757b
Set the status bar to light throughout the application.
Ross-Gibson Feb 2, 2016
d50dc48
Moved the Drink UI inside of a Stack View and set constraints to prev…
Ross-Gibson Feb 2, 2016
289a473
Resized the custom gulp icon to match the small and big gulp icons, a…
Ross-Gibson Feb 2, 2016
3179f51
Added resized custom-icon to the assets catalogue.
Ross-Gibson Feb 2, 2016
110960b
Localised new strings to Italian (using Google Translate).
Ross-Gibson Feb 2, 2016
dbe71a8
Refactored CustomViewController to reduce duplicate code.
Ross-Gibson Feb 2, 2016
dfa2afe
Updated constraints on the CustomViewController’s view to centre the …
Ross-Gibson Feb 2, 2016
69df90f
Reverted Awarai Studios local environment changes, restoring the proj…
Ross-Gibson Feb 2, 2016
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
2 changes: 2 additions & 0 deletions Gulps WatchKit Extension/ExtensionDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate, WCSessionDelegate {
NSNotificationCenter.defaultCenter().postNotificationName(NotificationContextReceived, object: nil)
self.reloadComplications()
}

// NOTE: The Apple Watch target does not yet support "Constants.Gulp.Custom.key"
}

func reloadComplications() {
Expand Down
8 changes: 6 additions & 2 deletions Gulps.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
65F55F2F1B5942A4008653F2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 65F55F211B592D91008653F2 /* Localizable.strings */; };
65F55F321B5F965F008653F2 /* drop.caf in Resources */ = {isa = PBXBuildFile; fileRef = 65F55F311B5D0A0E008653F2 /* drop.caf */; };
800E72B73F54FA65CABC4BD6 /* Pods_Gulps.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A701E98A87809500CB34BF4 /* Pods_Gulps.framework */; };
9E879C4F1C5FA5CD00AFD0F4 /* CustomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E879C4E1C5FA5CD00AFD0F4 /* CustomViewController.swift */; };
E3F5301FBFEDB00ED6B865BA /* Pods_GulpsToday.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD5FAC2A10E7AFB568C1D91E /* Pods_GulpsToday.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -227,11 +228,12 @@
65F55F1F1B5904B8008653F2 /* FeedbackViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbackViewController.swift; sourceTree = "<group>"; };
65F55F221B592D91008653F2 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
65F55F241B592DA2008653F2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
65F55F261B5938BE008653F2 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Main.strings; sourceTree = "<group>"; };
65F55F281B593A0A008653F2 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Onboarding.strings; sourceTree = "<group>"; };
65F55F2A1B593C16008653F2 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Interface.strings; sourceTree = "<group>"; };
65F55F311B5D0A0E008653F2 /* drop.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = drop.caf; sourceTree = "<group>"; };
8339035B8C2DA7AA7C151C33 /* Pods-GulpsTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsTests/Pods-GulpsTests.release.xcconfig"; sourceTree = "<group>"; };
9E879C4E1C5FA5CD00AFD0F4 /* CustomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomViewController.swift; sourceTree = "<group>"; };
9EF6A8D31C60CF4600C97FDE /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Main.strings; sourceTree = "<group>"; };
BEC10A47E1AB990C16B7DEFC /* Pods_Gulps_WatchKit_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Gulps_WatchKit_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C5FBA99C443A944184AA9213 /* Pods-GulpsToday.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GulpsToday.release.xcconfig"; path = "Pods/Target Support Files/Pods-GulpsToday/Pods-GulpsToday.release.xcconfig"; sourceTree = "<group>"; };
C916E6FEBE9F3B2034FA5E16 /* Pods-Gulps.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Gulps.release.xcconfig"; path = "Pods/Target Support Files/Pods-Gulps/Pods-Gulps.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -357,6 +359,7 @@
children = (
6555BB691B0CB90A00CE436A /* Support */,
6537A8211AF24CC800EC16E9 /* DrinkViewController.swift */,
9E879C4E1C5FA5CD00AFD0F4 /* CustomViewController.swift */,
6537A81F1AF24CC800EC16E9 /* CalendarViewController.swift */,
6537A8281AF24CC800EC16E9 /* SettingsViewController.swift */,
65F55F1F1B5904B8008653F2 /* FeedbackViewController.swift */,
Expand Down Expand Up @@ -955,6 +958,7 @@
65F44C211AF24B440093A3E9 /* AppDelegate.swift in Sources */,
6537A83A1AF24CC800EC16E9 /* NotificationViewController.swift in Sources */,
65C92DA71BB164D100E2DFE7 /* HealthKitHealper.swift in Sources */,
9E879C4F1C5FA5CD00AFD0F4 /* CustomViewController.swift in Sources */,
650DCE651AF3CD4100E12764 /* Constants.swift in Sources */,
6537A8311AF24CC800EC16E9 /* Extensions.swift in Sources */,
6537A8361AF24CC800EC16E9 /* DrinkViewController.swift in Sources */,
Expand Down Expand Up @@ -1047,7 +1051,7 @@
isa = PBXVariantGroup;
children = (
65F44C251AF24B440093A3E9 /* Base */,
65F55F261B5938BE008653F2 /* it */,
9EF6A8D31C60CF4600C97FDE /* it */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand Down
2 changes: 2 additions & 0 deletions Gulps/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WCSessionDelegate {
EntryHandler.sharedHandler.addGulp(NSUserDefaults.groupUserDefaults().doubleForKey(Constants.Gulp.Big.key()))
}
}

// NOTE: We do not currently support a shortcut for the "Constants.Gulp.Custom.key"
}

func session(session: WCSession, didReceiveApplicationContext applicationContext: [String : AnyObject]) {
Expand Down
Loading