Merge lp:~unity-api-team/unity8/pinunlock-ng into lp:unity8

[Antti Kaijanmäki]

[Michael Zanetti (mzanetti)]

49 + property var pinMinMax : [4, 8]

Don't set this as default for all PinlockScreens. Keep it null in here and only set it in NotificationMenuItemFactory.

review: Needs Fixing

[lp:~unity-api-team/unity8/pinunlock-ng]

856. By Antti Kaijanmäki on 2014-04-25

Increase the height of the PinLockScreen pinEntry shape to make room for the pin retry count.

[Michael Zanetti (mzanetti)]

> Increase the height of the PinLockScreen pinEntry shape to make room for the pin retry count.

The pin entry count should not be in there. You'll find the visual design in lp:~amanzi-team/design.

review: Needs Fixing

[Antti Kaijanmäki (kaijanmaki)]

> 49 + property var pinMinMax : [4, 8]
>
> Don't set this as default for all PinlockScreens. Keep it null in here and
> only set it in NotificationMenuItemFactory.

For _PIN_ lockscreen [4, 8] is the sane default as that is the most common limit. I can move it to the NotificatoinMenuItemFactory if you insist, though.

[Michael Zanetti (mzanetti)]

> > 49 + property var pinMinMax : [4, 8]
> >
> > Don't set this as default for all PinlockScreens. Keep it null in here and
> > only set it in NotificationMenuItemFactory.
>
> For _PIN_ lockscreen [4, 8] is the sane default as that is the most common
> limit. I can move it to the NotificatoinMenuItemFactory if you insist, though.

well, the PinLockscreen file is also used in case of the phone lock screen if it consists only of numbers. So... Everthing that should only affect _SIM PIN_ should be in Notification*

[Michael Zanetti (mzanetti)]

superseeded by another branch

review: Disapprove

Unmerged revisions

856. By Antti Kaijanmäki on 2014-04-25

Increase the height of the PinLockScreen pinEntry shape to make room for the pin retry count.

855. By Antti Kaijanmäki on 2014-04-24

minmax init

=== modified file 'qml/Components/PinPadButton.qml'
--- qml/Components/PinPadButton.qml	2013-10-17 12:54:22 +0000
+++ qml/Components/PinPadButton.qml	2014-04-25 08:19:00 +0000
@@ -62,7 +62,7 @@
         Label {
             id: subTextLabel
             fontSize: "small"
-            color: "grey"
+            color: root.enabled ? "#f3f3e7" : "grey"
             anchors.horizontalCenter: parent.horizontalCenter
             visible: text.length > 0
         }

=== modified file 'qml/Greeter/Lockscreen.qml'
--- qml/Greeter/Lockscreen.qml	2013-12-18 20:09:55 +0000
+++ qml/Greeter/Lockscreen.qml	2014-04-25 08:19:00 +0000
@@ -34,6 +34,11 @@
     // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.
     property int pinLength: -1
 
+    // min and max of the pin
+    // null - not set
+    // array of two integers: [min, max]
+    property var pinMinMax : null
+
     property url background: ""
 
     signal entered(string passphrase)
@@ -110,6 +115,11 @@
         }
         Binding {
             target: pinPadLoader.item
+            property: "pinMinMax"
+            value: root.pinMinMax
+        }
+        Binding {
+            target: pinPadLoader.item
             property: "placeholderText"
             value: root.placeholderText
         }

=== modified file 'qml/Greeter/PinLockscreen.qml'
--- qml/Greeter/PinLockscreen.qml	2013-11-26 14:16:26 +0000
+++ qml/Greeter/PinLockscreen.qml	2014-04-25 08:19:00 +0000
@@ -28,6 +28,7 @@
     property int padWidth: units.gu(34)
     property int padHeight: units.gu(28)
     property int pinLength: -1
+    property var pinMinMax : [4, 8]
 
     signal entered(string passphrase)
     signal cancel()
@@ -48,18 +49,26 @@
         anchors.horizontalCenter: parent.horizontalCenter
         color: "#55000000"
         width:root.padWidth
-        height: units.gu(5)
+        height: units.gu(6)
         radius: "medium"
         property string text: ""
         property string placeholderText: ""
         onTextChanged: {
+            /// todo: get rid of the pinLength and replace with MinMax
+            if (root.pinMinMax != null) {
+                if (text.length > root.pinMinMax[1]) {
+                    text = text.substring(0, text.length-1);
+                    return;
+                }
+            }
+
             pinentryFieldLabel.text = "";
             for (var i = 0; i < text.length; ++i) {
                 pinentryFieldLabel.text += "•";
             }
             if (text.length === root.pinLength) {
                 root.entered(text);
-            }
+            }            
         }
 
         Label {
@@ -71,6 +80,7 @@
             font.pixelSize: units.dp(44)
             color: "#f3f3e7"
             opacity: 0.6
+            textFormat: Text.RichText
         }
         Label {
             id: pinentryFieldPlaceHolder
@@ -203,7 +213,17 @@
                         root.entered(pinentryField.text);
                     }
                 }
-                enabled: entryEnabled
+                enabled: {
+                    if (root.pinMinMax == null) {
+                        return true;
+                    } else {
+                        if (root.pinMinMax[0] <= pinentryField.text.length) {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    }
+                }
             }
         }
     }

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-04-10 08:37:13 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-04-25 08:19:00 +0000
@@ -99,13 +99,16 @@
         id: pinLock
 
         Lockscreen {
+            id: lockscreen
             anchors.left: parent.left; anchors.right: parent.right
             height: menuFactory.maxHeight
-            placeholderText: i18n.tr("Please enter SIM PIN")
+            placeholderText: notification.summary
             background: shell.background
+            pinMinMax: [4, 8]
 
             onEntered: {
                 menuModel.changeState(menuIndex, passphrase);
+                lockscreen.clear(false);
                 entryEnabled = false;
             }