Merge pull request #14 from uclaradio/NewAppIcon

New app icon

UCLA Radio/UCLA Radio.xcodeproj/project.pbxproj

@@ -431,7 +431,7 @@
 				TargetAttributes = {
 					832C65DB1CD0800200B3479E = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = DGUKNK322A;
+						DevelopmentTeam = V4Z45C29H6;
 						LastSwiftMigration = 0800;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
@@ -747,7 +747,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = DGUKNK322A;
+				DEVELOPMENT_TEAM = V4Z45C29H6;
 				INFOPLIST_FILE = "UCLA Radio/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uclastudentmedia.UCLARadio;
@@ -756,7 +756,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "./UCLA Radio/UCLA_Radio-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -768,7 +768,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = DGUKNK322A;
+				DEVELOPMENT_TEAM = V4Z45C29H6;
 				INFOPLIST_FILE = "UCLA Radio/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uclastudentmedia.UCLARadio;
@@ -777,7 +777,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "./UCLA Radio/UCLA_Radio-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

UCLA Radio/UCLA Radio/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,49 +3,49 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@2x-1.png",
+      "filename" : "squarepink_40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@3x-1.png",
+      "filename" : "squarepink_60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@2x.png",
+      "filename" : "squarepink_58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small@3x.png",
+      "filename" : "squarepink_87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-40@2x.png",
+      "filename" : "squarepink_80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-40@3x.png",
+      "filename" : "squarepink_120.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Icon-60@2x.png",
+      "filename" : "squarepink_120-1.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Icon-60@3x.png",
+      "filename" : "squarepink_180.png",
       "scale" : "3x"
     }
   ],

UCLA Radio/UCLA Radio/Assets.xcassets/pinkburst.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "pinkburst.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UCLA Radio/UCLA Radio/Assets.xcassets/radio_banner.imageset/Contents.json

@@ -17,5 +17,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

UCLA Radio/UCLA Radio/Assets.xcassets/radio_banner_black.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radio_banner_black@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radio_banner_black@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UCLA Radio/UCLA Radio/Assets.xcassets/radio_banner_noborder.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "radio_banner_noborder@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

UCLA Radio/UCLA Radio/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -19,14 +22,39 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bear-gold" translatesAutoresizingMaskIntoConstraints="NO" id="JjQ-jf-21g"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="66f-XM-jlV" userLabel="Container View">
+                                <rect key="frame" x="-0.5" y="-0.5" width="375" height="667"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="pinkburst" translatesAutoresizingMaskIntoConstraints="NO" id="2fq-Ke-nMy">
+                                        <rect key="frame" x="-0.5" y="-0.5" width="375" height="667"/>
+                                    </imageView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radio_banner_noborder" translatesAutoresizingMaskIntoConstraints="NO" id="JjQ-jf-21g">
+                                        <rect key="frame" x="19.5" y="47" width="335" height="335"/>
+                                        <color key="tintColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" secondItem="JjQ-jf-21g" secondAttribute="height" multiplier="1:1" id="Xnq-ee-nwy"/>
+                                        </constraints>
+                                    </imageView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="2fq-Ke-nMy" firstAttribute="centerX" secondItem="66f-XM-jlV" secondAttribute="centerX" id="0tj-Om-lh1"/>
+                                    <constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="840-wS-Fcs"/>
+                                    <constraint firstItem="2fq-Ke-nMy" firstAttribute="height" secondItem="66f-XM-jlV" secondAttribute="height" id="Mqb-MN-0uX"/>
+                                    <constraint firstItem="2fq-Ke-nMy" firstAttribute="width" secondItem="66f-XM-jlV" secondAttribute="width" id="Tzt-Ac-Wdz"/>
+                                    <constraint firstItem="2fq-Ke-nMy" firstAttribute="centerY" secondItem="66f-XM-jlV" secondAttribute="centerY" id="W3g-UH-kAX"/>
+                                    <constraint firstItem="JjQ-jf-21g" firstAttribute="width" secondItem="66f-XM-jlV" secondAttribute="width" constant="-40" id="dI8-tc-obp"/>
+                                    <constraint firstItem="JjQ-jf-21g" firstAttribute="centerX" secondItem="66f-XM-jlV" secondAttribute="centerX" id="s36-47-OGd"/>
+                                    <constraint firstItem="JjQ-jf-21g" firstAttribute="top" secondItem="66f-XM-jlV" secondAttribute="top" constant="47" id="yEy-ci-vMM"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" red="0.16862745098039217" green="0.5490196078431373" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="JjQ-jf-21g" firstAttribute="height" secondItem="Ze5-6b-2t3" secondAttribute="height" multiplier="3:5" id="3ZU-hG-MPr"/>
-                            <constraint firstItem="JjQ-jf-21g" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="9IT-6X-T7x"/>
-                            <constraint firstItem="JjQ-jf-21g" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="HSa-Qr-kFy"/>
-                            <constraint firstItem="JjQ-jf-21g" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="4:5" id="YWt-vN-crX"/>
+                            <constraint firstItem="66f-XM-jlV" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4Ii-3E-0XE"/>
+                            <constraint firstItem="66f-XM-jlV" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="RQM-lm-4G2"/>
+                            <constraint firstItem="66f-XM-jlV" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" priority="999" id="lMH-oL-mFf"/>
+                            <constraint firstItem="66f-XM-jlV" firstAttribute="height" secondItem="Ze5-6b-2t3" secondAttribute="height" id="nSz-UY-u1L"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -36,6 +64,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="bear-gold" width="721" height="721"/>
+        <image name="pinkburst" width="16" height="16"/>
+        <image name="radio_banner_noborder" width="16" height="16"/>
     </resources>
 </document>

UCLA Radio/UCLA Radio/Base.lproj/Main.storyboard

@@ -111,7 +111,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cim-tj-Ljo" customClass="DesignableLabel" customModule="UCLA_Radio" customModuleProvider="target">
-                                                <rect key="frame" x="20" y="80" width="335" height="139"/>
+                                                <rect key="frame" x="20" y="80" width="335" height="143.5"/>
                                                 <string key="text">UCLA Radio is a completely student-run organization offering cultural content created by 100+ DJs. Please direct any feedback to the web department at radio.web@media.ucla.edu
 
 Follow @uclaradio on social media!</string>
@@ -123,7 +123,7 @@ Follow @uclaradio on social media!</string>
                                                 </userDefinedRuntimeAttributes>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleAspectFit" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="cc9-sz-B5m">
-                                                <rect key="frame" x="45" y="239" width="285" height="60"/>
+                                                <rect key="frame" x="45" y="243.5" width="285" height="60"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9h7-JI-paf">
                                                         <rect key="frame" x="0.0" y="0.0" width="60" height="60"/>
@@ -259,6 +259,7 @@ Follow @uclaradio on social media!</string>
                                     </imageView>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="AEg-ei-x8z">
                                         <rect key="frame" x="20" y="47" width="335" height="335"/>
+                                        <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="AEg-ei-x8z" secondAttribute="height" multiplier="1:1" id="ncc-B7-WDO"/>
                                         </constraints>
@@ -415,7 +416,7 @@ Follow @uclaradio on social media!</string>
                                                                 </constraints>
                                                             </imageView>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Day Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wug-EO-bPi">
-                                                                <rect key="frame" x="37" y="8" width="85" height="20"/>
+                                                                <rect key="frame" x="37" y="7" width="85" height="20"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="85" id="8vW-y1-fqr"/>
                                                                 </constraints>
@@ -435,7 +436,7 @@ Follow @uclaradio on social media!</string>
                                                         </constraints>
                                                     </view>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Genre" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cue-Gc-Mmx">
-                                                        <rect key="frame" x="289" y="23" width="46" height="20"/>
+                                                        <rect key="frame" x="289" y="22" width="46" height="20"/>
                                                         <fontDescription key="fontDescription" name="Apercu-Regular" family="Apercu" pointSize="16"/>
                                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>

UCLA Radio/UCLA Radio/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2</string>
+	<string>2.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>10</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>instagram</string>