-colorwheel on settings page, redesigned how the colors are stored, n…

…ow stored RGBA
uacaps · Jun 13, 2014 · c7841ab · c7841ab
1 parent 52eb729
commit c7841ab
Show file tree

Hide file tree

Showing 35 changed files with 3,155 additions and 2,109 deletions.
diff --git a/UniversityPrograms/Podfile b/UniversityPrograms/Podfile
@@ -6,4 +6,4 @@ pod 'Colours'
 pod 'SDWebImage'
 pod 'iOSWebserviceTemplate'
 pod 'MYBlurIntroductionView'
-
+pod 'NKOColorPickerView'
diff --git a/UniversityPrograms/Podfile.lock b/UniversityPrograms/Podfile.lock
@@ -3,6 +3,7 @@ PODS:
   - DateTools (1.2.0)
   - iOSWebserviceTemplate (1.0.0)
   - MYBlurIntroductionView (1.0.3)
+  - NKOColorPickerView (0.2)
   - SDWebImage (3.6):
     - SDWebImage/Core
   - SDWebImage/Core (3.6)
@@ -12,13 +13,15 @@ DEPENDENCIES:
   - DateTools
   - iOSWebserviceTemplate
   - MYBlurIntroductionView
+  - NKOColorPickerView
   - SDWebImage
 
 SPEC CHECKSUMS:
   Colours: 60b2e4dbdf2a0f077a98a07dae1ed18ac3333e21
   DateTools: 1765514cd526b2c2ab491b7747df67e0a82e97c1
   iOSWebserviceTemplate: 24de66e8bebe915c81b116eacff4c9d333bc67b9
   MYBlurIntroductionView: 6caf60805eaa555538aba9e2615820fd6f07cd23
+  NKOColorPickerView: b4d32e1eedfcaeaec890f8301081ee030d49cffd
   SDWebImage: c6989652c1cdf27cbdf3f56957e2030f825af5bc
 
 COCOAPODS: 0.33.1
diff --git a/UniversityPrograms/Pods/BuildHeaders/NKOColorPickerView/NKOColorPickerView.h b/UniversityPrograms/Pods/BuildHeaders/NKOColorPickerView/NKOColorPickerView.h
diff --git a/UniversityPrograms/Pods/Headers/NKOColorPickerView/NKOColorPickerView.h b/UniversityPrograms/Pods/Headers/NKOColorPickerView/NKOColorPickerView.h
diff --git a/UniversityPrograms/Pods/Manifest.lock b/UniversityPrograms/Pods/Manifest.lock
diff --git a/UniversityPrograms/Pods/NKOColorPickerView/Assets/nko_brightness_guide.png b/UniversityPrograms/Pods/NKOColorPickerView/Assets/nko_brightness_guide.png
diff --git a/UniversityPrograms/Pods/NKOColorPickerView/Assets/[email protected] b/UniversityPrograms/Pods/NKOColorPickerView/Assets/[email protected]
diff --git a/UniversityPrograms/Pods/NKOColorPickerView/Assets/nko_colormap.png b/UniversityPrograms/Pods/NKOColorPickerView/Assets/nko_colormap.png
diff --git a/UniversityPrograms/Pods/NKOColorPickerView/NKOColorPickerView.h b/UniversityPrograms/Pods/NKOColorPickerView/NKOColorPickerView.h