|
20 | 20 | xmlns:tools="http://schemas.android.com/tools" |
21 | 21 | android:layout_width="match_parent" |
22 | 22 | android:layout_height="match_parent" |
23 | | - android:orientation="vertical" |
24 | | - android:background="@color/backgroundLightest"> |
| 23 | + android:background="@color/backgroundLightest" |
| 24 | + android:orientation="vertical"> |
25 | 25 |
|
26 | 26 | <androidx.appcompat.widget.Toolbar |
27 | 27 | android:id="@+id/toolbar" |
|
41 | 41 | android:layout_height="wrap_content"> |
42 | 42 |
|
43 | 43 | <TextView |
44 | | - app:layout_constraintTop_toTopOf="parent" |
45 | 44 | android:id="@+id/qrCodeExplanation" |
46 | 45 | android:layout_width="match_parent" |
47 | 46 | android:layout_height="wrap_content" |
|
52 | 51 | android:importantForAccessibility="yes" |
53 | 52 | android:text="@string/qrCodeExplanation" |
54 | 53 | 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" /> |
56 | 67 |
|
57 | 68 | <androidx.constraintlayout.widget.Guideline |
58 | 69 | android:id="@+id/imageStart" |
59 | 70 | android:layout_width="0dp" |
60 | 71 | android:layout_height="wrap_content" |
61 | 72 | android:orientation="vertical" |
| 73 | + app:layout_constraintGuide_percent=".125" |
62 | 74 | app:layout_constraintStart_toStartOf="parent" |
63 | | - app:layout_constraintGuide_percent=".125" /> |
| 75 | + app:layout_constraintTop_toBottomOf="@id/qrCodeInstruction" /> |
64 | 76 |
|
65 | 77 | <androidx.constraintlayout.widget.Guideline |
66 | 78 | android:id="@+id/imageEnd" |
|
71 | 83 | app:layout_constraintGuide_percent=".875" /> |
72 | 84 |
|
73 | 85 | <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" |
77 | 87 | android:layout_width="0dp" |
78 | 88 | android:layout_height="wrap_content" |
79 | 89 | android:layout_gravity="center" |
80 | | - android:adjustViewBounds="true" |
81 | 90 | android:layout_marginTop="24dp" |
| 91 | + android:adjustViewBounds="true" |
82 | 92 | android:contentDescription="@string/qrCodeScreenshotContentDescription" |
83 | 93 | 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" /> |
85 | 98 |
|
86 | 99 | </androidx.constraintlayout.widget.ConstraintLayout> |
87 | 100 |
|
|
0 commit comments