Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(beta): add beta tag to pairing screens #15873

Merged
merged 1 commit into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ui/app/AppLayouts/Onboarding/views/KeysMainView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,14 @@ Item {
root.startupStore.doPrimaryAction()
}
}

StatusBetaTag {
id: betaTagButton1
visible: true
anchors.left: button1.right
anchors.leftMargin: 8
anchors.verticalCenter: button1.verticalCenter
}
}

StatusBaseText {
Expand Down Expand Up @@ -334,6 +342,10 @@ Item {
target: button1
text: qsTr("Scan or enter a sync code")
}
PropertyChanges {
target: betaTagButton1
visible: true
}
PropertyChanges {
target: button2
text: qsTr("I don’t have other device")
Expand Down Expand Up @@ -365,6 +377,10 @@ Item {
target: button1
text: ""
}
PropertyChanges {
target: betaTagButton1
visible: false
}
PropertyChanges {
target: button2
text: qsTr("Login with Keycard")
Expand Down Expand Up @@ -396,6 +412,10 @@ Item {
target: button1
text: qsTr("Generate new keys")
}
PropertyChanges {
target: betaTagButton1
visible: false
}
PropertyChanges {
target: button2
text: qsTr("Generate keys for a new Keycard")
Expand Down Expand Up @@ -427,6 +447,10 @@ Item {
target: button1
text: qsTr("Import a seed phrase")
}
PropertyChanges {
target: betaTagButton1
visible: false
}
PropertyChanges {
target: button2
text: qsTr("Import a seed phrase into a new Keycard")
Expand Down Expand Up @@ -458,6 +482,10 @@ Item {
target: button1
text: qsTr("Try to fetch profile again")
}
PropertyChanges {
target: betaTagButton1
visible: false
}
PropertyChanges {
target: button2
text: qsTr("Create new profile with the same chatkey")
Expand Down Expand Up @@ -487,6 +515,10 @@ Item {
target: button1
text: qsTr("Continue")
}
PropertyChanges {
target: betaTagButton1
visible: false
}
PropertyChanges {
target: button2
text: ""
Expand Down Expand Up @@ -518,6 +550,10 @@ Item {
target: button1
text: qsTr("Create replacement Keycard with seed phrase")
}
PropertyChanges {
target: betaTagButton1
visible: false
}
PropertyChanges {
target: button2
text: qsTr("Start using account without keycard")
Expand Down
3 changes: 2 additions & 1 deletion ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ QtObject {
isExperimental: true})
append({subsection: Constants.settingsSubsection.syncingSettings,
text: qsTr("Syncing"),
icon: "rotate"})
icon: "rotate",
isExperimental: true})
}
}

Expand Down
30 changes: 20 additions & 10 deletions ui/app/AppLayouts/Profile/views/SyncingView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,27 @@ SettingsContentBase {

spacing: 17

StatusBaseText {

objectName: "syncNewDeviceTextLabel"

Layout.fillWidth: true
Item {
Layout.alignment: Qt.AlignHCenter
height: syncNewDeviceText.height
width: syncNewDeviceText.width
Layout.topMargin: -8
horizontalAlignment: Text.AlignHCenter
color: Theme.palette.primaryColor1
font.pixelSize: 17
font.weight: Font.Bold
text: qsTr("Sync a New Device")

StatusBaseText {
id: syncNewDeviceText
objectName: "syncNewDeviceTextLabel"

color: Theme.palette.primaryColor1
font.pixelSize: 17
font.weight: Font.Bold
text: qsTr("Sync a New Device")

StatusBetaTag {
anchors.left: parent.right
anchors.leftMargin: 8
anchors.verticalCenter: parent.verticalCenter
}
}
}

StatusBaseText {
Expand Down
7 changes: 7 additions & 0 deletions ui/imports/shared/views/SyncingEnterCode.qml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.14

import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Components 0.1
import StatusQ.Controls 0.1
import StatusQ.Controls.Validators 0.1

Expand Down Expand Up @@ -44,6 +45,12 @@ ColumnLayout {
}
}

StatusBetaTag {
anchors.left: switchTabBar.right
anchors.leftMargin: 8
anchors.verticalCenter: switchTabBar.verticalCenter
}

StackLayout {
Layout.fillWidth: true
Layout.preferredHeight: Math.max(syncQr.implicitHeight, syncCode.implicitHeight)
Expand Down