Merge branch 'develop' into login

room-15 · Oct 5, 2018 · a56aca9 · a56aca9
2 parents 34d8bfc + eeb26a5
commit a56aca9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,12 +17,13 @@ android {
     buildToolsVersion buildToolsVersion
     defaultConfig {
         applicationId 'com.tristanwiley.chatse'
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode 3
         versionName "0.1.0_Alpha_$versionCode"
 
         vectorDrawables.useSupportLibrary = true
+        multiDexEnabled = true
 
         buildConfigField "String", "fabricApiKey", FABRIC_API_KEY
 

diff --git a/app/src/main/res/layout/simple_grid_item.xml b/app/src/main/res/layout/simple_grid_item.xml
@@ -1,21 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:gravity="center"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/image_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:scaleType="fitXY"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintBottom_toBottomOf="@id/text_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="16dp"
         android:gravity="center_horizontal"
-        android:textColor="@android:color/black" />
+        android:textColor="@android:color/black"
+        tools:text="Choose from gallery"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image_view"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
-</LinearLayout>
+</android.support.constraint.ConstraintLayout>