Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / res / layout / main.xml

diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index cdb72d664a16e289185374bec0e2911b054059bd..0ef5c289f8237ab6c1485a5e64e622a2e15b92bf 100644 (file)
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -1,40 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="fill_parent"\r
     android:layout_height="fill_parent"\r
+    android:background="@drawable/starfield"\r
     android:orientation="vertical" >\r
 \r
-    <TextView\r
+    <ImageView\r
         android:id="@+id/openrocket"\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content"\r
+        android:layout_weight="1"\r
+        android:gravity="center_horizontal"\r
+        android:paddingTop="22dp"\r
+        android:src="@drawable/openrocket" />\r
+\r
+    <TextView\r
         android:layout_width="fill_parent"\r
         android:layout_height="wrap_content"\r
         android:gravity="center_horizontal"\r
-        android:text="Welcome to OpenRocket" />\r
+        android:text="@string/version" />\r
 \r
     <ImageView\r
         android:id="@+id/rocketglobe"\r
         android:layout_width="fill_parent"\r
         android:layout_height="wrap_content"\r
-        android:layout_below="@id/openrocket"\r
+        android:layout_weight="4"\r
         android:src="@drawable/rocketglobe" />\r
 \r
     <LinearLayout\r
         android:layout_width="fill_parent"\r
         android:layout_height="wrap_content"\r
-        android:layout_below="@id/rocketglobe"\r
+        android:layout_weight="1"\r
         android:gravity="center_horizontal" >\r
 \r
         <Button\r
-            android:layout_width="wrap_content"\r
-            android:layout_height="wrap_content"\r
             android:id="@+id/main_open"\r
-            android:text="View ork file" />\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="50dp"\r
+            android:layout_gravity="center"\r
+            android:text="@string/openfilelabel" />\r
 \r
         <Button\r
+            android:id="@+id/main_browse"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="50dp"\r
+            android:layout_gravity="center"\r
+            android:text="@string/viewmotorslabel" />\r
+\r
+        <Button\r
+            android:id="@+id/main_donate"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:id="@+id/main_browse"\r
-            android:text="View motors" />\r
+            android:layout_gravity="center"\r
+            android:background="@drawable/sf_donate" />\r
     </LinearLayout>\r
 \r
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file