Ubuntu One Music App for iOS

Merge lp:~urbanape/ubuntuone-ios-music/2.0-resubmission into lp:ubuntuone-ios-music

  1. 2.0-resubmission
  2. Merge into trunk
Proposed by Zachery Bir
Status: Merged
Approved by: Zachery Bir
Approved revision: 201
Merged at revision: 201
Proposed branch: lp:~urbanape/ubuntuone-ios-music/2.0-resubmission
Merge into: lp:ubuntuone-ios-music
Diff against target: 235 lines (+18/-75)
2 files modified
iSub-Info.plist (+1/-1)
view_controllers/UOSSOCredentialsViewController.xib (+17/-74)
To merge this branch: bzr merge lp:~urbanape/ubuntuone-ios-music/2.0-resubmission
Reviewer Review Type Date Requested Status
Jason Foreman (community) Approve
Review via email: mp+68731@code.launchpad.net

Description of the change

Remove all extra verbiage from the login screen.

To post a comment you must log in.
Revision history for this message
Jason Foreman (threeve) wrote :

Unfortunate, but necessary. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'iSub-Info.plist'
--- iSub-Info.plist 2011-07-15 19:40:47 +0000
+++ iSub-Info.plist 2011-07-21 19:01:34 +0000
@@ -41,7 +41,7 @@
41 </dict>41 </dict>
42 </array>42 </array>
43 <key>CFBundleVersion</key>43 <key>CFBundleVersion</key>
44 <string>19</string>44 <string>20</string>
45 <key>LSRequiresIPhoneOS</key>45 <key>LSRequiresIPhoneOS</key>
46 <false/>46 <false/>
47 <key>NSMainNibFile</key>47 <key>NSMainNibFile</key>
4848
=== modified file 'view_controllers/UOSSOCredentialsViewController.xib'
--- view_controllers/UOSSOCredentialsViewController.xib 2011-07-15 18:52:50 +0000
+++ view_controllers/UOSSOCredentialsViewController.xib 2011-07-21 19:01:34 +0000
@@ -49,7 +49,7 @@
49 <object class="IBUITextField" id="327454090">49 <object class="IBUITextField" id="327454090">
50 <reference key="NSNextResponder" ref="191373211"/>50 <reference key="NSNextResponder" ref="191373211"/>
51 <int key="NSvFlags">292</int>51 <int key="NSvFlags">292</int>
52 <string key="NSFrame">{{120, 112}, {180, 31}}</string>52 <string key="NSFrame">{{120, 64}, {180, 31}}</string>
53 <reference key="NSSuperview" ref="191373211"/>53 <reference key="NSSuperview" ref="191373211"/>
54 <reference key="NSWindow"/>54 <reference key="NSWindow"/>
55 <reference key="NSNextKeyView" ref="1028176743"/>55 <reference key="NSNextKeyView" ref="1028176743"/>
@@ -67,6 +67,11 @@
67 <int key="NSID">2</int>67 <int key="NSID">2</int>
68 </object>68 </object>
69 </object>69 </object>
70 <object class="NSFont" key="IBUIFont">
71 <string key="NSName">Helvetica</string>
72 <double key="NSSize">12</double>
73 <int key="NSfFlags">16</int>
74 </object>
70 <bool key="IBUIAdjustsFontSizeToFit">YES</bool>75 <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
71 <float key="IBUIMinimumFontSize">17</float>76 <float key="IBUIMinimumFontSize">17</float>
72 <object class="IBUITextInputTraits" key="IBUITextInputTraits">77 <object class="IBUITextInputTraits" key="IBUITextInputTraits">
@@ -78,10 +83,10 @@
78 <object class="IBUITextField" id="965235407">83 <object class="IBUITextField" id="965235407">
79 <reference key="NSNextResponder" ref="191373211"/>84 <reference key="NSNextResponder" ref="191373211"/>
80 <int key="NSvFlags">292</int>85 <int key="NSvFlags">292</int>
81 <string key="NSFrame">{{120, 151}, {180, 31}}</string>86 <string key="NSFrame">{{120, 103}, {180, 31}}</string>
82 <reference key="NSSuperview" ref="191373211"/>87 <reference key="NSSuperview" ref="191373211"/>
83 <reference key="NSWindow"/>88 <reference key="NSWindow"/>
84 <reference key="NSNextKeyView" ref="167693937"/>89 <reference key="NSNextKeyView" ref="391813410"/>
85 <bool key="IBUIOpaque">NO</bool>90 <bool key="IBUIOpaque">NO</bool>
86 <bool key="IBUIClipsSubviews">YES</bool>91 <bool key="IBUIClipsSubviews">YES</bool>
87 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>92 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -104,7 +109,7 @@
104 <object class="IBUILabel" id="522019067">109 <object class="IBUILabel" id="522019067">
105 <reference key="NSNextResponder" ref="191373211"/>110 <reference key="NSNextResponder" ref="191373211"/>
106 <int key="NSvFlags">292</int>111 <int key="NSvFlags">292</int>
107 <string key="NSFrame">{{13, 116}, {101, 21}}</string>112 <string key="NSFrame">{{13, 68}, {101, 21}}</string>
108 <reference key="NSSuperview" ref="191373211"/>113 <reference key="NSSuperview" ref="191373211"/>
109 <reference key="NSWindow"/>114 <reference key="NSWindow"/>
110 <reference key="NSNextKeyView" ref="327454090"/>115 <reference key="NSNextKeyView" ref="327454090"/>
@@ -131,7 +136,7 @@
131 <object class="IBUILabel" id="1028176743">136 <object class="IBUILabel" id="1028176743">
132 <reference key="NSNextResponder" ref="191373211"/>137 <reference key="NSNextResponder" ref="191373211"/>
133 <int key="NSvFlags">292</int>138 <int key="NSvFlags">292</int>
134 <string key="NSFrame">{{13, 155}, {101, 21}}</string>139 <string key="NSFrame">{{13, 107}, {101, 21}}</string>
135 <reference key="NSSuperview" ref="191373211"/>140 <reference key="NSSuperview" ref="191373211"/>
136 <reference key="NSWindow"/>141 <reference key="NSWindow"/>
137 <reference key="NSNextKeyView" ref="965235407"/>142 <reference key="NSNextKeyView" ref="965235407"/>
@@ -148,35 +153,10 @@
148 <float key="IBUIMinimumFontSize">10</float>153 <float key="IBUIMinimumFontSize">10</float>
149 <int key="IBUITextAlignment">2</int>154 <int key="IBUITextAlignment">2</int>
150 </object>155 </object>
151 <object class="IBUILabel" id="995330960">
152 <reference key="NSNextResponder" ref="191373211"/>
153 <int key="NSvFlags">292</int>
154 <string key="NSFrame">{{20, 53}, {280, 48}}</string>
155 <reference key="NSSuperview" ref="191373211"/>
156 <reference key="NSWindow"/>
157 <reference key="NSNextKeyView" ref="522019067"/>
158 <bool key="IBUIOpaque">NO</bool>
159 <bool key="IBUIClipsSubviews">YES</bool>
160 <int key="IBUIContentMode">7</int>
161 <bool key="IBUIUserInteractionEnabled">NO</bool>
162 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
163 <string key="IBUIText">You need an Ubuntu One Music account to be able to use this app.</string>
164 <object class="NSFont" key="IBUIFont" id="224075413">
165 <string key="NSName">HelveticaNeue</string>
166 <double key="NSSize">15</double>
167 <int key="NSfFlags">16</int>
168 </object>
169 <reference key="IBUITextColor" ref="377051206"/>
170 <nil key="IBUIHighlightedColor"/>
171 <int key="IBUIBaselineAdjustment">1</int>
172 <float key="IBUIMinimumFontSize">10</float>
173 <int key="IBUINumberOfLines">0</int>
174 <int key="IBUITextAlignment">1</int>
175 </object>
176 <object class="IBUIButton" id="1065737352">156 <object class="IBUIButton" id="1065737352">
177 <reference key="NSNextResponder" ref="191373211"/>157 <reference key="NSNextResponder" ref="191373211"/>
178 <int key="NSvFlags">292</int>158 <int key="NSvFlags">292</int>
179 <string key="NSFrame">{{180, 197}, {120, 32}}</string>159 <string key="NSFrame">{{180, 149}, {120, 32}}</string>
180 <reference key="NSSuperview" ref="191373211"/>160 <reference key="NSSuperview" ref="191373211"/>
181 <reference key="NSWindow"/>161 <reference key="NSWindow"/>
182 <reference key="NSNextKeyView" ref="604644946"/>162 <reference key="NSNextKeyView" ref="604644946"/>
@@ -222,7 +202,7 @@
222 <string key="NSFrame">{{69, 11}, {182, 22}}</string>202 <string key="NSFrame">{{69, 11}, {182, 22}}</string>
223 <reference key="NSSuperview" ref="728132244"/>203 <reference key="NSSuperview" ref="728132244"/>
224 <reference key="NSWindow"/>204 <reference key="NSWindow"/>
225 <reference key="NSNextKeyView" ref="995330960"/>205 <reference key="NSNextKeyView"/>
226 <bool key="IBUIOpaque">NO</bool>206 <bool key="IBUIOpaque">NO</bool>
227 <bool key="IBUIClipsSubviews">YES</bool>207 <bool key="IBUIClipsSubviews">YES</bool>
228 <int key="IBUIContentMode">7</int>208 <int key="IBUIContentMode">7</int>
@@ -266,7 +246,7 @@
266 <object class="IBUIActivityIndicatorView" id="391813410">246 <object class="IBUIActivityIndicatorView" id="391813410">
267 <reference key="NSNextResponder" ref="191373211"/>247 <reference key="NSNextResponder" ref="191373211"/>
268 <int key="NSvFlags">-2147483356</int>248 <int key="NSvFlags">-2147483356</int>
269 <string key="NSFrame">{{150, 203}, {20, 20}}</string>249 <string key="NSFrame">{{150, 155}, {20, 20}}</string>
270 <reference key="NSSuperview" ref="191373211"/>250 <reference key="NSSuperview" ref="191373211"/>
271 <reference key="NSWindow"/>251 <reference key="NSWindow"/>
272 <reference key="NSNextKeyView" ref="1065737352"/>252 <reference key="NSNextKeyView" ref="1065737352"/>
@@ -277,7 +257,7 @@
277 <object class="IBUIImageView" id="604644946">257 <object class="IBUIImageView" id="604644946">
278 <reference key="NSNextResponder" ref="191373211"/>258 <reference key="NSNextResponder" ref="191373211"/>
279 <int key="NSvFlags">292</int>259 <int key="NSvFlags">292</int>
280 <string key="NSFrame">{{96, 262}, {128, 128}}</string>260 <string key="NSFrame">{{96, 236}, {128, 128}}</string>
281 <reference key="NSSuperview" ref="191373211"/>261 <reference key="NSSuperview" ref="191373211"/>
282 <reference key="NSWindow"/>262 <reference key="NSWindow"/>
283 <reference key="NSNextKeyView"/>263 <reference key="NSNextKeyView"/>
@@ -288,27 +268,6 @@
288 <string key="NSResourceName">music_512.png</string>268 <string key="NSResourceName">music_512.png</string>
289 </object>269 </object>
290 </object>270 </object>
291 <object class="IBUILabel" id="167693937">
292 <reference key="NSNextResponder" ref="191373211"/>
293 <int key="NSvFlags">292</int>
294 <string key="NSFrame">{{20, 402}, {280, 40}}</string>
295 <reference key="NSSuperview" ref="191373211"/>
296 <reference key="NSWindow"/>
297 <reference key="NSNextKeyView" ref="391813410"/>
298 <bool key="IBUIOpaque">NO</bool>
299 <bool key="IBUIClipsSubviews">YES</bool>
300 <int key="IBUIContentMode">7</int>
301 <bool key="IBUIUserInteractionEnabled">NO</bool>
302 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
303 <string key="IBUIText">Visit one.ubuntu.com to sign up.</string>
304 <reference key="IBUIFont" ref="224075413"/>
305 <reference key="IBUITextColor" ref="377051206"/>
306 <nil key="IBUIHighlightedColor"/>
307 <int key="IBUIBaselineAdjustment">1</int>
308 <float key="IBUIMinimumFontSize">10</float>
309 <int key="IBUINumberOfLines">0</int>
310 <int key="IBUITextAlignment">1</int>
311 </object>
312 </object>271 </object>
313 <string key="NSFrame">{{0, 20}, {320, 460}}</string>272 <string key="NSFrame">{{0, 20}, {320, 460}}</string>
314 <reference key="NSSuperview"/>273 <reference key="NSSuperview"/>
@@ -398,16 +357,14 @@
398 <reference key="object" ref="191373211"/>357 <reference key="object" ref="191373211"/>
399 <object class="NSMutableArray" key="children">358 <object class="NSMutableArray" key="children">
400 <bool key="EncodedWithXMLCoder">YES</bool>359 <bool key="EncodedWithXMLCoder">YES</bool>
360 <reference ref="79561459"/>
361 <reference ref="604644946"/>
401 <reference ref="327454090"/>362 <reference ref="327454090"/>
402 <reference ref="965235407"/>363 <reference ref="965235407"/>
403 <reference ref="522019067"/>364 <reference ref="522019067"/>
404 <reference ref="1028176743"/>365 <reference ref="1028176743"/>
405 <reference ref="79561459"/>
406 <reference ref="1065737352"/>366 <reference ref="1065737352"/>
407 <reference ref="391813410"/>367 <reference ref="391813410"/>
408 <reference ref="604644946"/>
409 <reference ref="167693937"/>
410 <reference ref="995330960"/>
411 </object>368 </object>
412 <reference key="parent" ref="0"/>369 <reference key="parent" ref="0"/>
413 </object>370 </object>
@@ -443,11 +400,6 @@
443 <reference key="parent" ref="191373211"/>400 <reference key="parent" ref="191373211"/>
444 </object>401 </object>
445 <object class="IBObjectRecord">402 <object class="IBObjectRecord">
446 <int key="objectID">10</int>
447 <reference key="object" ref="995330960"/>
448 <reference key="parent" ref="191373211"/>
449 </object>
450 <object class="IBObjectRecord">
451 <int key="objectID">11</int>403 <int key="objectID">11</int>
452 <reference key="object" ref="1065737352"/>404 <reference key="object" ref="1065737352"/>
453 <reference key="parent" ref="191373211"/>405 <reference key="parent" ref="191373211"/>
@@ -485,11 +437,6 @@
485 <reference key="object" ref="282574181"/>437 <reference key="object" ref="282574181"/>
486 <reference key="parent" ref="728132244"/>438 <reference key="parent" ref="728132244"/>
487 </object>439 </object>
488 <object class="IBObjectRecord">
489 <int key="objectID">27</int>
490 <reference key="object" ref="167693937"/>
491 <reference key="parent" ref="191373211"/>
492 </object>
493 </object>440 </object>
494 </object>441 </object>
495 <object class="NSMutableDictionary" key="flattenedProperties">442 <object class="NSMutableDictionary" key="flattenedProperties">
@@ -500,13 +447,11 @@
500 <string>-2.CustomClassName</string>447 <string>-2.CustomClassName</string>
501 <string>1.IBEditorWindowLastContentRect</string>448 <string>1.IBEditorWindowLastContentRect</string>
502 <string>1.IBPluginDependency</string>449 <string>1.IBPluginDependency</string>
503 <string>10.IBPluginDependency</string>
504 <string>11.IBPluginDependency</string>450 <string>11.IBPluginDependency</string>
505 <string>15.IBPluginDependency</string>451 <string>15.IBPluginDependency</string>
506 <string>22.IBPluginDependency</string>452 <string>22.IBPluginDependency</string>
507 <string>24.IBPluginDependency</string>453 <string>24.IBPluginDependency</string>
508 <string>26.IBPluginDependency</string>454 <string>26.IBPluginDependency</string>
509 <string>27.IBPluginDependency</string>
510 <string>4.IBPluginDependency</string>455 <string>4.IBPluginDependency</string>
511 <string>5.IBPluginDependency</string>456 <string>5.IBPluginDependency</string>
512 <string>6.IBPluginDependency</string>457 <string>6.IBPluginDependency</string>
@@ -529,8 +474,6 @@
529 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>474 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
530 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>475 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
531 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>476 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
532 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
533 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
534 </object>477 </object>
535 </object>478 </object>
536 <object class="NSMutableDictionary" key="unlocalizedProperties">479 <object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -545,7 +488,7 @@
545 <reference key="dict.values" ref="0"/>488 <reference key="dict.values" ref="0"/>
546 </object>489 </object>
547 <nil key="sourceID"/>490 <nil key="sourceID"/>
548 <int key="maxID">27</int>491 <int key="maxID">28</int>
549 </object>492 </object>
550 <object class="IBClassDescriber" key="IBDocument.Classes">493 <object class="IBClassDescriber" key="IBDocument.Classes">
551 <object class="NSMutableArray" key="referencedPartialClassDescriptions">494 <object class="NSMutableArray" key="referencedPartialClassDescriptions">

Subscribers

People subscribed via source and target branches