commit 411b56abd18c5d7008beb420f5c1047a6609cfba Author: n8fr8 nathan@freitas.net Date: Sun Oct 21 15:32:54 2012 +0530

moved up/down counters back to main screen --- res/layout/layout_main.xml | 92 ++++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 1d1bc18..c995186 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -53,77 +53,58 @@ android:textStyle="bold" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="50dp" + android:layout_marginBottom="20dp" android:textColor="#ffffff" /> -</LinearLayout> - - <SlidingDrawer - android:layout_width="fill_parent" - android:id="@+id/SlidingDrawer" - android:handle="@+id/slideButton" - android:content="@+id/trafficRow" - android:padding="10dip" - android:layout_height="fill_parent" - android:orientation="vertical" - android:gravity="bottom" - > - <Button - android:id="@+id/slideButton" - android:layout_width="wrap_content" - android:layout_height="35dp" - android:text="@string/menu_log" ></Button> - - <RelativeLayout android:id="@+id/trafficRow" - android:gravity="top" - android:layout_width="fill_parent" - android:visibility="invisible" - android:layout_height="wrap_content" - android:padding="6dp" - android:layout_marginTop="6dp" - android:background="#ee333333"> - + <RelativeLayout - android:id="@+id/rowTrafficDown" android:layout_width="fill_parent" + 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/trafficDownLabel" + android:id="@+id/trafficLabelDown" android:textColor="#FFFFFFFF" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:textSize="20sp" + android:textSize="15sp" android:text="@string/main_layout_download" android:gravity="center_vertical" android:textStyle="bold" /> - - <TextView - android:id="@+id/trafficDown" - android:textColor="#FF00B627" + <TextView + android:id="@+id/trafficLabelUp" + android:textColor="#FFFFFFFF" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:textSize="20sp" + 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:layout_below="@+id/rowTrafficDown" + android:paddingLeft="3sp" + android:paddingRight="3sp" + android:paddingBottom="3sp" + > <TextView - android:id="@+id/trafficUpLabel" - android:textColor="#FFFFFFFF" + android:id="@+id/trafficDown" + android:textColor="#FF00B627" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:text="@string/main_layout_upload" - android:textSize="20sp" + android:textSize="15sp" android:gravity="center_vertical" android:textStyle="bold" /> <TextView @@ -132,10 +113,37 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:textSize="20sp" + android:textSize="15sp" android:gravity="center_vertical" android:textStyle="bold" /> </RelativeLayout> +</LinearLayout> + + <SlidingDrawer + android:layout_width="fill_parent" + android:id="@+id/SlidingDrawer" + android:handle="@+id/slideButton" + android:content="@+id/trafficRow" + android:padding="10dip" + android:layout_height="fill_parent" + android:orientation="vertical" + android:gravity="bottom" + > + <Button + android:id="@+id/slideButton" + android:layout_width="wrap_content" + android:layout_height="35dp" + android:text="@string/menu_log" ></Button> + + <RelativeLayout android:id="@+id/trafficRow" + android:gravity="top" + android:layout_width="fill_parent" + android:visibility="invisible" + android:layout_height="wrap_content" + android:padding="6dp" + android:layout_marginTop="6dp" + android:background="#ee333333"> + <TextView android:id="@+id/orbotLog" android:textColor="#FFFFFF"