diff options
author | Camil Staps | 2015-04-23 17:14:19 +0200 |
---|---|---|
committer | Camil Staps | 2015-04-23 17:14:19 +0200 |
commit | 6ec7619a5845e757059120bb1fa4788ff10f7354 (patch) | |
tree | 9a7046d81af67548950c13e22a50673ba4bb9fad /app/src/main | |
parent | FullScreenActivity -> GamePlayActivity (diff) |
MainActivity
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/AndroidManifest.xml | 11 | ||||
-rw-r--r-- | app/src/main/java/com/camilstaps/rushhour/MainActivity.java | 26 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/values-w820dp/dimens.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/values/dimens.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
6 files changed, 63 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3c610a4..dacd771 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,16 +6,21 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppTheme" > + android:theme="@style/AppTheme"> <activity android:name=".GamePlayActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name" - android:theme="@style/FullscreenTheme" + android:screenOrientation="portrait" + android:theme="@style/FullscreenTheme" > + </activity> + <activity + android:name=".MainActivity" + android:label="@string/title_activity_main" + android:configChanges="orientation|keyboardHidden|screenSize" android:screenOrientation="portrait"> <intent-filter> <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> diff --git a/app/src/main/java/com/camilstaps/rushhour/MainActivity.java b/app/src/main/java/com/camilstaps/rushhour/MainActivity.java new file mode 100644 index 0000000..d0cf5c2 --- /dev/null +++ b/app/src/main/java/com/camilstaps/rushhour/MainActivity.java @@ -0,0 +1,26 @@ +package com.camilstaps.rushhour; + +import android.content.Intent; +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; + +public class MainActivity extends ActionBarActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } + + public void onClickHandler(View v) { + switch (v.getId()) { + case R.id.action_start: + Intent intent = new Intent(this, GamePlayActivity.class); + startActivity(intent); + break; + } + } + +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..8dcf3c0 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,16 @@ +<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" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingBottom="@dimen/activity_vertical_margin" + tools:context="com.camilstaps.rushhour.MainActivity"> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/action_start" + android:text="@string/action_start" + android:onClick="onClickHandler"/> + +</RelativeLayout> diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ +<resources> + <!-- Example customization of dimensions originally defined in res/values/dimens.xml + (such as screen margins) for screens with more than 820dp of available width. This + would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> + <dimen name="activity_horizontal_margin">64dp</dimen> +</resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ +<resources> + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</dimen> +</resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6597eec..c00a584 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ <resources> <string name="app_name">Rush Hour</string> + <string name="title_activity_main">@string/app_name</string> + <string name="action_start">Start</string> </resources> |