Skip to content

Commit ffcfb89

Browse files
authored
[MBL-18765][All] Update QR login screen explanation (#2956)
Test plan: See ticket. refs: MBL-18765 affects: Student, Teacher, Parent release note: Add further explanation to the QR login screen.
1 parent 9cee601 commit ffcfb89

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

libs/login-api-2/src/main/res/layout/activity_login_with_qr.xml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
23-
android:orientation="vertical"
24-
android:background="@color/backgroundLightest">
23+
android:background="@color/backgroundLightest"
24+
android:orientation="vertical">
2525

2626
<androidx.appcompat.widget.Toolbar
2727
android:id="@+id/toolbar"
@@ -41,7 +41,6 @@
4141
android:layout_height="wrap_content">
4242

4343
<TextView
44-
app:layout_constraintTop_toTopOf="parent"
4544
android:id="@+id/qrCodeExplanation"
4645
android:layout_width="match_parent"
4746
android:layout_height="wrap_content"
@@ -52,15 +51,28 @@
5251
android:importantForAccessibility="yes"
5352
android:text="@string/qrCodeExplanation"
5453
android:textColor="@color/textDarkest"
55-
android:textSize="16sp" />
54+
android:textSize="16sp"
55+
app:layout_constraintTop_toTopOf="parent" />
56+
57+
<TextView
58+
android:id="@+id/qrCodeInstruction"
59+
android:layout_width="match_parent"
60+
android:layout_height="wrap_content"
61+
android:layout_marginHorizontal="16dp"
62+
android:layout_marginTop="8dp"
63+
android:text="@string/qrCodeDisabledExplanation"
64+
android:textColor="@color/textDark"
65+
android:textSize="14sp"
66+
app:layout_constraintTop_toBottomOf="@id/qrCodeExplanation" />
5667

5768
<androidx.constraintlayout.widget.Guideline
5869
android:id="@+id/imageStart"
5970
android:layout_width="0dp"
6071
android:layout_height="wrap_content"
6172
android:orientation="vertical"
73+
app:layout_constraintGuide_percent=".125"
6274
app:layout_constraintStart_toStartOf="parent"
63-
app:layout_constraintGuide_percent=".125" />
75+
app:layout_constraintTop_toBottomOf="@id/qrCodeInstruction" />
6476

6577
<androidx.constraintlayout.widget.Guideline
6678
android:id="@+id/imageEnd"
@@ -71,17 +83,18 @@
7183
app:layout_constraintGuide_percent=".875" />
7284

7385
<ImageView
74-
app:layout_constraintStart_toEndOf="@id/imageStart"
75-
app:layout_constraintEnd_toStartOf="@id/imageEnd"
76-
app:layout_constraintTop_toBottomOf="@id/qrCodeExplanation"
86+
android:id="@+id/image"
7787
android:layout_width="0dp"
7888
android:layout_height="wrap_content"
7989
android:layout_gravity="center"
80-
android:adjustViewBounds="true"
8190
android:layout_marginTop="24dp"
91+
android:adjustViewBounds="true"
8292
android:contentDescription="@string/qrCodeScreenshotContentDescription"
8393
android:scaleType="fitCenter"
84-
android:src="@drawable/locate_qr_code_screenshot" />
94+
android:src="@drawable/locate_qr_code_screenshot"
95+
app:layout_constraintEnd_toStartOf="@id/imageEnd"
96+
app:layout_constraintStart_toEndOf="@id/imageStart"
97+
app:layout_constraintTop_toBottomOf="@id/qrCodeInstruction" />
8598

8699
</androidx.constraintlayout.widget.ConstraintLayout>
87100

libs/login-api-2/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ F
102102
<string name="findMySchool">Find my school</string>
103103
<string name="loginWithQRCode">QR Code</string>
104104
<string name="locateQRCode">Locate QR Code</string>
105-
<string name="qrCodeExplanation">You\'ll find the QR code on the web in your account profile. Click \'QR for Mobile Login\' in the list.</string>
105+
<string name="qrCodeExplanation">Find the QR code in your account profile on the web under \'QR for Mobile Login\'.</string>
106106
<string name="qrCodeScanningPrompt">Scan a QR code from Canvas to login</string>
107107
<string name="loginWithQRCodeError">There was an error logging in. Please generate another QR Code and try again.</string>
108108
<string name="invalidQRCodeError">Please scan a QR code generated by Canvas</string>
@@ -130,4 +130,5 @@ F
130130
<string name="weMadeChanges">We\'ve made a few changes.</string>
131131
<string name="whatsNewText">See what\'s new</string>
132132
<string name="findAnotherSchool">Find another school</string>
133+
<string name="qrCodeDisabledExplanation">If it\'s not there, your institution has disabled this option.</string>
133134
</resources>

0 commit comments

Comments
 (0)