Merge lp:~nik90/podbird/1-add-theming-support into lp:podbird

[Nekhelesh Ramananthan]

- Added theming support for Podbird. Two themes light and dark theme have been created. Default theme is still the light theme.
- Updated QtQuick to 2.3
- Fixed status icons in the episode page not being vertically centered correctly
- Added a settings page

This MP adds theming support for Podbird. I have added two themes dark and light. The default theme is still the light theme, so existing users won't see any change while users who prefer the dark theme can switch to it.

I also updated QtQuick to 2.3, fixed status icons in the episode page not being vertically centered correctly in v0.4 and also added a new settings page.

[lp:~nik90/podbird/1-add-theming-support]

41. By Nekhelesh Ramananthan on 2015-03-08

Added credit to micheal hall for his ThemeManager

[Michael Sheldon (michael-sheldon)]

Just had a cursory glance through the code so far, which looks good, but I don't think we can merge this until the licensing of the ThemeManager component is clear.

review: Needs Information

[Nekhelesh Ramananthan (nik90)]

> Just had a cursory glance through the code so far, which looks good, but I
> don't think we can merge this until the licensing of the ThemeManager
> component is clear.

Agreed. I have sent an email to Michael Hall (cced it to you as well) about this. Once I get it, I will update the MP.

[lp:~nik90/podbird/1-add-theming-support]

42. By Nekhelesh Ramananthan on 2015-03-08

Made expandable listitem into a reusuable component so that it can be used for other settings options as well

[Nekhelesh Ramananthan (nik90)]

@michael, I emailed michael hall and he said the license is BSD and that we can have it in the license of our choice. I looked through wikipedia and it seems some versions of BSD are compatible with GPL v3. Would you like to keep the same license or change it to GPL?

[lp:~nik90/podbird/1-add-theming-support]

43. By Nekhelesh Ramananthan on 2015-03-10

Updated thememanager copyright header

44. By Nekhelesh Ramananthan on 2015-03-10

Made ExpandableListItem title and subtitle APIs public

45. By Nekhelesh Ramananthan on 2015-03-27

Merged lp:podbird

46. By Nekhelesh Ramananthan on 2015-03-27

Made the expandable listitem API more standard (similar to what was done in the clock app)

47. By Nekhelesh Ramananthan on 2015-03-27

Updated ThemeManager to the latest version provided by michael hall

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-01-04 10:20:41 +0000
+++ app/CMakeLists.txt	2015-03-27 15:28:51 +0000
@@ -10,4 +10,5 @@
 install(FILES ${QML_JS_FILES} DESTINATION ${PODBIRD_DIR})
 
 add_subdirectory(ui)
+add_subdirectory(themes)
 

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-03-02 23:04:31 +0000
+++ app/podbird.qml	2015-03-27 15:28:51 +0000
@@ -1,38 +1,72 @@
-import QtQuick 2.0
+/*
+ * Copyright 2015 Michael Sheldon <[e-mail]>
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Podbird 1.0
 import QtMultimedia 5.0
+import Qt.labs.settings 1.0
+import Ubuntu.Components 1.1
 import QtQuick.LocalStorage 2.0
 import Ubuntu.DownloadManager 0.1
-import Ubuntu.Components 1.1
-import Podbird 1.0
 import "ui"
+import "themes" as Themes
 import "podcasts.js" as Podcasts
 
 MainView {
-    id: mainView
+    id: podbird
 
     objectName: "mainView"
     applicationName: "com.mikeasoft.podbird"
-
-    property string currentName
-    property string currentArtist
-    property string currentImage
-    property string currentGuid
-
     useDeprecatedToolbar: false
     anchorToKeyboard: true
 
     width: units.gu(50)
     height: units.gu(75)
 
-    FileManager {
-        id: fileManager
-    }
+    backgroundColor: theme.background
 
     Component.onDestruction: {
         console.log("Download cancelled");
         downloader.cancel();
     }
 
+    property string currentName
+    property string currentArtist
+    property string currentImage
+    property string currentGuid
+
+    Themes.ThemeManager {
+        id: themeManager
+        source: settings.themeName
+    }
+
+    property alias theme: themeManager.theme
+    property var themeManager: themeManager
+
+    property var settings: Settings {
+        // Set "Light.qml" as the default theme
+        property string themeName: "Light.qml"
+    }
+
+    FileManager {
+        id: fileManager
+    }
+
     SingleDownload {
         id: imageDownloader
         property string feed;
@@ -103,8 +137,14 @@
             }
 
             SearchTab {
+                id: searchTab
                 objectName: "searchTab"
             }
+
+            SettingsTab {
+                id: settingsTab
+                objectName: "settingsTab"
+            }
         }
     }
 
@@ -136,4 +176,3 @@
         }
     }
 }
-

=== added directory 'app/themes'
=== added file 'app/themes/CMakeLists.txt'
--- app/themes/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/themes/CMakeLists.txt	2015-03-27 15:28:51 +0000
@@ -0,0 +1,7 @@
+file(GLOB THEME_FILES *.qml)
+
+# Make the files visible in the qtcreator tree
+add_custom_target(podbird_THEMEFiles ALL SOURCES ${THEME_FILES})
+
+install(FILES ${THEME_FILES} DESTINATION ${PODBIRD_DIR}/themes)
+

=== added file 'app/themes/Dark.qml'
--- app/themes/Dark.qml	1970-01-01 00:00:00 +0000
+++ app/themes/Dark.qml	2015-03-27 15:28:51 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+QtObject {
+    // MainView
+    property color background: "#1E1E23"
+
+    // Main Text Colors
+    property color baseText: "White"
+    property color baseSubText: "#999999"
+    property color focusText: "#FF9900"
+
+    // Icon Colors
+    property color baseIcon: "White"
+
+    // Button Colors
+    property color positiveActionButton: UbuntuColors.green
+    property color negativeActionButton: UbuntuColors.red
+    property color neutralActionButton: UbuntuColors.coolGrey
+
+    // Bottom Player Bar Colors
+    property color bottomBarBackground: "#0F0F0F"
+
+    // Highlight Color
+    property color hightlightListView: "#2C2C34"
+}

=== added file 'app/themes/Light.qml'
--- app/themes/Light.qml	1970-01-01 00:00:00 +0000
+++ app/themes/Light.qml	2015-03-27 15:28:51 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+QtObject {
+    // MainView
+    property color background: "#EEEEEE"
+
+    // Main Text Colors
+    property color baseText: UbuntuColors.darkGrey
+    property color baseSubText: "#999999"
+    property color focusText: UbuntuColors.orange
+
+    // Icon Colors
+    property color baseIcon: UbuntuColors.darkGrey
+
+    // Button Colors
+    property color positiveActionButton: UbuntuColors.green
+    property color negativeActionButton: UbuntuColors.red
+    property color neutralActionButton: UbuntuColors.coolGrey
+
+    // Bottom Player Bar Colors
+    property color bottomBarBackground: "#0F0F0F"
+
+    // Highlight Color
+    property color hightlightListView: "#D8D8D8"
+}

=== added file 'app/themes/ThemeManager.qml'
--- app/themes/ThemeManager.qml	1970-01-01 00:00:00 +0000
+++ app/themes/ThemeManager.qml	2015-03-27 15:28:51 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Michael Hall <[e-mail]>
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+QtObject {
+    id: themeManager
+
+    property QtObject theme
+    property string source
+
+    onSourceChanged: {
+        var themeComponent = Qt.createComponent(source)
+        if (themeComponent.status == Component.Ready) {
+            themeManager.theme = themeComponent.createObject(themeManager)
+        }
+    }
+}

=== modified file 'app/ui/EmptyState.qml'
--- app/ui/EmptyState.qml	2015-01-24 16:48:16 +0000
+++ app/ui/EmptyState.qml	2015-03-27 15:28:51 +0000
@@ -37,10 +37,10 @@
 
     Icon {
         id: emptyIcon
-        anchors.horizontalCenter: parent.horizontalCenter
+        width: height
         height: units.gu(10)
-        width: height
-        color: "#BBBBBB"
+        color: podbird.theme.baseIcon
+        anchors.horizontalCenter: parent.horizontalCenter
     }
 
     Label {
@@ -49,14 +49,15 @@
         anchors.topMargin: units.gu(5)
         anchors.horizontalCenter: parent.horizontalCenter
         fontSize: "large"
-        font.bold: true
+        color: podbird.theme.baseText
     }
 
     Label {
         id: emptySublabel
-        anchors.top: emptyLabel.bottom
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.top: emptyLabel.bottom
+        color: podbird.theme.baseSubText
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
     }

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2015-03-26 12:12:17 +0000
+++ app/ui/EpisodesPage.qml	2015-03-27 15:28:51 +0000
@@ -1,4 +1,22 @@
-import QtQuick 2.0
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
 import QtMultimedia 5.0
 import Ubuntu.Components 1.1
 import QtQuick.Layouts 1.1
@@ -110,7 +128,7 @@
             contents: TextField {
                 id: searchField
                 inputMethodHints: Qt.ImhNoPredictiveText
-                placeholderText: i18n.tr("Search Episode...")
+                placeholderText: i18n.tr("Search episode")
                 anchors.left: parent ? parent.left : undefined
                 anchors.right: parent ? parent.right : undefined
                 anchors.rightMargin: units.gu(2)
@@ -132,8 +150,8 @@
             title: i18n.tr("Unsubscribe Confirmation")
             text: i18n.tr("Are you sure you want to unsubscribe from <b>%1</b>?").arg(episodesPage.episodeName)
             Button {
-                text: i18n.tr("Yes")
-                color: UbuntuColors.orange
+                text: i18n.tr("Unsubscribe")
+                color: podbird.theme.negativeActionButton
                 onClicked: {
                     var db = Podcasts.init();
                     db.transaction(function (tx) {
@@ -149,8 +167,8 @@
                 }
             }
             Button {
-                text: i18n.tr("No")
-                color: UbuntuColors.green
+                text: i18n.tr("Cancel")
+                color: podbird.theme.neutralActionButton
                 onClicked: {
                     PopupUtils.close(dialogInternal)
                 }
@@ -200,9 +218,15 @@
 
             width: parent.width
             height: mainColumn.height
+            highlightWhenPressed: false
 
             onClicked: listItem.expanded = !listItem.expanded
 
+            Rectangle {
+                anchors.fill: parent
+                color: listItem.pressed ? podbird.theme.hightlightListView : "transparent"
+            }
+
             Column {
                 id: mainColumn
 
@@ -243,8 +267,8 @@
                             maximumLineCount: 2
                             wrapMode: Text.WordWrap
                             elide: Text.ElideRight
-                            color: currentGuid === model.guid ? UbuntuColors.orange
-                                                              : Theme.palette.normal.fieldText
+                            color: currentGuid === model.guid ? podbird.theme.focusText
+                                                              : podbird.theme.baseText
                         }
 
                         Label {
@@ -252,8 +276,8 @@
                             width: parent.width
                             text: Qt.formatDate(new Date(model.published), "MMM d, yyyy")
                             fontSize: "x-small"
-                            color: currentGuid === model.guid ? UbuntuColors.orange
-                                                              : Theme.palette.normal.fieldText
+                            color: currentGuid === model.guid ? podbird.theme.focusText
+                                                              : podbird.theme.baseText
                             elide: Text.ElideRight
                         }
                     }
@@ -269,7 +293,7 @@
                     width: parent.width
                     elide: Text.ElideRight
                     fontSize: "small"
-                    color: "#999999"
+                    color: podbird.theme.baseSubText
                     Behavior on height {
                         UbuntuNumberAnimation {
                             duration: UbuntuAnimation.SlowDuration
@@ -326,6 +350,7 @@
                         radius: width / 2
                         anchors.right: durationIcon.left
                         anchors.rightMargin: units.gu(2)
+                        anchors.verticalCenter: actionRow.verticalCenter
                         visible: model.listened
                         Icon {
                             id: tick
@@ -345,10 +370,13 @@
                         visible: duration.text !== ""
                         anchors.right: duration.left
                         anchors.rightMargin: units.gu(0.5)
+                        anchors.verticalCenter: actionRow.verticalCenter
+                        color: podbird.theme.baseIcon
                     }
 
                     Label {
                         id: duration
+                        color: podbird.theme.baseText
                         anchors.right: parent.right
                         anchors.verticalCenter: durationIcon.verticalCenter
                         fontSize: "small"
@@ -393,6 +421,7 @@
                                 name: player.playbackState === MediaPlayer.PlayingState && currentGuid === model.guid ? "media-playback-pause"
                                                                                                                       : "media-playback-start"
                                 width: units.gu(2.5)
+                                color: podbird.theme.baseIcon
                                 height: width
                                 anchors.centerIn: parent
                             }
@@ -417,6 +446,7 @@
                                 anchors.centerIn: parent
                                 width: units.gu(2.5)
                                 height: width
+                                color: podbird.theme.baseIcon
                                 opacity: downloader.downloadingGuid === model.guid ? 0.4 : 1.0
                             }
 
@@ -449,6 +479,7 @@
                         anchors.right: model.listened ? listened.left : durationIcon.left
                         anchors.leftMargin: units.gu(2)
                         anchors.rightMargin: units.gu(2)
+                        anchors.verticalCenter: actionRow.verticalCenter
                         height: units.gu(2.6)
                         value: downloader.progress
                     }

=== added file 'app/ui/ExpandableListItem.qml'
--- app/ui/ExpandableListItem.qml	1970-01-01 00:00:00 +0000
+++ app/ui/ExpandableListItem.qml	2015-03-27 15:28:51 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+ListItem.Expandable {
+    id: expandableListItem
+
+    property ListModel model
+    property Component delegate
+    property alias text: expandableHeader.text
+    property alias subText: expandableHeader.subText
+    property alias listViewHeight: expandableList.height
+
+    anchors {
+        left: parent.left
+        right: parent.right
+        margins: units.gu(-2)
+    }
+
+    collapseOnClick: true
+    expandedHeight: contentColumn.height + units.gu(1)
+
+    Column {
+        id: contentColumn
+
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Item {
+            width: parent.width
+            height: expandableListItem.collapsedHeight
+
+            ListItem.Subtitled {
+                id: expandableHeader
+
+                onClicked: expandableListItem.expanded = true
+
+                Icon {
+                    id: arrow
+
+                    width: units.gu(2)
+                    height: width
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    name: "go-down"
+                    color: "Grey"
+                    rotation: expandableListItem.expanded ? 180 : 0
+
+                    Behavior on rotation {
+                        UbuntuNumberAnimation {}
+                    }
+                }
+            }
+        }
+
+        ListView {
+            id: expandableList
+
+            height: units.gu(11)
+            width: parent.width
+            interactive: false
+            model: expandableListItem.model
+            delegate: expandableListItem.delegate
+        }
+    }
+}

=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml	2015-03-01 21:16:35 +0000
+++ app/ui/NowPlayingPage.qml	2015-03-27 15:28:51 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
 import QtMultimedia 5.0
 import Ubuntu.Components 1.1
 import "../podcasts.js" as Podcasts
@@ -35,7 +35,8 @@
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.right: parent.right
-        height: title.lineCount === 1 ? parent.height/2 + units.gu(3) : parent.height/2
+        height: title.lineCount === 1 ? parent.height/2 + units.gu(3)
+                                      : parent.height/2
         art: currentImage
 
         Image {
@@ -59,6 +60,7 @@
         fontSize: "large"
         maximumLineCount: 2
         wrapMode: Text.WordWrap
+        color: podbird.theme.baseText
     }
 
     Label {
@@ -70,6 +72,7 @@
         text: currentArtist
         elide: Text.ElideRight
         fontSize: "small"
+        color: podbird.theme.baseSubText
     }
 
     Slider {
@@ -103,6 +106,7 @@
         fontSize: "small"
         anchors.left: scrubber.left
         anchors.top: scrubber.bottom
+        color: podbird.theme.baseText
         text: Podcasts.formatTime(player.position / 1000)
     }
 
@@ -111,6 +115,7 @@
         fontSize: "small"
         anchors.right: scrubber.right
         anchors.top: scrubber.bottom
+        color: podbird.theme.baseText
         text: Podcasts.formatTime(player.duration / 1000)
     }
 
@@ -139,6 +144,7 @@
                 Label {
                     text: i18n.tr("-15s")
                     fontSize: "xx-small"
+                    color: podbird.theme.baseText
                     anchors.verticalCenter: skipBackwardIcon.verticalCenter
                 }
 
@@ -147,6 +153,7 @@
                     width: units.gu(3)
                     height: width
                     name: "media-seek-backward"
+                    color: podbird.theme.baseIcon
                 }
             }
         }
@@ -163,6 +170,7 @@
                 width: units.gu(6)
                 height: width
                 anchors.centerIn: parent
+                color: podbird.theme.baseIcon
                 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
                                                                         : "media-playback-start"
             }
@@ -189,11 +197,13 @@
                     width: units.gu(3)
                     height: width
                     name: "media-seek-forward"
+                    color: podbird.theme.baseIcon
                 }
 
                 Label {
                     text: i18n.tr("+15s")
                     fontSize: "xx-small"
+                    color: podbird.theme.baseText
                     anchors.verticalCenter: skipForwardIcon.verticalCenter
                 }
             }

=== modified file 'app/ui/PlayerControls.qml'
--- app/ui/PlayerControls.qml	2015-03-02 22:53:50 +0000
+++ app/ui/PlayerControls.qml	2015-03-27 15:28:51 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
 import QtMultimedia 5.0
 import Ubuntu.Components 1.1
 import "../podcasts.js" as Podcasts
@@ -25,8 +25,8 @@
     id: controlRect
 
     height: 0
-    color: "black"
     width: parent.width
+    color: podbird.theme.bottomBarBackground
 
     MouseArea {
         z: -1
@@ -65,8 +65,8 @@
             anchors.leftMargin: units.gu(2)
 
             Label {
+                fontSize: "small"
                 font.weight: Font.Bold
-                fontSize: "small"
                 anchors.left: parent.left
                 anchors.right: parent.right
                 color: "white"
@@ -77,13 +77,13 @@
             }
 
             Label {
-                font.weight: Font.Light
                 fontSize: "small"
-                anchors.left: parent.left
-                anchors.right: parent.right
                 color: "#999999"
-                elide: Text.ElideRight
                 text: currentArtist
+                elide: Text.ElideRight
+                font.weight: Font.Light
+                anchors.left: parent.left
+                anchors.right: parent.right
             }
         }
 

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2015-01-30 00:22:36 +0000
+++ app/ui/PodcastsTab.qml	2015-03-27 15:28:51 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
 import QtMultimedia 5.0
 import QtQuick.Layouts 1.1
 import QtQuick.LocalStorage 2.0
@@ -94,7 +94,7 @@
                 contents: TextField {
                     id: searchField
                     inputMethodHints: Qt.ImhNoPredictiveText
-                    placeholderText: i18n.tr("Search Podcast...")
+                    placeholderText: i18n.tr("Search podcast")
                     anchors.left: parent ? parent.left : undefined
                     anchors.right: parent ? parent.right : undefined
                     anchors.rightMargin: units.gu(2)
@@ -130,7 +130,7 @@
                 contents: TextField {
                     id: feedUrlField
                     inputMethodHints: Qt.ImhUrlCharactersOnly
-                    placeholderText: i18n.tr("Feed URL...")
+                    placeholderText: i18n.tr("Feed URL")
                     anchors.left: parent ? parent.left : undefined
                     anchors.right: parent ? parent.right : undefined
                     onAccepted: {
@@ -158,6 +158,7 @@
                 text: i18n.tr("Please check the URL and try again")
                 Button {
                     text: i18n.tr("Close")
+                    color: podbird.theme.neutralActionButton
                     onClicked: PopupUtils.close(dialogInternal)
                 }
             }
@@ -212,6 +213,8 @@
                 height: units.gu(8)
                 removable: true
                 confirmRemoval: true
+                highlightWhenPressed: false
+
                 onItemRemoved: {
                     var db = Podcasts.init();
                     db.transaction(function (tx) {
@@ -225,6 +228,11 @@
                     });
                 }
 
+                Rectangle {
+                    anchors.fill: parent
+                    color: listItem.pressed ? podbird.theme.hightlightListView : "transparent"
+                }
+
                 onClicked: {
                     if(podcastPage.state === "search") {
                         view.forceActiveFocus()
@@ -271,15 +279,16 @@
                                 width: parent.width
                                 fontSize: "small"
                                 elide: Text.ElideRight
+                                color: podbird.theme.baseText
                             }
 
                             Label {
                                 id: episodeCount
                                 width: parent.width
-                                color: "#999999"
+                                fontSize: "x-small"
+                                color: podbird.theme.baseSubText
                                 visible: model.episodeCount > 0
                                 text: i18n.tr("%1 unheard episode", "%1 unheard episodes", model.episodeCount).arg(model.episodeCount)
-                                fontSize: "x-small"
                             }
                         }
                     }

=== modified file 'app/ui/SearchTab.qml'
--- app/ui/SearchTab.qml	2015-02-28 13:35:03 +0000
+++ app/ui/SearchTab.qml	2015-03-27 15:28:51 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.1
 import QtQuick.LocalStorage 2.0
@@ -62,8 +62,15 @@
                 }
 
                 delegate: ListItem.Empty {
+                    id: listItem
 
                     height: units.gu(8)
+                    highlightWhenPressed: false
+
+                    Rectangle {
+                        anchors.fill: parent
+                        color: listItem.pressed ? podbird.theme.hightlightListView : "transparent"
+                    }
 
                     RowLayout {
                         id: titleRow
@@ -112,6 +119,7 @@
                         Button {
                             anchors.right: parent.right
                             text: i18n.tr("Subscribe")
+                            color: UbuntuColors.green
                             onClicked: {
                                 Podcasts.subscribe(model.artist, model.name, model.feed, model.image);
                                 imageDownloader.feed = model.feed;

=== added file 'app/ui/SettingsTab.qml'
--- app/ui/SettingsTab.qml	1970-01-01 00:00:00 +0000
+++ app/ui/SettingsTab.qml	2015-03-27 15:28:51 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015 Podbird Team
+ *
+ * This file is part of Podbird.
+ *
+ * Podbird is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * Podbird is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Tab {
+    id: tab
+
+    title: i18n.tr("Settings")
+
+    page: Page {
+        id: settingsPage
+
+        ListModel {
+            id: themeModel
+            ListElement { name: "Light"; file: "Light.qml" }
+            ListElement { name: "Dark"; file: "Dark.qml" }
+        }
+
+        ExpandableListItem {
+            id: themeSetting
+
+            model: themeModel
+            text: i18n.tr("Theme")
+            subText: podbird.settings.themeName.split(".qml")[0]
+
+            delegate: ListItem.Standard {
+                text: model.name
+
+                onClicked: {
+                    var themeElement = model.file
+                    podbird.settings.themeName = themeElement
+                    podbird.themeManager.source = themeElement
+                    themeSetting.expanded = false
+                }
+
+                Icon {
+                    width: units.gu(2)
+                    height: width
+                    name: "ok"
+                    visible: podbird.settings.themeName === model.file
+                    anchors.right: parent.right
+                    anchors.rightMargin: units.gu(2)
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+        }
+    }
+}

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-03-26 12:12:17 +0000
+++ po/com.mikeasoft.podbird.pot	2015-03-27 15:28:51 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-26 13:11+0100\n"
+"POT-Creation-Date: 2015-03-27 16:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,63 +18,59 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/ui/EpisodesPage.qml:67
+#: ../app/ui/EpisodesPage.qml:85
 msgid "Search Episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:76
+#: ../app/ui/EpisodesPage.qml:94
 msgid "Mark all listened"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:87
+#: ../app/ui/EpisodesPage.qml:105 ../app/ui/EpisodesPage.qml:153
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:102 ../app/ui/PodcastsTab.qml:86
+#: ../app/ui/EpisodesPage.qml:120 ../app/ui/PodcastsTab.qml:86
 #: ../app/ui/PodcastsTab.qml:109
 msgid "Back"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:113
-msgid "Search Episode..."
+#: ../app/ui/EpisodesPage.qml:131
+msgid "Search episode"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:132
+#: ../app/ui/EpisodesPage.qml:150
 msgid "Unsubscribe Confirmation"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:133
+#: ../app/ui/EpisodesPage.qml:151
 #, qt-format
 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:135
-msgid "Yes"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:152
-msgid "No"
-msgstr ""
-
-#: ../app/ui/EpisodesPage.qml:166
+#: ../app/ui/EpisodesPage.qml:170
+msgid "Cancel"
+msgstr ""
+
+#: ../app/ui/EpisodesPage.qml:184
 msgid "No Episodes found"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:167
+#: ../app/ui/EpisodesPage.qml:185
 msgid "No episodes found matching the search term."
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:295
+#: ../app/ui/EpisodesPage.qml:319
 #, no-c-format, qt-format
 msgid "%1h %2m"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:304
+#: ../app/ui/EpisodesPage.qml:328
 #, no-c-format, qt-format
 msgid "%1h"
 msgstr ""
 
-#: ../app/ui/EpisodesPage.qml:312
+#: ../app/ui/EpisodesPage.qml:336
 #, no-c-format, qt-format
 msgid "%1m"
 msgstr ""
@@ -83,11 +79,11 @@
 msgid "Now Playing"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:140
+#: ../app/ui/NowPlayingPage.qml:145
 msgid "-15s"
 msgstr ""
 
-#: ../app/ui/NowPlayingPage.qml:195
+#: ../app/ui/NowPlayingPage.qml:204
 msgid "+15s"
 msgstr ""
 
@@ -104,7 +100,7 @@
 msgstr ""
 
 #: ../app/ui/PodcastsTab.qml:97
-msgid "Search Podcast..."
+msgid "Search podcast"
 msgstr ""
 
 #: ../app/ui/PodcastsTab.qml:120
@@ -112,7 +108,7 @@
 msgstr ""
 
 #: ../app/ui/PodcastsTab.qml:133
-msgid "Feed URL..."
+msgid "Feed URL"
 msgstr ""
 
 #: ../app/ui/PodcastsTab.qml:157
@@ -127,25 +123,25 @@
 msgid "Close"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:171
+#: ../app/ui/PodcastsTab.qml:172
 msgid "No Podcast Subscriptions"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:172
+#: ../app/ui/PodcastsTab.qml:173
 msgid "No Podcasts Found"
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:173
+#: ../app/ui/PodcastsTab.qml:174
 msgid ""
 "You haven't subscribed to any podcasts yet, visit the 'Find New Podcasts' "
 "page to add some."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:174
+#: ../app/ui/PodcastsTab.qml:175
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:281
+#: ../app/ui/PodcastsTab.qml:291
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
@@ -160,10 +156,18 @@
 msgid "Search..."
 msgstr ""
 
-#: ../app/ui/SearchTab.qml:114
+#: ../app/ui/SearchTab.qml:121
 msgid "Subscribe"
 msgstr ""
 
-#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-fix-translation-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
+#: ../app/ui/SettingsTab.qml:26
+msgid "Settings"
+msgstr ""
+
+#: ../app/ui/SettingsTab.qml:41
+msgid "Theme"
+msgstr ""
+
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-1-add-theming-support-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
 msgid "Podbird"
 msgstr ""