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

[Florian Boucault]

Show placeholder bottom edge hint when no option is set so that the user can always guess the existence of the bottom edge.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:530
http://jenkins.qa.ubuntu.com/job/camera-app-ci/399/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/95/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/168
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/688/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/407
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18585
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/806/console

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

Code LGTM and does what it says on the tin

review: Approve

[Bill Filler (bfiller)]

needs test

[Florian Boucault (fboucault)]

Test added.

On Wed, Mar 11, 2015 at 3:31 PM, Bill Filler <email address hidden>
wrote:

> needs test
> --
>
> https://code.launchpad.net/~fboucault/camera-app/bottom_edge_hint/+merge/251940
> You are the owner of lp:~fboucault/camera-app/bottom_edge_hint.
>

[lp:~fboucault/camera-app/bottom_edge_hint]

534. By Florian Boucault on 2015-03-12

Reverted unrelated change.

[Florian Boucault (fboucault)]

Tests now successfully pass in CI.

=== added file 'BottomEdgeIndicators.qml'
--- BottomEdgeIndicators.qml	1970-01-01 00:00:00 +0000
+++ BottomEdgeIndicators.qml	2015-03-12 22:36:26 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2015 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.2
+import Ubuntu.Components 1.1
+
+Item {
+    id: bottomEdgeIndicators
+
+    property var options
+    width: indicatorsRow.width + units.gu(2) + emptyIndicatorsHint.width
+    height: units.gu(3)
+
+    Image {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+        height: parent.height * 2
+        opacity: 0.3
+        source: "assets/ubuntu_shape.svg"
+        sourceSize.width: width
+        sourceSize.height: height
+        cache: false
+        asynchronous: true
+    }
+
+    Icon {
+        id: emptyIndicatorsHint
+        objectName: "emptyIndicatorsHint"
+        name: "go-up"
+        opacity: 0.5
+        color: "white"
+        visible: indicatorsRow.visibleChildren.length <= 1
+        anchors {
+            top: parent.top
+            topMargin: units.gu(0.5)
+            bottom: parent.bottom
+            bottomMargin: units.gu(0.5)
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: visible ? height * 1.5 : 0
+    }
+
+    Row {
+        id: indicatorsRow
+        objectName: "indicatorsRow"
+
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+        }
+        spacing: units.gu(1)
+
+        Repeater {
+            model: bottomEdgeIndicators.options
+            delegate: Item {
+                anchors {
+                    top: parent.top
+                    topMargin: units.gu(0.5)
+                    bottom: parent.bottom
+                    bottomMargin: units.gu(0.5)
+                }
+                width: units.gu(2)
+                visible: modelData.showInIndicators && modelData.available && modelData.visible ? (modelData.isToggle ? modelData.get(model.selectedIndex).value : true) : false
+                opacity: 0.5
+
+                Icon {
+                    id: indicatorIcon
+                    anchors.fill: parent
+                    color: "white"
+                    name: modelData && modelData.isToggle ? modelData.icon : modelData.get(model.selectedIndex).icon
+                    source: name ? "image://theme/%1".arg(name) : (modelData.iconSource || "")
+                    visible: source != ""
+                }
+
+                Label {
+                    id: indicatorLabel
+                    anchors.fill: parent
+                    fontSize: "xx-small"
+                    color: "white"
+                    text: modelData.label
+                    verticalAlignment: Text.AlignVCenter
+                    visible: indicatorIcon.name === ""
+                }
+            }
+        }
+    }
+}
 
=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-01-27 17:37:09 +0000
+++ ViewFinderOverlay.qml	2015-03-12 22:36:26 +0000
@@ -413,76 +413,14 @@
             return -1;
         }
 
-        Item {
+        BottomEdgeIndicators {
+            options: bottomEdge.options
             anchors {
                 horizontalCenter: parent.horizontalCenter
                 bottom: parent.top
             }
-            width: indicators.width + units.gu(2)
-            height: units.gu(3)
             opacity: bottomEdge.pressed || bottomEdge.opened ? 0.0 : 1.0
             Behavior on opacity { UbuntuNumberAnimation {} }
-
-            Image {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    top: parent.top
-                }
-                height: parent.height * 2
-                opacity: 0.3
-                source: "assets/ubuntu_shape.svg"
-                sourceSize.width: width
-                sourceSize.height: height
-                cache: false
-                asynchronous: true
-                visible: indicators.visibleChildren.length > 1
-            }
-
-            Row {
-                id: indicators
-
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                    horizontalCenter: parent.horizontalCenter
-                }
-                spacing: units.gu(1)
-
-                Repeater {
-                    model: bottomEdge.options
-                    delegate: Item {
-                        anchors {
-                            top: parent.top
-                            topMargin: units.gu(0.5)
-                            bottom: parent.bottom
-                            bottomMargin: units.gu(0.5)
-                        }
-                        width: units.gu(2)
-                        visible: modelData.showInIndicators && modelData.available && modelData.visible ? (modelData.isToggle ? modelData.get(model.selectedIndex).value : true) : false
-                        opacity: 0.5
-
-                        Icon {
-                            id: indicatorIcon
-                            anchors.fill: parent
-                            color: "white"
-                            name: modelData && modelData.isToggle ? modelData.icon : modelData.get(model.selectedIndex).icon
-                            source: name ? "image://theme/%1".arg(name) : (modelData.iconSource || "")
-                            visible: source != ""
-                        }
-
-                        Label {
-                            id: indicatorLabel
-                            anchors.fill: parent
-                            fontSize: "xx-small"
-                            color: "white"
-                            text: modelData.label
-                            verticalAlignment: Text.AlignVCenter
-                            visible: indicatorIcon.name === ""
-                        }
-                    }
-                }
-            }
         }
     }
 
 
=== modified file 'debian/control'
--- debian/control	2015-02-12 17:22:13 +0000
+++ debian/control	2015-03-12 22:36:26 +0000
@@ -21,6 +21,7 @@
                libusermetricsinput1-dev,
                gettext,
                dh-translations,
+               xvfb,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/camera-app
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
 
=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2015-01-23 15:02:49 +0000
+++ tests/unittests/CMakeLists.txt	2015-03-12 22:36:26 +0000
@@ -1,8 +1,13 @@
+find_program(XVFB_RUN_BIN
+    NAMES xvfb-run
+)
+
+set(XVFB_RUN_CMD ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24")
+
 add_executable(tst_QmlTests tst_QmlTests.cpp)
 qt5_use_modules(tst_QmlTests Core Qml Quick Test QuickTest)
 target_link_libraries(tst_QmlTests ${TPL_QT5_LIBRARIES})
-add_test(tst_QmlTests ${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests -import ${CMAKE_SOURCE_DIR})
-set_tests_properties(tst_QmlTests PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+add_test(tst_QmlTests ${XVFB_RUN_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests -import ${CMAKE_SOURCE_DIR})
 
 # copy qml test files to build dir
 file(GLOB qmlTestFiles RELATIVE ${CMAKE_SOURCE_DIR}/tests/unittests/ *qml)
 
=== added file 'tests/unittests/tst_BottomEdgeIndicators.qml'
--- tests/unittests/tst_BottomEdgeIndicators.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/tst_BottomEdgeIndicators.qml	2015-03-12 22:36:26 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2015 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.0
+import QtTest 1.0
+import "../../"
+import "../../.." //Needed for out of source build
+
+TestCase {
+    name: "BottomEdgeIndicators"
+    when: windowShown
+    visible: true
+
+    property list<ListModel> noOptions
+    property list<ListModel> noVisibleOptions: [
+        ListModel {
+            property string settingsProperty: "invisibleOption"
+            property string icon
+            property string label: ""
+            property bool isToggle: true
+            property int selectedIndex
+            property bool available: true
+            property bool visible: true
+            property bool showInIndicators: false
+
+            ListElement {
+                icon: ""
+                label: QT_TR_NOOP("On")
+                value: true
+            }
+            ListElement {
+                icon: ""
+                label: QT_TR_NOOP("Off")
+                value: false
+            }
+        }
+    ]
+    property list<ListModel> someVisibleOptions: [
+        ListModel {
+            property string settingsProperty: "invisibleOption"
+            property string icon
+            property string label: ""
+            property bool isToggle: true
+            property int selectedIndex
+            property bool available: true
+            property bool visible: true
+            property bool showInIndicators: false
+
+            ListElement {
+                icon: ""
+                label: QT_TR_NOOP("On")
+                value: true
+            }
+            ListElement {
+                icon: ""
+                label: QT_TR_NOOP("Off")
+                value: false
+            }
+        },
+        ListModel {
+            property string settingsProperty: "visibleOption"
+            property string icon
+            property string label: ""
+            property bool isToggle: true
+            property int selectedIndex
+            property bool available: true
+            property bool visible: true
+            property bool showInIndicators: true
+
+            ListElement {
+                icon: ""
+                label: QT_TR_NOOP("On")
+                value: true
+            }
+            ListElement {
+                icon: ""
+                label: QT_TR_NOOP("Off")
+                value: false
+            }
+        }
+    ]
+
+    function test_options_data() {
+        return [
+            {tag: "no options", options: noOptions, visibleChildren: 1, hintVisible: true },
+            {tag: "no visible options", options: noVisibleOptions, visibleChildren: 1, hintVisible: true },
+            {tag: "some visible options", options: someVisibleOptions, visibleChildren: 2, hintVisible: false },
+        ]
+    }
+
+    function test_options(data) {
+        indicators.options = data.options;
+        var emptyIndicatorsHint = findChild(indicators, "emptyIndicatorsHint");
+        var indicatorsRow = findChild(indicators, "indicatorsRow");
+        compare(indicatorsRow.visibleChildren.length, data.visibleChildren, "Incorrect number of visible children in indicatorsRow");
+        compare(emptyIndicatorsHint.visible, data.hintVisible, "Incorrect emptyIndicatorsHint's visibility");
+    }
+
+    BottomEdgeIndicators {
+        id: indicators
+    }
+}