← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state into lp:ubuntu-docviewer-app

 

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state into lp:ubuntu-docviewer-app.

Commit message:
Align 'no document found' empty state design to music-app

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1523122 in Ubuntu Document Viewer App: "Not consistent empty state design across the platform"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1523122

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state/+merge/280171

Align 'no document found' empty state design to music-app.
New graphics are taken from music-app and appropriately edited with GIMP.
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state into lp:ubuntu-docviewer-app.
=== modified file 'src/app/qml/documentPage/DocumentEmptyState.qml'
--- src/app/qml/documentPage/DocumentEmptyState.qml	2015-11-01 16:50:23 +0000
+++ src/app/qml/documentPage/DocumentEmptyState.qml	2015-12-10 16:55:45 +0000
@@ -15,17 +15,75 @@
 */
 
 import QtQuick 2.4
-import "../common"
+import Ubuntu.Components 1.3
 
 Item {
     anchors.fill: parent
 
-    EmptyState {
-        title: i18n.tr("No document found")
-        subTitle: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media with documents.")
-        iconName: "edit-copy"
-
+    Column {
         anchors.centerIn: parent
-        width: parent.width
+        spacing: units.gu(4)
+        width: units.gu(36)
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            Item {
+                height: parent.height
+                width: imageEmptyDownload.width + units.gu(2)
+
+                Image {
+                    id: imageEmptyDownload
+                    anchors.centerIn: parent
+                    antialiasing: true
+                    fillMode: Image.PreserveAspectFit
+                    height: units.gu(10)
+                    smooth: true
+                    source: Qt.resolvedUrl("graphics/document_download_icon.png")
+                }
+            }
+
+            Item {
+                height: parent.height
+                width: units.gu(7)
+
+                Image {
+                    anchors.centerIn: parent
+                    antialiasing: true
+                    fillMode: Image.PreserveAspectFit
+                    height: units.gu(6)
+                    smooth: true
+                    source: Qt.resolvedUrl("graphics/div.png")
+                }
+            }
+
+            Image {
+                anchors.verticalCenter: parent.verticalCenter
+                antialiasing: true
+                fillMode: Image.PreserveAspectFit
+                height: units.gu(7)
+                smooth: true
+                source: Qt.resolvedUrl("graphics/sd_phone_icon.png")
+            }
+        }
+
+        Label {
+            elide: Text.ElideRight
+            fontSize: "x-large"
+            horizontalAlignment: Text.AlignLeft
+            maximumLineCount: 2
+            text: i18n.tr("No document found")
+            width: parent.width
+            wrapMode: Text.WordWrap
+        }
+
+        Label {
+            elide: Text.ElideRight
+            fontSize: "large"
+            horizontalAlignment: Text.AlignLeft
+            text: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media with documents.")
+            width: parent.width
+            wrapMode: Text.WordWrap
+        }
     }
 }

=== added directory 'src/app/qml/documentPage/graphics'
=== added file 'src/app/qml/documentPage/graphics/div@xxxxxx'
Binary files src/app/qml/documentPage/graphics/div@xxxxxx	1970-01-01 00:00:00 +0000 and src/app/qml/documentPage/graphics/div@xxxxxx	2015-12-10 16:55:45 +0000 differ
=== added file 'src/app/qml/documentPage/graphics/document_download_icon@xxxxxx'
Binary files src/app/qml/documentPage/graphics/document_download_icon@xxxxxx	1970-01-01 00:00:00 +0000 and src/app/qml/documentPage/graphics/document_download_icon@xxxxxx	2015-12-10 16:55:45 +0000 differ
=== added file 'src/app/qml/documentPage/graphics/sd_phone_icon@xxxxxx'
Binary files src/app/qml/documentPage/graphics/sd_phone_icon@xxxxxx	1970-01-01 00:00:00 +0000 and src/app/qml/documentPage/graphics/sd_phone_icon@xxxxxx	2015-12-10 16:55:45 +0000 differ

Follow ups