diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_finished.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_fullscreen.xml | 34 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 47 |
3 files changed, 57 insertions, 29 deletions
diff --git a/app/src/main/res/layout/activity_finished.xml b/app/src/main/res/layout/activity_finished.xml index e9ae900..532db52 100644 --- a/app/src/main/res/layout/activity_finished.xml +++ b/app/src/main/res/layout/activity_finished.xml @@ -6,11 +6,6 @@ android:paddingBottom="@dimen/activity_vertical_margin" tools:context="com.camilstaps.rushhour.FinishedActivity"> - <TextView android:text="Gefeliciteerd!" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/textView" - android:textSize="40sp"/> - <ListView android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/activity_fullscreen.xml b/app/src/main/res/layout/activity_fullscreen.xml index fe85e97..4f4ac33 100644 --- a/app/src/main/res/layout/activity_fullscreen.xml +++ b/app/src/main/res/layout/activity_fullscreen.xml @@ -1,14 +1,30 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/board" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#eeeeee" tools:context=".FullscreenActivity" - android:paddingLeft="50dp" - android:paddingRight="50dp" - android:paddingBottom="50dp" - android:paddingTop="80dp"> + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical"> + + <RelativeLayout + android:id="@+id/board" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#eeeeee" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:paddingBottom="50dp" + android:paddingTop="50dp"> + </RelativeLayout> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/action_reset" + android:text="@string/action_reset" + android:onClick="onClickHandler" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:layout_marginBottom="10dp"/> -</RelativeLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c85e517..aec9e62 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,26 +1,43 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context="com.camilstaps.rushhour.MainActivity" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" - android:orientation="horizontal"> + android:orientation="vertical"> - <Button + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/action_start" - android:text="@string/action_start" - android:onClick="onClickHandler"/> + android:src="@drawable/rushhourlogo" + android:layout_centerHorizontal="true" + android:layout_marginTop="100dp"/> - <Button + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/action_highscores" - android:text="@string/action_highscores" - android:onClick="onClickHandler"/> + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingBottom="@dimen/activity_vertical_margin" + android:layout_marginBottom="50dp" + android:orientation="horizontal" + android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true"> -</LinearLayout> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/action_start" + android:text="@string/action_start" + android:onClick="onClickHandler"/> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/action_highscores" + android:text="@string/action_highscores" + android:onClick="onClickHandler"/> + + </LinearLayout> +</RelativeLayout>
\ No newline at end of file |