From fb070ab6947f48ca14c88465664192f2cbe27285 Mon Sep 17 00:00:00 2001
From: veyndan <veyndan89@gmail.com>
Date: Tue, 7 Mar 2017 01:32:44 +0000
Subject: [PATCH] Use GridLayout to show grid of Images instead of
 RelativeLayout

---
 .../main/res/layout-land/welcome_do_upload.xml  | 17 +++++------------
 app/src/main/res/layout/welcome_do_upload.xml   | 17 +++++------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index 48c5f7f2d..3aab6ca70 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -9,12 +9,13 @@
         >
 
 
-    <RelativeLayout
-        android:gravity="center"
+    <GridLayout
         android:layout_width="300dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
+        android:columnCount="2"
         >
 
         <ImageView
@@ -30,7 +31,6 @@
             android:id="@+id/llamas"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:layout_toRightOf="@+id/mount_zao"
             android:scaleType="fitXY"
             />
 
@@ -39,25 +39,18 @@
             android:id="@+id/rainbow_bridge"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:layout_below="@+id/mount_zao"
-
             android:scaleType="fitXY"
             />
 
         <ImageView
             android:src="@drawable/tulip"
             android:id="@+id/tulip"
-
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:layout_toRightOf="@+id/rainbow_bridge"
-
-
-            android:layout_below="@+id/llamas"
             android:scaleType="fitXY"
             />
 
-    </RelativeLayout>
+    </GridLayout>
 
 
     <LinearLayout android:orientation="vertical"
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index c2d5d0b8a..d983e5684 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -9,12 +9,13 @@
     android:weightSum="1"
     android:layout_centerHorizontal="true">
 
-    <RelativeLayout
-        android:gravity="center"
-        android:layout_width="match_parent"
+    <GridLayout
+        android:layout_width="wrap_content"
         android:layout_height="240dp"
+        android:layout_gravity="center_horizontal"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
+        android:columnCount="2"
         >
 
         <ImageView
@@ -30,7 +31,6 @@
             android:id="@+id/llamas"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:layout_toRightOf="@+id/mount_zao"
             android:scaleType="fitXY"
             />
 
@@ -39,25 +39,18 @@
             android:id="@+id/rainbow_bridge"
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:layout_below="@+id/mount_zao"
-
             android:scaleType="fitXY"
             />
 
         <ImageView
             android:src="@drawable/tulip"
             android:id="@+id/tulip"
-
             android:layout_width="150dp"
             android:layout_height="118dp"
-            android:layout_toRightOf="@+id/rainbow_bridge"
-
-
-            android:layout_below="@+id/llamas"
             android:scaleType="fitXY"
             />
 
-    </RelativeLayout>
+    </GridLayout>
 
     <TextView
         android:layout_width="295dp"