Merge lp:~rockstar/ubuntuone-ios-music/remove-playlists into lp:ubuntuone-ios-music
- remove-playlists
- 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 |
Related bugs: |
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 | 20 | <segue destination="4Hc-hN-hrq" kind="relationship" relationship="viewControllers" id="klJ-qc-fFf"/> | 20 | <segue destination="4Hc-hN-hrq" kind="relationship" relationship="viewControllers" id="klJ-qc-fFf"/> |
6 | 21 | <segue destination="zZR-vq-p7Z" kind="relationship" relationship="viewControllers" id="bF5-F8-6QW"/> | 21 | <segue destination="zZR-vq-p7Z" kind="relationship" relationship="viewControllers" id="bF5-F8-6QW"/> |
7 | 22 | <segue destination="o0z-jC-7D9" kind="relationship" relationship="viewControllers" id="Ewf-uJ-ZyV"/> | 22 | <segue destination="o0z-jC-7D9" kind="relationship" relationship="viewControllers" id="Ewf-uJ-ZyV"/> |
8 | 23 | <segue destination="LSp-29-1PS" kind="relationship" relationship="viewControllers" id="57I-h2-A9b"/> | ||
9 | 24 | <segue destination="1UW-CE-b1Y" kind="relationship" relationship="viewControllers" id="P7v-9L-Gv7"/> | 23 | <segue destination="1UW-CE-b1Y" kind="relationship" relationship="viewControllers" id="P7v-9L-Gv7"/> |
10 | 25 | </connections> | 24 | </connections> |
11 | 26 | </tabBarController> | 25 | </tabBarController> |
12 | @@ -633,7 +632,7 @@ | |||
13 | 633 | <objects> | 632 | <objects> |
14 | 634 | <tableViewController storyboardIdentifier="PlaylistsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="3pv-m5-N7g" customClass="PlaylistsViewController" sceneMemberID="viewController"> | 633 | <tableViewController storyboardIdentifier="PlaylistsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="3pv-m5-N7g" customClass="PlaylistsViewController" sceneMemberID="viewController"> |
15 | 635 | <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"> | 634 | <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"> |
17 | 636 | <rect key="frame" x="0.0" y="64" width="320" height="367"/> | 635 | <rect key="frame" x="0.0" y="64" width="320" height="504"/> |
18 | 637 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 636 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
19 | 638 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | 637 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
20 | 639 | <prototypes> | 638 | <prototypes> |
21 | @@ -954,22 +953,25 @@ | |||
22 | 954 | </scene> | 953 | </scene> |
23 | 955 | </scenes> | 954 | </scenes> |
24 | 956 | <resources> | 955 | <resources> |
39 | 957 | <image name="03-loopback.png" width="16" height="16"/> | 956 | <image name="03-loopback.png" width="32" height="22"/> |
40 | 958 | <image name="05-shuffle.png" width="16" height="16"/> | 957 | <image name="05-shuffle.png" width="28" height="20"/> |
41 | 959 | <image name="albums.png" width="16" height="16"/> | 958 | <image name="albums.png" width="30" height="30"/> |
42 | 960 | <image name="artists.png" width="16" height="16"/> | 959 | <image name="artists.png" width="30" height="30"/> |
43 | 961 | <image name="default-album-art-120.png" width="16" height="16"/> | 960 | <image name="default-album-art-120.png" width="60" height="60"/> |
44 | 962 | <image name="default-album-art-200.png" width="16" height="16"/> | 961 | <image name="default-album-art-200.png" width="100" height="100"/> |
45 | 963 | <image name="default-album-art-640.png" width="16" height="16"/> | 962 | <image name="default-album-art-640.png" width="320" height="320"/> |
46 | 964 | <image name="download-grey.png" width="16" height="16"/> | 963 | <image name="download-grey.png" width="28" height="28"/> |
47 | 965 | <image name="download.png" width="16" height="16"/> | 964 | <image name="download.png" width="28" height="28"/> |
48 | 966 | <image name="grabber.png" width="16" height="16"/> | 965 | <image name="grabber.png" width="22" height="44"/> |
49 | 967 | <image name="player_overlay_bg.png" width="16" height="16"/> | 966 | <image name="player_overlay_bg.png" width="320" height="100"/> |
50 | 968 | <image name="playlists.png" width="16" height="16"/> | 967 | <image name="playlists.png" width="30" height="30"/> |
51 | 969 | <image name="settings.png" width="16" height="16"/> | 968 | <image name="settings.png" width="30" height="30"/> |
52 | 970 | <image name="songs.png" width="16" height="16"/> | 969 | <image name="songs.png" width="30" height="30"/> |
53 | 971 | </resources> | 970 | </resources> |
54 | 972 | <classes> | 971 | <classes> |
55 | 972 | <class className="AlbumCell" superclassName="UITableViewCell"> | ||
56 | 973 | <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumCell.h"/> | ||
57 | 974 | </class> | ||
58 | 973 | <class className="AlbumViewController" superclassName="UIViewController"> | 975 | <class className="AlbumViewController" superclassName="UIViewController"> |
59 | 974 | <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumViewController.h"/> | 976 | <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumViewController.h"/> |
60 | 975 | <relationships> | 977 | <relationships> |
61 | @@ -980,16 +982,69 @@ | |||
62 | 980 | <relationship kind="outlet" name="tableView" candidateClass="UITableView"/> | 982 | <relationship kind="outlet" name="tableView" candidateClass="UITableView"/> |
63 | 981 | </relationships> | 983 | </relationships> |
64 | 982 | </class> | 984 | </class> |
66 | 983 | <class className="ArtistViewController"> | 985 | <class className="AlbumsViewController" superclassName="UOIndexedViewController"> |
67 | 986 | <source key="sourceIdentifier" type="project" relativePath="./Classes/AlbumsViewController.h"/> | ||
68 | 987 | </class> | ||
69 | 988 | <class className="ArtistCell" superclassName="UITableViewCell"> | ||
70 | 989 | <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistCell.h"/> | ||
71 | 990 | </class> | ||
72 | 991 | <class className="ArtistViewController" superclassName="UIViewController"> | ||
73 | 984 | <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/> | 992 | <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/> |
74 | 985 | <relationships> | 993 | <relationships> |
75 | 986 | <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/> | 994 | <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/> |
76 | 987 | <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/> | 995 | <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/> |
77 | 988 | <relationship kind="outlet" name="artistName" candidateClass="UILabel"/> | 996 | <relationship kind="outlet" name="artistName" candidateClass="UILabel"/> |
78 | 997 | <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/> | ||
79 | 989 | <relationship kind="outlet" name="tableView" candidateClass="UITableView"/> | 998 | <relationship kind="outlet" name="tableView" candidateClass="UITableView"/> |
80 | 990 | </relationships> | 999 | </relationships> |
81 | 991 | </class> | 1000 | </class> |
83 | 992 | <class className="SettingsAuthenticationViewController"> | 1001 | <class className="ArtistsViewController" superclassName="UOIndexedViewController"> |
84 | 1002 | <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistsViewController.h"/> | ||
85 | 1003 | </class> | ||
86 | 1004 | <class className="PlayerHeaderView" superclassName="UIView"> | ||
87 | 1005 | <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerHeaderView.h"/> | ||
88 | 1006 | <relationships> | ||
89 | 1007 | <relationship kind="outlet" name="album" candidateClass="UILabel"/> | ||
90 | 1008 | <relationship kind="outlet" name="artist" candidateClass="UILabel"/> | ||
91 | 1009 | <relationship kind="outlet" name="title" candidateClass="UILabel"/> | ||
92 | 1010 | </relationships> | ||
93 | 1011 | </class> | ||
94 | 1012 | <class className="PlayerViewController" superclassName="UIViewController"> | ||
95 | 1013 | <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerViewController.h"/> | ||
96 | 1014 | <relationships> | ||
97 | 1015 | <relationship kind="action" name="changeRepeat:"/> | ||
98 | 1016 | <relationship kind="action" name="changeShuffle:"/> | ||
99 | 1017 | <relationship kind="action" name="hide:"/> | ||
100 | 1018 | <relationship kind="action" name="next:"/> | ||
101 | 1019 | <relationship kind="action" name="pause:"/> | ||
102 | 1020 | <relationship kind="action" name="play:"/> | ||
103 | 1021 | <relationship kind="action" name="previous:"/> | ||
104 | 1022 | <relationship kind="action" name="toggleExtendedControls:"/> | ||
105 | 1023 | <relationship kind="outlet" name="albumart" candidateClass="UIButton"/> | ||
106 | 1024 | <relationship kind="outlet" name="artistLabel" candidateClass="UILabel"/> | ||
107 | 1025 | <relationship kind="outlet" name="controlBar" candidateClass="UIToolbar"/> | ||
108 | 1026 | <relationship kind="outlet" name="elapsedTime" candidateClass="UILabel"/> | ||
109 | 1027 | <relationship kind="outlet" name="extendedControlView" candidateClass="UIView"/> | ||
110 | 1028 | <relationship kind="outlet" name="nextButton" candidateClass="UIBarButtonItem"/> | ||
111 | 1029 | <relationship kind="outlet" name="pauseButton" candidateClass="UIBarButtonItem"/> | ||
112 | 1030 | <relationship kind="outlet" name="playButton" candidateClass="UIBarButtonItem"/> | ||
113 | 1031 | <relationship kind="outlet" name="playlistInfo" candidateClass="UILabel"/> | ||
114 | 1032 | <relationship kind="outlet" name="previousButton" candidateClass="UIBarButtonItem"/> | ||
115 | 1033 | <relationship kind="outlet" name="progressView" candidateClass="UISlider"/> | ||
116 | 1034 | <relationship kind="outlet" name="reflectionImage" candidateClass="UIImageView"/> | ||
117 | 1035 | <relationship kind="outlet" name="repeatButton" candidateClass="UIButton"/> | ||
118 | 1036 | <relationship kind="outlet" name="shuffleButton" candidateClass="UIButton"/> | ||
119 | 1037 | <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/> | ||
120 | 1038 | <relationship kind="outlet" name="totalTime" candidateClass="UILabel"/> | ||
121 | 1039 | </relationships> | ||
122 | 1040 | </class> | ||
123 | 1041 | <class className="PlaylistCell" superclassName="UITableViewCell"> | ||
124 | 1042 | <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistCell.h"/> | ||
125 | 1043 | </class> | ||
126 | 1044 | <class className="PlaylistsViewController" superclassName="UOIndexedViewController"> | ||
127 | 1045 | <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistsViewController.h"/> | ||
128 | 1046 | </class> | ||
129 | 1047 | <class className="SettingsAuthenticationViewController" superclassName="UIViewController"> | ||
130 | 993 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/> | 1048 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/> |
131 | 994 | <relationships> | 1049 | <relationships> |
132 | 995 | <relationship kind="action" name="authenticate:"/> | 1050 | <relationship kind="action" name="authenticate:"/> |
133 | @@ -999,7 +1054,7 @@ | |||
134 | 999 | <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/> | 1054 | <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/> |
135 | 1000 | </relationships> | 1055 | </relationships> |
136 | 1001 | </class> | 1056 | </class> |
138 | 1002 | <class className="SettingsViewController"> | 1057 | <class className="SettingsViewController" superclassName="UITableViewController"> |
139 | 1003 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/> | 1058 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/> |
140 | 1004 | <relationships> | 1059 | <relationships> |
141 | 1005 | <relationship kind="action" name="deleteCaches:"/> | 1060 | <relationship kind="action" name="deleteCaches:"/> |
142 | @@ -1010,6 +1065,30 @@ | |||
143 | 1010 | <relationship kind="outlet" name="versionNumber" candidateClass="UILabel"/> | 1065 | <relationship kind="outlet" name="versionNumber" candidateClass="UILabel"/> |
144 | 1011 | </relationships> | 1066 | </relationships> |
145 | 1012 | </class> | 1067 | </class> |
146 | 1068 | <class className="SongCell" superclassName="UITableViewCell"> | ||
147 | 1069 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SongCell.h"/> | ||
148 | 1070 | <relationships> | ||
149 | 1071 | <relationship kind="outlet" name="cacheImageIndicator" candidateClass="UIImageView"/> | ||
150 | 1072 | <relationship kind="outlet" name="cacheIndicator" candidateClass="UIView"/> | ||
151 | 1073 | <relationship kind="outlet" name="clock" candidateClass="UILabel"/> | ||
152 | 1074 | <relationship kind="outlet" name="handle" candidateClass="UIImageView"/> | ||
153 | 1075 | <relationship kind="outlet" name="title" candidateClass="UILabel"/> | ||
154 | 1076 | <relationship kind="outlet" name="topView" candidateClass="UIView"/> | ||
155 | 1077 | <relationship kind="outlet" name="track" candidateClass="UILabel"/> | ||
156 | 1078 | </relationships> | ||
157 | 1079 | </class> | ||
158 | 1080 | <class className="SongListCell" superclassName="UITableViewCell"> | ||
159 | 1081 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SongListCell.h"/> | ||
160 | 1082 | </class> | ||
161 | 1083 | <class className="SongsViewController" superclassName="UOIndexedViewController"> | ||
162 | 1084 | <source key="sourceIdentifier" type="project" relativePath="./Classes/SongsViewController.h"/> | ||
163 | 1085 | </class> | ||
164 | 1086 | <class className="UOIndexedViewController" superclassName="UITableViewController"> | ||
165 | 1087 | <source key="sourceIdentifier" type="project" relativePath="./Classes/UOIndexedViewController.h"/> | ||
166 | 1088 | <relationships> | ||
167 | 1089 | <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/> | ||
168 | 1090 | </relationships> | ||
169 | 1091 | </class> | ||
170 | 1013 | </classes> | 1092 | </classes> |
171 | 1014 | <simulatedMetricsContainer key="defaultSimulatedMetrics"> | 1093 | <simulatedMetricsContainer key="defaultSimulatedMetrics"> |
172 | 1015 | <simulatedStatusBarMetrics key="statusBar"/> | 1094 | <simulatedStatusBarMetrics key="statusBar"/> |