Merge lp:~rpadovani/ubuntu-calculator-app/improveFavouriteTextfield into lp:ubuntu-calculator-app

[Riccardo Padovani]

Improve favourite textfield management

Improve favourite textfield management

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:139
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/128/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2412
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/128

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/128/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This is certainly an improvement.

Added bug 1436792 which is related.

After adding the favourite, the screen seems to get stuck like this for a couple of seconds.

http://people.canonical.com/~alan/screenshots/device-2015-03-26-105328.png

[lp:~rpadovani/ubuntu-calculator-app/improveFavouriteTextfield]

140. By Riccardo Padovani on 2015-03-26

Hide favourite tip

[Riccardo Padovani (rpadovani)]

> Added bug 1436792 which is related.

I improved the behavior of the tip, let me know what do you think

> After adding the favourite, the screen seems to get stuck like this for a
> couple of seconds.

Uh, this is tricky, I have an idea on how to fix it, but I need to do some experiments

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:140
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/129/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2430
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/22
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/129

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/129/rebuild

review: Needs Fixing (continuous-integration)

[Bartosz Kosiorek (gang65)]

Regarding to bug 1435881
The "enter key" icon should be displayed only on Desktop, because without OSK you don't have possibility to confirm Favourite caption.

[Bartosz Kosiorek (gang65)]

The distinguish between Calculator and Webbrowser is already implemented in Browser.

There is formFactor == "Mobile", "Tablet" and "Desktop".
    readonly property string _formFactor: (Screen.width >= units.gu(60)) ? "Tablet" : "Mobile"

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/webbrowser-app/vivid/view/head:/src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml

Maybe we should do in similar way but we could distinguish between "Mobile" and "Desktop"?

review: Needs Information

[Bartosz Kosiorek (gang65)]

Hi.

Checking formFactor is wrong idea.

We should check if OSK is enabled there:
1. If OSK is enabled, then do not display favourite's confirmation button,
2. If OSK is disabled, then display favourite's confirmation button

For now let's just delete confirmaation button. We will reintroduce it later.

[lp:~rpadovani/ubuntu-calculator-app/improveFavouriteTextfield]

141. By Riccardo Padovani on 2015-03-30

Fix wrong keyboard management

[Riccardo Padovani (rpadovani)]

@popey: I think I fixed it, let me know

@gang65: since we want to land this asap and our focus isn't desktop, let's fix this in another branch :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:141
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/132/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2455
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/132

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/132/rebuild

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/ubuntu-calculator-app/improveFavouriteTextfield]

142. By Riccardo Padovani on 2015-03-30

Fix wrong position of a component

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:142
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/133/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2456
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/133

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/133/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Add a favourite, then go to Favourites and untap the star. Close favourites and then open it again.. you get this:-

http://people.canonical.com/~alan/screenshots/device-2015-03-30-103948.png

Which is confusing and wrong.

review: Needs Fixing

[lp:~rpadovani/ubuntu-calculator-app/improveFavouriteTextfield]

143. By Riccardo Padovani on 2015-03-30

Merge from trunk

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Seems I had some crap on my device. It's working fine now!

review: Approve

[Bartosz Kosiorek (gang65)]

It is working correctly for me. Thanks.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:143
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/134/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2458
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2458/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/27
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/134

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/134/rebuild

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-03-06 21:15:52 +0000
+++ app/ubuntu-calculator-app.qml	2015-03-30 10:02:55 +0000
@@ -73,6 +73,11 @@
     // If it is set to false, then editing will be invoked
     property bool deleteSelectedCalculation: true;
 
+    Connections {
+        id: oskKeyboard
+        target: Qt.inputMethod
+    }
+
     /**
      * The function calls the Formula.deleteLastFormulaElement function and
      * place the result in right vars
@@ -204,7 +209,10 @@
     PageStack {
         id: mainStack
 
-        Component.onCompleted: push(calculatorPage)
+        Component.onCompleted: {
+            push(calculatorPage);
+            calculatorPage.forceActiveFocus();
+        }
 
         PageWithBottomEdge {
             id: calculatorPage
@@ -217,6 +225,8 @@
                 title: i18n.tr("Favorite")
             }
 
+            bottomEdgeEnabled: textInputField.visible
+
             state: visualModel.isInSelectionMode ? "selection" : "default"
             states: [
                 State {
@@ -348,8 +358,8 @@
                         visualModel.selectItem(visualDelegate);
                     }
 
-                    rightSideActions: [ screenDelegateCopyAction.item, 
-                                        screenDelegateEditAction.item, 
+                    rightSideActions: [ screenDelegateCopyAction.item,
+                                        screenDelegateEditAction.item,
                                         screenDelegateFavouriteAction.item ]
                     leftSideAction: screenDelegateDeleteAction.item
 
@@ -385,10 +395,10 @@
                         id: screenDelegateFavouriteAction
                         sourceComponent: Action {
                             iconName: (editedCalculationIndex == model.index || model.isFavourite) ? "starred" : "non-starred"
-                            
+
                             text: i18n.tr("Add to favorites")
                             onTriggered: {
-                                
+
                                 if (model.isFavourite) {
                                     calculationHistory.updateCalculationInDatabase(model.index, model.dbId, !model.isFavourite, "");
                                     editedCalculationIndex = -1;
@@ -400,7 +410,7 @@
                                     favouriteTextField.forceActiveFocus();
                                     scrollableView.scrollToBottom();
                                 }
-   
+
                                 model.isFavourite = !model.isFavourite;
                             }
                         }
@@ -525,10 +535,10 @@
                         id: favouriteTextField
 
                         anchors {
-                            right: confirmFavourite.left
+                            right: parent.right
                             rightMargin: units.gu(1)
                         }
-                        width: parent.width - confirmFavourite.width - units.gu(3)
+                        width: parent.width - units.gu(3)
                         height: parent.height
                         visible: !textInputField.visible
 
@@ -547,49 +557,23 @@
                             }
                         }
 
-                        
-                    }
-
-                    Icon {
-                        id: confirmFavourite
-                        visible: favouriteTextField.visible
-
-                        name: "keyboard-enter"
-
-                        anchors {
-                            right: parent.right
-                            rightMargin: units.gu(1)
-                            top: parent.top
-                            topMargin: units.gu(1)
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-
-                            onReleased: {
-                                textInputField.visible = true;
-                                textInputField.forceActiveFocus();
-                                if (editedCalculationIndex >= 0) {
-                                    calculationHistory.updateCalculationInDatabase(editedCalculationIndex,
-                                                                                   calculationHistory.getContents().get(editedCalculationIndex).dbId,
-                                                                                   true,
-                                                                                   favouriteTextField.text);
-                                    favouriteTextField.text = "";
-                                    editedCalculationIndex = -1;
-                                }
+                        onAccepted: {
+                            textInputField.visible = true;
+                            textInputField.forceActiveFocus();
+                            if (editedCalculationIndex >= 0) {
+                                calculationHistory.updateCalculationInDatabase(editedCalculationIndex,
+                                 calculationHistory.getContents().get(editedCalculationIndex).dbId,
+                                 true,
+                                 favouriteTextField.text);
+                                favouriteTextField.text = "";
+                                editedCalculationIndex = -1;
                             }
                         }
-                        height: parent.height - units.gu(2)
-                        width: height
                     }
 
                     TextField {
                         id: textInputField
                         objectName: "textInputField"
-                        // TODO: Make sure this bug gets fixed in SDK:
-                        // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1320885
-                        // It has been fixed in vivid - wait until it becomes the stable
-                        // version before removing this
                         width: parent.width - units.gu(2)
                         height: parent.height
 
@@ -651,7 +635,7 @@
                 Loader {
                     id: keyboardLoader
                     width: parent.width
-                    visible: textInputField.visible
+                    visible: textInputField.visible && !oskKeyboard.visible
                     source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
                     opacity: ((y + height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
                 }

=== modified file 'app/ui/KeyboardButton.qml'
--- app/ui/KeyboardButton.qml	2015-03-06 21:13:52 +0000
+++ app/ui/KeyboardButton.qml	2015-03-30 10:02:55 +0000
@@ -22,7 +22,7 @@
 AbstractButton {
     id: buttonRect
     objectName: modelname + "Button"
-    activeFocusOnPress: false
+    activeFocusOnPress: true
 
     property real baseSize: 1
     property alias text: buttonText.text
@@ -36,6 +36,7 @@
     onKbdPressedChanged: {
         if (!kbdPressed) {
             buttonRect.clicked();
+            buttonRect.forceActiveFocus();
         }
     }