ItemHistory: Updated colors

nutritionfactsorg · Mar 9, 2018 · a38a48c · a38a48c
1 parent 34dee46
commit a38a48c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/DailyDozen/DailyDozen/App/Extensions/Colors.swift b/DailyDozen/DailyDozen/App/Extensions/Colors.swift
@@ -18,11 +18,21 @@ extension UIColor {
         return UIColor(red: 174/255, green: 215/255, blue: 142/255, alpha: 1)
     }
 
+    static var yellowColor: UIColor {
+        return UIColor(red: 235/255, green: 193/255, blue: 64/255, alpha: 1)
+    }
+
+    static var darkRedColor: UIColor {
+        return UIColor(red: 198/255, green: 108/255, blue: 108/255, alpha: 1)
+    }
+
     static var lightGrayColor: UIColor {
         return UIColor(red: 213/255, green: 213/255, blue: 213/255, alpha: 1)
     }
 
     static var darkBlueColor: UIColor {
         return UIColor(red: 60/255, green: 66/255, blue: 82/255, alpha: 1)
     }
+
+
 }
diff --git a/DailyDozen/DailyDozen/ItemHistory/Storyboards/ItemHistory.storyboard b/DailyDozen/DailyDozen/ItemHistory/Storyboards/ItemHistory.storyboard
@@ -62,14 +62,17 @@
                                                 <integer key="value" value="0"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="color" keyPath="weekdayTextColor">
-                                                <color key="value" red="0.61308070106486101" green="0.84998680099012891" blue="0.40801264397466824" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <color key="value" white="0.15913340779999999" alpha="1" colorSpace="calibratedWhite"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="color" keyPath="headerTitleColor">
-                                                <color key="value" red="0.49803921569999998" green="0.75294117650000003" blue="0.29803921570000003" alpha="1" colorSpace="calibratedRGB"/>
+                                                <color key="value" white="0.15913340779999999" alpha="1" colorSpace="calibratedWhite"/>
                                             </userDefinedRuntimeAttribute>
                                             <userDefinedRuntimeAttribute type="color" keyPath="titleDefaultColor">
                                                 <color key="value" red="0.23437002300000001" green="0.25768834350000003" blue="0.3199615777" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="color" keyPath="todayColor">
+                                                <color key="value" red="0.77647058823529413" green="0.42352941176470588" blue="0.42352941176470588" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="adv-QC-FQb">
@@ -110,7 +113,7 @@
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ojq-88-gmN">
                                                                 <rect key="frame" x="0.0" y="5" width="10" height="10"/>
-                                                                <color key="backgroundColor" red="0.0" green="0.97680455450000003" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <color key="backgroundColor" red="0.92156862745098034" green="0.75686274509803919" blue="0.25098039215686274" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="10" id="mEh-3z-9Y0"/>
                                                                     <constraint firstAttribute="width" constant="10" id="xW3-Z1-ZnH"/>

diff --git a/DailyDozen/DailyDozen/ItemHistory/Views/DateCell.swift b/DailyDozen/DailyDozen/ItemHistory/Views/DateCell.swift
@@ -44,7 +44,7 @@ class DateCell: FSCalendarCell {
     ///   - maximum: The maximum of states.
     func configure(for count: Int, maximum: Int) {
         if count == maximum {
-            borderView.backgroundColor = UIColor.green
+            borderView.backgroundColor = UIColor.yellowColor
         } else if count > 0 {
             borderView.backgroundColor = UIColor.yellow
         } else {