Merge pull request #101 from elaewin/erica-refactorConversionMethods

Erica refactor conversion methods
elaewin · May 2, 2017 · 992f8d7 · 992f8d7
2 parents 9ecc96a + c3f7af3
commit 992f8d7
Show file tree

Hide file tree

Showing 62 changed files with 390 additions and 165 deletions.
diff --git a/CFuWx.xcodeproj/project.pbxproj b/CFuWx.xcodeproj/project.pbxproj
@@ -398,7 +398,7 @@
 		555FA1F01E06FE680036FC1E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = "Erica Winberry";
 				TargetAttributes = {
 					555FA1F71E06FE680036FC1E = {
@@ -628,6 +628,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};

diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected] b/CFuWx/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/CFuWx/Assets.xcassets/cfuwx-icon.imageset/Contents.json b/CFuWx/Assets.xcassets/cfuwx-icon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "cfuwx-icon.jpg",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/cfuwx-icon.imageset/cfuwx-icon.jpg b/CFuWx/Assets.xcassets/cfuwx-icon.imageset/cfuwx-icon.jpg
diff --git a/CFuWx/Assets.xcassets/clear-day-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/clear-day-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "clear-day-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/clear-day-photo.imageset/clear-day-photo.jpg b/CFuWx/Assets.xcassets/clear-day-photo.imageset/clear-day-photo.jpg
diff --git a/CFuWx/Assets.xcassets/clear-night-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/clear-night-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "clear-night-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/clear-night-photo.imageset/clear-night-photo.jpg b/CFuWx/Assets.xcassets/clear-night-photo.imageset/clear-night-photo.jpg
diff --git a/CFuWx/Assets.xcassets/cloudy-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/cloudy-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "cloudy-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/cloudy-photo.imageset/cloudy-photo.jpg b/CFuWx/Assets.xcassets/cloudy-photo.imageset/cloudy-photo.jpg
diff --git a/CFuWx/Assets.xcassets/fog-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/fog-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "fog-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/fog-photo.imageset/fog-photo.jpg b/CFuWx/Assets.xcassets/fog-photo.imageset/fog-photo.jpg
diff --git a/CFuWx/Assets.xcassets/partly-cloudy-day-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/partly-cloudy-day-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "partly-cloudy-day-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/partly-cloudy-day-photo.imageset/partly-cloudy-day-photo.jpg b/CFuWx/Assets.xcassets/partly-cloudy-day-photo.imageset/partly-cloudy-day-photo.jpg
diff --git a/CFuWx/Assets.xcassets/partly-cloudy-night-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/partly-cloudy-night-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "partly-cloudy-night-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...ssets.xcassets/partly-cloudy-night-photo.imageset/partly-cloudy-night-photo.jpg b/...ssets.xcassets/partly-cloudy-night-photo.imageset/partly-cloudy-night-photo.jpg
diff --git a/CFuWx/Assets.xcassets/rain-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/rain-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "rain-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/rain-photo.imageset/rain-photo.jpg b/CFuWx/Assets.xcassets/rain-photo.imageset/rain-photo.jpg
diff --git a/CFuWx/Assets.xcassets/sleet-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/sleet-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "sleet-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/sleet-photo.imageset/sleet-photo.jpg b/CFuWx/Assets.xcassets/sleet-photo.imageset/sleet-photo.jpg
diff --git a/CFuWx/Assets.xcassets/snow-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/snow-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "snow-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/snow-photo.imageset/snow-photo.jpg b/CFuWx/Assets.xcassets/snow-photo.imageset/snow-photo.jpg
diff --git a/CFuWx/Assets.xcassets/wind-photo.imageset/Contents.json b/CFuWx/Assets.xcassets/wind-photo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "wind-photo.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/CFuWx/Assets.xcassets/wind-photo.imageset/wind-photo.jpg b/CFuWx/Assets.xcassets/wind-photo.imageset/wind-photo.jpg
diff --git a/CFuWx/Base.lproj/LaunchScreen.storyboard b/CFuWx/Base.lproj/LaunchScreen.storyboard
@@ -34,7 +34,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.16862745098039217" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstItem="6J5-X7-gl0" firstAttribute="height" secondItem="Ze5-6b-2t3" secondAttribute="height" multiplier="0.7" id="0GI-kk-OfN"/>
                             <constraint firstAttribute="trailing" secondItem="swC-bn-djX" secondAttribute="trailing" constant="16" id="2pv-pc-9IL"/>