status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-02 01:38:00 +00:00
Code Issues Projects Releases Wiki Activity

[onboarding]: fixed overall positioning

Browse Source 
Closes #8525
This commit is contained in:
Alexandra Betouni 2023-05-09 19:23:48 +03:00
parent 6b8632206a
commit d924d5a94a
10 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Onboarding/views/KeycardInitView.qml
View File

@ -28,7 +28,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
KeycardImage {

2
ui/app/AppLayouts/Onboarding/views/KeycardPinView.qml
View File

@ -47,7 +47,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
KeycardImage {

2
ui/app/AppLayouts/Onboarding/views/KeycardPukView.qml
View File

@ -51,7 +51,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
StatusBaseText {

2
ui/app/AppLayouts/Onboarding/views/KeycardStateView.qml
View File

@ -19,7 +19,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
KeycardImage {

2
ui/app/AppLayouts/Onboarding/views/KeysMainView.qml
View File

@ -38,7 +38,7 @@ Item {
}
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
Image {

68
ui/app/AppLayouts/Onboarding/views/LoginView.qml
View File

@ -63,7 +63,7 @@ Item {
readonly property string stateLoginRegularUser: "regularUserLogin"
readonly property string stateLoginKeycardUser: "keycardUserLogin"
readonly property bool isRegularLogin: (image.source.toString() === Style.png("status-logo"))
readonly property string lostKeycardItemKey: Constants.appTranslatableConstants.loginAccountsListLostKeycard
property int remainingAttempts: root.startupStore.startupModuleInst.remainingAttempts
@ -112,6 +112,8 @@ Item {
}
image.source = Style.png("keycard/biometrics-fail")
image.Layout.preferredWidth = Constants.onboarding.biometricsImageWidth
image.Layout.preferredHeight = Constants.onboarding.biometricsImageHeight;
info.icon = ""
info.color = Theme.palette.dangerColor1
info.text = qsTr("Fingerprint not recognized")
@ -164,15 +166,15 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.loginHeight
//26 for input error text top margin + height
anchors.verticalCenterOffset: d.isRegularLogin ? 26 : 0
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
KeycardImage {
id: image
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
Layout.preferredWidth: Constants.keycard.general.imageWidth
onAnimationCompleted: {
if (root.startupStore.currentStartupState.stateType === Constants.startupState.loginKeycardInsertedKeycard ||
root.startupStore.currentStartupState.stateType === Constants.startupState.loginKeycardReadingKeycard) {
@ -184,15 +186,17 @@ Item {
StatusBaseText {
id: title
Layout.alignment: Qt.AlignHCenter
//spacing between logo and title is 16px
Layout.topMargin: -Style.current.halfPadding
font.weight: Font.Bold
font.pixelSize: Constants.onboarding.titleFontSize
color: Theme.palette.directColor1
}
Item { Layout.fillHeight: d.isRegularLogin }
Item {
id: userInfo
Layout.preferredHeight: userImage.height
Layout.preferredWidth: 318
Layout.preferredHeight: userImage.height
Layout.alignment: Qt.AlignHCenter
enabled: root.startupStore.currentStartupState.stateType !== Constants.startupState.loginKeycardReadingKeycard &&
root.startupStore.currentStartupState.stateType !== Constants.startupState.loginKeycardRecognizedKeycard &&
@ -360,7 +364,6 @@ Item {
Layout.fillWidth: true
Layout.preferredHeight: txtPassword.height
Layout.alignment: Qt.AlignHCenter
Input {
id: txtPassword
textField.objectName: "loginPasswordInput"
@ -472,7 +475,6 @@ Item {
}
StatusBaseText {
id: infoTxt
Layout.alignment: Qt.AlignHCenter
horizontalAlignment: Text.AlignHCenter
font.pixelSize: Constants.keycard.general.fontSize3
wrapMode: Text.WordWrap
@ -515,11 +517,7 @@ Item {
}
}
}
Item {
Layout.fillWidth: true
Layout.fillHeight: true
}
Item { Layout.fillHeight: true }
}
states: [
@ -533,11 +531,11 @@ Item {
Style.png("keycard/biometrics-success") : Style.png("status-logo")
pattern: ""
Layout.preferredHeight: localAccountSettings.storeToKeychainValue === Constants.keychain.storedValue.store?
Constants.keycard.general.imageHeight :
Constants.keycard.general.loginStatusLogoHeight
Constants.onboarding.biometricsImageWidth :
Constants.onboarding.logoImageHeight
Layout.preferredWidth: localAccountSettings.storeToKeychainValue === Constants.keychain.storedValue.store?
Constants.keycard.general.imageWidth :
Constants.keycard.general.loginStatusLogoWidth
Constants.onboarding.biometricsImageHeight :
Constants.onboarding.logoImageWidth
}
PropertyChanges {
target: title
@ -585,6 +583,8 @@ Item {
target: image
source: Style.png("keycard/biometrics-success")
pattern: ""
Layout.preferredWidth: Constants.onboarding.biometricsImageWidth
Layout.preferredHeight: Constants.onboarding.biometricsImageHeight
}
PropertyChanges {
target: title
@ -632,6 +632,8 @@ Item {
target: image
source: Style.png("keycard/empty-reader")
pattern: ""
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -683,6 +685,8 @@ Item {
endImgIndex: Constants.keycardAnimations.cardInsert.endImgIndex
duration: Constants.keycardAnimations.cardInsert.duration
loops: Constants.keycardAnimations.cardInsert.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -736,6 +740,8 @@ Item {
endImgIndex: Constants.keycardAnimations.cardInserted.endImgIndex
duration: Constants.keycardAnimations.cardInserted.duration
loops: Constants.keycardAnimations.cardInserted.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -787,6 +793,8 @@ Item {
endImgIndex: Constants.keycardAnimations.warning.endImgIndex
duration: Constants.keycardAnimations.warning.duration
loops: Constants.keycardAnimations.warning.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -838,6 +846,8 @@ Item {
endImgIndex: Constants.keycardAnimations.success.endImgIndex
duration: Constants.keycardAnimations.success.duration
loops: Constants.keycardAnimations.success.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -883,9 +893,9 @@ Item {
PropertyChanges {
target: image
source: Style.png("status-logo")
Layout.preferredHeight: Constants.onboarding.logoImageWidth
Layout.preferredWidth: Constants.onboarding.logoImageHeight
pattern: ""
Layout.preferredHeight: Constants.keycard.general.loginStatusLogoHeight
Layout.preferredWidth: Constants.keycard.general.loginStatusLogoWidth
}
PropertyChanges {
target: title
@ -928,6 +938,8 @@ Item {
target: image
source: Style.png("keycard/card-empty")
pattern: ""
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -976,6 +988,8 @@ Item {
endImgIndex: Constants.keycardAnimations.strongSuccess.endImgIndex
duration: Constants.keycardAnimations.strongSuccess.duration
loops: Constants.keycardAnimations.strongSuccess.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1023,6 +1037,8 @@ Item {
endImgIndex: Constants.keycardAnimations.strongError.endImgIndex
duration: Constants.keycardAnimations.strongError.duration
loops: Constants.keycardAnimations.strongError.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1071,6 +1087,8 @@ Item {
target: image
source: Style.png("keycard/plain-error")
pattern: ""
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1129,6 +1147,8 @@ Item {
endImgIndex: Constants.keycardAnimations.strongError.endImgIndex
duration: Constants.keycardAnimations.strongError.duration
loops: Constants.keycardAnimations.strongError.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1175,6 +1195,8 @@ Item {
target: image
source: Style.png("keycard/card-empty")
pattern: ""
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1226,6 +1248,8 @@ Item {
endImgIndex: Constants.keycardAnimations.strongError.endImgIndex
duration: Constants.keycardAnimations.strongError.duration
loops: Constants.keycardAnimations.strongError.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1278,6 +1302,8 @@ Item {
endImgIndex: Constants.keycardAnimations.strongError.endImgIndex
duration: Constants.keycardAnimations.strongError.duration
loops: Constants.keycardAnimations.strongError.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: title
@ -1331,6 +1357,8 @@ Item {
endImgIndex: Constants.keycardAnimations.strongSuccess.endImgIndex
duration: Constants.keycardAnimations.strongSuccess.duration
loops: Constants.keycardAnimations.strongSuccess.loops
Layout.preferredWidth: Constants.keycard.general.imageWidth
Layout.preferredHeight: Constants.keycard.general.imageHeight
}
PropertyChanges {
target: userInfo

2
ui/app/AppLayouts/Onboarding/views/ProfileFetchingView.qml
View File

@ -31,7 +31,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
ProfileFetchingAnimation {

2
ui/app/AppLayouts/Onboarding/views/SeedPhraseView.qml
View File

@ -41,7 +41,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
StatusBaseText {

2
ui/app/AppLayouts/Onboarding/views/SeedPhraseWordsInputView.qml
View File

@ -66,7 +66,7 @@ Item {
ColumnLayout {
anchors.centerIn: parent
height: Constants.keycard.general.onboardingHeight
height: Constants.onboarding.loginHeight
spacing: Style.current.bigPadding
StatusBaseText {

8
ui/imports/utils/Constants.qml
View File

@ -347,6 +347,11 @@ QtObject {
}
readonly property QtObject onboarding: QtObject {
readonly property int loginHeight: 370
readonly property int logoImageWidth: 128
readonly property int logoImageHeight: 128
readonly property int biometricsImageWidth: 188
readonly property int biometricsImageHeight: 185
readonly property int userImageWidth: 40
readonly property int userImageHeight: 40
readonly property int titleFontSize: 17
@ -540,7 +545,6 @@ QtObject {
readonly property QtObject general: QtObject {
readonly property string purchasePage: "https://get.keycard.tech"
readonly property int onboardingHeight: 460
readonly property int loginHeight: 460
readonly property int imageWidth: 240
readonly property int imageHeight: 240
readonly property int seedPhraseWidth: 816
@ -572,8 +576,6 @@ QtObject {
readonly property int footerButtonsHeight: 44
readonly property int loginInfoHeight1: 24
readonly property int loginInfoHeight2: 44
readonly property int loginStatusLogoWidth: 128
readonly property int loginStatusLogoHeight: 128
}
readonly property QtObject keyPairType: QtObject {