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
=== modified file 'app/components/ActionButton.qml'
--- app/components/ActionButton.qml 2016-03-04 10:40:54 +0000
+++ app/components/ActionButton.qml 2016-05-30 18:00:34 +0000
@@ -28,7 +28,7 @@
28 Rectangle {28 Rectangle {
29 visible: abstractButton.pressed29 visible: abstractButton.pressed
30 anchors.fill: parent30 anchors.fill: parent
31 color: podbird.appTheme.hightlightListView31 color: theme.palette.selected.background
32 }32 }
3333
34 Icon {34 Icon {
@@ -36,6 +36,6 @@
36 width: units.gu(2.5)36 width: units.gu(2.5)
37 height: width37 height: width
38 anchors.centerIn: parent38 anchors.centerIn: parent
39 color: podbird.appTheme.baseIcon39 color: abstractButton.pressed ? theme.palette.selected.backgroundText : theme.palette.normal.backgroundText
40 }40 }
41}41}
4242
=== modified file 'app/components/Card.qml'
--- app/components/Card.qml 2016-03-24 16:39:24 +0000
+++ app/components/Card.qml 2016-05-30 18:00:34 +0000
@@ -49,7 +49,7 @@
49 Component {49 Component {
50 id: hintComponent50 id: hintComponent
51 Rectangle {51 Rectangle {
52 color: podbird.appTheme.focusText52 color: theme.palette.normal.positive
53 width: secondaryLabel.implicitWidth + units.gu(1)53 width: secondaryLabel.implicitWidth + units.gu(1)
54 height: secondaryLabel.implicitHeight + units.gu(1)54 height: secondaryLabel.implicitHeight + units.gu(1)
55 radius: units.gu(0.5)55 radius: units.gu(0.5)
@@ -60,7 +60,7 @@
60 text: secondaryText60 text: secondaryText
61 visible: text !== ""61 visible: text !== ""
62 textSize: Label.Small62 textSize: Label.Small
63 color: "White"63 color: theme.palette.normal.positiveText
64 }64 }
65 }65 }
66 }66 }
@@ -74,7 +74,7 @@
74 right: imgFrame.right74 right: imgFrame.right
75 margins: units.gu(1)75 margins: units.gu(1)
76 }76 }
77 color: podbird.appTheme.baseText77 color: theme.palette.normal.backgroundText
78 elide: Text.ElideRight78 elide: Text.ElideRight
79 textSize: Label.Small79 textSize: Label.Small
80 wrapMode: Text.WordWrap80 wrapMode: Text.WordWrap
8181
=== modified file 'app/components/CustomProgressBar.qml'
--- app/components/CustomProgressBar.qml 2016-03-04 10:40:54 +0000
+++ app/components/CustomProgressBar.qml 2016-05-30 18:00:34 +0000
@@ -26,7 +26,7 @@
26 property bool indeterminateProgress: false26 property bool indeterminateProgress: false
2727
28 radius: width/328 radius: width/3
29 color: Theme.palette.normal.base29 color: theme.palette.normal.base
3030
31 Rectangle {31 Rectangle {
32 id: currentProgress32 id: currentProgress
@@ -34,7 +34,7 @@
34 radius: parent.radius34 radius: parent.radius
35 anchors.left: parent.left35 anchors.left: parent.left
36 anchors.top: parent.top36 anchors.top: parent.top
37 color: podbird.appTheme.focusText37 color: theme.palette.normal.activity
38 width: progress >= 0 && progress <= 100 ? (progress / 100) * parent.width : parent.width / 638 width: progress >= 0 && progress <= 100 ? (progress / 100) * parent.width : parent.width / 6
3939
40 SequentialAnimation {40 SequentialAnimation {
4141
=== modified file 'app/components/CustomSectionHeader.qml'
--- app/components/CustomSectionHeader.qml 2016-03-24 16:39:24 +0000
+++ app/components/CustomSectionHeader.qml 2016-05-30 18:00:34 +0000
@@ -31,7 +31,7 @@
3131
32 Label {32 Label {
33 id: headerText33 id: headerText
34 color: podbird.appTheme.baseText34 color: theme.palette.normal.backgroundText
35 font.weight: Font.DemiBold35 font.weight: Font.DemiBold
36 anchors { top: parent.top; topMargin: units.gu(2); bottom: parent.bottom; bottomMargin: units.gu(2) }36 anchors { top: parent.top; topMargin: units.gu(2); bottom: parent.bottom; bottomMargin: units.gu(2) }
37 width: parent.width37 width: parent.width
@@ -39,7 +39,7 @@
39 39
40 Rectangle {40 Rectangle {
41 id: divider41 id: divider
42 color: settings.themeName === "Dark.qml" ? "#888888" : "#cdcdcd"42 color: theme.palette.normal.base
43 width: parent.width43 width: parent.width
44 height: units.dp(1)44 height: units.dp(1)
45 anchors.bottom: parent.bottom45 anchors.bottom: parent.bottom
4646
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml 2016-03-24 16:39:24 +0000
+++ app/components/EmptyState.qml 2016-05-30 18:00:34 +0000
@@ -38,7 +38,7 @@
38 id: emptyIcon38 id: emptyIcon
39 width: units.gu(22)39 width: units.gu(22)
40 height: units.gu(12)40 height: units.gu(12)
41 color: podbird.appTheme.baseIcon41 color: theme.palette.normal.backgroundText
42 anchors.horizontalCenter: parent.horizontalCenter42 anchors.horizontalCenter: parent.horizontalCenter
43 }43 }
4444
@@ -48,7 +48,7 @@
48 anchors.topMargin: units.gu(5)48 anchors.topMargin: units.gu(5)
49 width: parent.width49 width: parent.width
50 textSize: Label.Large50 textSize: Label.Large
51 color: podbird.appTheme.baseText51 color: theme.palette.normal.backgroundText
52 horizontalAlignment: Text.AlignHCenter52 horizontalAlignment: Text.AlignHCenter
53 wrapMode: Text.WrapAtWordBoundaryOrAnywhere53 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
54 }54 }
@@ -57,7 +57,7 @@
57 id: emptySublabel57 id: emptySublabel
58 width: parent.width58 width: parent.width
59 anchors.top: emptyLabel.bottom59 anchors.top: emptyLabel.bottom
60 color: podbird.appTheme.baseSubText60 color: theme.palette.normal.backgroundSecondaryText
61 horizontalAlignment: Text.AlignHCenter61 horizontalAlignment: Text.AlignHCenter
62 wrapMode: Text.WrapAtWordBoundaryOrAnywhere62 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
63 }63 }
6464
=== modified file 'app/components/HeaderListItem.qml'
--- app/components/HeaderListItem.qml 2016-03-24 16:39:24 +0000
+++ app/components/HeaderListItem.qml 2016-05-30 18:00:34 +0000
@@ -31,7 +31,6 @@
31 ListItemLayout {31 ListItemLayout {
32 id: headerText32 id: headerText
33 title.text: " "33 title.text: " "
34 title.color: podbird.appTheme.baseText
35 title.font.weight: Font.DemiBold34 title.font.weight: Font.DemiBold
36 }35 }
37}36}
3837
=== modified file 'app/components/SingleValueListItem.qml'
--- app/components/SingleValueListItem.qml 2016-03-24 16:39:24 +0000
+++ app/components/SingleValueListItem.qml 2016-05-30 18:00:34 +0000
@@ -32,11 +32,10 @@
32 id: customItemLayout32 id: customItemLayout
3333
34 title.text: " "34 title.text: " "
35 title.color: podbird.appTheme.baseText
3635
37 Label {36 Label {
38 id: _value37 id: _value
39 color: podbird.appTheme.baseText38 color: parent.title.color
40 SlotsLayout.position: SlotsLayout.Trailing;39 SlotsLayout.position: SlotsLayout.Trailing;
41 }40 }
4241
4342
=== modified file 'app/components/Walkthrough.qml'
--- app/components/Walkthrough.qml 2016-03-04 10:40:54 +0000
+++ app/components/Walkthrough.qml 2016-05-30 18:00:34 +0000
@@ -32,13 +32,13 @@
32 property list<Component> model32 property list<Component> model
3333
34 // Property to set the color of bottom cirle to indicate the user's progress34 // Property to set the color of bottom cirle to indicate the user's progress
35 property color completeColor: "green"35 property color completeColor: theme.palette.normal.activity
3636
37 // Property to set the color of the bottom circle to indicate the slide still left to cover37 // Property to set the color of the bottom circle to indicate the slide still left to cover
38 property color inCompleteColor: "lightgrey"38 property color inCompleteColor: theme.palette.normal.base
3939
40 // Property to set the color of the skip welcome wizard text40 // Property to set the color of the skip welcome wizard text
41 property color skipTextColor: "grey"41 property color skipTextColor: theme.palette.normal.backgroundSecondaryText
4242
43 // Property to signal walkthrough completion43 // Property to signal walkthrough completion
44 signal finished44 signal finished
@@ -122,7 +122,7 @@
122 border.width: listView.currentIndex == index ? units.gu(0.2) : units.gu(0)122 border.width: listView.currentIndex == index ? units.gu(0.2) : units.gu(0)
123 border.color: completeColor123 border.color: completeColor
124 anchors.verticalCenter: parent.verticalCenter124 anchors.verticalCenter: parent.verticalCenter
125 color: listView.currentIndex == index ? "White"125 color: listView.currentIndex == index ? theme.palette.normal.background
126 : listView.currentIndex >= index ? completeColor126 : listView.currentIndex >= index ? completeColor
127 : inCompleteColor127 : inCompleteColor
128 Behavior on color {128 Behavior on color {
129129
=== modified file 'app/podbird.qml'
--- app/podbird.qml 2016-03-28 21:03:25 +0000
+++ app/podbird.qml 2016-05-30 18:00:34 +0000
@@ -38,9 +38,7 @@
38 width: units.gu(50)38 width: units.gu(50)
39 height: units.gu(75)39 height: units.gu(75)
4040
41 backgroundColor: appTheme.background41 theme.name: appTheme.baseTheme
42 theme.name: settings.themeName == "Dark.qml" ? "Ubuntu.Components.Themes.SuruDark"
43 : "Ubuntu.Components.Themes.Ambiance"
4442
45 Component.onDestruction: {43 Component.onDestruction: {
46 console.log("[LOG]: Download cancelled");44 console.log("[LOG]: Download cancelled");
@@ -97,10 +95,6 @@
97 Themes.ThemeManager {95 Themes.ThemeManager {
98 id: themeManager96 id: themeManager
99 source: settings.themeName97 source: settings.themeName
100 onSourceChanged: {
101 podbird.theme.name = settings.themeName == "Dark.qml" ? "Ubuntu.Components.Themes.SuruDark"
102 : "Ubuntu.Components.Themes.Ambiance"
103 }
104 }98 }
10599
106 property alias appTheme: themeManager.theme100 property alias appTheme: themeManager.theme
@@ -426,7 +420,7 @@
426420
427 Rectangle {421 Rectangle {
428 id: loadingIndicator422 id: loadingIndicator
429 color: podbird.appTheme.background423 color: theme.palette.normal.background
430 anchors.fill: parent424 anchors.fill: parent
431425
432 ActivityIndicator {426 ActivityIndicator {
433427
=== modified file 'app/settings/About.qml'
--- app/settings/About.qml 2016-03-18 22:17:59 +0000
+++ app/settings/About.qml 2016-05-30 18:00:34 +0000
@@ -27,10 +27,6 @@
2727
28 title: i18n.tr("About")28 title: i18n.tr("About")
2929
30 StyleHints {
31 backgroundColor: podbird.appTheme.background
32 }
33
34 extension: Sections {30 extension: Sections {
35 id: aboutPageHeaderSections31 id: aboutPageHeaderSections
3632
@@ -39,9 +35,6 @@
39 bottom: parent.bottom35 bottom: parent.bottom
40 }36 }
4137
42 StyleHints {
43 selectedSectionColor: podbird.appTheme.focusText
44 }
45 // TRANSTORS: Credits as in the code and design contributors to the app38 // TRANSTORS: Credits as in the code and design contributors to the app
46 model: [i18n.tr("About"), i18n.tr("Credits")]39 model: [i18n.tr("About"), i18n.tr("Credits")]
47 }40 }
4841
=== modified file 'app/settings/CleanSetting.qml'
--- app/settings/CleanSetting.qml 2016-03-24 16:39:24 +0000
+++ app/settings/CleanSetting.qml 2016-05-30 18:00:34 +0000
@@ -28,9 +28,6 @@
28 header: PageHeader {28 header: PageHeader {
29 title: i18n.tr("Delete older than")29 title: i18n.tr("Delete older than")
30 flickable: cleanup30 flickable: cleanup
31 StyleHints {
32 backgroundColor: podbird.appTheme.background
33 }
34 }31 }
3532
36 ListModel {33 ListModel {
@@ -64,13 +61,12 @@
6461
65 ListItemLayout {62 ListItemLayout {
66 title.text: model.name63 title.text: model.name
67 title.color: podbird.appTheme.baseText
6864
69 Icon {65 Icon {
70 width: units.gu(2)66 width: units.gu(2)
71 height: width67 height: width
72 name: "ok"68 name: "ok"
73 color: podbird.appTheme.baseText69 color: parent.title.color
74 visible: podbird.settings.retentionDays === model.value70 visible: podbird.settings.retentionDays === model.value
75 SlotsLayout.position: SlotsLayout.Trailing71 SlotsLayout.position: SlotsLayout.Trailing
76 }72 }
7773
=== modified file 'app/settings/Credits.qml'
--- app/settings/Credits.qml 2016-03-24 16:39:24 +0000
+++ app/settings/Credits.qml 2016-05-30 18:00:34 +0000
@@ -58,7 +58,6 @@
58 delegate: ListItem {58 delegate: ListItem {
59 ListItemLayout {59 ListItemLayout {
60 title.text: model.name60 title.text: model.name
61 title.color: podbird.appTheme.baseText
62 ProgressionSlot {}61 ProgressionSlot {}
63 }62 }
64 divider.visible: false63 divider.visible: false
6564
=== modified file 'app/settings/DownloadSetting.qml'
--- app/settings/DownloadSetting.qml 2016-03-24 16:39:24 +0000
+++ app/settings/DownloadSetting.qml 2016-05-30 18:00:34 +0000
@@ -28,9 +28,6 @@
28 header: PageHeader {28 header: PageHeader {
29 title: i18n.tr("Download at most")29 title: i18n.tr("Download at most")
30 flickable: download30 flickable: download
31 StyleHints {
32 backgroundColor: podbird.appTheme.background
33 }
34 }31 }
3532
36 ListModel {33 ListModel {
@@ -63,13 +60,12 @@
6360
64 ListItemLayout {61 ListItemLayout {
65 title.text: model.name62 title.text: model.name
66 title.color: podbird.appTheme.baseText
6763
68 Icon {64 Icon {
69 width: units.gu(2)65 width: units.gu(2)
70 height: width66 height: width
71 name: "ok"67 name: "ok"
72 color: podbird.appTheme.baseText68 color: parent.title.color
73 visible: podbird.settings.maxEpisodeDownload === model.value69 visible: podbird.settings.maxEpisodeDownload === model.value
74 SlotsLayout.position: SlotsLayout.Trailing70 SlotsLayout.position: SlotsLayout.Trailing
75 }71 }
7672
=== modified file 'app/settings/ThemeSetting.qml'
--- app/settings/ThemeSetting.qml 2016-03-24 16:39:24 +0000
+++ app/settings/ThemeSetting.qml 2016-05-30 18:00:34 +0000
@@ -28,9 +28,6 @@
28 header: PageHeader {28 header: PageHeader {
29 title: i18n.tr("Theme")29 title: i18n.tr("Theme")
30 flickable: themes30 flickable: themes
31 StyleHints {
32 backgroundColor: podbird.appTheme.background
33 }
34 }31 }
3532
36 ListModel {33 ListModel {
@@ -64,13 +61,12 @@
64 id: themeLayout61 id: themeLayout
6562
66 title.text: model.name63 title.text: model.name
67 title.color: podbird.appTheme.baseText
6864
69 Icon {65 Icon {
70 width: units.gu(2)66 width: units.gu(2)
71 height: width67 height: width
72 name: "ok"68 name: "ok"
73 color: podbird.appTheme.baseText69 color: parent.title.color
74 visible: podbird.settings.themeName === model.file70 visible: podbird.settings.themeName === model.file
75 SlotsLayout.position: SlotsLayout.Trailing71 SlotsLayout.position: SlotsLayout.Trailing
76 }72 }
7773
=== modified file 'app/themes/Dark.qml'
--- app/themes/Dark.qml 2016-03-29 11:02:18 +0000
+++ app/themes/Dark.qml 2016-05-30 18:00:34 +0000
@@ -19,27 +19,11 @@
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22QtObject {22StyledItem {
23 // MainView23 // Themes
24 property color background: "#242423"24 property string baseTheme: "Ubuntu.Components.Themes.SuruDark"
2525 property string bottomBarTheme: "Ubuntu.Components.Themes.SuruDark"
26 // Main Text Colors26
27 property color baseText: "White"27 // Colors that themes don't provide
28 property color baseSubText: "#999999"28 property color linkText: UbuntuColors.blue // must work on normal.overlay too
29 property color focusText: "#35AF44"
30 property color linkText: "Cyan"
31
32 // Icon Colors
33 property color baseIcon: "White"
34
35 // Button Colors
36 property color positiveActionButton: UbuntuColors.green
37 property color negativeActionButton: UbuntuColors.red
38 property color neutralActionButton: UbuntuColors.coolGrey
39
40 // Bottom Player Bar Colors
41 property color bottomBarBackground: "#15141A"
42
43 // Highlight Color
44 property color hightlightListView: "#2D2D2C"
45}29}
4630
=== modified file 'app/themes/Light.qml'
--- app/themes/Light.qml 2016-03-29 11:02:18 +0000
+++ app/themes/Light.qml 2016-05-30 18:00:34 +0000
@@ -19,27 +19,11 @@
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22QtObject {22StyledItem {
23 // MainView23 // Themes
24 property color background: "#ECECEC"24 property string baseTheme: "Ubuntu.Components.Themes.Ambiance"
2525 property string bottomBarTheme: "Ubuntu.Components.Themes.SuruDark"
26 // Main Text Colors26
27 property color baseText: UbuntuColors.darkGrey27 // Colors that themes don't provide
28 property color baseSubText: "#999999"28 property color linkText: UbuntuColors.blue // must work on normal.overlay too
29 property color focusText: "#35AF44"
30 property color linkText: "Blue"
31
32 // Icon Colors
33 property color baseIcon: UbuntuColors.darkGrey
34
35 // Button Colors
36 property color positiveActionButton: UbuntuColors.green
37 property color negativeActionButton: UbuntuColors.red
38 property color neutralActionButton: UbuntuColors.coolGrey
39
40 // Bottom Player Bar Colors
41 property color bottomBarBackground: "#323435"
42
43 // Highlight Color
44 property color hightlightListView: "#F5F5F5"
45}29}
4630
=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml 2016-03-29 11:02:46 +0000
+++ app/ui/EpisodesPage.qml 2016-05-30 18:00:34 +0000
@@ -52,10 +52,6 @@
52 title: i18n.tr("Podcast")52 title: i18n.tr("Podcast")
53 flickable: null53 flickable: null
5454
55 StyleHints {
56 backgroundColor: podbird.appTheme.background
57 }
58
59 trailingActionBar.actions: [55 trailingActionBar.actions: [
60 Action {56 Action {
61 iconName: "search"57 iconName: "search"
@@ -90,10 +86,6 @@
90 }86 }
91 }87 }
9288
93 StyleHints {
94 backgroundColor: podbird.appTheme.background
95 }
96
97 contents: Loader {89 contents: Loader {
98 id: searchField90 id: searchField
99 sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined91 sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
@@ -115,10 +107,6 @@
115 }107 }
116 }108 }
117109
118 StyleHints {
119 backgroundColor: podbird.appTheme.background
120 }
121
122 leadingActionBar.actions: [110 leadingActionBar.actions: [
123 Action {111 Action {
124 iconName: "back"112 iconName: "back"
@@ -304,7 +292,7 @@
304 text: i18n.tr("Are you sure you want to unsubscribe from <b>%1</b>?").arg(episodesPage.episodeName)292 text: i18n.tr("Are you sure you want to unsubscribe from <b>%1</b>?").arg(episodesPage.episodeName)
305 Button {293 Button {
306 text: i18n.tr("Unsubscribe")294 text: i18n.tr("Unsubscribe")
307 color: podbird.appTheme.negativeActionButton295 color: theme.palette.normal.negative
308 onClicked: {296 onClicked: {
309 var db = Podcasts.init();297 var db = Podcasts.init();
310 db.transaction(function (tx) {298 db.transaction(function (tx) {
@@ -321,7 +309,6 @@
321 }309 }
322 Button {310 Button {
323 text: i18n.tr("Cancel")311 text: i18n.tr("Cancel")
324 color: podbird.appTheme.neutralActionButton
325 onClicked: {312 onClicked: {
326 PopupUtils.close(dialogInternal)313 PopupUtils.close(dialogInternal)
327 }314 }
@@ -347,15 +334,15 @@
347 Label {334 Label {
348 width: parent.width335 width: parent.width
349 wrapMode: Text.WordWrap336 wrapMode: Text.WordWrap
350 color: UbuntuColors.coolGrey337 color: theme.palette.normal.overlayText
351 linkColor: "Blue"338 linkColor: podbird.appTheme.linkText
352 text: dialogInternal.description339 text: dialogInternal.description
353 onLinkActivated: Qt.openUrlExternally(link)340 onLinkActivated: Qt.openUrlExternally(link)
354 }341 }
355342
356 Button {343 Button {
357 text: i18n.tr("Close")344 text: i18n.tr("Close")
358 color: podbird.appTheme.positiveActionButton345 color: theme.palette.normal.positive
359 onClicked: {346 onClicked: {
360 PopupUtils.close(dialogInternal)347 PopupUtils.close(dialogInternal)
361 }348 }
@@ -448,7 +435,7 @@
448 horizontalAlignment: Text.AlignHCenter435 horizontalAlignment: Text.AlignHCenter
449 maximumLineCount: 2436 maximumLineCount: 2
450 elide: Text.ElideRight437 elide: Text.ElideRight
451 color: podbird.appTheme.baseText438 color: theme.palette.normal.backgroundText
452 anchors.top: cover.bottom439 anchors.top: cover.bottom
453 anchors.topMargin: units.gu(2)440 anchors.topMargin: units.gu(2)
454 }441 }
@@ -473,7 +460,7 @@
473 anchors.margins: units.gu(2)460 anchors.margins: units.gu(2)
474 height: units.gu(0.25)461 height: units.gu(0.25)
475 radius: width/3462 radius: width/3
476 color: UbuntuColors.lightGrey463 color: theme.palette.normal.base
477 }464 }
478465
479 Rectangle {466 Rectangle {
@@ -483,7 +470,7 @@
483 height: units.gu(0.25)470 height: units.gu(0.25)
484 radius: width/3471 radius: width/3
485 width: sliderContainer.width/3472 width: sliderContainer.width/3
486 color: podbird.appTheme.focusText473 color: theme.palette.normal.positionText
487 x: {474 x: {
488 if (episodesPage.mode === "unheard")475 if (episodesPage.mode === "unheard")
489 return units.gu(2)476 return units.gu(2)
@@ -506,7 +493,7 @@
506 width: sliderContainer.width/3493 width: sliderContainer.width/3
507 horizontalAlignment: Text.AlignHCenter494 horizontalAlignment: Text.AlignHCenter
508 font.weight: Font.DemiBold495 font.weight: Font.DemiBold
509 color: episodesPage.mode == "unheard" ? podbird.appTheme.focusText : podbird.appTheme.baseText496 color: episodesPage.mode == "unheard" ? theme.palette.normal.positionText : theme.palette.normal.backgroundTertiaryText
510497
511 AbstractButton {498 AbstractButton {
512 anchors.fill: parent499 anchors.fill: parent
@@ -521,7 +508,7 @@
521 width: sliderContainer.width/3508 width: sliderContainer.width/3
522 font.weight: Font.DemiBold509 font.weight: Font.DemiBold
523 horizontalAlignment: Text.AlignHCenter510 horizontalAlignment: Text.AlignHCenter
524 color: episodesPage.mode == "listened" ? podbird.appTheme.focusText : podbird.appTheme.baseText511 color: episodesPage.mode == "listened" ? theme.palette.normal.positionText : theme.palette.normal.backgroundTertiaryText
525512
526 AbstractButton {513 AbstractButton {
527 anchors.fill: parent514 anchors.fill: parent
@@ -537,7 +524,7 @@
537 font.weight: Font.DemiBold524 font.weight: Font.DemiBold
538 horizontalAlignment: Text.AlignHCenter525 horizontalAlignment: Text.AlignHCenter
539 text: i18n.tr("Downloaded")526 text: i18n.tr("Downloaded")
540 color: episodesPage.mode == "downloaded" ? podbird.appTheme.focusText : podbird.appTheme.baseText527 color: episodesPage.mode == "downloaded" ? theme.palette.normal.positionText : theme.palette.normal.backgroundTertiaryText
541528
542 AbstractButton {529 AbstractButton {
543 anchors.fill: parent530 anchors.fill: parent
@@ -557,7 +544,7 @@
557 id: listItem544 id: listItem
558545
559 divider.visible: false546 divider.visible: false
560 highlightColor: podbird.appTheme.hightlightListView547 highlightColor: theme.palette.selected.background
561 height: visible ? listItemLayout.height + progressBarLoader.height + units.gu(1) : 0548 height: visible ? listItemLayout.height + progressBarLoader.height + units.gu(1) : 0
562549
563 visible: episodesPage.mode == "listened" ? model.listened550 visible: episodesPage.mode == "listened" ? model.listened
@@ -568,8 +555,8 @@
568 id: listItemLayout555 id: listItemLayout
569556
570 title.text: model.name !== undefined ? model.name.trim() : "Undefined"557 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
571 title.color: downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText558 title.color: downloader.downloadingGuid === model.guid ? theme.palette.normal.positionText
572 : podbird.appTheme.baseText559 : theme.palette.normal.backgroundText
573 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800560 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
574 title.maximumLineCount: 1561 title.maximumLineCount: 1
575562
@@ -577,7 +564,6 @@
577 : Qt.formatDate(new Date(model.published), "MMM d, yyyy")564 : Qt.formatDate(new Date(model.published), "MMM d, yyyy")
578 : model.downloadedfile ? "šŸ“Ž " + Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")565 : model.downloadedfile ? "šŸ“Ž " + Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
579 : Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")566 : Podcasts.formatEpisodeTime(model.duration) + " | " + Qt.formatDate(new Date(model.published), "MMM d, yyyy")
580 subtitle.color: podbird.appTheme.baseSubText
581567
582 padding.top: units.gu(1)568 padding.top: units.gu(1)
583 padding.bottom: units.gu(0.5)569 padding.bottom: units.gu(0.5)
@@ -707,7 +693,6 @@
707 Scrollbar {693 Scrollbar {
708 flickableItem: episodeList694 flickableItem: episodeList
709 align: Qt.AlignTrailing695 align: Qt.AlignTrailing
710 StyleHints { sliderColor: podbird.appTheme.focusText }
711 }696 }
712 }697 }
713698
714699
=== modified file 'app/ui/EpisodesTab.qml'
--- app/ui/EpisodesTab.qml 2016-03-24 16:43:33 +0000
+++ app/ui/EpisodesTab.qml 2016-05-30 18:00:34 +0000
@@ -47,10 +47,6 @@
47 visible: episodesPage.header === standardHeader47 visible: episodesPage.header === standardHeader
48 title: i18n.tr("Episodes")48 title: i18n.tr("Episodes")
4949
50 StyleHints {
51 backgroundColor: podbird.appTheme.background
52 }
53
54 leadingActionBar {50 leadingActionBar {
55 numberOfSlots: 051 numberOfSlots: 0
56 actions: tabsList.actions52 actions: tabsList.actions
@@ -75,10 +71,6 @@
75 bottom: parent.bottom71 bottom: parent.bottom
76 }72 }
7773
78 StyleHints {
79 selectedSectionColor: podbird.appTheme.focusText
80 }
81
82 model: [i18n.tr("Recent"), i18n.tr("Downloads"), i18n.tr("Favourites")]74 model: [i18n.tr("Recent"), i18n.tr("Downloads"), i18n.tr("Favourites")]
83 onSelectedIndexChanged: {75 onSelectedIndexChanged: {
84 refreshModel();76 refreshModel();
@@ -90,10 +82,6 @@
90 id: searchHeader82 id: searchHeader
91 visible: episodesPage.header === searchHeader83 visible: episodesPage.header === searchHeader
9284
93 StyleHints {
94 backgroundColor: podbird.appTheme.background
95 }
96
97 contents: Loader {85 contents: Loader {
98 id: searchField86 id: searchField
99 sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined87 sourceComponent: episodesPage.header === searchHeader ? searchFieldComponent : undefined
@@ -133,10 +121,6 @@
133 }121 }
134 }122 }
135123
136 StyleHints {
137 backgroundColor: podbird.appTheme.background
138 }
139
140 leadingActionBar.actions: [124 leadingActionBar.actions: [
141 Action {125 Action {
142 iconName: "back"126 iconName: "back"
@@ -409,15 +393,15 @@
409 Label {393 Label {
410 width: parent.width394 width: parent.width
411 wrapMode: Text.WordWrap395 wrapMode: Text.WordWrap
412 linkColor: "Blue"396 linkColor: podbird.appTheme.linkText
413 color: UbuntuColors.coolGrey397 color: theme.palette.normal.overlayText
414 text: dialogInternal.description398 text: dialogInternal.description
415 onLinkActivated: Qt.openUrlExternally(link)399 onLinkActivated: Qt.openUrlExternally(link)
416 }400 }
417401
418 Button {402 Button {
419 text: i18n.tr("Close")403 text: i18n.tr("Close")
420 color: podbird.appTheme.positiveActionButton404 color: theme.palette.normal.positive
421 onClicked: {405 onClicked: {
422 PopupUtils.close(dialogInternal)406 PopupUtils.close(dialogInternal)
423 }407 }
@@ -531,15 +515,15 @@
531 id: listItem515 id: listItem
532516
533 divider.visible: false517 divider.visible: false
534 highlightColor: podbird.appTheme.hightlightListView518 highlightColor: theme.palette.selected.background
535 height: downloader.downloadingGuid === model.guid ? listItemLayout.height + progressBarLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)519 height: downloader.downloadingGuid === model.guid ? listItemLayout.height + progressBarLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)
536520
537 ListItemLayout {521 ListItemLayout {
538 id: listItemLayout522 id: listItemLayout
539523
540 title.text: model.name !== undefined ? model.name.trim() : "Undefined"524 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
541 title.color: downloader.downloadingGuid === model.guid ? podbird.appTheme.focusText525 title.color: downloader.downloadingGuid === model.guid ? theme.palette.normal.positionText
542 : podbird.appTheme.baseText526 : theme.palette.normal.backgroundText
543 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800527 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
544 title.maximumLineCount: 1528 title.maximumLineCount: 1
545529
@@ -547,7 +531,6 @@
547 : model.artist531 : model.artist
548 : model.downloadedfile ? "šŸ“Ž " + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist532 : model.downloadedfile ? "šŸ“Ž " + Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
549 : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist533 : Podcasts.formatEpisodeTime(model.duration) + " | " + model.artist
550 subtitle.color: podbird.appTheme.baseSubText
551534
552 Image {535 Image {
553 height: width536 height: width
@@ -694,7 +677,6 @@
694 Scrollbar {677 Scrollbar {
695 flickableItem: episodeList678 flickableItem: episodeList
696 align: Qt.AlignTrailing679 align: Qt.AlignTrailing
697 StyleHints { sliderColor: podbird.appTheme.focusText }
698 }680 }
699681
700 PullToRefresh {682 PullToRefresh {
701683
=== modified file 'app/ui/FullPlayingView.qml'
--- app/ui/FullPlayingView.qml 2016-03-24 16:39:24 +0000
+++ app/ui/FullPlayingView.qml 2016-05-30 18:00:34 +0000
@@ -103,7 +103,7 @@
103 textSize: Label.Large103 textSize: Label.Large
104 maximumLineCount: 2104 maximumLineCount: 2
105 wrapMode: Text.WordWrap105 wrapMode: Text.WordWrap
106 color: podbird.appTheme.baseText106 color: theme.palette.normal.backgroundText
107 }107 }
108 108
109 Label {109 Label {
@@ -115,7 +115,7 @@
115 text: currentArtist115 text: currentArtist
116 elide: Text.ElideRight116 elide: Text.ElideRight
117 textSize: Label.Small117 textSize: Label.Small
118 color: podbird.appTheme.baseSubText118 color: theme.palette.normal.backgroundSecondaryText
119 }119 }
120 120
121 Slider {121 Slider {
@@ -141,7 +141,6 @@
141 }141 }
142 142
143 function formatValue(v) { return Podcasts.formatTime(v/1000); }143 function formatValue(v) { return Podcasts.formatTime(v/1000); }
144 StyleHints { foregroundColor: podbird.appTheme.focusText }
145 }144 }
146 145
147 Connections {146 Connections {
@@ -154,7 +153,7 @@
154 textSize: Label.Small153 textSize: Label.Small
155 anchors.left: scrubber.left154 anchors.left: scrubber.left
156 anchors.top: scrubber.bottom155 anchors.top: scrubber.bottom
157 color: podbird.appTheme.baseText156 color: theme.palette.normal.backgroundText
158 text: Podcasts.formatTime(player.position / 1000)157 text: Podcasts.formatTime(player.position / 1000)
159 }158 }
160 159
@@ -163,7 +162,7 @@
163 textSize: Label.Small162 textSize: Label.Small
164 anchors.right: scrubber.right163 anchors.right: scrubber.right
165 anchors.top: scrubber.bottom164 anchors.top: scrubber.bottom
166 color: podbird.appTheme.baseText165 color: theme.palette.normal.backgroundText
167 text: Podcasts.formatTime(player.duration / 1000)166 text: Podcasts.formatTime(player.duration / 1000)
168 }167 }
169 168
@@ -188,7 +187,7 @@
188 width: units.gu(3)187 width: units.gu(3)
189 height: width188 height: width
190 anchors.centerIn: parent189 anchors.centerIn: parent
191 color: podbird.appTheme.baseIcon190 color: theme.palette.normal.backgroundText
192 name: "media-skip-backward"191 name: "media-skip-backward"
193 }192 }
194 }193 }
@@ -214,7 +213,7 @@
214 // xgettext: no-c-format213 // xgettext: no-c-format
215 text: i18n.tr("-%1s").arg(podbird.settings.skipBack)214 text: i18n.tr("-%1s").arg(podbird.settings.skipBack)
216 textSize: Label.XxSmall215 textSize: Label.XxSmall
217 color: podbird.appTheme.baseText216 color: theme.palette.normal.backgroundText
218 anchors.verticalCenter: skipBackwardIcon.verticalCenter217 anchors.verticalCenter: skipBackwardIcon.verticalCenter
219 }218 }
220 219
@@ -223,7 +222,7 @@
223 width: units.gu(3)222 width: units.gu(3)
224 height: width223 height: width
225 name: "media-seek-backward"224 name: "media-seek-backward"
226 color: podbird.appTheme.baseIcon225 color: theme.palette.normal.backgroundText
227 }226 }
228 }227 }
229 }228 }
@@ -240,7 +239,7 @@
240 width: units.gu(6)239 width: units.gu(6)
241 height: width240 height: width
242 anchors.centerIn: parent241 anchors.centerIn: parent
243 color: podbird.appTheme.baseIcon242 color: theme.palette.normal.backgroundText
244 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"243 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
245 : "media-playback-start"244 : "media-playback-start"
246 }245 }
@@ -267,7 +266,7 @@
267 width: units.gu(3)266 width: units.gu(3)
268 height: width267 height: width
269 name: "media-seek-forward"268 name: "media-seek-forward"
270 color: podbird.appTheme.baseIcon269 color: theme.palette.normal.backgroundText
271 }270 }
272 271
273 Label {272 Label {
@@ -275,7 +274,7 @@
275 // xgettext: no-c-format274 // xgettext: no-c-format
276 text: i18n.tr("+%1s").arg(podbird.settings.skipForward)275 text: i18n.tr("+%1s").arg(podbird.settings.skipForward)
277 textSize: Label.XxSmall276 textSize: Label.XxSmall
278 color: podbird.appTheme.baseText277 color: theme.palette.normal.backgroundText
279 anchors.verticalCenter: skipForwardIcon.verticalCenter278 anchors.verticalCenter: skipForwardIcon.verticalCenter
280 }279 }
281 }280 }
@@ -295,7 +294,7 @@
295 width: units.gu(3)294 width: units.gu(3)
296 height: width295 height: width
297 anchors.centerIn: parent296 anchors.centerIn: parent
298 color: podbird.appTheme.baseIcon297 color: theme.palette.normal.backgroundText
299 name: "media-skip-forward"298 name: "media-skip-forward"
300 }299 }
301 }300 }
302301
=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml 2016-03-17 00:37:17 +0000
+++ app/ui/NowPlayingPage.qml 2016-05-30 18:00:34 +0000
@@ -33,10 +33,6 @@
33 header: PageHeader {33 header: PageHeader {
34 title: i18n.tr("Now Playing")34 title: i18n.tr("Now Playing")
3535
36 StyleHints {
37 backgroundColor: podbird.appTheme.background
38 }
39
40 leadingActionBar.actions: Action {36 leadingActionBar.actions: Action {
41 iconName: "back"37 iconName: "back"
42 text: i18n.tr("Back")38 text: i18n.tr("Back")
@@ -67,9 +63,6 @@
67 bottom: parent.bottom63 bottom: parent.bottom
68 }64 }
6965
70 StyleHints {
71 selectedSectionColor: podbird.appTheme.focusText
72 }
73 model: [i18n.tr("Full view"), i18n.tr("Queue")]66 model: [i18n.tr("Full view"), i18n.tr("Queue")]
74 }67 }
75 }68 }
7669
=== modified file 'app/ui/PlayerControls.qml'
--- app/ui/PlayerControls.qml 2016-03-14 00:19:15 +0000
+++ app/ui/PlayerControls.qml 2016-05-30 18:00:34 +0000
@@ -20,10 +20,17 @@
20import QtMultimedia 5.620import QtMultimedia 5.6
21import Ubuntu.Components 1.321import Ubuntu.Components 1.3
2222
23Rectangle {23StyledItem {
24 id: controlRect24 id: controlRect
2525
26 color: podbird.appTheme.bottomBarBackground26 theme: ThemeSettings {
27 name: appTheme.bottomBarTheme
28 }
29
30 Rectangle {
31 anchors.fill: parent
32 color: theme.palette.normal.overlay
33 }
2734
28 MouseArea {35 MouseArea {
29 z: -136 z: -1
@@ -47,7 +54,7 @@
47 id: progressBarHint54 id: progressBarHint
48 anchors.left: parent.left55 anchors.left: parent.left
49 anchors.top: cover.bottom56 anchors.top: cover.bottom
50 color: podbird.appTheme.focusText57 color: theme.palette.normal.activity
51 height: units.gu(0.25)58 height: units.gu(0.25)
52 width: player.duration > 0 ? (player.position / player.duration) * parent.width : 059 width: player.duration > 0 ? (player.position / player.duration) * parent.width : 0
53 }60 }
@@ -63,7 +70,7 @@
63 font.weight: Font.Bold70 font.weight: Font.Bold
64 anchors.left: parent.left71 anchors.left: parent.left
65 anchors.right: parent.right72 anchors.right: parent.right
66 color: "white"73 color: theme.palette.normal.overlayText
67 elide: Text.ElideRight74 elide: Text.ElideRight
68 maximumLineCount: 275 maximumLineCount: 2
69 wrapMode: Text.WordWrap76 wrapMode: Text.WordWrap
@@ -72,7 +79,7 @@
7279
73 Label {80 Label {
74 textSize: Label.Small81 textSize: Label.Small
75 color: "#999999"82 color: theme.palette.normal.overlaySecondaryText
76 text: currentArtist83 text: currentArtist
77 elide: Text.ElideRight84 elide: Text.ElideRight
78 font.weight: Font.Light85 font.weight: Font.Light
@@ -92,7 +99,7 @@
92 Rectangle {99 Rectangle {
93 id: playButtonBackground100 id: playButtonBackground
94 anchors.fill: parent101 anchors.fill: parent
95 color: "#FFF"102 color: theme.palette.normal.overlayText
96 opacity: 0.1103 opacity: 0.1
97 visible: playButton.pressed104 visible: playButton.pressed
98 }105 }
@@ -101,7 +108,7 @@
101 : player.play()108 : player.play()
102109
103 Icon {110 Icon {
104 color: "white"111 color: theme.palette.normal.overlayText
105 width: units.gu(3)112 width: units.gu(3)
106 height: width113 height: width
107 anchors.centerIn: playButtonBackground114 anchors.centerIn: playButtonBackground
108115
=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml 2016-03-29 11:02:46 +0000
+++ app/ui/PodcastsTab.qml 2016-05-30 18:00:34 +0000
@@ -42,10 +42,6 @@
42 title: i18n.tr("Podcasts")42 title: i18n.tr("Podcasts")
43 visible: podcastPage.header === standardHeader43 visible: podcastPage.header === standardHeader
4444
45 StyleHints {
46 backgroundColor: podbird.appTheme.background
47 }
48
49 leadingActionBar {45 leadingActionBar {
50 numberOfSlots: 046 numberOfSlots: 0
51 actions: tabsList.actions47 actions: tabsList.actions
@@ -67,10 +63,6 @@
67 id: searchHeader63 id: searchHeader
68 visible: podcastPage.header === searchHeader64 visible: podcastPage.header === searchHeader
6965
70 StyleHints {
71 backgroundColor: podbird.appTheme.background
72 }
73
74 contents: Loader {66 contents: Loader {
75 id: searchField67 id: searchField
76 sourceComponent: podcastPage.header === searchHeader ? searchFieldComponent : undefined68 sourceComponent: podcastPage.header === searchHeader ? searchFieldComponent : undefined
@@ -207,14 +199,13 @@
207199
208 height: listItemLayout.height200 height: listItemLayout.height
209 divider.visible: false201 divider.visible: false
210 highlightColor: podbird.appTheme.hightlightListView202 highlightColor: theme.palette.selected.background
211203
212 ListItemLayout {204 ListItemLayout {
213 id: listItemLayout205 id: listItemLayout
214 title.text: model.name !== undefined ? model.name.trim() : "Undefined"206 title.text: model.name !== undefined ? model.name.trim() : "Undefined"
215 summary.text: model.episodeCount > 0 ? i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)207 summary.text: model.episodeCount > 0 ? i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
216 : ""208 : ""
217 summary.color: podbird.appTheme.baseSubText
218209
219 Image {210 Image {
220 height: width211 height: width
@@ -257,7 +248,6 @@
257 Scrollbar {248 Scrollbar {
258 flickableItem: listView249 flickableItem: listView
259 align: Qt.AlignTrailing250 align: Qt.AlignTrailing
260 StyleHints { sliderColor: podbird.appTheme.focusText }
261 }251 }
262252
263 PullToRefresh {253 PullToRefresh {
264254
=== modified file 'app/ui/Queue.qml'
--- app/ui/Queue.qml 2016-03-24 16:39:24 +0000
+++ app/ui/Queue.qml 2016-05-30 18:00:34 +0000
@@ -58,11 +58,10 @@
58 title.text: layout.metaModel.name58 title.text: layout.metaModel.name
59 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 180059 // #FIXME: Change this 2 to prevent title eliding when UITK is updated to rev > 1800
60 title.maximumLineCount: 160 title.maximumLineCount: 1
61 title.color: player.playlist.currentIndex === index ? podbird.appTheme.focusText61 title.color: player.playlist.currentIndex === index ? theme.palette.normal.positionText
62 : podbird.appTheme.baseText62 : theme.palette.normal.backgroundText
6363
64 subtitle.text: layout.metaModel.artist64 subtitle.text: layout.metaModel.artist
65 subtitle.color: podbird.appTheme.baseSubText
66 }65 }
6766
68 leadingActions: ListItemActions {67 leadingActions: ListItemActions {
6968
=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml 2016-03-28 23:47:24 +0000
+++ app/ui/SearchPage.qml 2016-05-30 18:00:34 +0000
@@ -40,10 +40,6 @@
40 visible: searchPage.header === standardHeader40 visible: searchPage.header === standardHeader
41 title: i18n.tr("Add New Podcasts")41 title: i18n.tr("Add New Podcasts")
4242
43 StyleHints {
44 backgroundColor: podbird.appTheme.background
45 }
46
47 leadingActionBar {43 leadingActionBar {
48 numberOfSlots: 044 numberOfSlots: 0
49 actions: tabsList.actions45 actions: tabsList.actions
@@ -75,10 +71,6 @@
7571
76 visible: searchPage.header === searchHeader72 visible: searchPage.header === searchHeader
7773
78 StyleHints {
79 backgroundColor: podbird.appTheme.background
80 }
81
82 contents: Loader {74 contents: Loader {
83 id: searchField75 id: searchField
84 sourceComponent: searchPage.header === searchHeader ? searchFieldComponent : undefined76 sourceComponent: searchPage.header === searchHeader ? searchFieldComponent : undefined
@@ -104,10 +96,6 @@
10496
105 visible: searchPage.header === addHeader97 visible: searchPage.header === addHeader
10698
107 StyleHints {
108 backgroundColor: podbird.appTheme.background
109 }
110
111 contents: Loader {99 contents: Loader {
112 id: feedUrlField100 id: feedUrlField
113 sourceComponent: searchPage.header === addHeader ? feedUrlComponent : undefined101 sourceComponent: searchPage.header === addHeader ? feedUrlComponent : undefined
@@ -177,7 +165,6 @@
177 text: i18n.tr("Please check the URL and try again")165 text: i18n.tr("Please check the URL and try again")
178 Button {166 Button {
179 text: i18n.tr("Close")167 text: i18n.tr("Close")
180 color: podbird.appTheme.neutralActionButton
181 onClicked: {168 onClicked: {
182 PopupUtils.close(dialogInternal)169 PopupUtils.close(dialogInternal)
183 }170 }
@@ -248,7 +235,7 @@
248 divider.visible: false235 divider.visible: false
249 highlightColor: "Transparent"236 highlightColor: "Transparent"
250 height: expanded ? listItemLayout.height + descriptionLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)237 height: expanded ? listItemLayout.height + descriptionLoader.height + units.gu(1) : listItemLayout.height + units.gu(0.5)
251 color: index % 2 === 0 ? podbird.appTheme.hightlightListView : "Transparent"238 color: index % 2 === 0 ? theme.palette.selected.background : "Transparent"
252239
253 ListItemLayout {240 ListItemLayout {
254 id: listItemLayout241 id: listItemLayout
@@ -256,7 +243,6 @@
256 title.text: model.name243 title.text: model.name
257244
258 subtitle.text: model.artist245 subtitle.text: model.artist
259 subtitle.color: podbird.appTheme.baseSubText
260246
261 padding.top: units.gu(1)247 padding.top: units.gu(1)
262 padding.bottom: units.gu(0.5)248 padding.bottom: units.gu(0.5)
@@ -271,7 +257,7 @@
271257
272 Button {258 Button {
273 SlotsLayout.position: SlotsLayout.Trailing259 SlotsLayout.position: SlotsLayout.Trailing
274 color: !model.subscribed ? UbuntuColors.green : UbuntuColors.red260 color: !model.subscribed ? theme.palette.normal.positive : theme.palette.normal.negative
275 text: !model.subscribed ? i18n.tr("Subscribe") : i18n.tr("Unsubscribe")261 text: !model.subscribed ? i18n.tr("Subscribe") : i18n.tr("Unsubscribe")
276 onClicked: {262 onClicked: {
277 if (!model.subscribed) {263 if (!model.subscribed) {
@@ -313,7 +299,7 @@
313 text: i18n.tr("Last Updated: %1\n%2").arg(model.releaseDate.split("T")[0]).arg(model.description)299 text: i18n.tr("Last Updated: %1\n%2").arg(model.releaseDate.split("T")[0]).arg(model.description)
314 wrapMode: Text.WordWrap300 wrapMode: Text.WordWrap
315 textSize: Label.Small301 textSize: Label.Small
316 color: podbird.appTheme.baseSubText302 color: theme.palette.normal.backgroundTertiaryText
317 linkColor: podbird.appTheme.linkText303 linkColor: podbird.appTheme.linkText
318 height: expanded ? contentHeight : 0304 height: expanded ? contentHeight : 0
319 onLinkActivated: Qt.openUrlExternally(link)305 onLinkActivated: Qt.openUrlExternally(link)
320306
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml 2016-05-30 18:00:34 +0000
+++ app/ui/SettingsPage.qml 2016-05-30 18:00:34 +0000
@@ -33,10 +33,6 @@
33 header: PageHeader {33 header: PageHeader {
34 title: i18n.tr("Settings")34 title: i18n.tr("Settings")
3535
36 StyleHints {
37 backgroundColor: podbird.appTheme.background
38 }
39
40 leadingActionBar {36 leadingActionBar {
41 numberOfSlots: 037 numberOfSlots: 0
42 actions: tabsList.actions38 actions: tabsList.actions
@@ -70,12 +66,11 @@
70 maximumValue: 6066 maximumValue: 60
71 value: podbird.settings.skipForward67 value: podbird.settings.skipForward
72 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }68 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
73 StyleHints { foregroundColor: podbird.appTheme.focusText }
74 }69 }
7570
76 Button {71 Button {
77 text: i18n.tr("OK")72 text: i18n.tr("OK")
78 color: podbird.appTheme.positiveActionButton73 color: theme.palette.normal.positive
79 onClicked: {74 onClicked: {
80 podbird.settings.skipForward = Math.round(slider.value)75 podbird.settings.skipForward = Math.round(slider.value)
81 PopupUtils.close(dialogInternal)76 PopupUtils.close(dialogInternal)
@@ -83,7 +78,6 @@
83 }78 }
84 Button {79 Button {
85 text: i18n.tr("Cancel")80 text: i18n.tr("Cancel")
86 color: podbird.appTheme.neutralActionButton
87 onClicked: {81 onClicked: {
88 PopupUtils.close(dialogInternal)82 PopupUtils.close(dialogInternal)
89 }83 }
@@ -105,12 +99,11 @@
105 maximumValue: 6099 maximumValue: 60
106 value: podbird.settings.skipBack100 value: podbird.settings.skipBack
107 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }101 function formatValue(v) { return i18n.tr("%1 second", "%1 seconds", Math.round(v)).arg(Math.round(v)) }
108 StyleHints { foregroundColor: podbird.appTheme.focusText }
109 }102 }
110103
111 Button {104 Button {
112 text: i18n.tr("OK")105 text: i18n.tr("OK")
113 color: podbird.appTheme.positiveActionButton106 color: theme.palette.normal.positive
114 onClicked: {107 onClicked: {
115 podbird.settings.skipBack = Math.round(slider.value)108 podbird.settings.skipBack = Math.round(slider.value)
116 PopupUtils.close(dialogInternal)109 PopupUtils.close(dialogInternal)
@@ -118,7 +111,6 @@
118 }111 }
119 Button {112 Button {
120 text: i18n.tr("Cancel")113 text: i18n.tr("Cancel")
121 color: podbird.appTheme.neutralActionButton
122 onClicked: {114 onClicked: {
123 PopupUtils.close(dialogInternal)115 PopupUtils.close(dialogInternal)
124 }116 }
@@ -188,9 +180,7 @@
188 ListItemLayout {180 ListItemLayout {
189 id: deleteLayout181 id: deleteLayout
190 title.text: i18n.tr("Automatically delete old episodes")182 title.text: i18n.tr("Automatically delete old episodes")
191 title.color: podbird.appTheme.baseText
192 summary.text: i18n.tr("Delete episodes that are older than a given number of days for each podcast")183 summary.text: i18n.tr("Delete episodes that are older than a given number of days for each podcast")
193 summary.color: podbird.appTheme.baseSubText
194 ProgressionSlot {}184 ProgressionSlot {}
195 }185 }
196 divider.visible: false186 divider.visible: false
@@ -202,9 +192,7 @@
202 ListItemLayout {192 ListItemLayout {
203 id: downloadLayout193 id: downloadLayout
204 title.text: i18n.tr("Automatically download new episodes")194 title.text: i18n.tr("Automatically download new episodes")
205 title.color: podbird.appTheme.baseText
206 summary.text: i18n.tr("Default number of new episodes to download for each podcast")195 summary.text: i18n.tr("Default number of new episodes to download for each podcast")
207 summary.color: podbird.appTheme.baseSubText
208 ProgressionSlot{}196 ProgressionSlot{}
209 }197 }
210 divider.visible: false198 divider.visible: false
@@ -221,9 +209,7 @@
221 ListItemLayout {209 ListItemLayout {
222 id: refreshArt210 id: refreshArt
223 title.text: i18n.tr("Refresh podcast artwork")211 title.text: i18n.tr("Refresh podcast artwork")
224 title.color: podbird.appTheme.baseText
225 summary.text: i18n.tr("Update all podcasts artwork and fix missing ones (this only works with podcasts added via iTunesĀ® search)")212 summary.text: i18n.tr("Update all podcasts artwork and fix missing ones (this only works with podcasts added via iTunesĀ® search)")
226 summary.color: podbird.appTheme.baseSubText
227 summary.maximumLineCount: 3213 summary.maximumLineCount: 3
228 ProgressionSlot{}214 ProgressionSlot{}
229 }215 }
@@ -263,9 +249,7 @@
263 ListItemLayout {249 ListItemLayout {
264 id: orphanLayout250 id: orphanLayout
265 title.text: i18n.tr("Delete orphaned files and links")251 title.text: i18n.tr("Delete orphaned files and links")
266 title.color: podbird.appTheme.baseText
267 summary.text: i18n.tr("Free space by removing orphaned downloaded files and links")252 summary.text: i18n.tr("Free space by removing orphaned downloaded files and links")
268 summary.color: podbird.appTheme.baseSubText
269 ProgressionSlot {}253 ProgressionSlot {}
270 }254 }
271255
@@ -301,7 +285,7 @@
301285
302 Button {286 Button {
303 text: i18n.tr("Close")287 text: i18n.tr("Close")
304 color: podbird.appTheme.positiveActionButton288 color: theme.palette.normal.positive
305 onClicked: {289 onClicked: {
306 PopupUtils.close(dialogInternal)290 PopupUtils.close(dialogInternal)
307 }291 }
@@ -319,7 +303,6 @@
319 ListItemLayout {303 ListItemLayout {
320 // TRANSLATORS: About as in information about the app304 // TRANSLATORS: About as in information about the app
321 title.text: i18n.tr("About")305 title.text: i18n.tr("About")
322 title.color: podbird.appTheme.baseText
323 ProgressionSlot {}306 ProgressionSlot {}
324 }307 }
325 divider.visible: false308 divider.visible: false
@@ -329,7 +312,6 @@
329 ListItem {312 ListItem {
330 ListItemLayout {313 ListItemLayout {
331 title.text: i18n.tr("Report Bug")314 title.text: i18n.tr("Report Bug")
332 title.color: podbird.appTheme.baseText
333 ProgressionSlot {}315 ProgressionSlot {}
334 }316 }
335 divider.visible: false317 divider.visible: false
336318
=== modified file 'app/welcomewizard/Slide1.qml'
--- app/welcomewizard/Slide1.qml 2016-03-04 10:40:54 +0000
+++ app/welcomewizard/Slide1.qml 2016-05-30 18:00:34 +0000
@@ -65,7 +65,7 @@
65 anchors.right: parent.right65 anchors.right: parent.right
66 anchors.margins: units.gu(1)66 anchors.margins: units.gu(1)
67 anchors.bottom: parent.bottom67 anchors.bottom: parent.bottom
68 color: "grey"68 color: theme.palette.normal.backgroundSecondaryText
69 textSize: Label.Small69 textSize: Label.Small
70 wrapMode: Text.WordWrap70 wrapMode: Text.WordWrap
71 horizontalAlignment: Text.AlignHCenter71 horizontalAlignment: Text.AlignHCenter
7272
=== modified file 'app/welcomewizard/Slide7.qml'
--- app/welcomewizard/Slide7.qml 2016-03-18 12:44:26 +0000
+++ app/welcomewizard/Slide7.qml 2016-05-30 18:00:34 +0000
@@ -72,7 +72,7 @@
72 }72 }
73 height: units.gu(6)73 height: units.gu(6)
74 width: parent.width/1.374 width: parent.width/1.3
75 color: UbuntuColors.green75 color: theme.palette.normal.positive
76 text: i18n.tr("Finish")76 text: i18n.tr("Finish")
77 onClicked: finished()77 onClicked: finished()
78 }78 }

Subscribers

People subscribed via source and target branches