Merge lp:~rpadovani/ubuntu-weather-app/1198541 into lp:ubuntu-weather-app/obsolete.trunk

[Riccardo Padovani]

Added text delete when swiping a location, based on work of Nekhelesh Ramananthan in clock app

Added text delete when swiping a location, based on work of Nekhelesh Ramananthan in clock app

[Martin Borho (martin-borho)]

Fein, looks good!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'components/LocationManagerPage.qml'
--- components/LocationManagerPage.qml	2013-07-03 19:39:29 +0000
+++ components/LocationManagerPage.qml	2013-07-16 09:44:36 +0000
@@ -165,9 +165,9 @@
                         storage.clearLocation(location.dbId);
                         locationModel.remove(index)
                     }
-                    backgroundIndicator: Rectangle {
-                        anchors.fill: parent
-                        color: "gray"
+                    backgroundIndicator: SwipeDelete {
+                        id: swipeDelete
+                        state: swipingState
                     }
                 }
                 footer: ListItem.Standard {
 
=== added file 'components/SwipeDelete.qml'
--- components/SwipeDelete.qml	1970-01-01 00:00:00 +0000
+++ components/SwipeDelete.qml	2013-07-16 09:44:36 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program 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/>.
+ *
+ * Authored by: Nekhelesh Ramananthan <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: swipeBackgroundItem
+
+    anchors.fill: parent
+    color: UbuntuColors.orange
+
+    Label {
+        id: swipeBackgroundText
+
+        property int slidingMargin: units.gu(3)
+
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        color: "#FFFFFF"
+    }
+
+    states: [
+        State {
+            name: "SwipingRight"
+            PropertyChanges { target: swipeBackgroundText; anchors.rightMargin: swipeBackgroundText.slidingMargin
+                anchors.leftMargin: 0; horizontalAlignment: Text.AlignRight; text: i18n.tr("Delete") }
+        },
+
+        State {
+            name: "SwipingLeft"
+            PropertyChanges { target: swipeBackgroundText; anchors.rightMargin: 0; anchors.leftMargin: swipeBackgroundText.slidingMargin
+                horizontalAlignment: Text.AlignLeft; text: i18n.tr("Delete") }
+        }
+    ]
+}