Ubuntu One Music App for iOS

Merge lp:~rockstar/ubuntuone-ios-music/remove-playlists into lp:ubuntuone-ios-music

  1. remove-playlists
  2. Merge into trunk
Proposed by Paul Hummer
Status: Merged
Approved by: Paul Hummer
Approved revision: 262
Merged at revision: 254
Proposed branch: lp:~rockstar/ubuntuone-ios-music/remove-playlists
Merge into: lp:ubuntuone-ios-music
Prerequisite: lp:~rockstar/ubuntuone-ios-music/remote-controls
Diff against target: 172 lines (+98/-19)
1 file modified
Music/Storyboard_iPhone.storyboard (+98/-19)
To merge this branch: bzr merge lp:~rockstar/ubuntuone-ios-music/remove-playlists
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+148281@code.launchpad.net

Commit message

Disable playlists (temporarily)

Description of the change

Disable the playlists tab temporarily (the API needs some work, and so it makes no sense to present it when it doesn't really work).

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Music/Storyboard_iPhone.storyboard'
2--- Music/Storyboard_iPhone.storyboard 2013-02-09 03:10:41 +0000
3+++ Music/Storyboard_iPhone.storyboard 2013-02-13 18:49:20 +0000
4@@ -20,7 +20,6 @@
5 <segue destination="4Hc-hN-hrq" kind="relationship" relationship="viewControllers" id="klJ-qc-fFf"/>
6 <segue destination="zZR-vq-p7Z" kind="relationship" relationship="viewControllers" id="bF5-F8-6QW"/>
7 <segue destination="o0z-jC-7D9" kind="relationship" relationship="viewControllers" id="Ewf-uJ-ZyV"/>
8- <segue destination="LSp-29-1PS" kind="relationship" relationship="viewControllers" id="57I-h2-A9b"/>
9 <segue destination="1UW-CE-b1Y" kind="relationship" relationship="viewControllers" id="P7v-9L-Gv7"/>
10 </connections>
11 </tabBarController>
12@@ -633,7 +632,7 @@
13 <objects>
14 <tableViewController storyboardIdentifier="PlaylistsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="3pv-m5-N7g" customClass="PlaylistsViewController" sceneMemberID="viewController">
15 <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="5h4-j3-j1b">
16- <rect key="frame" x="0.0" y="64" width="320" height="367"/>
17+ <rect key="frame" x="0.0" y="64" width="320" height="504"/>
18 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
20 <prototypes>
21@@ -954,22 +953,25 @@
22 </scene>
23 </scenes>
24 <resources>
25- <image name="03-loopback.png" width="16" height="16"/>
26- <image name="05-shuffle.png" width="16" height="16"/>
27- <image name="albums.png" width="16" height="16"/>
28- <image name="artists.png" width="16" height="16"/>
29- <image name="default-album-art-120.png" width="16" height="16"/>
30- <image name="default-album-art-200.png" width="16" height="16"/>
31- <image name="default-album-art-640.png" width="16" height="16"/>
32- <image name="download-grey.png" width="16" height="16"/>
33- <image name="download.png" width="16" height="16"/>
34- <image name="grabber.png" width="16" height="16"/>
35- <image name="player_overlay_bg.png" width="16" height="16"/>
36- <image name="playlists.png" width="16" height="16"/>
37- <image name="settings.png" width="16" height="16"/>
38- <image name="songs.png" width="16" height="16"/>
39+ <image name="03-loopback.png" width="32" height="22"/>
40+ <image name="05-shuffle.png" width="28" height="20"/>
41+ <image name="albums.png" width="30" height="30"/>
42+ <image name="artists.png" width="30" height="30"/>
43+ <image name="default-album-art-120.png" width="60" height="60"/>
44+ <image name="default-album-art-200.png" width="100" height="100"/>
45+ <image name="default-album-art-640.png" width="320" height="320"/>
46+ <image name="download-grey.png" width="28" height="28"/>
47+ <image name="download.png" width="28" height="28"/>
48+ <image name="grabber.png" width="22" height="44"/>
49+ <image name="player_overlay_bg.png" width="320" height="100"/>
50+ <image name="playlists.png" width="30" height="30"/>
51+ <image name="settings.png" width="30" height="30"/>
52+ <image name="songs.png" width="30" height="30"/>
53 </resources>
54 <classes>
55+ <class className="AlbumCell" superclassName="UITableViewCell">
56+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumCell.h"/>
57+ </class>
58 <class className="AlbumViewController" superclassName="UIViewController">
59 <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumViewController.h"/>
60 <relationships>
61@@ -980,16 +982,69 @@
62 <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
63 </relationships>
64 </class>
65- <class className="ArtistViewController">
66+ <class className="AlbumsViewController" superclassName="UOIndexedViewController">
67+ <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumsViewController.h"/>
68+ </class>
69+ <class className="ArtistCell" superclassName="UITableViewCell">
70+ <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistCell.h"/>
71+ </class>
72+ <class className="ArtistViewController" superclassName="UIViewController">
73 <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/>
74 <relationships>
75 <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
76 <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/>
77 <relationship kind="outlet" name="artistName" candidateClass="UILabel"/>
78+ <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
79 <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
80 </relationships>
81 </class>
82- <class className="SettingsAuthenticationViewController">
83+ <class className="ArtistsViewController" superclassName="UOIndexedViewController">
84+ <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistsViewController.h"/>
85+ </class>
86+ <class className="PlayerHeaderView" superclassName="UIView">
87+ <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerHeaderView.h"/>
88+ <relationships>
89+ <relationship kind="outlet" name="album" candidateClass="UILabel"/>
90+ <relationship kind="outlet" name="artist" candidateClass="UILabel"/>
91+ <relationship kind="outlet" name="title" candidateClass="UILabel"/>
92+ </relationships>
93+ </class>
94+ <class className="PlayerViewController" superclassName="UIViewController">
95+ <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerViewController.h"/>
96+ <relationships>
97+ <relationship kind="action" name="changeRepeat:"/>
98+ <relationship kind="action" name="changeShuffle:"/>
99+ <relationship kind="action" name="hide:"/>
100+ <relationship kind="action" name="next:"/>
101+ <relationship kind="action" name="pause:"/>
102+ <relationship kind="action" name="play:"/>
103+ <relationship kind="action" name="previous:"/>
104+ <relationship kind="action" name="toggleExtendedControls:"/>
105+ <relationship kind="outlet" name="albumart" candidateClass="UIButton"/>
106+ <relationship kind="outlet" name="artistLabel" candidateClass="UILabel"/>
107+ <relationship kind="outlet" name="controlBar" candidateClass="UIToolbar"/>
108+ <relationship kind="outlet" name="elapsedTime" candidateClass="UILabel"/>
109+ <relationship kind="outlet" name="extendedControlView" candidateClass="UIView"/>
110+ <relationship kind="outlet" name="nextButton" candidateClass="UIBarButtonItem"/>
111+ <relationship kind="outlet" name="pauseButton" candidateClass="UIBarButtonItem"/>
112+ <relationship kind="outlet" name="playButton" candidateClass="UIBarButtonItem"/>
113+ <relationship kind="outlet" name="playlistInfo" candidateClass="UILabel"/>
114+ <relationship kind="outlet" name="previousButton" candidateClass="UIBarButtonItem"/>
115+ <relationship kind="outlet" name="progressView" candidateClass="UISlider"/>
116+ <relationship kind="outlet" name="reflectionImage" candidateClass="UIImageView"/>
117+ <relationship kind="outlet" name="repeatButton" candidateClass="UIButton"/>
118+ <relationship kind="outlet" name="shuffleButton" candidateClass="UIButton"/>
119+ <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
120+ <relationship kind="outlet" name="totalTime" candidateClass="UILabel"/>
121+ </relationships>
122+ </class>
123+ <class className="PlaylistCell" superclassName="UITableViewCell">
124+ <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistCell.h"/>
125+ </class>
126+ <class className="PlaylistsViewController" superclassName="UOIndexedViewController">
127+ <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistsViewController.h"/>
128+ </class>
129+ <class className="SettingsAuthenticationViewController" superclassName="UIViewController">
130 <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/>
131 <relationships>
132 <relationship kind="action" name="authenticate:"/>
133@@ -999,7 +1054,7 @@
134 <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/>
135 </relationships>
136 </class>
137- <class className="SettingsViewController">
138+ <class className="SettingsViewController" superclassName="UITableViewController">
139 <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/>
140 <relationships>
141 <relationship kind="action" name="deleteCaches:"/>
142@@ -1010,6 +1065,30 @@
143 <relationship kind="outlet" name="versionNumber" candidateClass="UILabel"/>
144 </relationships>
145 </class>
146+ <class className="SongCell" superclassName="UITableViewCell">
147+ <source key="sourceIdentifier" type="project" relativePath="./Classes/SongCell.h"/>
148+ <relationships>
149+ <relationship kind="outlet" name="cacheImageIndicator" candidateClass="UIImageView"/>
150+ <relationship kind="outlet" name="cacheIndicator" candidateClass="UIView"/>
151+ <relationship kind="outlet" name="clock" candidateClass="UILabel"/>
152+ <relationship kind="outlet" name="handle" candidateClass="UIImageView"/>
153+ <relationship kind="outlet" name="title" candidateClass="UILabel"/>
154+ <relationship kind="outlet" name="topView" candidateClass="UIView"/>
155+ <relationship kind="outlet" name="track" candidateClass="UILabel"/>
156+ </relationships>
157+ </class>
158+ <class className="SongListCell" superclassName="UITableViewCell">
159+ <source key="sourceIdentifier" type="project" relativePath="./Classes/SongListCell.h"/>
160+ </class>
161+ <class className="SongsViewController" superclassName="UOIndexedViewController">
162+ <source key="sourceIdentifier" type="project" relativePath="./Classes/SongsViewController.h"/>
163+ </class>
164+ <class className="UOIndexedViewController" superclassName="UITableViewController">
165+ <source key="sourceIdentifier" type="project" relativePath="./Classes/UOIndexedViewController.h"/>
166+ <relationships>
167+ <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
168+ </relationships>
169+ </class>
170 </classes>
171 <simulatedMetricsContainer key="defaultSimulatedMetrics">
172 <simulatedStatusBarMetrics key="statusBar"/>

Subscribers

People subscribed via source and target branches