From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 18 Jul 2012 21:20:23 +0000 (+0000)
Subject: Tweak the button layouts on the initial screen.
X-Git-Tag: upstream/12.09^2~94
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=668fb205b20a73c12f7bb4cc7bda7468cb668680;p=debian%2Fopenrocket

Tweak the button layouts on the initial screen.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@907 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/android/res/layout-v11/main.xml b/android/res/layout-v11/main.xml
deleted file mode 100644
index e4880d86..00000000
--- a/android/res/layout-v11/main.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/starfield"
-    android:orientation="vertical" >
-
-    <ImageView
-        android:id="@+id/openrocket"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_horizontal"
-        android:paddingTop="22dp"
-        android:src="@drawable/openrocket" />
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:text="@string/version" />
-
-    <ImageView
-        android:id="@+id/rocketglobe"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="4"
-        android:src="@drawable/rocketglobe" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_horizontal" >
-
-        <Button
-            android:id="@+id/main_open"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:text="@string/openfilelabel" />
-
-        <Button
-            android:id="@+id/main_browse"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:text="@string/viewmotorslabel" />
-
-        <Button
-            android:id="@+id/main_donate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="@drawable/sf_donate" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index aa7ef874..0ef5c289 100644
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -11,6 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_horizontal"
+        android:paddingTop="22dp"
         android:src="@drawable/openrocket" />
 
     <TextView
@@ -35,21 +36,23 @@
         <Button
             android:id="@+id/main_open"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
             android:text="@string/openfilelabel" />
 
         <Button
             android:id="@+id/main_browse"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
             android:text="@string/viewmotorslabel" />
-    </LinearLayout>
 
-    <Button
-        android:id="@+id/main_donate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/sf_donate" />
+        <Button
+            android:id="@+id/main_donate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/sf_donate" />
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file