Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b47cde1
pre-pull from master git
djayhsu Jun 26, 2015
86c975c
pre-pull from shared
djayhsu Jun 26, 2015
dc04f67
Merge branch 'master' of https://github.com/TradecraftEngineering/nume
djayhsu Jun 26, 2015
d3536ee
remove submodule
djayhsu Jun 26, 2015
4dd8918
Created Information object class in NumeKit and implemented across ap…
djayhsu Jun 27, 2015
25ca777
refactored loading of four friend profile pics and rating numbers on …
djayhsu Jun 28, 2015
57d02e0
created four friend Users in Model and refactored code accordingly
djayhsu Jun 29, 2015
d2ced7d
Completed round 1 of Code Review
djayhsu Jun 30, 2015
8c4825e
removed user Dictation on social feed
djayhsu Jul 1, 2015
aecda17
imported forward and back image buttons
djayhsu Jul 1, 2015
65052f5
imported Futura font
djayhsu Jul 2, 2015
5e1c64b
completed launch screen with logo
djayhsu Jul 2, 2015
7051e1b
implemented code for switching colors on ratingNumber controller
djayhsu Jul 2, 2015
bb64e76
created profile picture borders on social feed and function that ensu…
djayhsu Jul 2, 2015
47eb4b2
Adjusted margins between numbers and profile pics. Added more space f…
djayhsu Jul 2, 2015
726bd23
adjusted font size and spacing
djayhsu Jul 3, 2015
5f52723
inserted color gradient spectrum
djayhsu Jul 4, 2015
347a1d6
Changed segue type to modal for view controllers
djayhsu Jul 5, 2015
e46fac6
inserted app icon images
djayhsu Jul 10, 2015
cf3032f
changed colors for new color spectrum
djayhsu Jul 10, 2015
fc62625
color and text adjustments on watch
djayhsu Jul 10, 2015
8191cf3
changed background color and inserted new on boarding images
djayhsu Jul 14, 2015
08266da
changed numify logo, page indicator colors, and profile border color
djayhsu Jul 14, 2015
ee51ebe
adjusted location of fb login button
djayhsu Jul 14, 2015
0b6bbdf
switched logo and profile pic locations on iPhone page
djayhsu Jul 14, 2015
678a537
adjusted more font types and colors
djayhsu Jul 14, 2015
f3f4f16
more UI adjustments
djayhsu Jul 14, 2015
b40334c
updated frames
djayhsu Jul 14, 2015
52c6428
changed microphone size
djayhsu Jul 14, 2015
7129878
reversed dot colors for page indicators
djayhsu Jul 14, 2015
30f36aa
changed font to hypatia
djayhsu Jul 14, 2015
a806a07
adjusted image assets
djayhsu Jul 14, 2015
91b4f6c
major autolayout fixes
djayhsu Jul 16, 2015
d75a43b
imported HanziPen-SC font file
djayhsu Jul 16, 2015
782f051
changed bundle display name
djayhsu Jul 24, 2015
ab2ead8
changed bundle name for Apple Watch menu
djayhsu Jul 24, 2015
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
Binary file added 001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed 1.png
Binary file not shown.
Binary file removed 2.png
Binary file not shown.
Binary file removed 3.png
Binary file not shown.
Binary file removed 4.png
Binary file not shown.
Binary file added Hanzipen.ttc
Binary file not shown.
229 changes: 142 additions & 87 deletions Nume WatchKit App/Base.lproj/Interface.storyboard

Large diffs are not rendered by default.

Binary file added Nume WatchKit App/Futura Koyu.ttf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 109 additions & 1 deletion Nume WatchKit App/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,164 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "57x57",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "57x57",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "car",
"size" : "120x120",
"scale" : "1x"
},
{
"size" : "24x24",
"idiom" : "watch",
"scale" : "2x",
"filename" : "AppIcon24x24@2x.png",
"role" : "notificationCenter",
"subtype" : "38mm"
},
{
"size" : "27.5x27.5",
"idiom" : "watch",
"scale" : "2x",
"filename" : "AppIcon27.5x27.5@2x.png",
"role" : "notificationCenter",
"subtype" : "42mm"
},
{
"size" : "29x29",
"idiom" : "watch",
"filename" : "AppIcon29x29@2x.png",
"role" : "companionSettings",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "watch",
"filename" : "AppIcon29x29@3x.png",
"role" : "companionSettings",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "watch",
"scale" : "2x",
"filename" : "AppIcon40x40@2x.png",
"role" : "appLauncher",
"subtype" : "38mm"
},
{
"size" : "44x44",
"idiom" : "watch",
"scale" : "2x",
"filename" : "AppIcon44x44@2x.png",
"role" : "longLook",
"subtype" : "42mm"
},
{
"size" : "86x86",
"idiom" : "watch",
"scale" : "2x",
"filename" : "AppIcon86x86@2x.png",
"role" : "quickLook",
"subtype" : "38mm"
},
{
"size" : "98x98",
"idiom" : "watch",
"scale" : "2x",
"filename" : "AppIcon98x98@2x.png",
"role" : "quickLook",
"subtype" : "42mm"
}
Expand All @@ -59,4 +167,4 @@
"version" : 1,
"author" : "xcode"
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "Microphone.png"
"filename" : "arrowl.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "Microphone-1.png"
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "Microphone-2.png"
"scale" : "3x"
}
],
"info" : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Nume WatchKit App/Images.xcassets/arrowr.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "arrowr.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Nume WatchKit App/Images.xcassets/line.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "line.png"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "microphone.png"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions Nume WatchKit App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Nume</string>
<string>Numify</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>io.github.dhsu210.Nume.watchkitapp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<string>Numify</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>5</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
21 changes: 5 additions & 16 deletions Nume WatchKit Extension/DictationController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,20 @@ class DictationController: WKInterfaceController {
self.user!.userActivity! = input[0] as! String

// Placing dictation text and number rating into NSUserDefaults
let appGroupID = "group.io.github.dhsu210.Nume"
let defaults = NSUserDefaults(suiteName: appGroupID)
defaults!.setValue(self.user!.userNumber, forKey: "userNumberKey")
defaults!.setValue(self.user!.userActivity, forKey: "userActivityKey")
Information.storeRating(self.user!.userNumber! as Int)
Information.storeActivity(self.user!.userActivity! as String)

// Pulls username from logged in FB account on iPhone and sends userRating and userActivity to be posted via iPhone to server
let defaultConnect = NSUserDefaults.standardUserDefaults()
let userDictionary = defaultConnect.dictionaryRepresentation()
// Sends userNumber and userActivity to be posted via iPhone to server
let userDictionary = Information.getDictionary()
NumberNewsfeedController.openParentApplication(userDictionary) {
(replyDictionary, error) -> Void in

if let castedResponseDictionary = replyDictionary as? [String: AnyObject],
responseName = castedResponseDictionary["userNameKey"] as? String
{
self.user.userName = responseName
println("Congratulations, \(responseName) successfully rated a \(self.user!.userNumber!) with '\(self.user!.userActivity!)'")
}
println("Congratulations, \(Information.getName()) successfully rated a \(Information.getRating()) with '\(Information.getActivity())'")
}


self.pushControllerWithName("SocialFeed", context: self.user)
}



}

}
6 changes: 3 additions & 3 deletions Nume WatchKit Extension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>Nume WatchKit Extension</string>
<string>Numify WatchKit Extension</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand All @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<string>5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
Loading