podbird

Merge lp:~mterry/podbird/theme-colors into lp:podbird/devel

  1. theme-colors
  2. Merge into devel
Proposed by Michael Terry
Status: Needs review
Proposed branch: lp:~mterry/podbird/theme-colors
Merge into: lp:podbird/devel
Prerequisite: lp:~mterry/podbird/ok
Diff against target: 1190 lines (+91/-228)
27 files modified
app/components/ActionButton.qml (+2/-2)
app/components/Card.qml (+3/-3)
app/components/CustomProgressBar.qml (+2/-2)
app/components/CustomSectionHeader.qml (+2/-2)
app/components/EmptyState.qml (+3/-3)
app/components/HeaderListItem.qml (+0/-1)
app/components/SingleValueListItem.qml (+1/-2)
app/components/Walkthrough.qml (+4/-4)
app/podbird.qml (+2/-8)
app/settings/About.qml (+0/-7)
app/settings/CleanSetting.qml (+1/-5)
app/settings/Credits.qml (+0/-1)
app/settings/DownloadSetting.qml (+1/-5)
app/settings/ThemeSetting.qml (+1/-5)
app/themes/Dark.qml (+7/-23)
app/themes/Light.qml (+7/-23)
app/ui/EpisodesPage.qml (+13/-28)
app/ui/EpisodesTab.qml (+6/-24)
app/ui/FullPlayingView.qml (+11/-12)
app/ui/NowPlayingPage.qml (+0/-7)
app/ui/PlayerControls.qml (+14/-7)
app/ui/PodcastsTab.qml (+1/-11)
app/ui/Queue.qml (+2/-3)
app/ui/SearchPage.qml (+3/-17)
app/ui/SettingsPage.qml (+3/-21)
app/welcomewizard/Slide1.qml (+1/-1)
app/welcomewizard/Slide7.qml (+1/-1)
To merge this branch: bzr merge lp:~mterry/podbird/theme-colors
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan Needs Information
Review via email: mp+296062@code.launchpad.net

Commit message

Update colors to match current Ubuntu theme colors.

Description of the change

Use system theme light/dark colors instead of custom ones.

This also reduces the use of green to just positive button actions. Blue is used instead for progress and selected states, like other apps.

To post a comment you must log in.
lp:~mterry/podbird/theme-colors updated
150. By Michael Terry

Whoops, remove testing string

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Hmm I am having doubts about this. The green color we use is part of the app branding. Reverting this to the system colors defies this purpose. I'll defer this decision to Michael Sheldon.

review: Needs Information
Reply
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

@Michael Terry, BTW Thanks a lot for these patches!

Reply
Revision history for this message
Michael Terry (mterry) wrote :

No worries if you don't like it. I get it if you prefer branded colors.

Reply

Unmerged revisions

150. By Michael Terry

Whoops, remove testing string

149. By Michael Terry

Use theme colors more consistently

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/ActionButton.qml'
2--- app/components/ActionButton.qml 2016-03-04 10:40:54 +0000
3+++ app/components/ActionButton.qml 2016-05-30 18:00:34 +0000
4@@ -28,7 +28,7 @@
5 Rectangle {
6 visible: abstractButton.pressed
7 anchors.fill: parent
8- color: podbird.appTheme.hightlightListView
9+ color: theme.palette.selected.background
10 }
11
12 Icon {
13@@ -36,6 +36,6 @@
14 width: units.gu(2.5)
15 height: width
16 anchors.centerIn: parent
17- color: podbird.appTheme.baseIcon
18+ color: abstractButton.pressed ? theme.palette.selected.backgroundText : theme.palette.normal.backgroundText
19 }
20 }
21
22=== modified file 'app/components/Card.qml'
23--- app/components/Card.qml 2016-03-24 16:39:24 +0000
24+++ app/components/Card.qml 2016-05-30 18:00:34 +0000
25@@ -49,7 +49,7 @@
26 Component {
27 id: hintComponent
28 Rectangle {
29- color: podbird.appTheme.focusText
30+ color: theme.palette.normal.positive
31 width: secondaryLabel.implicitWidth + units.gu(1)
32 height: secondaryLabel.implicitHeight + units.gu(1)
33 radius: units.gu(0.5)
34@@ -60,7 +60,7 @@
35 text: secondaryText
36 visible: text !== ""
37 textSize: Label.Small
38- color: "White"
39+ color: theme.palette.normal.positiveText
40 }
41 }
42 }
43@@ -74,7 +74,7 @@
44 right: imgFrame.right
45 margins: units.gu(1)
46 }
47- color: podbird.appTheme.baseText
48+ color: theme.palette.normal.backgroundText
49 elide: Text.ElideRight
50 textSize: Label.Small
51 wrapMode: Text.WordWrap
52
53=== modified file 'app/components/CustomProgressBar.qml'
54--- app/components/CustomProgressBar.qml 2016-03-04 10:40:54 +0000
55+++ app/components/CustomProgressBar.qml 2016-05-30 18:00:34 +0000
56@@ -26,7 +26,7 @@
57 property bool indeterminateProgress: false
58
59 radius: width/3
60- color: Theme.palette.normal.base
61+ color: theme.palette.normal.base
62
63 Rectangle {
64 id: currentProgress
65@@ -34,7 +34,7 @@
66 radius: parent.radius
67 anchors.left: parent.left
68 anchors.top: parent.top
69- color: podbird.appTheme.focusText
70+ color: theme.palette.normal.activity
71 width: progress >= 0 && progress <= 100 ? (progress / 100) * parent.width : parent.width / 6
72
73 SequentialAnimation {
74
75=== modified file 'app/components/CustomSectionHeader.qml'
76--- app/components/CustomSectionHeader.qml 2016-03-24 16:39:24 +0000
77+++ app/components/CustomSectionHeader.qml 2016-05-30 18:00:34 +0000
78@@ -31,7 +31,7 @@
79
80 Label {
81 id: headerText
82- color: podbird.appTheme.baseText
83+ color: theme.palette.normal.backgroundText
84 font.weight: Font.DemiBold
85 anchors { top: parent.top; topMargin: units.gu(2); bottom: parent.bottom; bottomMargin: units.gu(2) }
86 width: parent.width
87@@ -39,7 +39,7 @@
88
89 Rectangle {
90 id: divider
91- color: settings.themeName === "Dark.qml" ? "#888888" : "#cdcdcd"
92+ color: theme.palette.normal.base
93 width: parent.width
94 height: units.dp(1)
95 anchors.bottom: parent.bottom
96
97=== modified file 'app/components/EmptyState.qml'
98--- app/components/EmptyState.qml 2016-03-24 16:39:24 +0000
99+++ app/components/EmptyState.qml 2016-05-30 18:00:34 +0000
100@@ -38,7 +38,7 @@
101 id: emptyIcon
102 width: units.gu(22)
103 height: units.gu(12)
104- color: podbird.appTheme.baseIcon
105+ color: theme.palette.normal.backgroundText
106 anchors.horizontalCenter: parent.horizontalCenter
107 }
108
109@@ -48,7 +48,7 @@
110 anchors.topMargin: units.gu(5)
111 width: parent.width
112 textSize: Label.Large
113- color: podbird.appTheme.baseText
114+ color: theme.palette.normal.backgroundText
115 horizontalAlignment: Text.AlignHCenter
116 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
117 }
118@@ -57,7 +57,7 @@
119 id: emptySublabel
120 width: parent.width
121 anchors.top: emptyLabel.bottom
122- color: podbird.appTheme.baseSubText
123+ color: theme.palette.normal.backgroundSecondaryText
124 horizontalAlignment: Text.AlignHCenter
125 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
126 }
127
128=== modified file 'app/components/HeaderListItem.qml'
129--- app/components/HeaderListItem.qml 2016-03-24 16:39:24 +0000
130+++ app/components/HeaderListItem.qml 2016-05-30 18:00:34 +0000
131@@ -31,7 +31,6 @@
132 ListItemLayout {
133 id: headerText
134 title.text: " "
135- title.color: podbird.appTheme.baseText
136 title.font.weight: Font.DemiBold
137 }
138 }
139
140=== modified file 'app/components/SingleValueListItem.qml'
141--- app/components/SingleValueListItem.qml 2016-03-24 16:39:24 +0000
142+++ app/components/SingleValueListItem.qml 2016-05-30 18:00:34 +0000
143@@ -32,11 +32,10 @@
144 id: customItemLayout
145
146 title.text: " "
147- title.color: podbird.appTheme.baseText
148
149 Label {
150 id: _value
151- color: podbird.appTheme.baseText
152+ color: parent.title.color
153 SlotsLayout.position: SlotsLayout.Trailing;
154 }
155
156
157=== modified file 'app/components/Walkthrough.qml'
158--- app/components/Walkthrough.qml 2016-03-04 10:40:54 +0000
159+++ app/components/Walkthrough.qml 2016-05-30 18:00:34 +0000
160@@ -32,13 +32,13 @@
161 property list<Component> model
162
163 // Property to set the color of bottom cirle to indicate the user's progress
164- property color completeColor: "green"
165+ property color completeColor: theme.palette.normal.activity
166
167 // Property to set the color of the bottom circle to indicate the slide still left to cover
168- property color inCompleteColor: "lightgrey"
169+ property color inCompleteColor: theme.palette.normal.base
170
171 // Property to set the color of the skip welcome wizard text
172- property color skipTextColor: "grey"
173+ property color skipTextColor: theme.palette.normal.backgroundSecondaryText
174
175 // Property to signal walkthrough completion
176 signal finished
177@@ -122,7 +122,7 @@
178 border.width: listView.currentIndex == index ? units.gu(0.2) : units.gu(0)
179 border.color: completeColor
180 anchors.verticalCenter: parent.verticalCenter
181- color: listView.currentIndex == index ? "White"
182+ color: listView.currentIndex == index ? theme.palette.normal.background
183 : listView.currentIndex >= index ? completeColor
184 : inCompleteColor
185 Behavior on color {
186
187=== modified file 'app/podbird.qml'
188--- app/podbird.qml 2016-03-28 21:03:25 +0000
189+++ app/podbird.qml 2016-05-30 18:00:34 +0000
190@@ -38,9 +38,7 @@
191 width: units.gu(50)
192 height: units.gu(75)
193
194- backgroundColor: appTheme.background
195- theme.name: settings.themeName == "Dark.qml" ? "Ubuntu.Components.Themes.SuruDark"
196- : "Ubuntu.Components.Themes.Ambiance"
197+ theme.name: appTheme.baseTheme
198
199 Component.onDestruction: {
200 console.log("[LOG]: Download cancelled");
201@@ -97,10 +95,6 @@
202 Themes.ThemeManager {
203 id: themeManager
204 source: settings.themeName
205- onSourceChanged: {
206- podbird.theme.name = settings.themeName == "Dark.qml" ? "Ubuntu.Components.Themes.SuruDark"
207- : "Ubuntu.Components.Themes.Ambiance"
208- }
209 }
210
211 property alias appTheme: themeManager.theme
212@@ -426,7 +420,7 @@
213
214 Rectangle {
215 id: loadingIndicator
216- color: podbird.appTheme.background
217+ color: theme.palette.normal.background
218 anchors.fill: parent
219
220 ActivityIndicator {
221
222=== modified file 'app/settings/About.qml'
223--- app/settings/About.qml 2016-03-18 22:17:59 +0000
224+++ app/settings/About.qml 2016-05-30 18:00:34 +0000
225@@ -27,10 +27,6 @@
226
227 title: i18n.tr("About")
228
229- StyleHints {
230- backgroundColor: podbird.appTheme.background
231- }
232-
233 extension: Sections {
234 id: aboutPageHeaderSections
235
236@@ -39,9 +35,6 @@
237 bottom: parent.bottom
238 }
239
240- StyleHints {
241- selectedSectionColor: podbird.appTheme.focusText
242- }
243 // TRANSTORS: Credits as in the code and design contributors to the app
244 model: [i18n.tr("About"), i18n.tr("Credits")]
245 }
246
247=== modified file 'app/settings/CleanSetting.qml'
248--- app/settings/CleanSetting.qml 2016-03-24 16:39:24 +0000
249+++ app/settings/CleanSetting.qml 2016-05-30 18:00:34 +0000
250@@ -28,9 +28,6 @@
251 header: PageHeader {
252 title: i18n.tr("Delete older than")
253 flickable: cleanup
254- StyleHints {
255- backgroundColor: podbird.appTheme.background
256- }
257 }
258
259 ListModel {
260@@ -64,13 +61,12 @@
261
262 ListItemLayout {
263 title.text: model.name
264- title.color: podbird.appTheme.baseText
265
266 Icon {
267 width: units.gu(2)
268 height: width
269 name: "ok"
270- color: podbird.appTheme.baseText
271+ color: parent.title.color
272 visible: podbird.settings.retentionDays === model.value
273 SlotsLayout.position: SlotsLayout.Trailing
274 }
275
276=== modified file 'app/settings/Credits.qml'
277--- app/settings/Credits.qml 2016-03-24 16:39:24 +0000
278+++ app/settings/Credits.qml 2016-05-30 18:00:34 +0000
279@@ -58,7 +58,6 @@
280 delegate: ListItem {
281 ListItemLayout {
282 title.text: model.name
283- title.color: podbird.appTheme.baseText
284 ProgressionSlot {}
285 }
286 divider.visible: false
287
288=== modified file 'app/settings/DownloadSetting.qml'
289--- app/settings/DownloadSetting.qml 2016-03-24 16:39:24 +0000
290+++ app/settings/DownloadSetting.qml 2016-05-30 18:00:34 +0000
291@@ -28,9 +28,6 @@
292 header: PageHeader {
293 title: i18n.tr("Download at most")
294 flickable: download
295- StyleHints {
296- backgroundColor: podbird.appTheme.background
297- }
298 }
299
300 ListModel {
301@@ -63,13 +60,12 @@
302
303 ListItemLayout {
304 title.text: model.name
305- title.color: podbird.appTheme.baseText
306
307 Icon {
308 width: units.gu(2)
309 height: width
310 name: "ok"
311- color: podbird.appTheme.baseText
312+ color: parent.title.color
313 visible: podbird.settings.maxEpisodeDownload === model.value
314 SlotsLayout.position: SlotsLayout.Trailing
315 }
316
317=== modified file 'app/settings/ThemeSetting.qml'
318--- app/settings/ThemeSetting.qml 2016-03-24 16:39:24 +0000
319+++ app/settings/ThemeSetting.qml 2016-05-30 18:00:34 +0000
320@@ -28,9 +28,6 @@
321 header: PageHeader {
322 title: i18n.tr("Theme")
323 flickable: themes
324- StyleHints {
325- backgroundColor: podbird.appTheme.background
326- }
327 }
328
329 ListModel {
330@@ -64,13 +61,12 @@
331 id: themeLayout
332
333 title.text: model.name
334- title.color: podbird.appTheme.baseText
335
336 Icon {
337 width: units.gu(2)
338 height: width
339 name: "ok"
340- color: podbird.appTheme.baseText
341+ color: parent.title.color
342 visible: podbird.settings.themeName === model.file
343 SlotsLayout.position: SlotsLayout.Trailing
344 }
345
346=== modified file 'app/themes/Dark.qml'
347--- app/themes/Dark.qml 2016-03-29 11:02:18 +0000
348+++ app/themes/Dark.qml 2016-05-30 18:00:34 +0000
349@@ -19,27 +19,11 @@
350 import QtQuick 2.4
351 import Ubuntu.Components 1.3
352
353-QtObject {
354- // MainView
355- property color background: "#242423"
356-
357- // Main Text Colors
358- property color baseText: "White"
359- property color baseSubText: "#999999"
360- property color focusText: "#35AF44"
361- property color linkText: "Cyan"
362-
363- // Icon Colors
364- property color baseIcon: "White"
365-
366- // Button Colors
367- property color positiveActionButton: UbuntuColors.green
368- property color negativeActionButton: UbuntuColors.red
369- property color neutralActionButton: UbuntuColors.coolGrey
370-
371- // Bottom Player Bar Colors
372- property color bottomBarBackground: "#15141A"
373-
374- // Highlight Color
375- property color hightlightListView: "#2D2D2C"
376+StyledItem {
377+ // Themes
378+ property string baseTheme: "Ubuntu.Components.Themes.SuruDark"
379+ property string bottomBarTheme: "Ubuntu.Components.Themes.SuruDark"
380+
381+ // Colors that themes don't provide
382+ property color linkText: UbuntuColors.blue // must work on normal.overlay too
383 }
384
385=== modified file 'app/themes/Light.qml'
386--- app/themes/Light.qml 2016-03-29 11:02:18 +0000
387+++ app/themes/Light.qml 2016-05-30 18:00:34 +0000
388@@ -19,27 +19,11 @@
389 import QtQuick 2.4
390 import Ubuntu.Components 1.3
391
392-QtObject {
393- // MainView
394- property color background: "#ECECEC"
395-
396- // Main Text Colors
397- property color baseText: UbuntuColors.darkGrey
398- property color baseSubText: "#999999"
399- property color focusText: "#35AF44"
400- property color linkText: "Blue"
401-
402- // Icon Colors
403- property color baseIcon: UbuntuColors.darkGrey
404-
405- // Button Colors
406- property color positiveActionButton: UbuntuColors.green
407- property color negativeActionButton: UbuntuColors.red
408- property color neutralActionButton: UbuntuColors.coolGrey
409-
410- // Bottom Player Bar Colors
411- property color bottomBarBackground: "#323435"
412-
413- // Highlight Color
414- property color hightlightListView: "#F5F5F5"
415+StyledItem {
416+ // Themes
417+ property string baseTheme: "Ubuntu.Components.Themes.Ambiance"
418+ property string bottomBarTheme: "Ubuntu.Components.Themes.SuruDark"
419+
420+ // Colors that themes don't provide
421+ property color linkText: UbuntuColors.blue // must work on normal.overlay too
422 }
423
424=== modified file 'app/ui/EpisodesPage.qml'
425--- app/ui/EpisodesPage.qml 2016-03-29 11:02:46 +0000
426+++ app/ui/EpisodesPage.qml 2016-05-30 18:00:34 +0000
427@@ -52,10 +52,6 @@
428 title: i18n.tr("Podcast")
429 flickable: null
430
431- StyleHints {
432- backgroundColor: podbird.appTheme.background
433- }
434-
435 trailingActionBar.actions: [
436 Action {
437 iconName: "search"
438@@ -90,10 +86,6 @@
439 }
440 }
441
442- StyleHints {
443- backgroundColor: podbird.appTheme.background
444- }
445-
446 contents: Loader {
447 id: searchField
448 sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
449@@ -115,10 +107,6 @@
450 }
451 }
452
453- StyleHints {
454- backgroundColor: podbird.appTheme.background
455- }
456-
457 leadingActionBar.actions: [
458 Action {
459 iconName: "back"
460@@ -304,7 +292,7 @@
461 text: i18n.tr("Are you sure you want to unsubscribe from <b>%1</b>?").arg(episodesPage.episodeName)
462 Button {
463 text: i18n.tr("Unsubscribe")
464- color: podbird.appTheme.negativeActionButton
465+ color: theme.palette.normal.negative
466 onClicked: {
467 var db = Podcasts.init();
468 db.transaction(function (tx) {
469@@ -321,7 +309,6 @@
470 }
471 Button {
472 text: i18n.tr("Cancel")
473- color: podbird.appTheme.neutralActionButton
474 onClicked: {
475 PopupUtils.close(dialogInternal)
476 }
477@@ -347,15 +334,15 @@
478 Label {
479 width: parent.width
480 wrapMode: Text.WordWrap
481- color: UbuntuColors.coolGrey
482- linkColor: "Blue"
483+ color: theme.palette.normal.overlayText
484+ linkColor: podbird.appTheme.linkText
485 text: dialogInternal.description
486 onLinkActivated: Qt.openUrlExternally(link)
487 }
488
489 Button {
490 text: i18n.tr("Close")
491- color: podbird.appTheme.positiveActionButton
492+ color: theme.palette.normal.positive
493 onClicked: {
494 PopupUtils.close(dialogInternal)
495 }
496@@ -448,7 +435,7 @@
497 horizontalAlignment: Text.AlignHCenter
498 maximumLineCount: 2
499 elide: Text.ElideRight
500- color: podbird.appTheme.baseText
501+ color: theme.palette.normal.backgroundText
502 anchors.top: cover.bottom
503 anchors.topMargin: units.gu(2)
504 }
505@@ -473,7 +460,7 @@
506 anchors.margins: units.gu(2)
507 height: units.gu(0.25)
508 radius: width/3
509- color: UbuntuColors.lightGrey
510+ color: theme.palette.normal.base
511 }
512
513 Rectangle {
514@@ -483,7 +470,7 @@
515 height: units.gu(0.25)
516 radius: width/3
517 width: sliderContainer.width/3
518- color: podbird.appTheme.focusText
519+ color: theme.palette.normal.positionText
520 x: {
521 if (episodesPage.mode === "unheard")
522 return units.gu(2)
523@@ -506,7 +493,7 @@
524 width: sliderContainer.width/3
525 horizontalAlignment: Text.AlignHCenter
526 font.weight: Font.DemiBold
527- color: episodesPage.mode == "unheard" ? podbird.appTheme.focusText : podbird.appTheme.baseText
528+ color: episodesPage.mode == "unheard" ? theme.palette.normal.positionText : theme.palette.normal.backgroundTertiaryText
529
530 AbstractButton {
531 anchors.fill: parent
532@@ -521,7 +508,7 @@
533 width: sliderContainer.width/3
534 font.weight: Font.DemiBold
535 horizontalAlignment: Text.AlignHCenter
536- color: episodesPage.mode == "listened" ? podbird.appTheme.focusText : podbird.appTheme.baseText
537+ color: episodesPage.mode == "listened" ? theme.palette.normal.positionText : theme.palette.normal.backgroundTertiaryText
538
539 AbstractButton {
540 anchors.fill: parent
541@@ -537,7 +524,7 @@
542 font.weight: Font.DemiBold
543 horizontalAlignment: Text.AlignHCenter
544 text: i18n.tr("Downloaded")
545- color: episodesPage.mode == "downloaded" ? podbird.appTheme.focusText : podbird.appTheme.baseText
546+ color: episodesPage.mode == "downloaded" ? theme.palette.normal.positionText : theme.palette.normal.backgroundTertiaryText
547
548 AbstractButton {
549 anchors.fill: parent
550@@ -557,7 +544,7 @@
551 id: listItem
552
553 divider.visible: false
554- highlightColor: podbird.appTheme.hightlightListView
555+ highlightColor: theme.palette.selected.background
556 height: visible ? listItemLayout.height + progressBarLoader.height + units.gu(1) : 0
557
558 visible: episodesPage.mode == "listened" ? model.listened
559@@ -568,8 +555,8 @@
560 id: listItemLayout
561
562 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
563- title.color: downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
564- : podbird.appTheme.baseText
565+ title.color: downloader.downloadingGuid === model.guid ? theme.palette.normal.positionText
566+ : theme.palette.normal.backgroundText
567 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
568 title.maximumLineCount: 1
569
570@@ -577,7 +564,6 @@
571 : Qt.formatDate(new Date(model.published), "MMM d, yyyy")
572 : model.downloadedfile ? "šŸ“Ž " + Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
573 : Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
574- subtitle.color: podbird.appTheme.baseSubText
575
576 padding.top: units.gu(1)
577 padding.bottom: units.gu(0.5)
578@@ -707,7 +693,6 @@
579 Scrollbar {
580 flickableItem: episodeList
581 align: Qt.AlignTrailing
582- StyleHints { sliderColor: podbird.appTheme.focusText }
583 }
584 }
585
586
587=== modified file 'app/ui/EpisodesTab.qml'
588--- app/ui/EpisodesTab.qml 2016-03-24 16:43:33 +0000
589+++ app/ui/EpisodesTab.qml 2016-05-30 18:00:34 +0000
590@@ -47,10 +47,6 @@
591 visible: episodesPage.header === standardHeader
592 title: i18n.tr("Episodes")
593
594- StyleHints {
595- backgroundColor: podbird.appTheme.background
596- }
597-
598 leadingActionBar {
599 numberOfSlots: 0
600 actions: tabsList.actions
601@@ -75,10 +71,6 @@
602 bottom: parent.bottom
603 }
604
605- StyleHints {
606- selectedSectionColor: podbird.appTheme.focusText
607- }
608-
609 model: [i18n.tr("Recent"), i18n.tr("Downloads"), i18n.tr("Favourites")]
610 onSelectedIndexChanged: {
611 refreshModel();
612@@ -90,10 +82,6 @@
613 id: searchHeader
614 visible: episodesPage.header === searchHeader
615
616- StyleHints {
617- backgroundColor: podbird.appTheme.background
618- }
619-
620 contents: Loader {
621 id: searchField
622 sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
623@@ -133,10 +121,6 @@
624 }
625 }
626
627- StyleHints {
628- backgroundColor: podbird.appTheme.background
629- }
630-
631 leadingActionBar.actions: [
632 Action {
633 iconName: "back"
634@@ -409,15 +393,15 @@
635 Label {
636 width: parent.width
637 wrapMode: Text.WordWrap
638- linkColor: "Blue"
639- color: UbuntuColors.coolGrey
640+ linkColor: podbird.appTheme.linkText
641+ color: theme.palette.normal.overlayText
642 text: dialogInternal.description
643 onLinkActivated: Qt.openUrlExternally(link)
644 }
645
646 Button {
647 text: i18n.tr("Close")
648- color: podbird.appTheme.positiveActionButton
649+ color: theme.palette.normal.positive
650 onClicked: {
651 PopupUtils.close(dialogInternal)
652 }
653@@ -531,15 +515,15 @@
654 id: listItem
655
656 divider.visible: false
657- highlightColor: podbird.appTheme.hightlightListView
658+ highlightColor: theme.palette.selected.background
659 height: downloader.downloadingGuid === model.guid ? listItemLayout.height + progressBarLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)
660
661 ListItemLayout {
662 id: listItemLayout
663
664 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
665- title.color: downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText
666- : podbird.appTheme.baseText
667+ title.color: downloader.downloadingGuid === model.guid ? theme.palette.normal.positionText
668+ : theme.palette.normal.backgroundText
669 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
670 title.maximumLineCount: 1
671
672@@ -547,7 +531,6 @@
673 : model.artist
674 : model.downloadedfile ? "šŸ“Ž " + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
675 : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
676- subtitle.color: podbird.appTheme.baseSubText
677
678 Image {
679 height: width
680@@ -694,7 +677,6 @@
681 Scrollbar {
682 flickableItem: episodeList
683 align: Qt.AlignTrailing
684- StyleHints { sliderColor: podbird.appTheme.focusText }
685 }
686
687 PullToRefresh {
688
689=== modified file 'app/ui/FullPlayingView.qml'
690--- app/ui/FullPlayingView.qml 2016-03-24 16:39:24 +0000
691+++ app/ui/FullPlayingView.qml 2016-05-30 18:00:34 +0000
692@@ -103,7 +103,7 @@
693 textSize: Label.Large
694 maximumLineCount: 2
695 wrapMode: Text.WordWrap
696- color: podbird.appTheme.baseText
697+ color: theme.palette.normal.backgroundText
698 }
699
700 Label {
701@@ -115,7 +115,7 @@
702 text: currentArtist
703 elide: Text.ElideRight
704 textSize: Label.Small
705- color: podbird.appTheme.baseSubText
706+ color: theme.palette.normal.backgroundSecondaryText
707 }
708
709 Slider {
710@@ -141,7 +141,6 @@
711 }
712
713 function formatValue(v) { return Podcasts.formatTime(v/1000); }
714- StyleHints { foregroundColor: podbird.appTheme.focusText }
715 }
716
717 Connections {
718@@ -154,7 +153,7 @@
719 textSize: Label.Small
720 anchors.left: scrubber.left
721 anchors.top: scrubber.bottom
722- color: podbird.appTheme.baseText
723+ color: theme.palette.normal.backgroundText
724 text: Podcasts.formatTime(player.position / 1000)
725 }
726
727@@ -163,7 +162,7 @@
728 textSize: Label.Small
729 anchors.right: scrubber.right
730 anchors.top: scrubber.bottom
731- color: podbird.appTheme.baseText
732+ color: theme.palette.normal.backgroundText
733 text: Podcasts.formatTime(player.duration / 1000)
734 }
735
736@@ -188,7 +187,7 @@
737 width: units.gu(3)
738 height: width
739 anchors.centerIn: parent
740- color: podbird.appTheme.baseIcon
741+ color: theme.palette.normal.backgroundText
742 name: "media-skip-backward"
743 }
744 }
745@@ -214,7 +213,7 @@
746 // xgettext: no-c-format
747 text: i18n.tr("-%1s").arg(podbird.settings.skipBack)
748 textSize: Label.XxSmall
749- color: podbird.appTheme.baseText
750+ color: theme.palette.normal.backgroundText
751 anchors.verticalCenter: skipBackwardIcon.verticalCenter
752 }
753
754@@ -223,7 +222,7 @@
755 width: units.gu(3)
756 height: width
757 name: "media-seek-backward"
758- color: podbird.appTheme.baseIcon
759+ color: theme.palette.normal.backgroundText
760 }
761 }
762 }
763@@ -240,7 +239,7 @@
764 width: units.gu(6)
765 height: width
766 anchors.centerIn: parent
767- color: podbird.appTheme.baseIcon
768+ color: theme.palette.normal.backgroundText
769 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
770 : "media-playback-start"
771 }
772@@ -267,7 +266,7 @@
773 width: units.gu(3)
774 height: width
775 name: "media-seek-forward"
776- color: podbird.appTheme.baseIcon
777+ color: theme.palette.normal.backgroundText
778 }
779
780 Label {
781@@ -275,7 +274,7 @@
782 // xgettext: no-c-format
783 text: i18n.tr("+%1s").arg(podbird.settings.skipForward)
784 textSize: Label.XxSmall
785- color: podbird.appTheme.baseText
786+ color: theme.palette.normal.backgroundText
787 anchors.verticalCenter: skipForwardIcon.verticalCenter
788 }
789 }
790@@ -295,7 +294,7 @@
791 width: units.gu(3)
792 height: width
793 anchors.centerIn: parent
794- color: podbird.appTheme.baseIcon
795+ color: theme.palette.normal.backgroundText
796 name: "media-skip-forward"
797 }
798 }
799
800=== modified file 'app/ui/NowPlayingPage.qml'
801--- app/ui/NowPlayingPage.qml 2016-03-17 00:37:17 +0000
802+++ app/ui/NowPlayingPage.qml 2016-05-30 18:00:34 +0000
803@@ -33,10 +33,6 @@
804 header: PageHeader {
805 title: i18n.tr("Now Playing")
806
807- StyleHints {
808- backgroundColor: podbird.appTheme.background
809- }
810-
811 leadingActionBar.actions: Action {
812 iconName: "back"
813 text: i18n.tr("Back")
814@@ -67,9 +63,6 @@
815 bottom: parent.bottom
816 }
817
818- StyleHints {
819- selectedSectionColor: podbird.appTheme.focusText
820- }
821 model: [i18n.tr("Full view"), i18n.tr("Queue")]
822 }
823 }
824
825=== modified file 'app/ui/PlayerControls.qml'
826--- app/ui/PlayerControls.qml 2016-03-14 00:19:15 +0000
827+++ app/ui/PlayerControls.qml 2016-05-30 18:00:34 +0000
828@@ -20,10 +20,17 @@
829 import QtMultimedia 5.6
830 import Ubuntu.Components 1.3
831
832-Rectangle {
833+StyledItem {
834 id: controlRect
835
836- color: podbird.appTheme.bottomBarBackground
837+ theme: ThemeSettings {
838+ name: appTheme.bottomBarTheme
839+ }
840+
841+ Rectangle {
842+ anchors.fill: parent
843+ color: theme.palette.normal.overlay
844+ }
845
846 MouseArea {
847 z: -1
848@@ -47,7 +54,7 @@
849 id: progressBarHint
850 anchors.left: parent.left
851 anchors.top: cover.bottom
852- color: podbird.appTheme.focusText
853+ color: theme.palette.normal.activity
854 height: units.gu(0.25)
855 width: player.duration > 0 ? (player.position / player.duration) * parent.width : 0
856 }
857@@ -63,7 +70,7 @@
858 font.weight: Font.Bold
859 anchors.left: parent.left
860 anchors.right: parent.right
861- color: "white"
862+ color: theme.palette.normal.overlayText
863 elide: Text.ElideRight
864 maximumLineCount: 2
865 wrapMode: Text.WordWrap
866@@ -72,7 +79,7 @@
867
868 Label {
869 textSize: Label.Small
870- color: "#999999"
871+ color: theme.palette.normal.overlaySecondaryText
872 text: currentArtist
873 elide: Text.ElideRight
874 font.weight: Font.Light
875@@ -92,7 +99,7 @@
876 Rectangle {
877 id: playButtonBackground
878 anchors.fill: parent
879- color: "#FFF"
880+ color: theme.palette.normal.overlayText
881 opacity: 0.1
882 visible: playButton.pressed
883 }
884@@ -101,7 +108,7 @@
885 : player.play()
886
887 Icon {
888- color: "white"
889+ color: theme.palette.normal.overlayText
890 width: units.gu(3)
891 height: width
892 anchors.centerIn: playButtonBackground
893
894=== modified file 'app/ui/PodcastsTab.qml'
895--- app/ui/PodcastsTab.qml 2016-03-29 11:02:46 +0000
896+++ app/ui/PodcastsTab.qml 2016-05-30 18:00:34 +0000
897@@ -42,10 +42,6 @@
898 title: i18n.tr("Podcasts")
899 visible: podcastPage.header === standardHeader
900
901- StyleHints {
902- backgroundColor: podbird.appTheme.background
903- }
904-
905 leadingActionBar {
906 numberOfSlots: 0
907 actions: tabsList.actions
908@@ -67,10 +63,6 @@
909 id: searchHeader
910 visible: podcastPage.header === searchHeader
911
912- StyleHints {
913- backgroundColor: podbird.appTheme.background
914- }
915-
916 contents: Loader {
917 id: searchField
918 sourceComponent: podcastPage.header === searchHeader ? searchFieldComponent : undefined
919@@ -207,14 +199,13 @@
920
921 height: listItemLayout.height
922 divider.visible: false
923- highlightColor: podbird.appTheme.hightlightListView
924+ highlightColor: theme.palette.selected.background
925
926 ListItemLayout {
927 id: listItemLayout
928 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
929 summary.text: model.episodeCount > 0 ? i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
930 : ""
931- summary.color: podbird.appTheme.baseSubText
932
933 Image {
934 height: width
935@@ -257,7 +248,6 @@
936 Scrollbar {
937 flickableItem: listView
938 align: Qt.AlignTrailing
939- StyleHints { sliderColor: podbird.appTheme.focusText }
940 }
941
942 PullToRefresh {
943
944=== modified file 'app/ui/Queue.qml'
945--- app/ui/Queue.qml 2016-03-24 16:39:24 +0000
946+++ app/ui/Queue.qml 2016-05-30 18:00:34 +0000
947@@ -58,11 +58,10 @@
948 title.text: layout.metaModel.name
949 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
950 title.maximumLineCount: 1
951- title.color: player.playlist.currentIndex === index ? podbird.appTheme.focusText
952- : podbird.appTheme.baseText
953+ title.color: player.playlist.currentIndex === index ? theme.palette.normal.positionText
954+ : theme.palette.normal.backgroundText
955
956 subtitle.text: layout.metaModel.artist
957- subtitle.color: podbird.appTheme.baseSubText
958 }
959
960 leadingActions: ListItemActions {
961
962=== modified file 'app/ui/SearchPage.qml'
963--- app/ui/SearchPage.qml 2016-03-28 23:47:24 +0000
964+++ app/ui/SearchPage.qml 2016-05-30 18:00:34 +0000
965@@ -40,10 +40,6 @@
966 visible: searchPage.header === standardHeader
967 title: i18n.tr("Add New Podcasts")
968
969- StyleHints {
970- backgroundColor: podbird.appTheme.background
971- }
972-
973 leadingActionBar {
974 numberOfSlots: 0
975 actions: tabsList.actions
976@@ -75,10 +71,6 @@
977
978 visible: searchPage.header === searchHeader
979
980- StyleHints {
981- backgroundColor: podbird.appTheme.background
982- }
983-
984 contents: Loader {
985 id: searchField
986 sourceComponent: searchPage.header === searchHeader ? searchFieldComponent : undefined
987@@ -104,10 +96,6 @@
988
989 visible: searchPage.header === addHeader
990
991- StyleHints {
992- backgroundColor: podbird.appTheme.background
993- }
994-
995 contents: Loader {
996 id: feedUrlField
997 sourceComponent: searchPage.header === addHeader ? feedUrlComponent : undefined
998@@ -177,7 +165,6 @@
999 text: i18n.tr("Please check the URL and try again")
1000 Button {
1001 text: i18n.tr("Close")
1002- color: podbird.appTheme.neutralActionButton
1003 onClicked: {
1004 PopupUtils.close(dialogInternal)
1005 }
1006@@ -248,7 +235,7 @@
1007 divider.visible: false
1008 highlightColor: "Transparent"
1009 height: expanded ? listItemLayout.height + descriptionLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)
1010- color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"
1011+ color: index % 2 === 0 ? theme.palette.selected.background : "Transparent"
1012
1013 ListItemLayout {
1014 id: listItemLayout
1015@@ -256,7 +243,6 @@
1016 title.text: model.name
1017
1018 subtitle.text: model.artist
1019- subtitle.color: podbird.appTheme.baseSubText
1020
1021 padding.top: units.gu(1)
1022 padding.bottom: units.gu(0.5)
1023@@ -271,7 +257,7 @@
1024
1025 Button {
1026 SlotsLayout.position: SlotsLayout.Trailing
1027- color: !model.subscribed ? UbuntuColors.green : UbuntuColors.red
1028+ color: !model.subscribed ? theme.palette.normal.positive : theme.palette.normal.negative
1029 text: !model.subscribed ? i18n.tr("Subscribe") : i18n.tr("Unsubscribe")
1030 onClicked: {
1031 if (!model.subscribed) {
1032@@ -313,7 +299,7 @@
1033 text: i18n.tr("Last Updated: %1\n%2").arg(model.releaseDate.split("T")[0]).arg(model.description)
1034 wrapMode: Text.WordWrap
1035 textSize: Label.Small
1036- color: podbird.appTheme.baseSubText
1037+ color: theme.palette.normal.backgroundTertiaryText
1038 linkColor: podbird.appTheme.linkText
1039 height: expanded ? contentHeight : 0
1040 onLinkActivated: Qt.openUrlExternally(link)
1041
1042=== modified file 'app/ui/SettingsPage.qml'
1043--- app/ui/SettingsPage.qml 2016-05-30 18:00:34 +0000
1044+++ app/ui/SettingsPage.qml 2016-05-30 18:00:34 +0000
1045@@ -33,10 +33,6 @@
1046 header: PageHeader {
1047 title: i18n.tr("Settings")
1048
1049- StyleHints {
1050- backgroundColor: podbird.appTheme.background
1051- }
1052-
1053 leadingActionBar {
1054 numberOfSlots: 0
1055 actions: tabsList.actions
1056@@ -70,12 +66,11 @@
1057 maximumValue: 60
1058 value: podbird.settings.skipForward
1059 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
1060- StyleHints { foregroundColor: podbird.appTheme.focusText }
1061 }
1062
1063 Button {
1064 text: i18n.tr("OK")
1065- color: podbird.appTheme.positiveActionButton
1066+ color: theme.palette.normal.positive
1067 onClicked: {
1068 podbird.settings.skipForward = Math.round(slider.value)
1069 PopupUtils.close(dialogInternal)
1070@@ -83,7 +78,6 @@
1071 }
1072 Button {
1073 text: i18n.tr("Cancel")
1074- color: podbird.appTheme.neutralActionButton
1075 onClicked: {
1076 PopupUtils.close(dialogInternal)
1077 }
1078@@ -105,12 +99,11 @@
1079 maximumValue: 60
1080 value: podbird.settings.skipBack
1081 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
1082- StyleHints { foregroundColor: podbird.appTheme.focusText }
1083 }
1084
1085 Button {
1086 text: i18n.tr("OK")
1087- color: podbird.appTheme.positiveActionButton
1088+ color: theme.palette.normal.positive
1089 onClicked: {
1090 podbird.settings.skipBack = Math.round(slider.value)
1091 PopupUtils.close(dialogInternal)
1092@@ -118,7 +111,6 @@
1093 }
1094 Button {
1095 text: i18n.tr("Cancel")
1096- color: podbird.appTheme.neutralActionButton
1097 onClicked: {
1098 PopupUtils.close(dialogInternal)
1099 }
1100@@ -188,9 +180,7 @@
1101 ListItemLayout {
1102 id: deleteLayout
1103 title.text: i18n.tr("Automatically delete old episodes")
1104- title.color: podbird.appTheme.baseText
1105 summary.text: i18n.tr("Delete episodes that are older than a given number of days for each podcast")
1106- summary.color: podbird.appTheme.baseSubText
1107 ProgressionSlot {}
1108 }
1109 divider.visible: false
1110@@ -202,9 +192,7 @@
1111 ListItemLayout {
1112 id: downloadLayout
1113 title.text: i18n.tr("Automatically download new episodes")
1114- title.color: podbird.appTheme.baseText
1115 summary.text: i18n.tr("Default number of new episodes to download for each podcast")
1116- summary.color: podbird.appTheme.baseSubText
1117 ProgressionSlot{}
1118 }
1119 divider.visible: false
1120@@ -221,9 +209,7 @@
1121 ListItemLayout {
1122 id: refreshArt
1123 title.text: i18n.tr("Refresh podcast artwork")
1124- title.color: podbird.appTheme.baseText
1125 summary.text: i18n.tr("Update all podcasts artwork and fix missing ones (this only works with podcasts added via iTunesĀ® search)")
1126- summary.color: podbird.appTheme.baseSubText
1127 summary.maximumLineCount: 3
1128 ProgressionSlot{}
1129 }
1130@@ -263,9 +249,7 @@
1131 ListItemLayout {
1132 id: orphanLayout
1133 title.text: i18n.tr("Delete orphaned files and links")
1134- title.color: podbird.appTheme.baseText
1135 summary.text: i18n.tr("Free space by removing orphaned downloaded files and links")
1136- summary.color: podbird.appTheme.baseSubText
1137 ProgressionSlot {}
1138 }
1139
1140@@ -301,7 +285,7 @@
1141
1142 Button {
1143 text: i18n.tr("Close")
1144- color: podbird.appTheme.positiveActionButton
1145+ color: theme.palette.normal.positive
1146 onClicked: {
1147 PopupUtils.close(dialogInternal)
1148 }
1149@@ -319,7 +303,6 @@
1150 ListItemLayout {
1151 // TRANSLATORS: About as in information about the app
1152 title.text: i18n.tr("About")
1153- title.color: podbird.appTheme.baseText
1154 ProgressionSlot {}
1155 }
1156 divider.visible: false
1157@@ -329,7 +312,6 @@
1158 ListItem {
1159 ListItemLayout {
1160 title.text: i18n.tr("Report Bug")
1161- title.color: podbird.appTheme.baseText
1162 ProgressionSlot {}
1163 }
1164 divider.visible: false
1165
1166=== modified file 'app/welcomewizard/Slide1.qml'
1167--- app/welcomewizard/Slide1.qml 2016-03-04 10:40:54 +0000
1168+++ app/welcomewizard/Slide1.qml 2016-05-30 18:00:34 +0000
1169@@ -65,7 +65,7 @@
1170 anchors.right: parent.right
1171 anchors.margins: units.gu(1)
1172 anchors.bottom: parent.bottom
1173- color: "grey"
1174+ color: theme.palette.normal.backgroundSecondaryText
1175 textSize: Label.Small
1176 wrapMode: Text.WordWrap
1177 horizontalAlignment: Text.AlignHCenter
1178
1179=== modified file 'app/welcomewizard/Slide7.qml'
1180--- app/welcomewizard/Slide7.qml 2016-03-18 12:44:26 +0000
1181+++ app/welcomewizard/Slide7.qml 2016-05-30 18:00:34 +0000
1182@@ -72,7 +72,7 @@
1183 }
1184 height: units.gu(6)
1185 width: parent.width/1.3
1186- color: UbuntuColors.green
1187+ color: theme.palette.normal.positive
1188 text: i18n.tr("Finish")
1189 onClicked: finished()
1190 }

Subscribers

People subscribed via source and target branches