Buttons Added

Agamemnyan · May 15, 2012 · 754253e · 754253e
1 parent af88646
commit 754253e
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 20 deletions.
diff --git a/MemoMeme/AndroidManifest.xml b/MemoMeme/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:label="@string/app_name" >
         <activity
             android:name=".Main"
-            android:theme="@android:style/Theme.Light.NoTitleBar" >
+            android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,7 +27,7 @@
         <activity
             android:name=".GameOver"
             android:noHistory="true"
-            android:theme="@android:style/Theme.Light.NoTitleBar" />
+            android:theme="@android:style/Theme.Light.NoTitleBar.Fullscreen" />
     </application>
 
 </manifest>
diff --git a/MemoMeme/res/layout-land/main.xml b/MemoMeme/res/layout-land/main.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/textWelcome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textWelcome"
+        android:textSize="24sp" />
+
+    <TextView
+        android:id="@+id/textGameName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textGameName"
+        android:textSize="42sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonGo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="28dp"
+        android:text="@string/buttonGo" />
+
+    <Button
+        android:id="@+id/buttonContinue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/buttonResume" />
+
+    <Button
+        android:id="@+id/buttonLoad"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/buttonLoad" />
+
+</LinearLayout>
diff --git a/MemoMeme/res/layout/main.xml b/MemoMeme/res/layout/main.xml
@@ -1,34 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
     android:orientation="vertical" >
 
+    <TextView
+        android:id="@+id/textWelcome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/textWelcome"
+        android:textSize="24sp" />
+
     <TextView
         android:id="@+id/textGameName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="@string/textGameName" android:textSize="42sp" android:textStyle="bold"/>
+        android:text="@string/textGameName"
+        android:textSize="42sp"
+        android:textStyle="bold" />
 
     <Button
         android:id="@+id/buttonGo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/textGameName"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="28dp"
         android:text="@string/buttonGo" />
 
-    <TextView
-        android:id="@+id/textWelcome"
+    <Button
+        android:id="@+id/buttonContinue"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/textGameName"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="29dp"
-        android:text="@string/textWelcome"
-        android:textSize="24sp" />
+        android:text="@string/buttonResume" />
+
+    <Button
+        android:id="@+id/buttonLoad"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/buttonLoad" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/MemoMeme/res/values-ru/strings.xml b/MemoMeme/res/values-ru/strings.xml
@@ -3,7 +3,9 @@
     <string name="app_name">MemoMeme</string>
     <string name="textWelcome">Добро Пожаловать в</string>
     <string name="textGameName">MemoMeme</string>
-    <string name="buttonGo">Начать!</string>
+    <string name="buttonGo">Начать новую игру</string>
+    <string name="buttonResume">Продолжить последнюю</string>
+    <string name="buttonLoad">Загрузить игру</string>
     <string name="imgSlot">Troll</string>
     <string name="imgGameOver">Game Over Meme</string>
     <string name="buttonRestart">Начать Заново!</string>

diff --git a/MemoMeme/res/values/strings.xml b/MemoMeme/res/values/strings.xml
@@ -3,7 +3,9 @@
     <string name="app_name">MemoMeme</string>
     <string name="textWelcome">Welcome to</string>
     <string name="textGameName">MemoMeme</string>
-    <string name="buttonGo">GO!</string>
+    <string name="buttonGo">New Game</string>
+    <string name="buttonResume">Continue</string>
+    <string name="buttonLoad">Load Game</string>
     <string name="imgSlot">Troll</string>
     <string name="imgGameOver">Game Over Meme</string>
     <string name="buttonRestart">Restart Game!</string>