Browse files

anges in layouts, added logo, screen orieantation

  • Loading branch information...
1 parent 165f584 commit 2b2de20b95d75de2109e7644bcc6862f6cf93951 Jan Zalsky committed Feb 19, 2012
View
5 AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cz.gug.hackathon.mantattan"
- android:versionCode="2"
+ android:versionCode="1"
android:versionName="1.0" >
<uses-sdk android:minSdkVersion="8" />
@@ -11,6 +11,7 @@
android:label="@string/app_name" >
<activity
android:name=".MainActivity"
+ android:screenOrientation="portrait"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -20,11 +21,13 @@
</activity>
<activity
android:name=".AboutActivity"
+ android:screenOrientation="portrait"
android:label="@string/app_name" >
</activity>
<activity
android:name=".InGameActivity"
+ android:screenOrientation="portrait"
android:label="@string/app_name" >
</activity>
View
BIN res/drawable-hdpi/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-ldpi/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN res/drawable-mdpi/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
43 res/layout/about.xml
@@ -4,50 +4,47 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
-
- <TextView
- android:textSize="50px"
- android:paddingTop="230px"
- android:paddingBottom="30px"
- android:gravity="center"
- android:layout_width="fill_parent"
+ <ImageView
+ android:id="@+id/logo"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/about_team_name" />
-
+ android:src="@drawable/logo" android:layout_gravity="center_horizontal" android:paddingBottom="20dip"/>
+
<TextView
- android:textSize="15px"
- android:paddingTop="2px"
- android:paddingBottom="2px"
+ android:textSize="24dip"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/about_presents" />
<TextView
- android:textSize="50px"
- android:paddingTop="30px"
- android:paddingBottom="30px"
+ android:textSize="40dip"
+ android:paddingBottom="30dip"
android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/app_name_menu" />
+ android:text="@string/about_team_name" android:textColor="@color/headers"/>
+
+
<TextView
- android:textSize="15px"
- android:paddingTop="2px"
- android:paddingBottom="2px"
+ android:textSize="20dip"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/about_developers_intro" />
<TextView
- android:textSize="20px"
- android:paddingTop="2px"
- android:paddingBottom="2px"
+ android:textSize="20dip"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
android:gravity="center"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/about_developers" />
+ android:text="@string/about_developers" android:textColor="@color/headers"/>
</LinearLayout>
View
17 res/layout/main.xml
@@ -5,28 +5,23 @@
android:layout_height="fill_parent"
android:orientation="vertical" >
- <TextView
-
- android:textSize="50px"
- android:paddingTop="250px"
- android:paddingBottom="30px"
- android:gravity="center"
- android:layout_width="fill_parent"
+ <ImageView
+ android:id="@+id/logo"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/app_name_menu" />
+ android:src="@drawable/logo" android:layout_gravity="center_horizontal" android:paddingBottom="20dip"/>
<Button
android:gravity="center"
android:id="@+id/start_new_button"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
- android:text="@string/app_menu_newgame"
- />
+ android:text="@string/app_menu_newgame" android:layout_marginLeft="40dip" android:layout_marginRight="40dip"/>
<Button
android:gravity="center"
android:id="@+id/about_button"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:text="@string/app_menu_about"
- />
+ android:layout_marginRight="40dip" android:layout_marginLeft="40dip" android:layout_marginTop="10dip"/>
</LinearLayout>
View
BIN res/raw/theme.ogg
Binary file not shown.
View
7 res/values/strings.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
-
- <string name="hello">Hello World, MainActivity!</string>
- <string name="app_name">ProjectM</string>
+ <string name="app_name">Weed Crusher</string>
<string name="app_name_menu">weed crusher</string>
<string name="app_menu_newgame">Start</string>
<string name="app_menu_about">About</string>
<string name="about_team_name">Densely Demon Brutally Tough</string>
- <string name="about_presents">presents</string>
+ <string name="about_presents">by</string>
<string name="about_developers">Ivan Janković, Lukáš Benda, Jan Žalský, Tomáš Ciboch</string>
<string name="about_developers_intro">developed by:</string>
+ <color name="headers">#552200</color>
</resources>

0 comments on commit 2b2de20

Please sign in to comment.