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

layout changes for a modern, cleaner (purple!) look

This commit is contained in:
Nathan Freitas 2015-02-15 01:22:15 -05:00
parent f22978e53c
commit 70d6203fdb
5 changed files with 96 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
res/drawable/button.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8" ?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="@color/panel_background" />
<stroke
android:width="1dp"
android:color="#ffffff" />
<corners
android:radius="6dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/panel_background_dark"
android:endColor="@color/panel_background_main"
android:angle="270" />
<stroke
android:width="2dp"
android:color="#aaaaaa" />
<corners
android:radius="6dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>

37
res/drawable/button_off.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8" ?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="@color/panel_background" />
<stroke
android:width="1dp"
android:color="#ffffff" />
<corners
android:radius="6dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/panel_background_dark"
android:endColor="@color/panel_background_main"
android:angle="270" />
<stroke
android:width="2dp"
android:color="#555555" />
<corners
android:radius="6dp" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>

8
res/drawable/toggle.xml Normal file
View File

@ -0,0 +1,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="false"
android:drawable="@drawable/button_off" />
<item
android:state_checked="true"
android:drawable="@drawable/button" />
</selector>

12
res/layout/layout_main.xml
View File

@ -127,6 +127,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/panel_background_main"
> >
<org.torproject.android.ui.ImageProgressView <org.torproject.android.ui.ImageProgressView
android:id="@+id/imgStatus" android:id="@+id/imgStatus"
@ -143,11 +145,10 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="16sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:text="" android:text=""
android:background="#aa333333"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_margin="10dp" android:layout_margin="10dp"
@ -168,6 +169,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/menu_verify_browser" android:text="@string/menu_verify_browser"
android:background="@drawable/button"
android:layout_margin="3dp"
/> />
<ToggleButton <ToggleButton
@ -176,6 +180,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="@string/bridges" android:textOff="@string/bridges"
android:textOn="@string/bridges" android:textOn="@string/bridges"
android:background="@drawable/toggle"
android:layout_margin="3dp"
/> />
<ToggleButton <ToggleButton
@ -184,6 +190,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textOff="@string/menu_vpn" android:textOff="@string/menu_vpn"
android:textOn="@string/menu_vpn" android:textOn="@string/menu_vpn"
android:background="@drawable/toggle"
android:layout_margin="3dp"
/> />
</LinearLayout> </LinearLayout>

5
res/values/colors.xml
View File

@ -1,6 +1,7 @@
<resources> <resources>
<color name="panel_background">#460072</color> <color name="panel_background">#55460072</color>
<color name="panel_background_dark">#240020</color> <color name="panel_background_dark">#aa460072</color>
<color name="panel_background_main">#460072</color>
</resources> </resources>