GODT-1542: Update login screen for rebranding.

xliee · May 18, 2022 · 7d41062 · 7d41062
1 parent f3c69fa
commit 7d41062
Show file tree

Hide file tree

Showing 10 changed files with 567 additions and 343 deletions.
diff --git a/internal/frontend/qml/Bridge_test.qml b/internal/frontend/qml/Bridge_test.qml
@@ -262,7 +262,7 @@ Window {
 
 
  // add one user on start
- var hasUserOnStart = true
+ var hasUserOnStart = false
  if (hasUserOnStart) {
  var newUserObject = root.userComponent.createObject(root)
  newUserObject.username = "LerooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooyJenkins@protonmail.com"

diff --git a/internal/frontend/qml/Proton/ColorScheme.qml b/internal/frontend/qml/Proton/ColorScheme.qml
@@ -88,4 +88,5 @@ QtObject {
 
  // Images
  property string welcome_img
+ property string logo_img
 }
diff --git a/internal/frontend/qml/Proton/Style.qml b/internal/frontend/qml/Proton/Style.qml
@@ -106,6 +106,7 @@ QtObject {
 
  // Images
  welcome_img: "icons/img-welcome.png"
+ logo_img: "icons/product_logos.svg"
  }
 
  property ColorScheme lightProminentStyle: ColorScheme {
@@ -180,6 +181,7 @@ QtObject {
 
  // Images
  welcome_img: "icons/img-welcome-dark.png"
+ logo_img: "icons/product_logos_dark.svg"
  }
 
  property ColorScheme darkStyle: ColorScheme {
@@ -254,6 +256,7 @@ QtObject {
 
  // Images
  welcome_img: "icons/img-welcome-dark.png"
+ logo_img: "icons/product_logos_dark.svg"
  }
 
  property ColorScheme darkProminentStyle: ColorScheme {
@@ -328,6 +331,7 @@ QtObject {
 
  // Images
  welcome_img: "icons/img-welcome-dark.png"
+ logo_img: "icons/product_logos_dark.svg"
  }
 
  property ColorScheme currentStyle: lightStyle

diff --git a/internal/frontend/qml/WelcomeGuide.qml b/internal/frontend/qml/WelcomeGuide.qml
@@ -102,7 +102,7 @@ Item {
  Label {
  colorScheme: root.colorScheme
  id: longTextLabel
- text: qsTr("Now you can securely access and manage Proton Mail messages in your favorite email client. Bridge runs in the background and encrypts and decrypts your messages seamlessly.")
+ text: qsTr("Add your Proton Mail account to securely access and manage your messages in your favorite email client. Bridge runs in the background and encrypts and decrypts your messages seamlessly.")
  Layout.alignment: Qt.AlignHCenter
  Layout.fillWidth: true
  Layout.topMargin: 16
@@ -135,14 +135,14 @@ Item {
 
  Image {
  id: logoImage
- source: "icons/product_logos.svg"
+ source: colorScheme.logo_img
 
  anchors.horizontalCenter: parent.horizontalCenter
  anchors.bottom: parent.bottom
  anchors.topMargin: 48
  anchors.bottomMargin: 48
- sourceSize.height: 22
- sourceSize.width: 132
+ sourceSize.height: 25
+ sourceSize.width: 200
  }
  }
  }

diff --git a/internal/frontend/qml/icons/img-welcome-dark.png b/internal/frontend/qml/icons/img-welcome-dark.png