Merge lp:~nik90/podbird/fix-header-issue into lp:podbird

[Nekhelesh Ramananthan]

This MP fixes,
- first listitem behind hidden by the header
- scrollbar in episodes page sometimes showing behind the page header (in vivid)
- Removes loader anchors as specified in the SDK docs (no change visually)

This is only a temporary fix to the listitem issue since it looks like a sdk issue. I tried creating a sample app to reproduce it but in vain. I will keep trying.

[Michael Sheldon (michael-sheldon)]

Merged, but I've restored the anchors to the loader for now as it broke the settings page and search page on the desktop.

review: Approve

[Nekhelesh Ramananthan (nik90)]

Oh..that's strange. I will make sure to test on the desktop here on for stuff like these.

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-04-19 13:13:25 +0000
+++ app/podbird.qml	2015-04-20 12:18:35 +0000
@@ -226,9 +226,6 @@
 
                 page: Loader {
                     parent: searchTab
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.bottom: parent.bottom
                     source: (tabs.selectedTab === searchTab) ? Qt.resolvedUrl("ui/SearchPage.qml") : ""
                 }
             }
@@ -240,9 +237,6 @@
 
                 page: Loader {
                     parent: settingsTab
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.bottom: parent.bottom
                     source: (tabs.selectedTab === settingsTab) ? Qt.resolvedUrl("ui/SettingsPage.qml") : ""
                 }
             }

=== modified file 'app/ui/EpisodesPage.qml'
--- app/ui/EpisodesPage.qml	2015-04-19 13:10:27 +0000
+++ app/ui/EpisodesPage.qml	2015-04-20 12:18:35 +0000
@@ -598,11 +598,11 @@
             refreshing: episodesUpdating
             onRefresh: updateEpisodesDatabase();
         }
-    }
 
-    // #FIXME: Use SDK Scrollbar when it is themeable
-    CustomScrollBar {
-        listview: episodeList
+        // #FIXME: Use SDK Scrollbar when it is themeable
+        CustomScrollBar {
+            listview: episodeList
+        }
     }
 
     function refreshModel() {

=== modified file 'app/ui/PodcastsTab.qml'
--- app/ui/PodcastsTab.qml	2015-04-18 22:44:02 +0000
+++ app/ui/PodcastsTab.qml	2015-04-20 12:18:35 +0000
@@ -36,7 +36,12 @@
     page: Page {
         id: podcastPage
 
-        flickable: viewLoader.item
+        /*
+         #FIXME: The page flickable is to null instead of viewLoader.item since
+         it otherwise creates bug http://pad.lv/1446162 which can confuse a
+         new user.
+        */
+        flickable: null
 
         /*
          #FIXME: The following lines of code is necessary due to a upstream bug
@@ -145,6 +150,7 @@
 
             CardView {
                 id: cardView
+                clip: true
                 model: sortedPodcastModel
                 delegate: Card {
                     id: albumCard
@@ -177,6 +183,7 @@
                     flickDeceleration = flickDeceleration * scaleFactor;
                 }
 
+                clip: true
                 model: sortedPodcastModel
                 anchors.fill: parent
 

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-04-19 23:37:08 +0000
+++ po/com.mikeasoft.podbird.pot	2015-04-20 12:18:35 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-20 00:36+0100\n"
+"POT-Creation-Date: 2015-04-20 12:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -31,7 +31,7 @@
 msgid "Add New Podcasts"
 msgstr ""
 
-#: ../app/podbird.qml:239
+#: ../app/podbird.qml:236
 msgid "Settings"
 msgstr ""
 
@@ -267,7 +267,7 @@
 msgid "No podcasts found matching the search term."
 msgstr ""
 
-#: ../app/ui/PodcastsTab.qml:153 ../app/ui/PodcastsTab.qml:273
+#: ../app/ui/PodcastsTab.qml:154 ../app/ui/PodcastsTab.qml:275
 #, qt-format
 msgid "%1 unheard episode"
 msgid_plural "%1 unheard episodes"
@@ -493,6 +493,6 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/mike/src/podbird/build-debian-packaging-Ubuntu_Device3_GCC_armhf_ubuntu_sdk_14_10_utopic-Default/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-fix-header-issue-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
 msgid "Podbird"
 msgstr ""