Updated screen for Accepted Invitation.

Applied review comments.
MerginMaps · Dec 12, 2023 · 432ae90 · 432ae90 · inputapp-bot · Dec 12, 2023
1 parent 755ef4b
commit 432ae90
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 47 deletions.
diff --git a/app/qml/components/MMDrawer.qml b/app/qml/components/MMDrawer.qml
@@ -82,8 +82,6 @@ Drawer {
           id: closeButton
 
           source: __style.closeButtonIcon
-          //anchors.right: parent.right
-          //anchors.rightMargin: 20 * __dp
 
           MouseArea {
             anchors.fill: parent

diff --git a/app/qml/components/MMLink.qml b/app/qml/components/MMLink.qml
@@ -51,7 +51,7 @@ Button {
 
   background: Rectangle {
     width: control.width
-    height: control,height
+    height: control.height
     color: __style.transparentColor
   }
 }
diff --git a/app/qml/onboarding/MMAcceptInvitation.qml b/app/qml/onboarding/MMAcceptInvitation.qml
@@ -11,68 +11,111 @@ import QtQuick.Layouts
 import QtQuick.Controls
 
 import "../components"
+import "../inputs"
 
 Page {
   id: root
 
+  required property string user
+  required property string workspace
+
   signal backClicked
   signal continueClicked
   signal createWorkspaceClicked
 
-  Column {
-    spacing: 20
+  Rectangle {
+    anchors.fill: parent
+    color: __style.lightGreenColor
+  }
 
-    MMHeader {
-      headerTitle: qsTr("Accept Invitation")
+  ScrollView {
+    width: parent.width
+    height: parent.height
 
-      onBackClicked: root.backClicked()
-    }
+    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+    ScrollBar.vertical.policy: ScrollBar.AlwaysOff
+
+    Column {
+      id: mainColumn
+
+      width: root.width
+      spacing: 20 * __dp
+      leftPadding: 20 * __dp
+      rightPadding: 20 * __dp
+      topPadding: 100 * __dp
+      bottomPadding: 20 * __dp
 
-   Item {
-     width: bg.width
-     height: bg.height
+      Item {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
+        height: bg.height
 
-     MMIcon {
-       id: bg
-       source: __style.acceptInvitationImage
-     }
+        Image {
+          id: bg
 
-     MMIcon {
-        id: fg
-        x: ( bg.width - fg.width ) / 2 + 7
-        y: ( bg.height - fg.height ) / 2 + 5
-        source: __style.acceptInvitationLogoImage
-     }
-   }
+          anchors.horizontalCenter: parent.horizontalCenter
+          source: __style.acceptInvitationImage
 
-    Label {
+          Image {
+            id: fg
+            x: ( bg.width - fg.width ) / 2 + 7
+            y: ( bg.height - fg.height ) / 2 + 5
+            source: __style.acceptInvitationLogoImage
+          }
+        }
+      }
+
+      Text {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
         text: qsTr("You have been invited to workspace")
-        font: __style.t1
+        font: __style.h3
         color: __style.forestColor
-    }
+        wrapMode: Text.WordWrap
+        horizontalAlignment: Text.AlignHCenter
+        lineHeight: 1.2
+      }
 
-    Label {
-        text: qsTr("User %1 has invited you to join his workspace").arg("andrej")
-        font: __style.p2
-    }
+      Text {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
+        text: qsTr("User %1 has invited you to join his workspace").arg(root.user)
+        font: __style.p5
+        color: __style.nightColor
+        wrapMode: Text.WordWrap
+        horizontalAlignment: Text.AlignHCenter
+        lineHeight: 1.5
+      }
 
-    Label {
-        text: "my-workspace-funny"
-        font: __style.p2
-    }
+      Item { width: 1; height: 1 }
 
-    MMButton {
-      onClicked: root.continueClicked()
-      text: qsTr("Join workspace")
-    }
+      Text {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
+        text: root.workspace
+        font: __style.t1
+        color: __style.nightColor
+        wrapMode: Text.WordWrap
+        horizontalAlignment: Text.AlignHCenter
+        lineHeight: 1.5
+      }
 
-    MMHlineText {
-      title: qsTr("or")
-    }
+      Item { width: 1; height: 50 }
+
+      MMButton {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
+        text: qsTr("Join workspace")
+
+        onClicked: root.continueClicked()
+      }
+
+      MMHlineText {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
+        title: qsTr("or")
+      }
+
+      MMLinkButton {
+        width: parent.width - mainColumn.leftPadding - mainColumn.rightPadding
+        text: qsTr("Create new workspace")
 
-    MMLinkButton {
-      onClicked: root.createWorkspaceClicked()
-      text: qsTr("Create new workspace")
+        onClicked: root.createWorkspaceClicked()
+      }
     }
   }
 }
diff --git a/gallery/qml/pages/OnboardingPage.qml b/gallery/qml/pages/OnboardingPage.qml
@@ -101,16 +101,21 @@ Page {
     onBackClicked: visible = false
   }
 
-
-
   MMAcceptInvitation {
     id: acceptInvitation
+
     anchors.fill: parent
     visible: false
+    user: "Lubos"
+    workspace: "my-workspace.funny"
 
-    onBackClicked: {visible=false}
+    onBackClicked: visible = false
+    onContinueClicked: console.log("Join workspace clicked")
+    onCreateWorkspaceClicked: console.log("Create new workspace clicked")
   }
 
+
+
   MMCreateWorkspace {
     id: createWorkspace
     anchors.fill: parent