Changeset 86f2f30 in orbit for iOS

Timestamp:

10/22/13 12:06:38 (6 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

e59da66

Parents:

8f73bed

Message:

• Status images updated with new Orbit images

Location:

iOS/Orbit

Files:

• .DS_Store (modified) (previous)
• Orbit/en.lproj/MainStoryboard.storyboard (modified) (2 diffs)
• orbit.xcodeproj/project.pbxproj (modified) (8 diffs)
• status_0.png (modified) (previous)
• status_0@2x.png (modified) (previous)
• status_1.png (modified) (previous)
• status_1@2x.png (modified) (previous)
• status_1_connecting.png (deleted)
• status_2.png (modified) (previous)
• status_2@2x.png (modified) (previous)
• status_2_connected.png (deleted)
• status_3.png (modified) (previous)
• status_3@2x.png (modified) (previous)
• status_3_processing.png (deleted)
• status_4.png (modified) (previous)
• status_4@2x.png (modified) (previous)
• status_4_active.png (deleted)
• status_default.png (deleted)

iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

@@ -373 +373 @@
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="status_default.png" id="aa9-oz-0Qj">
+                                    <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="status_0.png" id="aa9-oz-0Qj">
                                         <rect key="frame" x="5" y="32" width="300" height="66"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
@@ -469 +469 @@
     </scenes>
     <resources>
-        <image name="status_default.png" width="1080" height="216"/>
+        <image name="status_0.png" width="1080" height="216"/>
         <image name="tab_advanced-30x30.png" width="30" height="30"/>
         <image name="tab_flight-30x30.png" width="30" height="30"/>

iOS/Orbit/orbit.xcodeproj/project.pbxproj

@@ -61 +61 @@
                 5270753917CEC8CF00476875 /* DroidSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */; };
                 5270753A17CEC8CF00476875 /* DroidSans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5270753717CEC8CF00476875 /* DroidSans.ttf */; };
-                527B4FFA1816612900081A44 /* status_1_connecting.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF51816612900081A44 /* status_1_connecting.png */; };
-                527B4FFB1816612900081A44 /* status_2_connected.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF61816612900081A44 /* status_2_connected.png */; };
-                527B4FFC1816612900081A44 /* status_3_processing.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF71816612900081A44 /* status_3_processing.png */; };
-                527B4FFD1816612900081A44 /* status_4_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF81816612900081A44 /* status_4_active.png */; };
-                527B4FFE1816612900081A44 /* status_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF91816612900081A44 /* status_default.png */; };
                 5286861517CAA8E800956FA9 /* step05-2.html in Resources */ = {isa = PBXBuildFile; fileRef = 5286861417CAA8E800956FA9 /* step05-2.html */; };
                 5286861B17CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */; };
@@ -183 +178 @@
                 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DroidSans-Bold.ttf"; sourceTree = "<group>"; };
                 5270753717CEC8CF00476875 /* DroidSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = DroidSans.ttf; sourceTree = "<group>"; };
-                527B4FF51816612900081A44 /* status_1_connecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_1_connecting.png; sourceTree = "<group>"; };
-                527B4FF61816612900081A44 /* status_2_connected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_2_connected.png; sourceTree = "<group>"; };
-                527B4FF71816612900081A44 /* status_3_processing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_3_processing.png; sourceTree = "<group>"; };
-                527B4FF81816612900081A44 /* status_4_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_4_active.png; sourceTree = "<group>"; };
-                527B4FF91816612900081A44 /* status_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_default.png; sourceTree = "<group>"; };
                 5286861417CAA8E800956FA9 /* step05-2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step05-2.html"; path = "tutorial/step05-2.html"; sourceTree = "<group>"; };
                 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tutorial-02-charging-usb-lit.jpg"; sourceTree = "<group>"; };
@@ -463 +453 @@
                         isa = PBXGroup;
                         children = (
-                                527B4FF51816612900081A44 /* status_1_connecting.png */,
-                                527B4FF61816612900081A44 /* status_2_connected.png */,
-                                527B4FF71816612900081A44 /* status_3_processing.png */,
-                                527B4FF81816612900081A44 /* status_4_active.png */,
-                                527B4FF91816612900081A44 /* status_default.png */,
                                 5255A28E17CAEA1C00AD4349 /* tab_welcome-30x30.png */,
                                 5255A28F17CAEA1C00AD4349 /* tab_welcome-60x60.png */,
@@ -691 +676 @@
                                 2843FE8F1790205900C79D56 /* status_4.png in Resources */,
                                 2843FE901790205900C79D56 /* status_4@2x.png in Resources */,
-                                527B4FFC1816612900081A44 /* status_3_processing.png in Resources */,
                                 52E3302D17AE9A8B00671D06 /* tutorial-04-headset.jpg in Resources */,
                                 52E3302E17AE9A8B00671D06 /* index.html in Resources */,
@@ -697 +681 @@
                                 52E3303017AE9A8B00671D06 /* step04-1.html in Resources */,
                                 52E3303117AE9A8B00671D06 /* step05-1.html in Resources */,
-                                527B4FFD1816612900081A44 /* status_4_active.png in Resources */,
                                 52E3303217AE9A8B00671D06 /* step06-1.html in Resources */,
                                 52E3303317AE9A8B00671D06 /* step07-1.html in Resources */,
@@ -738 +721 @@
                                 5286861F17CAB03100956FA9 /* tutorial-09-flight-transmit-on.jpg in Resources */,
                                 5255A29017CAEA1C00AD4349 /* tab_welcome-30x30.png in Resources */,
-                                527B4FFA1816612900081A44 /* status_1_connecting.png in Resources */,
                                 5255A29117CAEA1C00AD4349 /* tab_welcome-60x60.png in Resources */,
                                 5255A29817CAF65800AD4349 /* tab_flight-30x30.png in Resources */,
@@ -746 +728 @@
                                 5255A2A017CB070B00AD4349 /* tab_support-30x30.png in Resources */,
                                 5255A2A117CB070B00AD4349 /* tab_support-60x60.png in Resources */,
-                                527B4FFE1816612900081A44 /* status_default.png in Resources */,
                                 5270752217CD7A7000476875 /* tutorial-07-acquiring_a_clean_signal.gif in Resources */,
                                 5270752417CD7C9400476875 /* step07-2.html in Resources */,
@@ -760 +741 @@
                                 5270753A17CEC8CF00476875 /* DroidSans.ttf in Resources */,
                                 5266D47117CEDCD900A31E0D /* support.html in Resources */,
-                                527B4FFB1816612900081A44 /* status_2_connected.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;