[tor-commits] [orbot/master] added Google Play to tips page

[n8fr8 at torproject.org]

commit 7581f10f0fd1a92698717b8dfc6366cce68e5a48
Author: n8fr8 <nathan at freitas.net>
Date:   Mon Oct 22 17:18:00 2012 +0530

    added Google Play to tips page
---
 res/drawable/ic_play.png                           |  Bin 0 -> 3560 bytes
 res/layout/layout_wizard_tips.xml                  |    9 +++++++++
 res/values/strings.xml                             |   12 +++++++-----
 .../torproject/android/wizard/TipsAndTricks.java   |   13 +++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/res/drawable/ic_play.png b/res/drawable/ic_play.png
new file mode 100644
index 0000000..a919794
Binary files /dev/null and b/res/drawable/ic_play.png differ
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index 6bd9be0..d203889 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -112,6 +112,15 @@
         android:drawableLeft="@drawable/ic_twitter"
         android:text="@string/wizard_tips_twitter" />
     
+     <Button
+        android:id="@+id/WizardRootButtonGooglePlay"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        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 9590e45..34be55c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,8 +31,8 @@
 <string name="menu_about">About</string>
 <string name="menu_wizard">Wizard</string>
 
-<string name="main_layout_download">Down (kbps/kb)</string> 
-<string name="main_layout_upload">Up (kbps/kb)</string> 
+<string name="main_layout_download">Download</string> 
+<string name="main_layout_upload">Upload</string> 
 
 <string name="button_help">Help</string>
 <string name="button_close">Close</string>
@@ -105,7 +105,7 @@
    	<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
    	
     <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
-    <string name="proxymob_setup_url">http://tinyurl.com/getproxymob</string>
+    <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
    	
     <string name="wizard_tips_twitter">Set Twitter proxy to host "localhost" and port 8118</string>
     <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
@@ -146,11 +146,13 @@
 	<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://market.android.com/details?id=info.guardianproject.otr.app.im</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://market.android.com/details?id=info.guardianproject.browser</string>
+	<string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</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>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index 26cf7ae..97b8d9a 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -130,6 +130,19 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			}
 		});
         
+        btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.wizard_tips_play_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
+        
         
         Button back = ((Button)findViewById(R.id.btnWizard1));
         Button next = ((Button)findViewById(R.id.btnWizard2));