spring 18 updates

iosdecal · Feb 14, 2018 · fe3886f · fe3886f
1 parent 5855440
commit fe3886f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/Drummer.xcodeproj/project.pbxproj b/Drummer.xcodeproj/project.pbxproj
@@ -381,7 +381,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = iosdecal.Drummer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -394,7 +393,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = iosdecal.Drummer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;

diff --git a/Drummer/Assets.xcassets/AppIcon.appiconset/Contents.json b/Drummer/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -123,6 +123,11 @@
       "idiom" : "ipad",
       "filename" : "167by167.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Drummer/Base.lproj/Main.storyboard b/Drummer/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,12 +20,6 @@
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HAK-WU-pAF">
-                                <rect key="frame" x="-21" y="65" width="200" height="110"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </stackView>
-                        </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Once you open your storyboard file, drag one 'Button' out from the `Object libra
 
 You can edit how the button looks by opening the `Attributes Inspector`, which can be found in the Utilities sidebar to the right side of the screen. Feel free to customize the button as much as you want, but at minimum, change out the background color so that the buttons are easy to see. 
 
-**Once you complete one button, create 6 others, and add them to your view in the following arrangement.** Since we want each button to play a unique sound, **give each button a unique integer tag from 0 to 6 (you can change a button's tag value using the Attributes Inspector**)
+**Once you complete one button, create 6 others, and add them to your view in the following arrangement.** Since we want each button to play a unique sound, **give each button a unique integer tag from 0 to 6 (you can change a button's tag value using the `Attributes Inspector`**)
 
 ![alt text](/README-images/part2-2.png)
 
@@ -124,7 +124,7 @@ If you implemented the method correctly, tapping on the Segmented Control in you
 
 ## Grading ##
 
-Once you've finished the lab, you can check-off using this form https://goo.gl/forms/OFCeJhQWSZ7Qhaxi2. If you weren't able to finish before 8pm, make sure to let a TA know you attended (do not fill out the google form), and be sure to check-off next week at the beginning of lab.
+Once you've finished the lab, you can check-off using this form https://goo.gl/forms/2tdeDVlWMfREpNV02. If you weren't able to finish before 8pm, make sure to fill in the keyword question, and be sure to check-off next week at the beginning of lab.
 
 We will grade your work based off the following criteria (all requirements must be satisfied to receive credit).