Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Replace illustration for adding contacts nearby

Browse Source
This commit is contained in:
Torsten Grote
2022-10-19 16:04:11 -03:00
parent 790818623f
commit 5d1d0fb12a
19 changed files with 778 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
briar-android/src/main/res/layout/fragment_keyagreement_id.xml
View File

@@ -1,80 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/margin_large">
<ImageView
android:id="@+id/diagram"
android:layout_width="@dimen/hero_square"
android:layout_height="@dimen/hero_square"
android:adjustViewBounds="true"
android:importantForAccessibility="no"
android:scaleType="fitCenter"
app:layout_constraintBottom_toTopOf="@id/introTwoWay"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/il_qr_code" />
<TextView
android:id="@+id/introTwoWay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/add_contact_intro_two_way"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/diagram" />
<ImageView
android:id="@+id/explanationImage"
android:layout_width="@dimen/hero_rect_width"
android:layout_height="@dimen/hero_rect_height"
android:layout_marginTop="16dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toTopOf="@id/explanationText"
app:layout_constraintEnd_toEndOf="@id/diagram"
app:layout_constraintStart_toStartOf="@id/diagram"
app:layout_constraintTop_toBottomOf="@id/introTwoWay"
app:srcCompat="@drawable/il_qr_code_nearby"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/explanationText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/face_to_face"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/explanationImage" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<Button
android:id="@+id/continueButton"
style="@style/BriarButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/margin_large">
android:layout_marginHorizontal="16dp"
android:layout_marginTop="@dimen/margin_medium"
android:text="@string/continue_button" />
<ImageView
android:id="@+id/diagram"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:paddingBottom="@dimen/margin_large"
android:scaleType="fitCenter"
app:layout_constraintBottom_toTopOf="@id/explanationImage"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/qr_code_intro"
app:tint="@color/color_primary" />
<ImageView
android:id="@+id/explanationImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:paddingLeft="@dimen/margin_large"
android:paddingTop="@dimen/margin_large"
android:paddingRight="@dimen/margin_large"
android:scaleType="fitCenter"
app:layout_constraintBottom_toTopOf="@id/explanationText"
app:layout_constraintEnd_toEndOf="@id/diagram"
app:layout_constraintStart_toStartOf="@id/diagram"
app:layout_constraintTop_toBottomOf="@id/diagram"
app:srcCompat="@drawable/qr_code_explanation"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/explanationText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/margin_large"
android:text="@string/face_to_face"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toBottomOf="@id/explanationImage" />
<View
android:id="@+id/explanationBorder"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/border_explanation"
app:layout_constraintBottom_toBottomOf="@id/explanationText"
app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toTopOf="@id/explanationImage" />
<Button
android:id="@+id/continueButton"
style="@style/BriarButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:text="@string/continue_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toBottomOf="@id/explanationText" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</LinearLayout>