[tor-commits] [orbot/master] updated layout for larger screens

[n8fr8 at torproject.org]

commit 265bd29a6c79a0ff26d1345eea211d181928358b
Author: n8fr8 <nathan at freitas.net>
Date:   Wed Jun 20 23:46:06 2012 -0400

    updated layout for larger screens
---
 res/layout-land/layout_main.xml |   55 ---------------------------------------
 res/layout/layout_main.xml      |   42 +++++++++++++----------------
 res/values/strings.xml          |    4 +-
 3 files changed, 21 insertions(+), 80 deletions(-)

diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml
deleted file mode 100644
index e55fda5..0000000
--- a/res/layout-land/layout_main.xml
+++ /dev/null
@@ -1,55 +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/bgtitanium" android:orientation="vertical">
-    
-    	<RelativeLayout android:id="@+id/layoutHeaderMain"
-		android:layout_width="fill_parent"
-		android:layout_height="30dp"
-		android:layout_gravity="center_horizontal"
-		android:background="#A0909090">
-        <ImageView android:id="@+id/radioModeImage"
- 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-			android:layout_marginTop="3px"
-			android:layout_marginRight="3px"
-			android:gravity="right"
-			android:layout_toRightOf="@+id/radioModeLabel"
-			android:layout_alignParentRight="true"
-			android:layout_alignParentTop="true"
-			android:src="@drawable/tor25"
-			/>
-		<TextView android:id="@+id/radioModeText"
- 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"           
-            android:text="@string/powered_by"
-			android:layout_marginTop="8px"
-			android:layout_marginRight="0px"
-			android:gravity="right"
-			android:layout_toLeftOf="@+id/radioModeImage"
-            android:textColor="#cccccc" />
-	</RelativeLayout>
-        
-			<ImageView
-			android:id="@+id/imgStatus"
-			 android:layout_width="fill_parent"
-			 android:layout_margin="5dip"
- 			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:src="@drawable/toroff" android:layout_weight=".5"/>
-	
-        <TextView android:id="@+id/lblStatus"
-			android:text="@string/press_to_start"
-			android:layout_gravity="center_horizontal"
-			android:textStyle="bold"
-			android:layout_width="wrap_content"
-			 			android:layout_height="wrap_content"
-			
-			android:textColor="#ffffff"
-			 />
-
-
-       
-</LinearLayout>
-
diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
index 6515156..7c711b6 100644
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bgtitanium"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:id="@+id/viewMain"
-    >
+
+    android:paddingTop="0sp">
     
+    <org.torproject.android.AnimatedBlockView  android:layout_width="fill_parent"
+	      android:layout_height="fill_parent"></org.torproject.android.AnimatedBlockView>
+       
     	<RelativeLayout android:id="@+id/layoutHeaderMain"
 		android:layout_width="fill_parent"
 		android:layout_height="30dp"
-		android:layout_gravity="center_horizontal"
 		android:background="#A0909090">
                <ImageView android:id="@+id/radioModeImage"
  		    android:layout_width="wrap_content"
@@ -33,21 +34,18 @@
 			android:layout_toLeftOf="@+id/radioModeImage"
             android:textColor="#cccccc" />
 	</RelativeLayout>
-    <RelativeLayout 
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_gravity="center_vertical"
- 
-    >
-    <ImageView
+		<LinearLayout android:gravity="center_vertical|center_horizontal"
+		     android:orientation="vertical" android:layout_width="fill_parent"
+		      android:layout_height="fill_parent">
+    	
+       <ImageView
 		android:id="@+id/imgStatus"
-		android:layout_margin="15dip"
+				    android:layout_marginTop="40dip"
+
 		android:layout_width="fill_parent"
-		android:layout_height="320dip"
+		android:layout_height="fill_parent"
 		android:src="@drawable/toroff"
-		android:layout_gravity="center_horizontal"
-		/>
+		android:layout_gravity="center_horizontal" />
 		
 	<TextView android:id="@+id/lblStatus"
 		android:text="@string/press_to_start"
@@ -58,9 +56,7 @@
 		android:textColor="#ffffff"
 		android:layout_below="@id/imgStatus"
 		 />
-		</RelativeLayout>
-
-       
 </LinearLayout>
-
+       
+</FrameLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d891851..d14cd27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,8 +238,8 @@
 <string name="the_tor_license">The Tor License</string>
 <string name="https_torproject_org">https://torproject.org</string>
 <string name="third_party_software">3rd-Party-Software: </string>
-<string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-<string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+<string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+<string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
 <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
 <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
 <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>