Merge lp:~nik90/ubuntu-clock-app/fix-alarm-label-behavior into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Improved alarm label behavior by not allowing empty alarm labels and also disabling predictive text.

This improves the alarm label behavior by not allowing empty strings and also by disabling predictive text.

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

FAILED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/167/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1483/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/167/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/167/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Other than allowing lots of spaces as an alarm name, looks good.

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

To clarify, we discussed the "multiple spaces" on IRC. It's fine to allow spaces as the alarm name if the user wishes IMO.

[Nekhelesh Ramananthan (nik90)]

I don't think we can allow an alarm label with multiple spaces since it results in http://imgur.com/aPGjPKn which looks weird. Also the alarm label is shown in the snap notification. It might break there as well.

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/fix-alarm-label-behavior]

50. By Nekhelesh Ramananthan on 2014-08-12

Fixed string containing only spaces which will now not be accepted anymore

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

FAILED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/170/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1489/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/170/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/170/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/fix-alarm-label-behavior]

51. By Nekhelesh Ramananthan on 2014-08-13

Merged trunk

52. By Nekhelesh Ramananthan on 2014-08-13

Updated changelog

53. By Nekhelesh Ramananthan on 2014-08-13

Updated versioning

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

PASSED: Continuous integration, rev:53
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/185/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/18
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/185

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/185/rebuild

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2014-07-30 20:16:06 +0000
+++ app/alarm/AlarmLabel.qml	2014-08-13 14:00:32 +0000
@@ -48,12 +48,32 @@
             objectName: "labelEntry"
             text: alarm.message
             width: parent.width
+            inputMethodHints: Qt.ImhNoPredictiveText
+
+            onTextChanged:  {
+                backAction.enabled = false
+
+                // If string is empty, reject it immediately
+                if(text === "") {
+                    backAction.enabled = false
+                    return
+                }
+
+                // Check if strings contain only blank spaces. If yes reject.
+                for (var i=0; i < text.length; i++) {
+                    if(text[i] !== " ") {
+                        backAction.enabled = true
+                        return
+                    }
+                }
+            }
         }
     }
 
     tools: ToolbarItems {
         back: Button {
             action: Action {
+                id: backAction
                 iconName: "back"
                 onTriggered: {
                     alarm.message = _labelEntry.text

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-13 11:48:37 +0000
+++ debian/changelog	2014-08-13 14:00:32 +0000
@@ -1,3 +1,11 @@
+ubuntu-clock-app (3.1) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Alarm name label no longer accepts predictive text and empty
+    strings. (LP: #1355414)
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Wed, 13 Aug 2014 15:46:12 +0200
+
 ubuntu-clock-app (3.0-0ubuntu1) utopic; urgency=medium
 
   [ Daniel Holbach ]