mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #401 from veyndan/grid-layout

Browse source 
Use GridLayout to show grid of Images instead of RelativeLayout
This commit is contained in:
Josephine Lim 2017-03-07 20:59:51 +10:00 • committed by GitHub
commit 80a0bb1bdd
2 changed files with 10 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -9,12 +9,13 @@
> >
<RelativeLayout <GridLayout
android:gravity="center"
android:layout_width="300dp" 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_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:columnCount="2"
> >
<ImageView <ImageView
@ -30,7 +31,6 @@
android:id="@+id/llamas" android:id="@+id/llamas"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:layout_toRightOf="@+id/mount_zao"
android:scaleType="fitXY" android:scaleType="fitXY"
/> />
@ -39,25 +39,18 @@
android:id="@+id/rainbow_bridge" android:id="@+id/rainbow_bridge"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:layout_below="@+id/mount_zao"
android:scaleType="fitXY" android:scaleType="fitXY"
/> />
<ImageView <ImageView
android:src="@drawable/tulip" android:src="@drawable/tulip"
android:id="@+id/tulip" android:id="@+id/tulip"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:layout_toRightOf="@+id/rainbow_bridge"
android:layout_below="@+id/llamas"
android:scaleType="fitXY" android:scaleType="fitXY"
/> />
</RelativeLayout> </GridLayout>
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"

17
app/src/main/res/layout/welcome_do_upload.xml
View file

@ -9,12 +9,13 @@
android:weightSum="1" android:weightSum="1"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
<RelativeLayout <GridLayout
android:gravity="center" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="240dp" android:layout_height="240dp"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:columnCount="2"
> >
<ImageView <ImageView
@ -30,7 +31,6 @@
android:id="@+id/llamas" android:id="@+id/llamas"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:layout_toRightOf="@+id/mount_zao"
android:scaleType="fitXY" android:scaleType="fitXY"
/> />
@ -39,25 +39,18 @@
android:id="@+id/rainbow_bridge" android:id="@+id/rainbow_bridge"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:layout_below="@+id/mount_zao"
android:scaleType="fitXY" android:scaleType="fitXY"
/> />
<ImageView <ImageView
android:src="@drawable/tulip" android:src="@drawable/tulip"
android:id="@+id/tulip" android:id="@+id/tulip"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:layout_toRightOf="@+id/rainbow_bridge"
android:layout_below="@+id/llamas"
android:scaleType="fitXY" android:scaleType="fitXY"
/> />
</RelativeLayout> </GridLayout>
<TextView <TextView
android:layout_width="295dp" android:layout_width="295dp"