Merge lp:~etherpulse/podbird/bottom_edge into lp:podbird/devel

[Eran Uzan]

Added bottom edge support (it can be turned off in the settings).

Unmerged revisions

159. By Eran Uzan on 2017-06-10

Added bottom edge support toggle in setting page

158. By Eran Uzan on 2017-06-08

Removed unneeded code

157. By Eran Uzan on 2017-06-08

Added bottom edge

156. By Eran Uzan on 2017-01-20

Merged with upstream/devel

155. By Eran Uzan on 2016-12-01

Merged with lp:podbird/devel

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2017-01-02 23:58:38 +0000
+++ app/podbird.qml	2017-06-10 21:55:08 +0000
@@ -127,6 +127,7 @@
         property int skipForward: 30
         property int skipBack: 10
         property bool downloadOverWifiOnly: true
+        property bool enableBottomEdge: true
     }
 
     FileManager {
@@ -469,7 +470,6 @@
 
     Loader {
         id: playerControlLoader
-
         anchors.bottom: parent.bottom
         height: units.gu(7)
         width: parent.width
@@ -479,13 +479,13 @@
         states: [
             State {
                 name: "shown"
-                when: player.playlist.itemCount !== 0 && !mainStack.currentPage.isNowPlayingPage
+                when: player.playlist.itemCount !== 0
                 PropertyChanges { target: playerControlLoader; anchors.bottomMargin: 0 }
             },
 
             State {
                 name: "hidden"
-                when: player.playlist.itemCount === 0 || mainStack.currentPage.isNowPlayingPage || !playerControl.visible
+                when: player.playlist.itemCount === 0 || !playerControl.visible
                 PropertyChanges { target: playerControlLoader; anchors.bottomMargin: -units.gu(7) }
             }
         ]
@@ -494,7 +494,7 @@
             Transition {
                 from: "hidden"; to: "shown"
                 SequentialAnimation {
-                    ScriptAction { script: playerControlLoader.source = Qt.resolvedUrl("ui/PlayerControls.qml") }
+                    ScriptAction { script: playerControlLoader.setSource( Qt.resolvedUrl("ui/PlayerControls.qml") ,{ bottomEdge : bottomEdgeLoader.item})}
                     UbuntuNumberAnimation { target: playerControlLoader; property: "anchors.bottomMargin"; duration: UbuntuAnimation.SlowDuration }
                 }
             },
@@ -503,7 +503,7 @@
                 from: "shown"; to: "hidden"
                 SequentialAnimation {
                     UbuntuNumberAnimation { target: playerControlLoader; property: "anchors.bottomMargin"; duration: UbuntuAnimation.SlowDuration }
-                    ScriptAction { script: playerControlLoader.source = "" }
+                    ScriptAction { script: playerControlLoader.setSource( "" ); }
                 }
             }
         ]
@@ -525,4 +525,14 @@
         }
     }
 
+    Loader {
+        id: bottomEdgeLoader
+        asynchronous: true
+        Component.onCompleted: setSource("ui/BottomEdge.qml", {
+                                             "objectName": "bottomEdge",
+                                             "parent": podbird,
+                                             "hint.objectName": "bottomEdgeHint"
+                                         })
+    }
+
 }
 
=== added file 'app/ui/BottomEdge.qml'
--- app/ui/BottomEdge.qml	1970-01-01 00:00:00 +0000
+++ app/ui/BottomEdge.qml	2017-06-10 21:55:08 +0000
@@ -0,0 +1,29 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+
+BottomEdge {
+    id: bottomEdge
+    objectName: "bottomEdge"
+
+   hint {
+       id:bottomEdgeHint
+       enabled: bottomEdge.status != BottomEdge.Committed && podbird.settings.enableBottomEdge
+       visible : player.playlist.itemCount !== 0 && podbird.settings.enableBottomEdge
+       status: BottomEdgeHint.Inactive
+   }
+
+   onCollapseCompleted : {
+       bottomEdgeHint.status = BottomEdgeHint.Inactive
+   }
+
+
+    contentComponent: NowPlayingPage {
+        implicitWidth: bottomEdge.width
+        implicitHeight: bottomEdge.height
+        enabled: bottomEdge.status === BottomEdge.Committed
+        active: bottomEdge.status === BottomEdge.Committed
+        visible: (bottomEdge.status !== BottomEdge.Hidden)
+        onCloseBottomEdge: bottomEdge.collapse()
+    }
+}
 
=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml	2016-03-17 00:37:17 +0000
+++ app/ui/NowPlayingPage.qml	2017-06-10 21:55:08 +0000
@@ -30,6 +30,8 @@
 
     property bool isNowPlayingPage: true
 
+    signal closeBottomEdge()
+
     header: PageHeader {
         title: i18n.tr("Now Playing")
 
@@ -38,13 +40,13 @@
         }
 
         leadingActionBar.actions: Action {
-            iconName: "back"
+            iconName: nowPlayingPageSections.selectedIndex === 1 && currentViewLoader.item.ViewItems.dragMode ? "back" : "go-down"
             text: i18n.tr("Back")
             onTriggered: {
                 if (nowPlayingPageSections.selectedIndex === 1 && currentViewLoader.item.ViewItems.dragMode) {
                     currentViewLoader.item.ViewItems.dragMode = !currentViewLoader.item.ViewItems.dragMode
                 } else {
-                    mainStack.pop()
+                    closeBottomEdge()
                 }
             }
         }
@@ -55,7 +57,7 @@
             onTriggered: {
                 Podcasts.clearQueue()
                 player.playlist.clear()
-                mainStack.pop()
+                 closeBottomEdge()
             }
         }
 
 
=== modified file 'app/ui/PlayerControls.qml'
--- app/ui/PlayerControls.qml	2016-12-22 21:00:02 +0000
+++ app/ui/PlayerControls.qml	2017-06-10 21:55:08 +0000
@@ -23,14 +23,18 @@
 Rectangle {
     id: controlRect
 
+    property var bottomEdge: null
+
     color: podbird.appTheme.bottomBarBackground
 
     MouseArea {
         z: -1
         anchors.fill: parent
         onClicked: {
-            mainStack.push(Qt.resolvedUrl("NowPlayingPage.qml"))
+            //mainStack.push(Qt.resolvedUrl("NowPlayingPage.qml"))
+            bottomEdge.commit();
         }
+
     }
 
     Image {
 
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2016-12-08 17:20:48 +0000
+++ app/ui/SettingsPage.qml	2017-06-10 21:55:08 +0000
@@ -150,6 +150,20 @@
 
             ListItem {
                 ListItemLayout {
+                    id: bottomEdgeSwitchLayout
+                    title.text: i18n.tr("Enable bottom edge slide interaction")
+                    Switch {
+                        SlotsLayout.position: SlotsLayout.Last
+                        checked: podbird.settings.enableBottomEdge
+                        onClicked: podbird.settings.enableBottomEdge = checked
+                    }
+                }
+                divider.visible: false
+                height: bottomEdgeSwitchLayout.height
+            }
+
+            ListItem {
+                ListItemLayout {
                     id: gridViewLayout
                     title.text: i18n.tr("Displays podcasts in a list view")
                     Switch {