diff --git a/ChineseFoodTracker.xcodeproj/project.xcworkspace/xcuserdata/twer.xcuserdatad/UserInterfaceState.xcuserstate b/ChineseFoodTracker.xcodeproj/project.xcworkspace/xcuserdata/twer.xcuserdatad/UserInterfaceState.xcuserstate index 5885bff..12762a2 100644 Binary files a/ChineseFoodTracker.xcodeproj/project.xcworkspace/xcuserdata/twer.xcuserdatad/UserInterfaceState.xcuserstate and b/ChineseFoodTracker.xcodeproj/project.xcworkspace/xcuserdata/twer.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ChineseFoodTracker.xcodeproj/xcuserdata/twer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ChineseFoodTracker.xcodeproj/xcuserdata/twer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..fe2b454 --- /dev/null +++ b/ChineseFoodTracker.xcodeproj/xcuserdata/twer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/ChineseFoodTracker/Assets.xcassets/defaultImage.imageset/Contents.json b/ChineseFoodTracker/Assets.xcassets/defaultImage.imageset/Contents.json new file mode 100644 index 0000000..d585a34 --- /dev/null +++ b/ChineseFoodTracker/Assets.xcassets/defaultImage.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "2-110H12040500-L.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "2-110H12040500-L-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ChineseFoodTracker/Assets.xcassets/icons/Contents.json b/ChineseFoodTracker/Assets.xcassets/icons/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/ChineseFoodTracker/Assets.xcassets/icons/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/Contents.json b/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/Contents.json new file mode 100644 index 0000000..0c5988e --- /dev/null +++ b/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "star-o.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "star-o-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/star-o-1.png b/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/star-o-1.png new file mode 100644 index 0000000..7a36d51 Binary files /dev/null and b/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/star-o-1.png differ diff --git a/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/star-o.png b/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/star-o.png new file mode 100644 index 0000000..7a36d51 Binary files /dev/null and b/ChineseFoodTracker/Assets.xcassets/icons/emptyStar.imageset/star-o.png differ diff --git a/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/Contents.json b/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/Contents.json new file mode 100644 index 0000000..25c5b94 --- /dev/null +++ b/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "star.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "star-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/star-1.png b/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/star-1.png new file mode 100644 index 0000000..d09ee7b Binary files /dev/null and b/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/star-1.png differ diff --git a/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/star.png b/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/star.png new file mode 100644 index 0000000..d09ee7b Binary files /dev/null and b/ChineseFoodTracker/Assets.xcassets/icons/star.imageset/star.png differ diff --git a/ChineseFoodTracker/RatingControl.swift b/ChineseFoodTracker/RatingControl.swift index 36b5102..0271a1a 100644 --- a/ChineseFoodTracker/RatingControl.swift +++ b/ChineseFoodTracker/RatingControl.swift @@ -18,9 +18,16 @@ class RatingControl: UIView { required init(coder aDecoder: NSCoder) { super.init(coder: aDecoder) + let emptyStar = UIImage(named: "emptyStar") + let filledStar = UIImage(named: "star") + for _ in 1...5 { let button = UIButton() - button.backgroundColor = UIColor.redColor() + button.setImage(emptyStar, forState: .Normal) + button.setImage(filledStar, forState: .Selected) + button.setImage(filledStar, forState: [.Selected, .Highlighted]) + + button.adjustsImageWhenHighlighted = false button.addTarget(self, action: "ratingButtonTapped:", forControlEvents: .TouchDown) ratingButtons += [button] addSubview(button) @@ -37,12 +44,19 @@ class RatingControl: UIView { buttonFrame.origin.x = CGFloat(index * (buttonSize + 5)) button.frame = buttonFrame } - + updateButtonSelectionStates() } //MARK: button action func ratingButtonTapped(button: UIButton){ - print("button pressed 🎃😀") - + rating = ratingButtons.indexOf(button)! + 1 + updateButtonSelectionStates() } + + func updateButtonSelectionStates(){ + for(index, button) in ratingButtons.enumerate() { + button.selected = index < rating + } + } + }