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

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
Josephine Lim 2017-03-07 21:03:38 +10:00
commit 7339d4b4ac
4 changed files with 12 additions and 43 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
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"

10
app/src/main/res/layout-land/welcome_final.xml
View file

@ -44,18 +44,10 @@
android:textColor="@android:color/white"
android:singleLine="false"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"/>
<Button
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:text="@string/welcome_final_button_text"
android:id="@+id/welcomeYesButton"
android:layout_gravity="center"

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

@ -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"

11
app/src/main/res/layout/welcome_final.xml
View file

@ -48,19 +48,10 @@
android:singleLine="false"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"
/>
<Button
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:text="@string/welcome_final_button_text"
android:id="@+id/welcomeYesButton"
android:layout_gravity="center"