diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 20 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 6 |
2 files changed, 17 insertions, 9 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8dcf3c0..c85e517 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,10 +1,13 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin" +<LinearLayout 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" - tools:context="com.camilstaps.rushhour.MainActivity"> + android:orientation="horizontal"> <Button android:layout_width="wrap_content" @@ -13,4 +16,11 @@ android:text="@string/action_start" android:onClick="onClickHandler"/> -</RelativeLayout> + <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> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c46740f..14b245c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,8 +2,6 @@ <string name="app_name">Rush Hour</string> <string name="title_activity_main">@string/app_name</string> <string name="action_start">Start</string> - <string name="title_activity_finished">FinishedActivity</string> - - <string name="hello_world">Hello world!</string> - <string name="action_settings">Settings</string> + <string name="action_highscores">Highscores</string> + <string name="title_activity_finished">Finished!</string> </resources> |