From 23c689c8a1585f1125145a368b9ff0214f76885b Mon Sep 17 00:00:00 2001
From: Amogh Pradeep <amoghbl1@gmail.com>
Date: Fri, 23 May 2014 02:38:33 +0530
Subject: [PATCH 1/3] added icon for story maker button to be added to the
 hints and tips page

---
 res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 res/drawable/icon_story_maker.png

diff --git a/res/drawable/icon_story_maker.png b/res/drawable/icon_story_maker.png
new file mode 100755
index 0000000000000000000000000000000000000000..9c54ca5677c94c4d93cfb91e9053ab2294a64195
GIT binary patch
literal 4290
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

literal 0
HcmV?d00001


From 255623a1ddb32d03b41327e6a83585059966cc6c Mon Sep 17 00:00:00 2001
From: Amogh Pradeep <amoghbl1@gmail.com>
Date: Fri, 23 May 2014 02:45:57 +0530
Subject: [PATCH 2/3] added the story maker button to the tips wizard page,
 also added tip string to the strings file.

---
 res/layout/layout_wizard_tips.xml | 11 ++++++++++-
 res/values/strings.xml            |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index 5129935b..992dfd10 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -34,7 +34,7 @@
         android:textColor="#ffffff"
         android:textSize="8pt" >
     </TextView>
-
+    
     <Button
         android:id="@+id/WizardRootButtonInstallOrweb"
         android:layout_width="fill_parent"
@@ -81,6 +81,15 @@
         android:drawableLeft="@drawable/ic_twitter"
         android:text="@string/wizard_tips_twitter" />
     
+    <Button
+        android:id="@+id/WizardRootButtonInstallStoryMaker"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/icon_story_maker"
+        android:text="@string/wizard_tips_story_maker" />
+    
     <!-- 
      <Button
         android:id="@+id/WizardRootButtonGooglePlay"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c4c61434..52905ffe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,6 +79,7 @@
   <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (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="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Settings</string>
   <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>

From 4759d9f14326a7ce5dae67a4c9779d4adf9ea548 Mon Sep 17 00:00:00 2001
From: Amogh Pradeep <amoghbl1@gmail.com>
Date: Sat, 24 May 2014 03:15:33 +0530
Subject: [PATCH 3/3] implemented button click function for the story maker
 button, also url added in strings, change to liking at review

---
 res/values/strings.xml                               |  1 +
 src/org/torproject/android/wizard/TipsAndTricks.java | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52905ffe..28d74f81 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -80,6 +80,7 @@
   <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="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string>
+  <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Settings</string>
   <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index 5d0872cd..300730b7 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -127,6 +127,18 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			}
 		});
         
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallStoryMaker);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.story_maker_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
         /**
         btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay);