[tor-commits] [orbot/master] updates to graphics, layouts and strings
n8fr8 at torproject.org
n8fr8 at torproject.org
Mon Aug 19 15:21:28 UTC 2013
commit 9a2a9897def3f79a25765e1a50b44f0716024457
Author: Nathan Freitas <nathan at freitas.net>
Date: Mon Aug 19 11:17:11 2013 -0400
updates to graphics, layouts and strings
---
res/drawable/bgtitanium.jpg | Bin 40884 -> 0 bytes
res/drawable/icon_orweb.png | Bin 8783 -> 6596 bytes
res/drawable/toroff.png | Bin 35872 -> 67176 bytes
res/drawable/toron.png | Bin 60598 -> 74095 bytes
res/drawable/torstarting.png | Bin 53000 -> 74011 bytes
res/layout-land/layout_main.xml | 30 +++++++++++++++++++++++++-----
res/layout/layout_log.xml | 5 ++---
res/layout/layout_main.xml | 31 ++++++++++++++++++++++---------
res/layout/layout_wizard_proxy_help.xml | 6 +++++-
res/layout/layout_wizard_tips.xml | 3 ++-
res/values/strings.xml | 3 +--
res/values/theme.xml | 1 -
12 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/res/drawable/bgtitanium.jpg b/res/drawable/bgtitanium.jpg
deleted file mode 100755
index 1047e4c..0000000
Binary files a/res/drawable/bgtitanium.jpg and /dev/null differ
diff --git a/res/drawable/icon_orweb.png b/res/drawable/icon_orweb.png
index 679986f..a9077b8 100755
Binary files a/res/drawable/icon_orweb.png and b/res/drawable/icon_orweb.png differ
diff --git a/res/drawable/toroff.png b/res/drawable/toroff.png
index a5cfb97..4dceca3 100644
Binary files a/res/drawable/toroff.png and b/res/drawable/toroff.png differ
diff --git a/res/drawable/toron.png b/res/drawable/toron.png
index 94ad237..5f6eed6 100644
Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ
diff --git a/res/drawable/torstarting.png b/res/drawable/torstarting.png
index 0d05e42..31c4dd7 100644
Binary files a/res/drawable/torstarting.png and b/res/drawable/torstarting.png differ
diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml
index ec3d4ed..595495e 100644
--- a/res/layout-land/layout_main.xml
+++ b/res/layout-land/layout_main.xml
@@ -36,7 +36,10 @@
android:layout_marginRight="0px"
android:gravity="right"
android:layout_toLeftOf="@+id/radioModeImage"
- android:textColor="#cccccc" />
+ android:textColor="#cccccc"
+ android:fontFamily="sans-serif-light"
+
+ />
</RelativeLayout>
<LinearLayout android:gravity="center_vertical"
@@ -64,6 +67,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:textColor="#ffffff"
+ android:maxLines="1"
+ android:fontFamily="sans-serif-light"
+
/>
</LinearLayout>
@@ -96,7 +102,10 @@
android:textSize="15sp"
android:text="@string/main_layout_download"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light"
+
+ />
<TextView
android:id="@+id/trafficLabelUp"
android:textColor="#FFFFFFFF"
@@ -106,7 +115,10 @@
android:text="@string/main_layout_upload"
android:textSize="15sp"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light"
+
+ />
</RelativeLayout>
<RelativeLayout
@@ -126,7 +138,10 @@
android:layout_alignParentLeft="true"
android:textSize="15sp"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light"
+
+ />
<TextView
android:id="@+id/trafficUp"
android:textColor="#FF00B627"
@@ -135,7 +150,10 @@
android:layout_alignParentRight="true"
android:textSize="15sp"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light"
+
+ />
</RelativeLayout>
<TextView
android:id="@+id/orbotLog"
@@ -147,6 +165,8 @@
android:layout_alignParentLeft="true"
android:textIsSelectable="true"
android:layout_below="@+id/rowTrafficData"
+ android:fontFamily="sans-serif-light"
+
/>
</RelativeLayout>
</RelativeLayout>
diff --git a/res/layout/layout_log.xml b/res/layout/layout_log.xml
index d3bc32a..b9c7623 100644
--- a/res/layout/layout_log.xml
+++ b/res/layout/layout_log.xml
@@ -3,8 +3,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@drawable/bgtitanium">
+ android:layout_height="fill_parent">
<RelativeLayout android:id="@+id/layoutHeaderMain"
android:layout_width="fill_parent"
@@ -36,7 +35,7 @@
<ScrollView android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/logScrollView"
- xmlns:android="http://schemas.android.com/apk/res/android">
+ >
<TextView android:id="@+id/messageLog"
android:layout_height="wrap_content"
diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
index cfb0324..762e458 100644
--- a/res/layout/layout_main.xml
+++ b/res/layout/layout_main.xml
@@ -32,7 +32,10 @@
android:layout_marginRight="0px"
android:gravity="right"
android:layout_toLeftOf="@+id/radioModeImage"
- android:textColor="#cccccc" />
+ android:textColor="#cccccc"
+ android:fontFamily="sans-serif-light"
+
+ />
</RelativeLayout>
<LinearLayout android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" android:layout_width="fill_parent"
@@ -52,9 +55,13 @@
android:gravity="center_horizontal"
android:textStyle="bold"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50sp"
android:layout_marginBottom="20dp"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
android:textColor="#ffffff"
+ android:maxLines="2"
+ android:fontFamily="sans-serif-light"
/>
@@ -76,7 +83,8 @@
android:textSize="15sp"
android:text="@string/main_layout_download"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/trafficLabelUp"
android:textColor="#FFFFFFFF"
@@ -86,7 +94,8 @@
android:text="@string/main_layout_upload"
android:textSize="15sp"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light" />
</RelativeLayout>
<RelativeLayout
@@ -106,7 +115,9 @@
android:layout_alignParentLeft="true"
android:textSize="15sp"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light"
+ />
<TextView
android:id="@+id/trafficUp"
android:textColor="#FF00B627"
@@ -115,7 +126,9 @@
android:layout_alignParentRight="true"
android:textSize="15sp"
android:gravity="center_vertical"
- android:textStyle="bold" />
+ android:textStyle="bold"
+ android:fontFamily="sans-serif-light"
+ />
</RelativeLayout>
</LinearLayout>
@@ -123,7 +136,7 @@
android:layout_width="fill_parent"
android:id="@+id/SlidingDrawer"
android:handle="@+id/slideButton"
- android:content="@+id/trafficRow"
+ android:content="@+id/trafficLog"
android:padding="10dip"
android:layout_height="fill_parent"
android:orientation="vertical"
@@ -135,7 +148,7 @@
android:layout_height="wrap_content"
android:text="@string/menu_log" ></Button>
- <RelativeLayout android:id="@+id/trafficRow"
+ <RelativeLayout android:id="@+id/trafficLog"
android:gravity="top"
android:layout_width="fill_parent"
android:visibility="invisible"
@@ -152,9 +165,9 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_below="@+id/rowTrafficUp"
android:layout_marginTop="10dp"
android:textIsSelectable="true"
+ android:fontFamily="sans-serif-light"
/>
</RelativeLayout>
</SlidingDrawer>
diff --git a/res/layout/layout_wizard_proxy_help.xml b/res/layout/layout_wizard_proxy_help.xml
index cedc385..d5e1d56 100644
--- a/res/layout/layout_wizard_proxy_help.xml
+++ b/res/layout/layout_wizard_proxy_help.xml
@@ -14,7 +14,11 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
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>
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index d203889..c7d1f98 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -112,6 +112,7 @@
android:drawableLeft="@drawable/ic_twitter"
android:text="@string/wizard_tips_twitter" />
+ <!--
<Button
android:id="@+id/WizardRootButtonGooglePlay"
android:layout_width="fill_parent"
@@ -120,7 +121,7 @@
android:layout_marginTop="10px"
android:drawableLeft="@drawable/ic_play"
android:text="@string/wizard_tips_play" />
-
+ -->
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2ea568..bca3086 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -107,7 +107,7 @@
<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="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_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>
@@ -238,7 +238,6 @@
<string name="bandwidth_">Bandwidth:</string>
<string name="down">down</string>
<string name="up">up</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>
</resources>
diff --git a/res/values/theme.xml b/res/values/theme.xml
index efc15c4..6e7cc53 100644
--- a/res/values/theme.xml
+++ b/res/values/theme.xml
@@ -3,7 +3,6 @@
<resources>
<color name="custom_theme_color">#333</color>
<style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar">
- <item name="android:windowBackground">@drawable/bgtitanium</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>
More information about the tor-commits
mailing list