fix(Onboarding/PasswordScreens): UI small fixes (texts, sizes, positions)
- Updated finalise button text with the British spelling. - Password warning texts in onboard flow updated to correct size. - Updated StatusQ that fixes button change size after loading. - Updated position of the message error in the Confirmation Screen. Fixes #5607, #5339, #5606 and #5610 NOTE: Updated status-desktop compilation error after StatusQ commit 1a5990f24bd3f2aba87ab62880e39113c63ba015
This commit is contained in:
parent
5dd0ad36be
commit
e4feaa39ac
|
@ -1 +1 @@
|
||||||
Subproject commit ae1e72fb23e1037293c55e5279f5337a13aef19f
|
Subproject commit 3bdfc3e52817e2e3ce156ac549482405e76150b1
|
|
@ -44,75 +44,86 @@ OnboardingBasePage {
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
text: qsTr("You will never be able to recover your password if you lose it.")
|
text: qsTr("You will never be able to recover your password if you lose it.")
|
||||||
font.pixelSize: 12
|
font.pixelSize: 15
|
||||||
color: Theme.palette.dangerColor1
|
color: Theme.palette.dangerColor1
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
text: qsTr("If you need to, write it using pen and paper and keep in a safe place.")
|
text: qsTr("If you need to, write it using pen and paper and keep in a safe place.")
|
||||||
font.pixelSize: 12
|
font.pixelSize: 15
|
||||||
color: Theme.palette.baseColor1
|
color: Theme.palette.baseColor1
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
text: qsTr("If you lose your password you will lose access to your Status profile.")
|
text: qsTr("If you lose your password you will lose access to your Status profile.")
|
||||||
font.pixelSize: 12
|
font.pixelSize: 15
|
||||||
color: Theme.palette.baseColor1
|
color: Theme.palette.baseColor1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO replace with StatusInput as soon as it supports password
|
Column {
|
||||||
Input {
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
id: confPswInput
|
spacing: Style.current.padding
|
||||||
|
|
||||||
property bool showPassword: false
|
|
||||||
|
|
||||||
width: parent.width
|
width: parent.width
|
||||||
enabled: !submitBtn.loading
|
|
||||||
placeholderText: qsTr("Confirm you password (again)")
|
// TODO replace with StatusInput as soon as it supports password
|
||||||
textField.echoMode: showPassword ? TextInput.Normal : TextInput.Password
|
Input {
|
||||||
textField.validator: RegExpValidator { regExp: /^[!-~]{0,64}$/ } // That incudes NOT extended ASCII printable characters less space and a maximum of 64 characters allowed
|
id: confPswInput
|
||||||
keepHeight: true
|
|
||||||
textField.rightPadding: showHideCurrentIcon.width + showHideCurrentIcon.anchors.rightMargin + Style.current.padding / 2
|
property bool showPassword: false
|
||||||
onTextChanged: {
|
|
||||||
errorTxt.text = ""
|
width: parent.width
|
||||||
|
enabled: !submitBtn.loading
|
||||||
|
placeholderText: qsTr("Confirm you password (again)")
|
||||||
|
textField.echoMode: showPassword ? TextInput.Normal : TextInput.Password
|
||||||
|
textField.validator: RegExpValidator { regExp: /^[!-~]{0,64}$/ } // That incudes NOT extended ASCII printable characters less space and a maximum of 64 characters allowed
|
||||||
|
keepHeight: true
|
||||||
|
textField.rightPadding: showHideCurrentIcon.width + showHideCurrentIcon.anchors.rightMargin + Style.current.padding / 2
|
||||||
|
onTextChanged: {
|
||||||
|
errorTxt.text = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
StatusFlatRoundButton {
|
||||||
|
id: showHideCurrentIcon
|
||||||
|
visible: confPswInput.text !== ""
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 16
|
||||||
|
width: 24
|
||||||
|
height: 24
|
||||||
|
icon.name: confPswInput.showPassword ? "hide" : "show"
|
||||||
|
icon.color: Theme.palette.baseColor1
|
||||||
|
|
||||||
|
onClicked: confPswInput.showPassword = !confPswInput.showPassword
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusFlatRoundButton {
|
StatusBaseText {
|
||||||
id: showHideCurrentIcon
|
id: errorTxt
|
||||||
visible: confPswInput.text !== ""
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
font.pixelSize: 12
|
||||||
anchors.right: parent.right
|
color: Theme.palette.dangerColor1
|
||||||
anchors.rightMargin: 16
|
onTextChanged: {
|
||||||
width: 24
|
if(text === "") filler.visible = true
|
||||||
height: 24
|
else filler.visible = false
|
||||||
icon.name: confPswInput.showPassword ? "hide" : "show"
|
}
|
||||||
icon.color: Theme.palette.baseColor1
|
|
||||||
|
|
||||||
onClicked: confPswInput.showPassword = !confPswInput.showPassword
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
StatusBaseText {
|
// Just a column filler to keep the component height althought errorTxt.text is ""
|
||||||
id: errorTxt
|
Item {
|
||||||
font.pixelSize: 12
|
id: filler
|
||||||
width: parent.width
|
width: root.width
|
||||||
horizontalAlignment: StatusBaseText.AlignHCenter
|
visible: true
|
||||||
color: Theme.palette.dangerColor1
|
height: errorTxt.height
|
||||||
}
|
}
|
||||||
|
|
||||||
// Just a column filler to fit the design
|
|
||||||
Item {
|
|
||||||
height: Style.current.padding
|
|
||||||
width: parent.width
|
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusButton {
|
StatusButton {
|
||||||
id: submitBtn
|
id: submitBtn
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
text: qsTr("Finalize Status Password Creation")
|
text: qsTr("Finalise Status Password Creation")
|
||||||
enabled:!submitBtn.loading && confPswInput.text.length >= 6
|
enabled:!submitBtn.loading && confPswInput.text.length >= 6
|
||||||
|
|
||||||
property Timer sim: Timer {
|
property Timer sim: Timer {
|
||||||
|
|
|
@ -125,7 +125,7 @@ StatusModal {
|
||||||
input.placeholderText: qsTr("Say who you are / why you want to become a contact...")
|
input.placeholderText: qsTr("Say who you are / why you want to become a contact...")
|
||||||
input.multiline: true
|
input.multiline: true
|
||||||
input.implicitHeight: d.msgHeight
|
input.implicitHeight: d.msgHeight
|
||||||
input.verticalAlignmet: TextEdit.AlignTop
|
input.verticalAlignment: TextEdit.AlignTop
|
||||||
|
|
||||||
validators: [StatusMinLengthValidator {
|
validators: [StatusMinLengthValidator {
|
||||||
minLength: d.minMsgLength
|
minLength: d.minMsgLength
|
||||||
|
|
Loading…
Reference in New Issue