From 411b56abd18c5d7008beb420f5c1047a6609cfba Mon Sep 17 00:00:00 2001
From: n8fr8 <nathan@freitas.net>
Date: Sun, 21 Oct 2012 15:32:54 +0530
Subject: [PATCH] moved up/down counters back to main screen

---
 res/layout/layout_main.xml | 114 ++++++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 53 deletions(-)

diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
index 1d1bc18d..c9951865 100644
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@@ -53,10 +53,70 @@
 		android:textStyle="bold"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="50dp"
+		android:layout_marginBottom="20dp"
 		android:textColor="#ffffff"
 		 />
 	
+	
+	    <RelativeLayout 
+		     android:id="@+id/rowTrafficDown" 
+		     android:layout_width="fill_parent"
+		      android:layout_height="wrap_content"
+		       android:orientation="horizontal"
+		       android:paddingLeft="3sp"
+		       android:paddingRight="3sp"
+		       
+		      >
+	    <TextView
+	    	android:id="@+id/trafficLabelDown"
+			android:textColor="#FFFFFFFF"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentLeft="true"
+			android:textSize="15sp"
+			android:text="@string/main_layout_download"
+			android:gravity="center_vertical"
+			android:textStyle="bold" />
+	    <TextView
+			android:id="@+id/trafficLabelUp"
+			android:textColor="#FFFFFFFF"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentRight="true"
+			android:text="@string/main_layout_upload"
+			android:textSize="15sp"
+			android:gravity="center_vertical"
+			android:textStyle="bold" />
+		
+		</RelativeLayout>
+		 <RelativeLayout 
+		     android:id="@+id/rowTrafficUp"
+		     android:layout_width="fill_parent"
+		      android:layout_height="wrap_content"
+		     	  android:paddingLeft="3sp"
+		       android:paddingRight="3sp"
+		       android:paddingBottom="3sp"
+		     
+		      >
+		<TextView
+			android:id="@+id/trafficDown"
+			android:textColor="#FF00B627"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentLeft="true"
+			android:textSize="15sp"
+			android:gravity="center_vertical"
+			android:textStyle="bold" />
+		<TextView
+			android:id="@+id/trafficUp"
+			android:textColor="#FF00B627"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentRight="true"
+			android:textSize="15sp"
+			android:gravity="center_vertical"
+			android:textStyle="bold" />
+		</RelativeLayout>
 </LinearLayout>
 
 	 <SlidingDrawer
@@ -84,58 +144,6 @@
 	    android:layout_marginTop="6dp"
 	    android:background="#ee333333">
 	    
-	    <RelativeLayout 
-		     android:id="@+id/rowTrafficDown" android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		       android:orientation="horizontal"
-		      >
-	    <TextView
-	    	android:id="@+id/trafficDownLabel"
-			android:textColor="#FFFFFFFF"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			 android:layout_alignParentLeft="true"
-			android:textSize="20sp"
-			android:text="@string/main_layout_download"
-			android:gravity="center_vertical"
-			android:textStyle="bold" />
-	    
-		<TextView
-			android:id="@+id/trafficDown"
-			android:textColor="#FF00B627"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			 android:layout_alignParentRight="true"
-			android:textSize="20sp"
-			android:gravity="center_vertical"
-			android:textStyle="bold" />
-		</RelativeLayout>
-		 <RelativeLayout 
-		     android:id="@+id/rowTrafficUp"
-		     android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		     android:layout_below="@+id/rowTrafficDown"
-		      >
-		<TextView
-			android:id="@+id/trafficUpLabel"
-			android:textColor="#FFFFFFFF"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			 android:layout_alignParentLeft="true"
-			android:text="@string/main_layout_upload"
-			android:textSize="20sp"
-			android:gravity="center_vertical"
-			android:textStyle="bold" />
-		<TextView
-			android:id="@+id/trafficUp"
-			android:textColor="#FF00B627"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			 android:layout_alignParentRight="true"
-			android:textSize="20sp"
-			android:gravity="center_vertical"
-			android:textStyle="bold" />
-		</RelativeLayout>
 		<TextView
 			android:id="@+id/orbotLog"
 			android:textColor="#FFFFFF"