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
1=== modified file 'iSub-Info.plist'
2--- iSub-Info.plist 2011-07-15 19:40:47 +0000
3+++ iSub-Info.plist 2011-07-21 19:01:34 +0000
4@@ -41,7 +41,7 @@
5 </dict>
6 </array>
7 <key>CFBundleVersion</key>
8- <string>19</string>
9+ <string>20</string>
10 <key>LSRequiresIPhoneOS</key>
11 <false/>
12 <key>NSMainNibFile</key>
13
14=== modified file 'view_controllers/UOSSOCredentialsViewController.xib'
15--- view_controllers/UOSSOCredentialsViewController.xib 2011-07-15 18:52:50 +0000
16+++ view_controllers/UOSSOCredentialsViewController.xib 2011-07-21 19:01:34 +0000
17@@ -49,7 +49,7 @@
18 <object class="IBUITextField" id="327454090">
19 <reference key="NSNextResponder" ref="191373211"/>
20 <int key="NSvFlags">292</int>
21- <string key="NSFrame">{{120, 112}, {180, 31}}</string>
22+ <string key="NSFrame">{{120, 64}, {180, 31}}</string>
23 <reference key="NSSuperview" ref="191373211"/>
24 <reference key="NSWindow"/>
25 <reference key="NSNextKeyView" ref="1028176743"/>
26@@ -67,6 +67,11 @@
27 <int key="NSID">2</int>
28 </object>
29 </object>
30+ <object class="NSFont" key="IBUIFont">
31+ <string key="NSName">Helvetica</string>
32+ <double key="NSSize">12</double>
33+ <int key="NSfFlags">16</int>
34+ </object>
35 <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
36 <float key="IBUIMinimumFontSize">17</float>
37 <object class="IBUITextInputTraits" key="IBUITextInputTraits">
38@@ -78,10 +83,10 @@
39 <object class="IBUITextField" id="965235407">
40 <reference key="NSNextResponder" ref="191373211"/>
41 <int key="NSvFlags">292</int>
42- <string key="NSFrame">{{120, 151}, {180, 31}}</string>
43+ <string key="NSFrame">{{120, 103}, {180, 31}}</string>
44 <reference key="NSSuperview" ref="191373211"/>
45 <reference key="NSWindow"/>
46- <reference key="NSNextKeyView" ref="167693937"/>
47+ <reference key="NSNextKeyView" ref="391813410"/>
48 <bool key="IBUIOpaque">NO</bool>
49 <bool key="IBUIClipsSubviews">YES</bool>
50 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
51@@ -104,7 +109,7 @@
52 <object class="IBUILabel" id="522019067">
53 <reference key="NSNextResponder" ref="191373211"/>
54 <int key="NSvFlags">292</int>
55- <string key="NSFrame">{{13, 116}, {101, 21}}</string>
56+ <string key="NSFrame">{{13, 68}, {101, 21}}</string>
57 <reference key="NSSuperview" ref="191373211"/>
58 <reference key="NSWindow"/>
59 <reference key="NSNextKeyView" ref="327454090"/>
60@@ -131,7 +136,7 @@
61 <object class="IBUILabel" id="1028176743">
62 <reference key="NSNextResponder" ref="191373211"/>
63 <int key="NSvFlags">292</int>
64- <string key="NSFrame">{{13, 155}, {101, 21}}</string>
65+ <string key="NSFrame">{{13, 107}, {101, 21}}</string>
66 <reference key="NSSuperview" ref="191373211"/>
67 <reference key="NSWindow"/>
68 <reference key="NSNextKeyView" ref="965235407"/>
69@@ -148,35 +153,10 @@
70 <float key="IBUIMinimumFontSize">10</float>
71 <int key="IBUITextAlignment">2</int>
72 </object>
73- <object class="IBUILabel" id="995330960">
74- <reference key="NSNextResponder" ref="191373211"/>
75- <int key="NSvFlags">292</int>
76- <string key="NSFrame">{{20, 53}, {280, 48}}</string>
77- <reference key="NSSuperview" ref="191373211"/>
78- <reference key="NSWindow"/>
79- <reference key="NSNextKeyView" ref="522019067"/>
80- <bool key="IBUIOpaque">NO</bool>
81- <bool key="IBUIClipsSubviews">YES</bool>
82- <int key="IBUIContentMode">7</int>
83- <bool key="IBUIUserInteractionEnabled">NO</bool>
84- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
85- <string key="IBUIText">You need an Ubuntu One Music account to be able to use this app.</string>
86- <object class="NSFont" key="IBUIFont" id="224075413">
87- <string key="NSName">HelveticaNeue</string>
88- <double key="NSSize">15</double>
89- <int key="NSfFlags">16</int>
90- </object>
91- <reference key="IBUITextColor" ref="377051206"/>
92- <nil key="IBUIHighlightedColor"/>
93- <int key="IBUIBaselineAdjustment">1</int>
94- <float key="IBUIMinimumFontSize">10</float>
95- <int key="IBUINumberOfLines">0</int>
96- <int key="IBUITextAlignment">1</int>
97- </object>
98 <object class="IBUIButton" id="1065737352">
99 <reference key="NSNextResponder" ref="191373211"/>
100 <int key="NSvFlags">292</int>
101- <string key="NSFrame">{{180, 197}, {120, 32}}</string>
102+ <string key="NSFrame">{{180, 149}, {120, 32}}</string>
103 <reference key="NSSuperview" ref="191373211"/>
104 <reference key="NSWindow"/>
105 <reference key="NSNextKeyView" ref="604644946"/>
106@@ -222,7 +202,7 @@
107 <string key="NSFrame">{{69, 11}, {182, 22}}</string>
108 <reference key="NSSuperview" ref="728132244"/>
109 <reference key="NSWindow"/>
110- <reference key="NSNextKeyView" ref="995330960"/>
111+ <reference key="NSNextKeyView"/>
112 <bool key="IBUIOpaque">NO</bool>
113 <bool key="IBUIClipsSubviews">YES</bool>
114 <int key="IBUIContentMode">7</int>
115@@ -266,7 +246,7 @@
116 <object class="IBUIActivityIndicatorView" id="391813410">
117 <reference key="NSNextResponder" ref="191373211"/>
118 <int key="NSvFlags">-2147483356</int>
119- <string key="NSFrame">{{150, 203}, {20, 20}}</string>
120+ <string key="NSFrame">{{150, 155}, {20, 20}}</string>
121 <reference key="NSSuperview" ref="191373211"/>
122 <reference key="NSWindow"/>
123 <reference key="NSNextKeyView" ref="1065737352"/>
124@@ -277,7 +257,7 @@
125 <object class="IBUIImageView" id="604644946">
126 <reference key="NSNextResponder" ref="191373211"/>
127 <int key="NSvFlags">292</int>
128- <string key="NSFrame">{{96, 262}, {128, 128}}</string>
129+ <string key="NSFrame">{{96, 236}, {128, 128}}</string>
130 <reference key="NSSuperview" ref="191373211"/>
131 <reference key="NSWindow"/>
132 <reference key="NSNextKeyView"/>
133@@ -288,27 +268,6 @@
134 <string key="NSResourceName">music_512.png</string>
135 </object>
136 </object>
137- <object class="IBUILabel" id="167693937">
138- <reference key="NSNextResponder" ref="191373211"/>
139- <int key="NSvFlags">292</int>
140- <string key="NSFrame">{{20, 402}, {280, 40}}</string>
141- <reference key="NSSuperview" ref="191373211"/>
142- <reference key="NSWindow"/>
143- <reference key="NSNextKeyView" ref="391813410"/>
144- <bool key="IBUIOpaque">NO</bool>
145- <bool key="IBUIClipsSubviews">YES</bool>
146- <int key="IBUIContentMode">7</int>
147- <bool key="IBUIUserInteractionEnabled">NO</bool>
148- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
149- <string key="IBUIText">Visit one.ubuntu.com to sign up.</string>
150- <reference key="IBUIFont" ref="224075413"/>
151- <reference key="IBUITextColor" ref="377051206"/>
152- <nil key="IBUIHighlightedColor"/>
153- <int key="IBUIBaselineAdjustment">1</int>
154- <float key="IBUIMinimumFontSize">10</float>
155- <int key="IBUINumberOfLines">0</int>
156- <int key="IBUITextAlignment">1</int>
157- </object>
158 </object>
159 <string key="NSFrame">{{0, 20}, {320, 460}}</string>
160 <reference key="NSSuperview"/>
161@@ -398,16 +357,14 @@
162 <reference key="object" ref="191373211"/>
163 <object class="NSMutableArray" key="children">
164 <bool key="EncodedWithXMLCoder">YES</bool>
165+ <reference ref="79561459"/>
166+ <reference ref="604644946"/>
167 <reference ref="327454090"/>
168 <reference ref="965235407"/>
169 <reference ref="522019067"/>
170 <reference ref="1028176743"/>
171- <reference ref="79561459"/>
172 <reference ref="1065737352"/>
173 <reference ref="391813410"/>
174- <reference ref="604644946"/>
175- <reference ref="167693937"/>
176- <reference ref="995330960"/>
177 </object>
178 <reference key="parent" ref="0"/>
179 </object>
180@@ -443,11 +400,6 @@
181 <reference key="parent" ref="191373211"/>
182 </object>
183 <object class="IBObjectRecord">
184- <int key="objectID">10</int>
185- <reference key="object" ref="995330960"/>
186- <reference key="parent" ref="191373211"/>
187- </object>
188- <object class="IBObjectRecord">
189 <int key="objectID">11</int>
190 <reference key="object" ref="1065737352"/>
191 <reference key="parent" ref="191373211"/>
192@@ -485,11 +437,6 @@
193 <reference key="object" ref="282574181"/>
194 <reference key="parent" ref="728132244"/>
195 </object>
196- <object class="IBObjectRecord">
197- <int key="objectID">27</int>
198- <reference key="object" ref="167693937"/>
199- <reference key="parent" ref="191373211"/>
200- </object>
201 </object>
202 </object>
203 <object class="NSMutableDictionary" key="flattenedProperties">
204@@ -500,13 +447,11 @@
205 <string>-2.CustomClassName</string>
206 <string>1.IBEditorWindowLastContentRect</string>
207 <string>1.IBPluginDependency</string>
208- <string>10.IBPluginDependency</string>
209 <string>11.IBPluginDependency</string>
210 <string>15.IBPluginDependency</string>
211 <string>22.IBPluginDependency</string>
212 <string>24.IBPluginDependency</string>
213 <string>26.IBPluginDependency</string>
214- <string>27.IBPluginDependency</string>
215 <string>4.IBPluginDependency</string>
216 <string>5.IBPluginDependency</string>
217 <string>6.IBPluginDependency</string>
218@@ -529,8 +474,6 @@
219 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
220 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
221 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
222- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
223- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
224 </object>
225 </object>
226 <object class="NSMutableDictionary" key="unlocalizedProperties">
227@@ -545,7 +488,7 @@
228 <reference key="dict.values" ref="0"/>
229 </object>
230 <nil key="sourceID"/>
231- <int key="maxID">27</int>
232+ <int key="maxID">28</int>
233 </object>
234 <object class="IBClassDescriber" key="IBDocument.Classes">
235 <object class="NSMutableArray" key="referencedPartialClassDescriptions">

Subscribers

People subscribed via source and target branches