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

updates to graphics, layouts and strings

This commit is contained in:
Nathan Freitas 2013-08-19 11:17:11 -04:00
parent 2cfd6af6c5
commit 9a2a9897de
12 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/bgtitanium.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

BIN
res/drawable/icon_orweb.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
res/drawable/toroff.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 66 KiB

BIN
res/drawable/toron.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 72 KiB

BIN
res/drawable/torstarting.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 72 KiB

30
res/layout-land/layout_main.xml
View File

@ -36,7 +36,10 @@
android:layout_marginRight="0px" android:layout_marginRight="0px"
android:gravity="right" android:gravity="right"
android:layout_toLeftOf="@+id/radioModeImage" android:layout_toLeftOf="@+id/radioModeImage"
android:textColor="#cccccc" /> android:textColor="#cccccc"
android:fontFamily="sans-serif-light"
/>
</RelativeLayout> </RelativeLayout>
<LinearLayout android:gravity="center_vertical" <LinearLayout android:gravity="center_vertical"
@ -64,6 +67,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:textColor="#ffffff" android:textColor="#ffffff"
android:maxLines="1"
android:fontFamily="sans-serif-light"
/> />
</LinearLayout> </LinearLayout>
@ -96,7 +102,10 @@
android:textSize="15sp" android:textSize="15sp"
android:text="@string/main_layout_download" android:text="@string/main_layout_download"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light"
/>
<TextView <TextView
android:id="@+id/trafficLabelUp" android:id="@+id/trafficLabelUp"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
@ -106,7 +115,10 @@
android:text="@string/main_layout_upload" android:text="@string/main_layout_upload"
android:textSize="15sp" android:textSize="15sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light"
/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -126,7 +138,10 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:textSize="15sp" android:textSize="15sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light"
/>
<TextView <TextView
android:id="@+id/trafficUp" android:id="@+id/trafficUp"
android:textColor="#FF00B627" android:textColor="#FF00B627"
@ -135,7 +150,10 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:textSize="15sp" android:textSize="15sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light"
/>
</RelativeLayout> </RelativeLayout>
<TextView <TextView
android:id="@+id/orbotLog" android:id="@+id/orbotLog"
@ -147,6 +165,8 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:textIsSelectable="true" android:textIsSelectable="true"
android:layout_below="@+id/rowTrafficData" android:layout_below="@+id/rowTrafficData"
android:fontFamily="sans-serif-light"
/> />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

5
res/layout/layout_log.xml
View File

@ -3,8 +3,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
android:background="@drawable/bgtitanium">
<RelativeLayout android:id="@+id/layoutHeaderMain" <RelativeLayout android:id="@+id/layoutHeaderMain"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -36,7 +35,7 @@
<ScrollView android:orientation="vertical" <ScrollView android:orientation="vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/logScrollView" android:layout_width="fill_parent" android:id="@+id/logScrollView"
xmlns:android="http://schemas.android.com/apk/res/android"> >
<TextView android:id="@+id/messageLog" <TextView android:id="@+id/messageLog"
android:layout_height="wrap_content" android:layout_height="wrap_content"

31
res/layout/layout_main.xml
View File

@ -32,7 +32,10 @@
android:layout_marginRight="0px" android:layout_marginRight="0px"
android:gravity="right" android:gravity="right"
android:layout_toLeftOf="@+id/radioModeImage" android:layout_toLeftOf="@+id/radioModeImage"
android:textColor="#cccccc" /> android:textColor="#cccccc"
android:fontFamily="sans-serif-light"
/>
</RelativeLayout> </RelativeLayout>
<LinearLayout android:gravity="center_vertical|center_horizontal" <LinearLayout android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" android:layout_width="fill_parent" android:orientation="vertical" android:layout_width="fill_parent"
@ -52,9 +55,13 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textStyle="bold" android:textStyle="bold"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="50sp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:textColor="#ffffff" android:textColor="#ffffff"
android:maxLines="2"
android:fontFamily="sans-serif-light"
/> />
@ -76,7 +83,8 @@
android:textSize="15sp" android:textSize="15sp"
android:text="@string/main_layout_download" android:text="@string/main_layout_download"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light" />
<TextView <TextView
android:id="@+id/trafficLabelUp" android:id="@+id/trafficLabelUp"
android:textColor="#FFFFFFFF" android:textColor="#FFFFFFFF"
@ -86,7 +94,8 @@
android:text="@string/main_layout_upload" android:text="@string/main_layout_upload"
android:textSize="15sp" android:textSize="15sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -106,7 +115,9 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:textSize="15sp" android:textSize="15sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light"
/>
<TextView <TextView
android:id="@+id/trafficUp" android:id="@+id/trafficUp"
android:textColor="#FF00B627" android:textColor="#FF00B627"
@ -115,7 +126,9 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:textSize="15sp" android:textSize="15sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold" /> android:textStyle="bold"
android:fontFamily="sans-serif-light"
/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
@ -123,7 +136,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:id="@+id/SlidingDrawer" android:id="@+id/SlidingDrawer"
android:handle="@+id/slideButton" android:handle="@+id/slideButton"
android:content="@+id/trafficRow" android:content="@+id/trafficLog"
android:padding="10dip" android:padding="10dip"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:orientation="vertical"
@ -135,7 +148,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/menu_log" ></Button> android:text="@string/menu_log" ></Button>
<RelativeLayout android:id="@+id/trafficRow" <RelativeLayout android:id="@+id/trafficLog"
android:gravity="top" android:gravity="top"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:visibility="invisible" android:visibility="invisible"
@ -152,9 +165,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/rowTrafficUp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textIsSelectable="true" android:textIsSelectable="true"
android:fontFamily="sans-serif-light"
/> />
</RelativeLayout> </RelativeLayout>
</SlidingDrawer> </SlidingDrawer>

6
res/layout/layout_wizard_proxy_help.xml
View File

@ -14,7 +14,11 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:padding="3px"> android:padding="3px">
<TextView android:text="@string/wizard_proxy_help_msg" android:textColor="#ffffff" android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> <TextView android:text="@string/wizard_proxy_help_msg" android:textColor="#ffffff"
android:id="@+id/WizardRootTextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"
></TextView>

3
res/layout/layout_wizard_tips.xml
View File

@ -112,6 +112,7 @@
android:drawableLeft="@drawable/ic_twitter" android:drawableLeft="@drawable/ic_twitter"
android:text="@string/wizard_tips_twitter" /> android:text="@string/wizard_tips_twitter" />
<!--
<Button <Button
android:id="@+id/WizardRootButtonGooglePlay" android:id="@+id/WizardRootButtonGooglePlay"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -120,7 +121,7 @@
android:layout_marginTop="10px" android:layout_marginTop="10px"
android:drawableLeft="@drawable/ic_play" android:drawableLeft="@drawable/ic_play"
android:text="@string/wizard_tips_play" /> android:text="@string/wizard_tips_play" />
-->
</LinearLayout> </LinearLayout>

3
res/values/strings.xml
View File

@ -107,7 +107,7 @@
<string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
<string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
<string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
<string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string>
<string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
<string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
<!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
@ -238,7 +238,6 @@
<string name="bandwidth_">Bandwidth:</string> <string name="bandwidth_">Bandwidth:</string>
<string name="down">down</string> <string name="down">down</string>
<string name="up">up</string> <string name="up">up</string>
<string name="pref_disable_network_title">Network Auto-Sleep</string> <string name="pref_disable_network_title">Network Auto-Sleep</string>
<string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string> <string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string>
</resources> </resources>

1
res/values/theme.xml
View File

@ -3,7 +3,6 @@
<resources> <resources>
<color name="custom_theme_color">#333</color> <color name="custom_theme_color">#333</color>
<style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar"> <style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">@drawable/bgtitanium</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
</style> </style>
</resources> </resources>