Merge lp:~fboucault/camera-app/empty_photo_roll into lp:camera-app

[Florian Boucault]

Display message when no media present in photo roll.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/camera-app-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/114
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/480
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4045
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/792
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14515
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4374
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4374/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/298/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'CameraApp/foldersmodel.cpp'
--- CameraApp/foldersmodel.cpp	2014-09-02 13:19:22 +0000
+++ CameraApp/foldersmodel.cpp	2014-10-28 21:44:01 +0000
@@ -75,6 +75,10 @@
     }
 }
 
+int FoldersModel::count() const
+{
+    return m_fileInfoList.count();
+}
 
 void FoldersModel::updateFileInfoList()
 {
@@ -94,6 +98,7 @@
     }
     endResetModel();
     m_selectedFiles.clear();
+    Q_EMIT countChanged();
     Q_EMIT selectedFilesChanged();
 }
 
@@ -138,6 +143,7 @@
         beginInsertRows(QModelIndex(), index, index);
         m_fileInfoList.append(newFileInfo);
         endInsertRows();
+        Q_EMIT countChanged();
     } else {
         m_fileInfoList.append(newFileInfo);
     }
@@ -251,6 +257,7 @@
             beginRemoveRows(QModelIndex(), fileIndex, fileIndex);
             m_fileInfoList.removeAt(fileIndex);
             endRemoveRows();
+            Q_EMIT countChanged();
         }
     }
 }
 
=== modified file 'CameraApp/foldersmodel.h'
--- CameraApp/foldersmodel.h	2014-09-02 13:19:22 +0000
+++ CameraApp/foldersmodel.h	2014-10-28 21:44:01 +0000
@@ -31,6 +31,7 @@
     Q_PROPERTY (QStringList typeFilters READ typeFilters WRITE setTypeFilters NOTIFY typeFiltersChanged)
     Q_PROPERTY (QList<int> selectedFiles READ selectedFiles NOTIFY selectedFilesChanged)
     Q_PROPERTY (bool singleSelectionOnly READ singleSelectionOnly WRITE setSingleSelectionOnly NOTIFY singleSelectionOnlyChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
     enum Roles {
@@ -50,6 +51,7 @@
     QList<int> selectedFiles() const;
     bool singleSelectionOnly() const;
     void setSingleSelectionOnly(bool singleSelectionOnly);
+    int count() const;
 
     void updateFileInfoList();
     bool fileMatchesTypeFilters(const QFileInfo& newFileInfo);
@@ -71,6 +73,7 @@
     void typeFiltersChanged();
     void selectedFilesChanged();
     void singleSelectionOnlyChanged();
+    void countChanged();
 
 private:
     QStringList m_folders;
 
=== modified file 'GalleryView.qml'
--- GalleryView.qml	2014-09-02 13:19:22 +0000
+++ GalleryView.qml	2014-10-28 21:44:01 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.0
+import Ubuntu.Components 1.1
 import Ubuntu.Content 0.1
 import CameraApp 0.1
 import "MimeTypeMapper.js" as MimeTypeMapper
@@ -115,10 +115,38 @@
         }
     }
 
-    Label {
-        anchors.centerIn: parent
+    Rectangle {
+        objectName: "noMediaHint"
+        anchors.fill: parent
         visible: model.count === 0
-        text: i18n.tr("No media available.")
+        color: "#0F0F0F"
+
+        Icon {
+            id: noMediaIcon
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+                verticalCenterOffset: -units.gu(1)
+            }
+            height: units.gu(9)
+            width: units.gu(9)
+            color: "white"
+            opacity: 0.2
+            name: "camera-app-symbolic"
+        }
+
+        Label {
+            id: noMediaLabel
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                top: noMediaIcon.bottom
+                topMargin: units.gu(4)
+            }
+            text: i18n.tr("No media available.")
+            color: "white"
+            opacity: 0.2
+            fontSize: "large"
+        }
     }
 
     state: galleryView.gridMode || main.contentExportMode ? "GRID" : "SLIDESHOW"
 
=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2014-10-28 21:44:01 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2014-10-28 21:44:01 +0000
@@ -32,6 +32,10 @@
         """Returns the gallery view"""
         return self.app.wait_select_single("GalleryView")
 
+    def get_no_media_hint(self):
+        """Returns the Item representing the hint that no media is available"""
+        return self.app.wait_select_single(objectName="noMediaHint")
+
     def get_focus_ring(self):
         """Returns the focus ring of the camera"""
         return self.app.wait_select_single("FocusRing")
 
=== modified file 'tests/autopilot/camera_app/tests/test_gallery_view.py'
--- tests/autopilot/camera_app/tests/test_gallery_view.py	2014-10-28 21:44:01 +0000
+++ tests/autopilot/camera_app/tests/test_gallery_view.py	2014-10-28 21:44:01 +0000
@@ -13,6 +13,7 @@
 from camera_app.tests import CameraAppTestCase
 
 import unittest
+import os
 
 
 class TestCameraGalleryView(CameraAppTestCase):
@@ -24,6 +25,8 @@
         super(TestCameraGalleryView, self).setUp()
         self.assertThat(
             self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+        self.pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
+        self.videos_dir = os.path.expanduser("~/Videos/com.ubuntu.camera")
 
     def tearDown(self):
         super(TestCameraGalleryView, self).tearDown()
@@ -65,3 +68,34 @@
 
         self.assertThat(slideshow_view.visible, Eventually(Equals(False)))
         self.assertThat(photogrid_view.visible, Eventually(Equals(True)))
+
+    def delete_all_media(self):
+        picture_files = os.listdir(self.pictures_dir)
+        for f in picture_files:
+            os.remove(os.path.join(self.pictures_dir, f))
+
+        video_files = os.listdir(self.videos_dir)
+        for f in video_files:
+            os.remove(os.path.join(self.videos_dir, f))
+
+    """Tests swiping to the gallery/photo roll with no media in it"""
+    def test_swipe_to_empty_gallery(self):
+        self.delete_all_media()
+        viewfinder = self.main_window.get_viewfinder()
+        gallery = self.main_window.get_gallery()
+
+        self.main_window.swipe_to_gallery(self)
+
+        self.assertThat(viewfinder.inView, Eventually(Equals(False)))
+        self.assertThat(gallery.inView, Eventually(Equals(True)))
+
+        hint = self.main_window.get_no_media_hint()
+
+        self.assertThat(hint.visible, Eventually(Equals(True)))
+
+        # add a fake photo to pictures_dir
+        photo_path = os.path.join(self.pictures_dir, "fake_photo.jpg")
+        with open(photo_path, 'a'):
+            os.utime(photo_path, None)
+
+        self.assertThat(hint.visible, Eventually(Equals(False)))