@@ -15,7 +15,8 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Styles 1.1
1920import Utils 0.1
2021import Unity 0.2
2122import Dash 0.1
@@ -496,6 +497,85 @@ FocusScope {
496497 }
497498 }
498499
500+ Rectangle {
501+ id: pullToRefreshClippingRectangle
502+ anchors.left: parent.left
503+ anchors.right: parent.right
504+ anchors.bottom: parent.bottom
505+ height: parent.height - pullToRefresh.contentY + (pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].height - pageHeaderLoader.item.height : 0)
506+ clip: true
507+ color: "#00000000"
508+
509+ PullToRefresh {
510+ id: pullToRefresh
511+ objectName: "pullToRefresh"
512+ target: categoryView
513+
514+ readonly property real contentY: categoryView.contentY - categoryView.originY
515+ y: -contentY - units.gu(5)
516+
517+ onRefresh: {
518+ refreshing = true
519+ scopeView.scope.refresh()
520+ }
521+ anchors.left: parent.left
522+ anchors.right: parent.right
523+
524+ Connections {
525+ target: scopeView
526+ onProcessingChanged: if (!scopeView.processing) pullToRefresh.refreshing = false
527+ }
528+
529+ style: PullToRefreshStyle {
530+ anchors.fill: parent
531+ activationThreshold: units.gu(14)
532+ releaseToRefresh: -pullToRefresh.contentY > activationThreshold
533+
534+ Connections {
535+ target: categoryView
536+ onDraggingChanged: if (!categoryView.dragging && releaseToRefresh) pullToRefresh.refresh()
537+ }
538+
539+ Label {
540+ id: pullLabel
541+ anchors.horizontalCenter: parent.horizontalCenter
542+ horizontalAlignment: Text.AlignHCenter
543+ verticalAlignment: Text.AlignVCenter
544+ states: [
545+ State {
546+ name: "pulling"
547+ when: categoryView.dragging && !releaseToRefresh
548+ PropertyChanges { target: pullLabel; text: i18n.tr("Pull to refresh…") }
549+ },
550+ State {
551+ name: "releasable"
552+ when: categoryView.dragging && releaseToRefresh
553+ PropertyChanges { target: pullLabel; text: i18n.tr("Release to refresh…") }
554+ }
555+ ]
556+ transitions: Transition {
557+ SequentialAnimation {
558+ UbuntuNumberAnimation {
559+ target: pullLabel
560+ property: "opacity"
561+ to: 0.0
562+ }
563+ PropertyAction {
564+ target: pullLabel
565+ property: "text"
566+ }
567+ UbuntuNumberAnimation {
568+ target: pullLabel
569+ property: "opacity"
570+ to: 1.0
571+ }
572+ }
573+ }
574+ }
575+ }
576+ }
577+ }
578+
499579 AbstractButton {
500580 id: floatingSeeLess
501581 objectName: "floatingSeeLess"