Merge lp:~libqtelegram-team/telegram-app/fix-the-ContentPeerPicker-layout-issue into lp:telegram-app

[Jin]

[Roberto Mier Escandon (rmescandon)]

Not sure what is changing here, but if I try to import a contact from Address Book, the "Choose from" is not on top (this was not happening before)

review: Needs Fixing

[lp:~libqtelegram-team/telegram-app/fix-the-ContentPeerPicker-layout-issue]

249. By Jin on 2016-11-17

Revert file: ContactImport.qml

[Jin (jindallo)]

@Roberto,

Thanks man, already fixed and verified on my local,
please have a look on those changes.

[Roberto Mier Escandon (rmescandon)]

Works as expected

review: Approve

=== modified file 'telegram/app/qml/MediaImport.qml'
--- telegram/app/qml/MediaImport.qml	2016-04-08 06:08:04 +0000
+++ telegram/app/qml/MediaImport.qml	2016-11-17 14:27:00 +0000
@@ -51,8 +51,11 @@
                     id: peerPicker
 
                     anchors.fill: parent
+                    anchors.topMargin: page.header.height
+
                     contentType: root.contentType
                     handler: ContentHub.ContentHandler.Source
+                    showTitle: true
 
                     onPeerSelected: {
                         peer.selectionType = ContentHub.ContentTransfer.Single
 
=== modified file 'telegram/app/qml/PickerPage.qml'
--- telegram/app/qml/PickerPage.qml	2016-09-05 07:47:08 +0000
+++ telegram/app/qml/PickerPage.qml	2016-11-17 14:27:00 +0000
@@ -31,16 +31,13 @@
     }
 
     ContentPeerPicker {
-        anchors {
-            top: picker.bottom
-            left: parent.left
-            right: parent.right
-            margins: units.gu(6)
-        }
+        anchors.fill: parent
+        anchors.topMargin: page.header.height
+
         visible: parent.visible
         contentType: picker.contentType
         handler: picker.handler
-        showTitle: false
+        showTitle: true
         onPeerSelected: {
             picker.curTransfer = peer.request();
             pageStack.removePages(picker);
 
=== modified file 'telegram/app/qml/components/MediaImport.qml'
--- telegram/app/qml/components/MediaImport.qml	2016-11-09 10:32:21 +0000
+++ telegram/app/qml/components/MediaImport.qml	2016-11-17 14:27:00 +0000
@@ -53,8 +53,11 @@
                     objectName: "contentPeerPicker"
 
                     anchors.fill: parent
+                    anchors.topMargin: page.header.height
+
                     contentType: root.contentType
                     handler: ContentHub.ContentHandler.Source
+                    showTitle: true
 
                     onPeerSelected: {
                         peer.selectionType = ContentHub.ContentTransfer.Multiple