Merge lp:~nik90/podbird/12-optimize-playbar into lp:podbird

[Nekhelesh Ramananthan]

- Improves the show/hide animation of the bottom bar manipulating the bottomMargin variable instead of the height resulting in a more smoother feel

- The player control bottom bar is now loaded dynamically using a QML Loader.

[lp:~nik90/podbird/12-optimize-playbar]

82. By Nekhelesh Ramananthan on 2015-04-28

Merged prerequisite lp:~nik90/podbird/11-enable-rotation

83. By Nekhelesh Ramananthan on 2015-06-13

merged lp:~nik90/podbird/11-enable-rotation

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-06-13 16:54:25 +0000
+++ app/podbird.qml	2015-06-13 16:54:26 +0000
@@ -259,32 +259,46 @@
         }
     }
 
-    PlayerControls {
-        id: playerControl
+    Loader {
+        id: playerControlLoader
 
+        anchors.bottom: parent.bottom
+        height: units.gu(7)
+        width: parent.width
         visible: !Qt.inputMethod.visible
-        anchors.bottom: parent.bottom
 
-        state: "hidden"
+        state: "shown"
         states: [
             State {
                 name: "shown"
                 when: player.source != "" && !mainStack.currentPage.isNowPlayingPage
-                PropertyChanges { target: playerControl; height: units.gu(7) }
+                PropertyChanges { target: playerControlLoader; anchors.bottomMargin: 0 }
             },
 
             State {
                 name: "hidden"
-                when: player.source == ""
-                PropertyChanges { target: playerControl; height: 0 }
-            }
-        ]
-
-        Behavior on height {
-            UbuntuNumberAnimation {
-                duration: UbuntuAnimation.SlowDuration
-            }
-        }
+                when: player.source == "" || mainStack.currentPage.isNowPlayingPage || !playerControl.visible
+                PropertyChanges { target: playerControlLoader; anchors.bottomMargin: -units.gu(7) }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "hidden"; to: "shown"
+                SequentialAnimation {
+                    ScriptAction { script: playerControlLoader.source = Qt.resolvedUrl("ui/PlayerControls.qml") }
+                    UbuntuNumberAnimation { target: playerControlLoader; property: "anchors.bottomMargin"; duration: UbuntuAnimation.SlowDuration }
+                }
+            },
+
+            Transition {
+                from: "shown"; to: "hidden"
+                SequentialAnimation {
+                    UbuntuNumberAnimation { target: playerControlLoader; property: "anchors.bottomMargin"; duration: UbuntuAnimation.SlowDuration }
+                    ScriptAction { script: playerControlLoader.source = "" }
+                }
+            }
+        ]
     }
 
     function cleanUp(today, retentionDays) {

=== modified file 'app/ui/PlayerControls.qml'
--- app/ui/PlayerControls.qml	2015-04-22 10:15:34 +0000
+++ app/ui/PlayerControls.qml	2015-06-13 16:54:26 +0000
@@ -24,8 +24,6 @@
 Rectangle {
     id: controlRect
 
-    height: 0
-    width: parent.width
     color: podbird.appTheme.bottomBarBackground
 
     MouseArea {
@@ -38,7 +36,6 @@
 
     Item {
         anchors.fill: parent
-        visible: controlRect.height > 0
 
         Image {
             id: cover
@@ -94,8 +91,6 @@
             height: cover.height
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
-            enabled: controlRect.height > 0
-            visible: enabled
 
             Rectangle {
                 id: playButtonBackground

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-06-13 16:54:25 +0000
+++ po/com.mikeasoft.podbird.pot	2015-06-13 16:54:26 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-28 14:20+0000\n"
+"POT-Creation-Date: 2015-04-28 23:23+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"
@@ -512,6 +512,6 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-11-enable-rotation-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-12-optimize-playbar-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""