Merge lp:~renatofilho/address-book-app/fix-1450252 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Make sure the import page still visible while importing contacts from sim.

[lp:~renatofilho/address-book-app/fix-1450252]

536. By Renato Araujo Oliveira Filho on 2016-02-03

Add debug messages.

537. By Renato Araujo Oliveira Filho on 2016-02-04

Pop import contacts from sim page on import complet.

538. By Renato Araujo Oliveira Filho on 2016-02-04

Parent merged.

539. By Renato Araujo Oliveira Filho on 2016-02-04

Removed debug messages.

540. By Renato Araujo Oliveira Filho on 2016-02-04

Remove debug messages.

541. By Renato Araujo Oliveira Filho on 2016-02-22

Trunk merged.

Unmerged revisions

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2016-01-06 18:54:25 +0000
+++ src/imports/ABContactListPage.qml	2016-02-03 14:15:56 +0000
@@ -791,8 +791,11 @@
                 mainPage.state = "vcardImported"
 
                 if (mainPage._busyDialog) {
+                    console.debug("Closing import dialog")
                     PopupUtils.close(mainPage._busyDialog)
                     mainPage._busyDialog = null
+                } else {
+                    console.debug("No import dialog")
                 }
             }
         }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-01-07 12:21:49 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-02-03 14:15:56 +0000
@@ -118,7 +118,8 @@
         if (!item)
             return
 
-        var position = activeItem.mapToItem(editEditor, item.x, item.y);
+
+        var position = item.mapToItem(editEditor, item.x, item.y);
         // check if the item is already visible
         var bottomY = scrollArea.contentY + scrollArea.height
         var itemBottom = position.y + (item.height * 3) // extra margin

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2016-01-06 18:54:07 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2016-02-03 14:15:56 +0000
@@ -91,7 +91,6 @@
             overlaySpacing: 0
             frameSpacing: 0
             background: Item {}
-            color: UbuntuColors.lightAubergine
         }
         onActiveFocusChanged: {
             if (activeFocus) {

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2015-12-10 19:13:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2016-02-03 14:15:56 +0000
@@ -59,7 +59,6 @@
 
                 // style
                 fontSize: "medium"
-                color: UbuntuColors.lightAubergine
             }
         }
     }

=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt	2015-09-03 17:15:32 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2016-02-03 14:15:56 +0000
@@ -31,6 +31,7 @@
     SIMList.qml
     SIMCardImportPage.qml
     SubtitledWithColors.qml
+    Triangle.qml
     VCardParser.qml
 )
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2016-02-03 14:15:56 +0000
@@ -40,8 +40,9 @@
         initialsLabel.contactDisplayName = Qt.binding(function() { return ContactsJS.formatToDisplayWithDetails(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName) })
     }
 
+    aspect: UbuntuShape.Flat
     radius: "medium"
-    backgroundColor: Theme.palette.normal.overlay
+    backgroundColor: ContactsJS.contactColor(displayName)
 
     Label {
         id: initialsLabel
@@ -51,8 +52,8 @@
 
         anchors.centerIn: parent
         text: Contacts.contactInitialsFromString(contactDisplayName)
-        color: UbuntuColors.lightAubergine
-        visible: (img.status != Image.Ready)
+        color: "white"
+        visible: (img.status != Image.Ready) && !fallbackIcon.visible
         fontSize: "large"
     }
 
@@ -65,13 +66,24 @@
 
         property string avatarUrl: ContactsJS.getAvatar(contactElement, fallbackAvatarUrl)
 
-        anchors.centerIn: visible ? avatar : undefined
         asynchronous: true
-        source: avatar.showAvatarPicture ? avatar.avatarUrl : ""
-        height: visible ? units.gu(3) : avatar.height
+        source: avatar.showAvatarPicture && (avatar.avatarUrl.indexOf("image://theme/") === -1)  ? avatar.avatarUrl : ""
+        height: avatar.height
         width: height
-        visible: avatar.avatarUrl.indexOf("image://theme/") === 0
+        visible: false
         sourceSize.width: avatar.width
         sourceSize.height: avatar.height
     }
+
+    Icon {
+        id: fallbackIcon
+        objectName: "fallbackIcon"
+
+        source: visible ? img.avatarUrl : ""
+        visible: avatar.showAvatarPicture && (avatar.avatarUrl.indexOf("image://theme/") === 0)
+        color: "white"
+        anchors.centerIn: avatar
+        height: units.gu(3)
+        width: height
+    }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2015-12-10 19:13:20 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2016-02-03 14:15:56 +0000
@@ -76,7 +76,7 @@
                 verticalCenter: parent.verticalCenter
                 right: parent.right
             }
-            color: UbuntuColors.lightAubergine
+            color: selected ? "white" : UbuntuColors.darkGrey
             text: root.displayLabel != "" ? root.displayLabel : i18n.dtr("address-book-app", "No name")
             elide: Text.ElideRight
         }

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2016-02-03 14:15:56 +0000
@@ -80,7 +80,6 @@
                 }
 
                 text: i18n.dtr("address-book-app", "Add number...")
-                color: UbuntuColors.lightAubergine
             }
             visible: phoneNumberEntries.count == 0
             MouseArea {
@@ -104,7 +103,6 @@
                 text: modelData.number
                 subText: phoneTypeModel.get(phoneTypeModel.getTypeIndex(modelData)).label
                 onClicked: root.detailClicked(modelData, "call")
-                textColor: UbuntuColors.lightAubergine
 
                 MouseArea {
                     anchors {

=== modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml	2016-02-03 14:15:56 +0000
@@ -73,7 +73,6 @@
            right: parent.right
            rightMargin: units.gu(2)
        }
-       color: UbuntuColors.lightAubergine
        elide: Text.ElideRight
        visible: root.showContents
    }

=== modified file 'src/imports/Ubuntu/Contacts/Contacts.js'
--- src/imports/Ubuntu/Contacts/Contacts.js	2015-06-01 18:26:26 +0000
+++ src/imports/Ubuntu/Contacts/Contacts.js	2016-02-03 14:15:56 +0000
@@ -1,5 +1,6 @@
 
 var phoneTypeModel = null
+var contactColors = ["#DC3023", "#FF8936", "#FFB95A", "#8DB255", "#749F8D", "#48929B", "#A87CA0"]
 
 // Format contact name to be displayed
 function formatToDisplayWithDetails(contact, contactDetail, detailFields, defaultTitle)
@@ -145,3 +146,9 @@
 {
     return (contact && (contact.contactId === "qtcontacts:::"))
 }
+
+function contactColor(name)
+{
+    var hash = Contacts.qHash(name)
+    return contactColors[(hash % contactColors.length)]
+}

=== modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml'
--- src/imports/Ubuntu/Contacts/FastScroll.qml	2015-12-10 19:08:19 +0000
+++ src/imports/Ubuntu/Contacts/FastScroll.qml	2016-02-03 14:15:56 +0000
@@ -72,15 +72,16 @@
     }
 
 
-    Rectangle {
+    UbuntuShape {
         id: magnified
 
+        aspect: UbuntuShape.Flat
         color: Theme.palette.normal.foreground
-        radius: height * 0.3
-        height: pinSize * 2
-        width: height
+        radius: "medium"
+        height: units.gu(6)
+        width: units.gu(8)
         opacity: internal.fastScrolling && root.enabled ? 1.0 : 0.0
-        x: -cursor.width - units.gu(3)
+        x: -magnified.width
         y: {
             if (internal.currentItem) {
                 var itemCenterY = rail.y + internal.currentItem.y + (internal.currentItem.height / 2)
@@ -90,6 +91,20 @@
             }
         }
 
+        Triangle {
+            id: arrow
+
+            color: magnified.color
+            fill: true
+            height: units.gu(1.5)
+            width: units.gu(0.5)
+            anchors {
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+                rightMargin: -width
+            }
+        }
+
         Label {
             color: Theme.palette.normal.foregroundText
             anchors.fill: parent

=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-01-06 15:09:18 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-02-03 14:15:56 +0000
@@ -246,7 +246,7 @@
                        width: units.gu(3)
                        height: units.gu(3)
                        name: modelData.iconName
-                       color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
+                       color: root.activeAction === modelData ? UbuntuColors.orange : UbuntuColors.lightGrey
                    }
               }
            }

=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-12-02 13:36:03 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2016-02-03 14:15:56 +0000
@@ -26,7 +26,7 @@
 Page {
     id: root
 
-    readonly property string exportFile: "file://%1/ubuntu_contacts_sim.vcf".arg(Contacts.tempPath)
+    readonly property string exportFile: Contacts.tempFile("ubuntu_contacts_XXXXXX.vcf")
     readonly property alias hasContacts: simCardContacts.hasContacts
     property var targetModel: null
     property var sims: []
@@ -98,7 +98,7 @@
         multiSelectionEnabled: true
         multipleSelection: true
         showSections: false
-        visible: !indicator.visible
+        visible: !indicator.visible && !statusMessage.visible
         showBusyIndicator: false
 
         manager: "memory"
@@ -168,9 +168,26 @@
 
         onExportCompleted: {
             if ((error === ContactModel.ExportNoError) && targetModel) {
+                root.state = "saving"
                 targetModel.importContacts(url)
+             } else {
+                console.debug("Failt to export selected contacts")
+                root.state = "error"
+            }
+        }
+    }
+
+    Connections {
+        target: root.targetModel
+        onImportCompleted: {
+             if (error === ContactModel.ImportNoError) {
+                 Contacts.removeFile(root.exportFile)
+                 root.state = ""
+                 root.importCompleted()
+             } else {
+                 console.error("Fail to import contacts on device")
+                 root.state = "error"
              }
-            root.importCompleted()
         }
     }
 
@@ -235,7 +252,15 @@
             name: "importing"
             PropertyChanges {
                 target: indicator
-                title: i18n.dtr("address-book-app", "Importing...")
+                title: i18n.dtr("address-book-app", "Reading contacts from SIM...")
+                visible: true
+            }
+        },
+        State {
+            name: "saving"
+            PropertyChanges {
+                target: indicator
+                title: i18n.dtr("address-book-app", "Saving contacts on phone...")
                 visible: true
             }
         },
@@ -249,6 +274,7 @@
         }
     ]
 
+    Component.onCompleted: console.debug("Temporary file:" + exportFile)
     Component.onDestruction: {
         Contacts.removeFile(root.exportFile)
     }

=== added file 'src/imports/Ubuntu/Contacts/Triangle.qml'
--- src/imports/Ubuntu/Contacts/Triangle.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/Triangle.qml	2016-02-03 14:15:56 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+import QtQuick 2.4
+
+Canvas {
+    id: triangle
+    antialiasing: true
+
+    property color color: "#ffffff"
+    property int lineWidth: 3
+    property bool fill: false
+
+    onLineWidthChanged:requestPaint();
+    onFillChanged:requestPaint();
+
+    onPaint: {
+        var ctx = getContext("2d");
+        ctx.save();
+        ctx.clearRect(0,0,triangle.width, triangle.height);
+        ctx.strokeStyle = triangle.color;
+        ctx.lineWidth = triangle.lineWidth
+        ctx.fillStyle = triangle.color
+        ctx.globalAlpha = 1.0
+        ctx.lineJoin = "round";
+        ctx.beginPath();
+
+        ctx.translate(0,  0);
+        ctx.lineTo(0, triangle.height);
+        ctx.lineTo(triangle.width,  0.5 * triangle.height);
+        ctx.lineTo(0,  0);
+
+        if (triangle.fill)
+          ctx.fill();
+        if (triangle.stroke)
+          ctx.stroke();
+        ctx.restore();
+    }
+}

=== modified file 'src/imports/Ubuntu/Contacts/contacts.cpp'
--- src/imports/Ubuntu/Contacts/contacts.cpp	2015-10-28 19:42:30 +0000
+++ src/imports/Ubuntu/Contacts/contacts.cpp	2016-02-03 14:15:56 +0000
@@ -109,6 +109,22 @@
     return QFile::exists(updaterLockFile());
 }
 
+
+QUrl UbuntuContacts::tempFile(const QString &templateName)
+{
+    QTemporaryFile tmp(QString("%1/%2").arg(tempPath()).arg(templateName));
+    tmp.setAutoRemove(false);
+    if (tmp.open())
+        return QUrl::fromLocalFile(tmp.fileName());
+    else
+        return QUrl();
+}
+
+uint UbuntuContacts::qHash(const QString &str)
+{
+    return ::qHash(str);
+}
+
 QString UbuntuContacts::updaterLockFile()
 {
     return QString("%1/%2").arg(QDir::tempPath()).arg("/address-book-updater.lock");

=== modified file 'src/imports/Ubuntu/Contacts/contacts.h'
--- src/imports/Ubuntu/Contacts/contacts.h	2015-10-28 19:42:30 +0000
+++ src/imports/Ubuntu/Contacts/contacts.h	2016-02-03 14:15:56 +0000
@@ -40,6 +40,8 @@
     Q_INVOKABLE bool containsLetters(const QString &value);
     Q_INVOKABLE bool removeFile(const QUrl &file);
     Q_INVOKABLE bool updateIsRunning() const;
+    Q_INVOKABLE QUrl tempFile(const QString &suffix);
+    Q_INVOKABLE uint qHash(const QString &str);
 
 Q_SIGNALS:
     void imageCopyDone(const QString &id, const QString &fileName);

=== modified file 'tests/qml/tst_ContactAvatar.qml'
--- tests/qml/tst_ContactAvatar.qml	2015-10-26 13:18:11 +0000
+++ tests/qml/tst_ContactAvatar.qml	2016-02-03 14:15:56 +0000
@@ -151,14 +151,20 @@
             waitForRendering(avatarComponent);
             var avatarInitials = findChild(avatarComponent, "avatarInitials")
             var avatarImage = findChild(avatarComponent, "avatarImage")
+            var avatarFallback = findChild(avatarComponent, "fallbackIcon")
 
             avatarComponent.showAvatarPicture = true
             tryCompare(avatarInitials, "visible", false)
-            tryCompare(avatarImage, "source", avatarComponent.fallbackAvatarUrl)
+            tryCompare(avatarImage, "source", "")
+            tryCompare(avatarFallback, "visible", true)
+            tryCompare(avatarFallback, "source", avatarComponent.fallbackAvatarUrl)
 
             avatarComponent.showAvatarPicture = false
             tryCompare(avatarImage, "source", "")
             tryCompare(avatarImage, "status", Image.Null)
+            tryCompare(avatarFallback, "visible", false)
+            tryCompare(avatarFallback, "source", "")
+
             tryCompare(avatarInitials, "visible", true)
         }
     }