dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved up/down counters back to main screen

This commit is contained in:
n8fr8 2012-10-21 15:32:54 +05:30
parent 50de0bb788
commit 411b56abd1
1 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
res/layout/layout_main.xml
View File

@ -53,10 +53,70 @@
android:textStyle="bold" android:textStyle="bold"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="50dp" android:layout_marginBottom="20dp"
android:textColor="#ffffff" 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> </LinearLayout>
<SlidingDrawer <SlidingDrawer
@ -84,58 +144,6 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:background="#ee333333"> 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 <TextView
android:id="@+id/orbotLog" android:id="@+id/orbotLog"
android:textColor="#FFFFFF" android:textColor="#FFFFFF"