Commit 48849cf9 authored by Matthieu's avatar Matthieu

Merge branch 'fix-alignment' into 'master'

Fix grid alignment (#242)

Closes #242

See merge request !240
parents 9d9010d0 7066c8e9
......@@ -151,6 +151,7 @@ dependencies {
implementation 'com.karumi:dexter:6.2.1'
implementation 'com.google.android:flexbox:2.0.1'
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
......
<?xml version="1.0" encoding="utf-8"?>
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
app:flexWrap="wrap"
app:justifyContent="center">
<androidx.cardview.widget.CardView
......@@ -19,4 +21,4 @@
</androidx.cardview.widget.CardView>
</GridLayout>
</com.google.android.flexbox.FlexboxLayout>
......@@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<com.google.android.material.textfield.TextInputLayout
......@@ -32,8 +33,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:text="@string/search"
android:backgroundTint="@color/colorButtonBg"
android:text="@string/search"
android:textColor="@color/colorButtonText"
app:layout_constraintBottom_toBottomOf="@+id/search"
app:layout_constraintEnd_toEndOf="parent"
......@@ -62,10 +63,10 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/discoverList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
app:layoutManager="LinearLayoutManager"
app:layoutManager="com.google.android.flexbox.FlexboxLayoutManager"
app:layout_constraintTop_toBottomOf="@+id/search" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
......
Markdown is supported
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