mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-26 19:36:08 +03:00
Complete qr code login instructions screen.
This commit is contained in:
parent
4fdb4e8c79
commit
9859dab3cc
2 changed files with 52 additions and 0 deletions
|
@ -3336,5 +3336,8 @@
|
||||||
<string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security & Privacy</string>
|
<string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security & Privacy</string>
|
||||||
<string name="qr_code_login_new_device_instruction_3">Select \'Link a device\'</string>
|
<string name="qr_code_login_new_device_instruction_3">Select \'Link a device\'</string>
|
||||||
<string name="qr_code_login_new_device_instruction_4">Select \'Show QR code on this device\'</string>
|
<string name="qr_code_login_new_device_instruction_4">Select \'Show QR code on this device\'</string>
|
||||||
|
<string name="qr_code_login_show_qr_code_button">Show QR code in this device</string>
|
||||||
|
<string name="qr_code_login_need_an_alternative_method">Need an alternative method?</string>
|
||||||
|
<string name="qr_code_login_scan_qr_code_button">Scan QR code</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -31,4 +31,53 @@
|
||||||
app:qrCodeLoginInstruction3="@string/qr_code_login_new_device_instruction_3"
|
app:qrCodeLoginInstruction3="@string/qr_code_login_new_device_instruction_3"
|
||||||
app:qrCodeLoginInstruction4="@string/qr_code_login_new_device_instruction_4" />
|
app:qrCodeLoginInstruction4="@string/qr_code_login_new_device_instruction_4" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/qrCodeLoginInstructionsShowQrCodeButton"
|
||||||
|
style="@style/Widget.Vector.Button.Outlined"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="40dp"
|
||||||
|
android:text="@string/qr_code_login_show_qr_code_button"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@+id/qrCodeLoginInstructionsAlternativeLayout"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="12dp"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/qrCodeLoginInstructionsShowQrCodeButton"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:background="@drawable/divider_horizontal" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/qrCodeLoginInstructionsAlternativeTextView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:background="?android:colorBackground"
|
||||||
|
android:paddingHorizontal="12dp"
|
||||||
|
android:text="@string/qr_code_login_need_an_alternative_method"
|
||||||
|
app:drawableLeftCompat="@drawable/divider_horizontal"
|
||||||
|
app:drawableTint="@color/alert_default_error_background" />
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/qrCodeLoginInstructionsScanQrCodeButton"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="20dp"
|
||||||
|
android:text="@string/qr_code_login_scan_qr_code_button"
|
||||||
|
android:textAllCaps="false"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/qrCodeLoginInstructionsAlternativeLayout"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
Loading…
Reference in a new issue