Skip to content
Snippets Groups Projects
Verified Commit bfdc79ac authored by akwizgran's avatar akwizgran
Browse files

Use ConstraintLayout for intro fragment.

parent 06897569
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
+ 61
− 45
View file @ bfdc79ac
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView
android:id="@+id/scrollView"
xmlns:android="http://schemas.android.com/apk/res/android" 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" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/scrollView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/margin_large"> android:padding="@dimen/margin_large">
<LinearLayout <ImageView
android:layout_width="match_parent" android:id="@+id/diagram"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_weight="1"
android:padding="@dimen/margin_medium"> android:adjustViewBounds="true"
android:padding="@dimen/margin_medium"
<ImageView android:scaleType="fitCenter"
android:id="@+id/imageView" android:src="@drawable/qr_code_intro"
android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent"
android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent"
android:layout_weight="1" app:layout_constraintEnd_toStartOf="@id/explanationText"
android:layout_gravity="center_vertical" app:layout_constraintBottom_toBottomOf="@id/explanationText"/>
android:adjustViewBounds="true"
android:padding="@dimen/margin_medium"
android:scaleType="fitCenter"
android:src="@drawable/qr_code_intro"/>
<LinearLayout <ImageView
android:layout_width="0dp" android:id="@+id/explanationImage"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_weight="1"
android:background="@drawable/border_explanation" android:adjustViewBounds="true"
android:orientation="vertical" android:paddingTop="@dimen/margin_large"
android:padding="@dimen/margin_large"> android:paddingLeft="@dimen/margin_large"
android:paddingRight="@dimen/margin_large"
<ImageView android:scaleType="fitCenter"
android:layout_width="match_parent" android:src="@drawable/qr_code_explanation"
android:layout_height="wrap_content" tools:ignore="ContentDescription"
android:adjustViewBounds="true" app:layout_constraintTop_toTopOf="parent"
android:padding="@dimen/margin_medium" app:layout_constraintStart_toEndOf="@id/diagram"
android:scaleType="fitCenter" app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/qr_code_explanation" app:layout_constraintBottom_toTopOf="@id/explanationText"/>
tools:ignore="ContentDescription"/>
<TextView <TextView
style="@style/BriarTextBody" android:id="@+id/explanationText"
android:layout_width="match_parent" style="@style/BriarTextBody"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_marginTop="@dimen/margin_medium" android:layout_height="wrap_content"
android:text="@string/face_to_face"/> android:layout_weight="1"
android:padding="@dimen/margin_large"
android:text="@string/face_to_face"
app:layout_constraintTop_toBottomOf="@id/explanationImage"
app:layout_constraintStart_toEndOf="@id/diagram"
app:layout_constraintEnd_toEndOf="parent"/>
</LinearLayout> <View
android:id="@+id/explanationBorder"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/border_explanation"
app:layout_constraintTop_toTopOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintBottom_toBottomOf="@id/explanationText"/>
</LinearLayout> <android.support.constraint.Barrier
android:id="@+id/barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="diagram,explanationBorder"/>
<Button <Button
android:id="@+id/continueButton" android:id="@+id/continueButton"
...@@ -66,8 +80,10 @@ ...@@ -66,8 +80,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" 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/barrier"
app:layout_constraintBottom_toBottomOf="parent"/>
</LinearLayout> </android.support.constraint.ConstraintLayout>
</ScrollView> </ScrollView>
\ No newline at end of file
briar-android/src/main/res/layout/fragment_keyagreement_id.xml
+ 45
− 37
View file @ bfdc79ac
...@@ -2,56 +2,62 @@ ...@@ -2,56 +2,62 @@
<ScrollView <ScrollView
android:id="@+id/scrollView" android:id="@+id/scrollView"
xmlns:android="http://schemas.android.com/apk/res/android" 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:padding="@dimen/margin_large">
android:paddingBottom="@dimen/margin_activity_vertical"
android:paddingEnd="@dimen/margin_activity_horizontal"
android:paddingLeft="@dimen/margin_activity_horizontal"
android:paddingRight="@dimen/margin_activity_horizontal"
android:paddingStart="@dimen/margin_activity_horizontal"
android:paddingTop="@dimen/margin_activity_vertical">
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/diagram"
android:layout_width="match_parent" 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:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/qr_code_intro" android:src="@drawable/qr_code_intro"
tools:ignore="ContentDescription"/> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/explanationImage"/>
<LinearLayout <ImageView
android:layout_width="match_parent" android:id="@+id/explanationImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_small" android:adjustViewBounds="true"
android:layout_marginRight="@dimen/margin_small" android:paddingTop="@dimen/margin_large"
android:layout_marginTop="@dimen/margin_xlarge" android:paddingLeft="@dimen/margin_large"
android:background="@drawable/border_explanation" android:paddingRight="@dimen/margin_large"
android:orientation="vertical" android:scaleType="fitCenter"
android:padding="@dimen/margin_large"> android:src="@drawable/qr_code_explanation"
tools:ignore="ContentDescription"
<ImageView app:layout_constraintTop_toBottomOf="@id/diagram"
android:layout_width="match_parent" app:layout_constraintBottom_toTopOf="@id/explanationText"/>
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:padding="@dimen/margin_medium"
android:src="@drawable/qr_code_explanation"
android:contentDescription="@string/face_to_face"/>
<TextView <TextView
style="@style/BriarTextBody" android:id="@+id/explanationText"
android:layout_width="match_parent" style="@style/BriarTextBody"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="@dimen/margin_medium" android:layout_height="wrap_content"
android:text="@string/face_to_face"/> android:padding="@dimen/margin_large"
android:text="@string/face_to_face"
app:layout_constraintTop_toBottomOf="@id/explanationImage"
app:layout_constraintBottom_toTopOf="@id/continueButton"/>
</LinearLayout> <View
android:id="@+id/explanationBorder"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/border_explanation"
app:layout_constraintTop_toTopOf="@id/explanationImage"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintBottom_toBottomOf="@id/explanationText"/>
<Button <Button
android:id="@+id/continueButton" android:id="@+id/continueButton"
...@@ -60,8 +66,10 @@ ...@@ -60,8 +66,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" 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"/>
</LinearLayout> </android.support.constraint.ConstraintLayout>
</ScrollView> </ScrollView>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment