podbird

Merge lp:~nik90/podbird/new-design-part1 into lp:podbird/devel

  1. new-design-part1
  2. Merge into devel
Proposed by Nekhelesh Ramananthan
Status: Merged
Merged at revision: 123
Proposed branch: lp:~nik90/podbird/new-design-part1
Merge into: lp:podbird/devel
Diff against target: 506 lines (+116/-127)
7 files modified
app/components/HeaderListItem.qml (+2/-0)
app/components/SingleValueListItem.qml (+3/-0)
app/themes/Dark.qml (+3/-3)
app/themes/Light.qml (+3/-3)
app/ui/EpisodesPage.qml (+67/-78)
app/ui/EpisodesTab.qml (+11/-16)
po/podbird.nik90.pot (+27/-27)
To merge this branch: bzr merge lp:~nik90/podbird/new-design-part1
Reviewer Review Type Date Requested Status
Podbird Developers Pending
Review via email: mp+288215@code.launchpad.net

Commit message

- Implemented part of the new design spec [1].
- Fixed the episode description color in dialogs
- Changed button colors to match the new SDK palette colors

[1] https://drive.google.com/file/d/0B8NjAHEq9cvEY2VZb1lGczRKMVE/view

Description of the change

Implement part of the new design spec [1]. Also fixed the episode description color in dialogs.

[1] https://drive.google.com/file/d/0B8NjAHEq9cvEY2VZb1lGczRKMVE/view

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/HeaderListItem.qml'
2--- app/components/HeaderListItem.qml 2016-03-04 10:40:54 +0000
3+++ app/components/HeaderListItem.qml 2016-03-06 12:22:11 +0000
4@@ -25,6 +25,8 @@
5 property alias title: headerText.title
6
7 height: headerText.height + divider.height
8+ divider.anchors.leftMargin: units.gu(2)
9+ divider.anchors.rightMargin: units.gu(2)
10
11 ListItemLayout {
12 id: headerText
13
14=== modified file 'app/components/SingleValueListItem.qml'
15--- app/components/SingleValueListItem.qml 2016-03-04 10:40:54 +0000
16+++ app/components/SingleValueListItem.qml 2016-03-06 12:22:11 +0000
17@@ -25,6 +25,9 @@
18 property alias title: customItemLayout.title
19 property alias value: _value.text
20
21+ divider.anchors.leftMargin: units.gu(2)
22+ divider.anchors.rightMargin: units.gu(2)
23+
24 ListItemLayout {
25 id: customItemLayout
26
27
28=== modified file 'app/themes/Dark.qml'
29--- app/themes/Dark.qml 2016-03-04 10:40:54 +0000
30+++ app/themes/Dark.qml 2016-03-06 12:22:11 +0000
31@@ -33,9 +33,9 @@
32 property color baseIcon: "White"
33
34 // Button Colors
35- property color positiveActionButton: UbuntuColors.green
36- property color negativeActionButton: UbuntuColors.red
37- property color neutralActionButton: UbuntuColors.coolGrey
38+ property color positiveActionButton: "#3EB34F" // UbuntuColors.green
39+ property color negativeActionButton: "#ED3146" // UbuntuColors.red
40+ property color neutralActionButton: "#5D5D5D" // UbuntuColors.coolGrey
41
42 // Bottom Player Bar Colors
43 property color bottomBarBackground: "#15141A"
44
45=== modified file 'app/themes/Light.qml'
46--- app/themes/Light.qml 2016-03-04 10:40:54 +0000
47+++ app/themes/Light.qml 2016-03-06 12:22:11 +0000
48@@ -33,9 +33,9 @@
49 property color baseIcon: UbuntuColors.darkGrey
50
51 // Button Colors
52- property color positiveActionButton: UbuntuColors.green
53- property color negativeActionButton: UbuntuColors.red
54- property color neutralActionButton: UbuntuColors.coolGrey
55+ property color positiveActionButton: "#3EB34F" // UbuntuColors.green
56+ property color negativeActionButton: "#ED3146" // UbuntuColors.red
57+ property color neutralActionButton: "#5D5D5D" // UbuntuColors.coolGrey
58
59 // Bottom Player Bar Colors
60 property color bottomBarBackground: "#323435"
61
62=== modified file 'app/ui/EpisodesPage.qml'
63--- app/ui/EpisodesPage.qml 2016-03-05 20:10:55 +0000
64+++ app/ui/EpisodesPage.qml 2016-03-06 12:22:11 +0000
65@@ -19,7 +19,6 @@
66 import QtQuick 2.4
67 import QtMultimedia 5.4
68 import Ubuntu.Components 1.3
69-import QtQuick.Layouts 1.1
70 import QtQuick.LocalStorage 2.0
71 import Ubuntu.DownloadManager 0.1
72 import Ubuntu.Components.Popups 1.3
73@@ -226,7 +225,6 @@
74 Label {
75 width: parent.width
76 wrapMode: Text.WordWrap
77- color: podbird.appTheme.baseText
78 linkColor: "Blue"
79 text: dialogInternal.description
80 onLinkActivated: Qt.openUrlExternally(link)
81@@ -278,7 +276,7 @@
82 : RegExp("", "gi")
83 }
84
85- UbuntuListView {
86+ ListView {
87 id: episodeList
88
89 Component.onCompleted: {
90@@ -291,76 +289,97 @@
91
92 anchors.fill: parent
93 model: sortedEpisodeModel
94- currentIndex: -1
95 clip: true
96
97 header: Column {
98- height: blurredBackground.height + modeTabs.height + units.gu(2)
99- spacing: units.gu(2)
100- BlurredBackground {
101- id: blurredBackground
102+ height: coverArtContainer.height + modeTabs.height + units.gu(2)
103+ Item {
104+ id: coverArtContainer
105
106- art: episodeImage
107- width: parent.width
108+ width: episodesPage.width
109 visible: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0
110- height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(4) : 0
111- backgroundStrength: podbird.settings.themeName === "Light.qml" ? 0.3 : 0.6
112+ height: episodesPage.state !== "search" && sortedEpisodeModel.count !== 0 ? cover.height + units.gu(6) : 0
113
114 Image {
115 id:cover
116- width: units.gu(12)
117+ width: units.gu(18)
118 height: width
119 sourceSize.height: width
120 sourceSize.width: width
121 source: episodeImage
122 asynchronous: true
123 anchors {
124- left: parent.left
125+ horizontalCenter: parent.horizontalCenter
126 top: parent.top
127 margins: units.gu(2)
128 }
129 }
130
131- Column {
132- id: podcastTitle
133-
134- anchors {
135- left: cover.right
136- right: parent.right
137- bottom: parent.bottom
138- margins: units.gu(2)
139- }
140-
141- Label {
142- text: episodeName
143- width: parent.width
144- wrapMode: Text.WordWrap
145- maximumLineCount: 2
146- elide: Text.ElideRight
147- color: podbird.appTheme.baseText
148- }
149-
150- Label {
151- text: i18n.tr("%1 episode", "%1 episodes", episodeList.count).arg(episodeList.count)
152- width: parent.width
153- elide: Text.ElideRight
154- textSize: Label.XSmall
155- color: podbird.appTheme.baseText
156- }
157+ Label {
158+ text: episodeName
159+ width: parent.width
160+ wrapMode: Text.WordWrap
161+ horizontalAlignment: Text.AlignHCenter
162+ maximumLineCount: 2
163+ elide: Text.ElideRight
164+ color: podbird.appTheme.baseText
165+ anchors.top: cover.bottom
166+ anchors.topMargin: units.gu(2)
167 }
168 }
169
170 Item {
171+ width: parent.width
172+ height: units.gu(2)
173+ }
174+
175+ Item {
176 id: modeTabs
177- height: unheardTab.implicitHeight + units.gu(2)
178+ height: unheardTab.implicitHeight + units.gu(2.25)
179 width: episodesPage.width
180
181+ Rectangle {
182+ id: sliderContainer
183+ anchors.top: unheardTab.bottom
184+ anchors.topMargin: units.gu(1)
185+ anchors.left: parent.left
186+ anchors.right: parent.right
187+ anchors.margins: units.gu(2)
188+ height: units.gu(0.25)
189+ radius: width/3
190+ color: UbuntuColors.lightGrey
191+ }
192+
193+ Rectangle {
194+ id: slider
195+ anchors.top: unheardTab.bottom
196+ anchors.topMargin: units.gu(1)
197+ height: units.gu(0.25)
198+ radius: width/3
199+ width: sliderContainer.width/3
200+ color: podbird.appTheme.focusText
201+ x: {
202+ if (episodesPage.mode === "unheard")
203+ return units.gu(2)
204+ else if (episodesPage.mode === "listened")
205+ return width + units.gu(2)
206+ else
207+ return 2 * width + units.gu(2)
208+ }
209+
210+ Behavior on x {
211+ UbuntuNumberAnimation {}
212+ }
213+ }
214+
215 Label {
216 id: unheardTab
217- textSize: Label.Large
218 text: i18n.tr("Unheard")
219 anchors.left: parent.left
220 anchors.leftMargin: units.gu(2)
221+ width: sliderContainer.width/3
222+ horizontalAlignment: Text.AlignHCenter
223+ font.weight: Font.DemiBold
224 color: episodesPage.mode == "unheard" ? podbird.appTheme.focusText : podbird.appTheme.baseText
225
226 AbstractButton {
227@@ -369,23 +388,13 @@
228 }
229 }
230
231- Rectangle {
232- anchors.top: unheardTab.bottom
233- anchors.topMargin: units.gu(1)
234- anchors.horizontalCenter: unheardTab.horizontalCenter
235- height: units.gu(0.25)
236- width: unheardTab.width
237- radius: width/3
238- color: podbird.appTheme.focusText
239- visible: episodesPage.mode == "unheard"
240- }
241-
242 Label {
243 id: listenedTab
244 anchors.left: unheardTab.right
245- anchors.leftMargin: (parent.width - unheardTab.width - listenedTab.width - downloadedTab.width - unheardTab.anchors.leftMargin - downloadedTab.anchors.rightMargin) / 2.0
246- textSize: Label.Large
247 text: i18n.tr("Listened")
248+ width: sliderContainer.width/3
249+ font.weight: Font.DemiBold
250+ horizontalAlignment: Text.AlignHCenter
251 color: episodesPage.mode == "listened" ? podbird.appTheme.focusText : podbird.appTheme.baseText
252
253 AbstractButton {
254@@ -394,22 +403,13 @@
255 }
256 }
257
258- Rectangle {
259- anchors.top: listenedTab.bottom
260- anchors.topMargin: units.gu(1)
261- anchors.horizontalCenter: listenedTab.horizontalCenter
262- height: units.gu(0.25)
263- width: listenedTab.width
264- radius: width/3
265- color: podbird.appTheme.focusText
266- visible: episodesPage.mode == "listened"
267- }
268-
269 Label {
270 id: downloadedTab
271 anchors.right: parent.right
272 anchors.rightMargin: units.gu(2)
273- textSize: Label.Large
274+ width: sliderContainer.width/3
275+ font.weight: Font.DemiBold
276+ horizontalAlignment: Text.AlignHCenter
277 text: i18n.tr("Downloaded")
278 color: episodesPage.mode == "downloaded" ? podbird.appTheme.focusText : podbird.appTheme.baseText
279
280@@ -418,17 +418,6 @@
281 onClicked: episodesPage.mode = "downloaded"
282 }
283 }
284-
285- Rectangle {
286- anchors.top: downloadedTab.bottom
287- anchors.topMargin: units.gu(1)
288- anchors.horizontalCenter: downloadedTab.horizontalCenter
289- height: units.gu(0.25)
290- width: downloadedTab.width
291- radius: width/3
292- color: podbird.appTheme.focusText
293- visible: episodesPage.mode == "downloaded"
294- }
295 }
296
297 }
298
299=== modified file 'app/ui/EpisodesTab.qml'
300--- app/ui/EpisodesTab.qml 2016-03-05 20:23:06 +0000
301+++ app/ui/EpisodesTab.qml 2016-03-06 12:22:11 +0000
302@@ -132,7 +132,7 @@
303 selectedSectionColor: podbird.appTheme.focusText
304 }
305
306- model: [i18n.tr("What's New"), i18n.tr("Downloaded"), i18n.tr("Favourites")]
307+ model: [i18n.tr("New"), i18n.tr("Downloaded"), i18n.tr("Favourites")]
308 onSelectedIndexChanged: {
309 refreshModel();
310 }
311@@ -297,7 +297,6 @@
312 Label {
313 width: parent.width
314 wrapMode: Text.WordWrap
315- color: podbird.appTheme.baseText
316 linkColor: "Blue"
317 text: dialogInternal.description
318 onLinkActivated: Qt.openUrlExternally(link)
319@@ -336,20 +335,14 @@
320 section.property: "diff"
321 section.labelPositioning: ViewSection.InlineLabels
322
323- section.delegate: Rectangle {
324- width: parent.width
325- color: "Transparent"
326- height: header.text !== "" ? header.implicitHeight + units.gu(2) : units.gu(0)
327- Label {
328- id: header
329- anchors {
330- left: parent.left
331- right: parent.right
332- margins: units.gu(2)
333- verticalCenter: parent.verticalCenter
334- }
335- textSize: Label.XLarge
336- text: {
337+ section.delegate: ListItem {
338+ height: headerText.title.text !== "" ? headerText.height + divider.height : units.gu(0)
339+ divider.anchors.leftMargin: units.gu(2)
340+ divider.anchors.rightMargin: units.gu(2)
341+
342+ ListItemLayout {
343+ id: headerText
344+ title.text: {
345 if (section === "Today") {
346 return i18n.tr("Today")
347 }
348@@ -366,6 +359,8 @@
349 return ""
350 }
351 }
352+ title.color: podbird.appTheme.baseText
353+ title.font.weight: Font.DemiBold
354 }
355 }
356
357
358=== modified file 'po/podbird.nik90.pot'
359--- po/podbird.nik90.pot 2016-03-05 20:23:06 +0000
360+++ po/podbird.nik90.pot 2016-03-06 12:22:11 +0000
361@@ -8,7 +8,7 @@
362 msgstr ""
363 "Project-Id-Version: \n"
364 "Report-Msgid-Bugs-To: \n"
365-"POT-Creation-Date: 2016-03-06 01:51+0530\n"
366+"POT-Creation-Date: 2016-03-06 17:42+0530\n"
367 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
368 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
369 "Language-Team: LANGUAGE <LL@li.org>\n"
370@@ -139,7 +139,7 @@
371 #: ../app/settings/DownloadSetting.qml:34
372 #: ../app/settings/DownloadSetting.qml:35
373 #: ../app/settings/DownloadSetting.qml:36
374-#: ../app/settings/DownloadSetting.qml:37 ../app/ui/EpisodesPage.qml:344
375+#: ../app/settings/DownloadSetting.qml:37
376 #, qt-format
377 msgid "%1 episode"
378 msgid_plural "%1 episodes"
379@@ -160,67 +160,67 @@
380 msgid "Dark"
381 msgstr ""
382
383-#: ../app/ui/EpisodesPage.qml:33
384+#: ../app/ui/EpisodesPage.qml:32
385 msgid "Podcast"
386 msgstr ""
387
388-#: ../app/ui/EpisodesPage.qml:74 ../app/ui/EpisodesTab.qml:62
389+#: ../app/ui/EpisodesPage.qml:73 ../app/ui/EpisodesTab.qml:62
390 msgid "Search Episode"
391 msgstr ""
392
393-#: ../app/ui/EpisodesPage.qml:83 ../app/ui/EpisodesTab.qml:72
394+#: ../app/ui/EpisodesPage.qml:82 ../app/ui/EpisodesTab.qml:72
395 msgid "Mark all listened"
396 msgstr ""
397
398-#: ../app/ui/EpisodesPage.qml:94 ../app/ui/EpisodesPage.qml:185
399+#: ../app/ui/EpisodesPage.qml:93 ../app/ui/EpisodesPage.qml:184
400 #: ../app/ui/SearchPage.qml:266
401 msgid "Unsubscribe"
402 msgstr ""
403
404-#: ../app/ui/EpisodesPage.qml:137 ../app/ui/EpisodesTab.qml:173
405+#: ../app/ui/EpisodesPage.qml:136 ../app/ui/EpisodesTab.qml:173
406 msgid "Search episode"
407 msgstr ""
408
409+#: ../app/ui/EpisodesPage.qml:181
410+msgid "Unsubscribe Confirmation"
411+msgstr ""
412+
413 #: ../app/ui/EpisodesPage.qml:182
414-msgid "Unsubscribe Confirmation"
415-msgstr ""
416-
417-#: ../app/ui/EpisodesPage.qml:183
418 #, qt-format
419 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
420 msgstr ""
421
422-#: ../app/ui/EpisodesPage.qml:202 ../app/ui/SearchPage.qml:121
423+#: ../app/ui/EpisodesPage.qml:201 ../app/ui/SearchPage.qml:121
424 #: ../app/ui/SettingsPage.qml:83 ../app/ui/SettingsPage.qml:118
425 msgid "Cancel"
426 msgstr ""
427
428-#: ../app/ui/EpisodesPage.qml:224 ../app/ui/EpisodesTab.qml:295
429+#: ../app/ui/EpisodesPage.qml:223 ../app/ui/EpisodesTab.qml:295
430 msgid "Episode Description"
431 msgstr ""
432
433-#: ../app/ui/EpisodesPage.qml:236 ../app/ui/EpisodesTab.qml:307
434+#: ../app/ui/EpisodesPage.qml:235 ../app/ui/EpisodesTab.qml:307
435 #: ../app/ui/SearchPage.qml:170
436 msgid "Close"
437 msgstr ""
438
439+#: ../app/ui/EpisodesPage.qml:263
440+msgid "No episodes found"
441+msgstr ""
442+
443 #: ../app/ui/EpisodesPage.qml:264
444-msgid "No episodes found"
445-msgstr ""
446-
447-#: ../app/ui/EpisodesPage.qml:265
448 msgid "No episodes found matching the search term."
449 msgstr ""
450
451-#: ../app/ui/EpisodesPage.qml:361
452+#: ../app/ui/EpisodesPage.qml:378
453 msgid "Unheard"
454 msgstr ""
455
456-#: ../app/ui/EpisodesPage.qml:388
457+#: ../app/ui/EpisodesPage.qml:395
458 msgid "Listened"
459 msgstr ""
460
461-#: ../app/ui/EpisodesPage.qml:413 ../app/ui/EpisodesTab.qml:135
462+#: ../app/ui/EpisodesPage.qml:414 ../app/ui/EpisodesTab.qml:135
463 msgid "Downloaded"
464 msgstr ""
465
466@@ -233,7 +233,7 @@
467 msgstr ""
468
469 #: ../app/ui/EpisodesTab.qml:135
470-msgid "What's New"
471+msgid "New"
472 msgstr ""
473
474 #: ../app/ui/EpisodesTab.qml:135
475@@ -272,15 +272,15 @@
476 msgid "No Episodes found matching the search term."
477 msgstr ""
478
479-#: ../app/ui/EpisodesTab.qml:354
480+#: ../app/ui/EpisodesTab.qml:348
481 msgid "Today"
482 msgstr ""
483
484-#: ../app/ui/EpisodesTab.qml:358
485+#: ../app/ui/EpisodesTab.qml:352
486 msgid "Yesterday"
487 msgstr ""
488
489-#: ../app/ui/EpisodesTab.qml:362
490+#: ../app/ui/EpisodesTab.qml:356
491 msgid "Older"
492 msgstr ""
493
494@@ -529,10 +529,10 @@
495 msgid "Finish"
496 msgstr ""
497
498-#: /home/krnekhelesh/Development/add-favourites-view-build/po/Podbird.desktop.in.h:1
499+#: /home/krnekhelesh/Development/new-design-touches-part1-build/po/Podbird.desktop.in.h:1
500 msgid "The chirpiest podcast manager for Ubuntu"
501 msgstr ""
502
503-#: /home/krnekhelesh/Development/add-favourites-view-build/po/Podbird.desktop.in.h:2
504+#: /home/krnekhelesh/Development/new-design-touches-part1-build/po/Podbird.desktop.in.h:2
505 msgid "podcast;audio;itunes;broadcast;digital;stream;podcatcher;video;vodcast;"
506 msgstr ""

Subscribers

People subscribed via source and target branches