[tor-commits] [orbot/master] update menu, strings, icons for ChatSecure (from Gibberbot)

[n8fr8 at torproject.org]

commit 17f7d46e5c0f2b35383620e72bffe2dc1cd727f5
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Dec 27 21:43:33 2013 -0500

    update menu, strings, icons for ChatSecure (from Gibberbot)
---
 res/drawable/ic_chatsecure.png         |  Bin 0 -> 4013 bytes
 res/drawable/ic_launcher_gibberbot.png |  Bin 4741 -> 0 bytes
 res/layout/layout_wizard_tips.xml      |    2 +-
 res/menu/main.xml                      |   20 ++++++++++++++++----
 res/values/strings.xml                 |   10 +++++++---
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/res/drawable/ic_chatsecure.png b/res/drawable/ic_chatsecure.png
new file mode 100644
index 0000000..aaddd88
Binary files /dev/null and b/res/drawable/ic_chatsecure.png differ
diff --git a/res/drawable/ic_launcher_gibberbot.png b/res/drawable/ic_launcher_gibberbot.png
deleted file mode 100644
index 0dadd41..0000000
Binary files a/res/drawable/ic_launcher_gibberbot.png and /dev/null differ
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index c7d1f98..98b7196 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -81,7 +81,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="left"
         android:layout_marginTop="10px"
-        android:drawableLeft="@drawable/ic_launcher_gibberbot"
+        android:drawableLeft="@drawable/ic_chatsecure"
         android:text="@string/wizard_tips_gibberbot" />
 
     
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 7870c32..4b98c27 100755
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -32,13 +32,25 @@
          android:showAsAction="always"
          />
 
- <item android:id="@+id/menu_verify"
+ <item 
+     android:id="@+id/menu_verify_list"
         android:title="@string/menu_verify"
          android:icon="@drawable/ic_action_browse"
-                  android:showAsAction="always"
-         
-         />
+                  android:showAsAction="always"         
+        >
+        <menu>
+        <item android:id="@+id/menu_verify"
+        android:title="@string/menu_verify_browser"
+         android:icon="@drawable/ic_action_browse"  
+        />
  
+        <item android:id="@+id/menu_use_chatsecure"
+        android:title="@string/menu_use_chatsecure"
+         android:icon="@drawable/ic_chatsecure" 
+        />
+        
+        </menu>
+ </item>
  <item android:id="@+id/menu_about"
         android:title="@string/menu_about"
          android:icon="@drawable/ic_menu_about"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21592b6..cb03c10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -72,7 +72,7 @@
   <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
   <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
   <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string>
   <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
   <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
   <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
@@ -104,8 +104,8 @@
   <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
   <!--TipsAndTricks screen-->
   <string name="wizard_tips_title">Orbot-Enabled Apps</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="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string>
+  <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-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.apk</string>
   <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
@@ -241,4 +241,8 @@
   <string name="pref_disable_network_title">No Network Auto-Sleep</string>
   <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string>
   <string name="newnym">You\'ve switched to a new Tor identity!</string>
+  
+    <string name="menu_verify_browser">Check Browser</string>
+    <string name="menu_use_chatsecure">Use ChatSecure</string>
+  
 </resources>