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

Merge branch 'fix-intro-fragment' into 'maintenance-0.16'

Browse Source 
Backport: Fix uncentered intro fragment

See merge request akwizgran/briar!718
This commit is contained in:
akwizgran
2018-03-07 11:52:22 +00:00
parent fd3e74cefc ef12191ec8
commit 08b63201d9
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,58 +17,64 @@
android:id="@+id/diagram" android:id="@+id/diagram"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:paddingBottom="@dimen/margin_large" android:paddingBottom="@dimen/margin_large"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/qr_code_intro" android:src="@drawable/qr_code_intro"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/explanationImage"
app:layout_constraintBottom_toTopOf="@id/explanationImage"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView <ImageView
android:id="@+id/explanationImage" android:id="@+id/explanationImage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:paddingTop="@dimen/margin_large"
android:paddingLeft="@dimen/margin_large" android:paddingLeft="@dimen/margin_large"
android:paddingRight="@dimen/margin_large" android:paddingRight="@dimen/margin_large"
android:paddingTop="@dimen/margin_large"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/qr_code_explanation" android:src="@drawable/qr_code_explanation"
tools:ignore="ContentDescription" 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:layout_constraintTop_toBottomOf="@id/diagram"
app:layout_constraintBottom_toTopOf="@id/explanationText"/> tools:ignore="ContentDescription"/>
<TextView <TextView
android:id="@+id/explanationText" android:id="@+id/explanationText"
style="@style/BriarTextBody" style="@style/BriarTextBody"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/margin_large" android:padding="@dimen/margin_large"
android:text="@string/face_to_face" android:text="@string/face_to_face"
app:layout_constraintTop_toBottomOf="@id/explanationImage" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@id/continueButton"/> app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toBottomOf="@id/explanationImage"/>
<View <View
android:id="@+id/explanationBorder" android:id="@+id/explanationBorder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@drawable/border_explanation" android:background="@drawable/border_explanation"
app:layout_constraintTop_toTopOf="@id/explanationImage" app:layout_constraintBottom_toBottomOf="@id/explanationText"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintEnd_toEndOf="@id/explanationImage" app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintBottom_toBottomOf="@id/explanationText"/> app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toTopOf="@id/explanationImage"/>
<Button <Button
android:id="@+id/continueButton" android:id="@+id/continueButton"
style="@style/BriarButton.Default" style="@style/BriarButton.Default"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:text="@string/continue_button" android:text="@string/continue_button"
app:layout_constraintTop_toBottomOf="@id/explanationText" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toBottomOf="@id/explanationText"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>