From 8c5b38eeea019f582d28708eb02bc0ac57e1b074 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Sat, 28 Mar 2015 00:55:28 -0400 Subject: [PATCH] more UI clean-up, removing old wizard code --- AndroidManifest.xml | 2 +- res/layout/layout_wizard_proxy_help.xml | 28 ----------------- res/layout/layout_wizard_stock.xml | 31 ------------------- res/layout/layout_wizard_tips.xml | 4 +-- .../torproject/android/OrbotMainActivity.java | 10 +++--- .../ui/wizard/ChooseLocaleWizardActivity.java | 4 +-- ...sAndTricks.java => PromoAppsActivity.java} | 9 +++--- 7 files changed, 16 insertions(+), 72 deletions(-) delete mode 100644 res/layout/layout_wizard_proxy_help.xml delete mode 100644 res/layout/layout_wizard_stock.xml rename src/org/torproject/android/ui/wizard/{TipsAndTricks.java => PromoAppsActivity.java} (95%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ee624d85..2dd7d1c3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -88,7 +88,7 @@ /> - + org.torproject.android.ui.wizard.ChooseLocaleWizardActivityui.ChooseLocaleWizardActivity" android:exported="false"/> diff --git a/res/layout/layout_wizard_proxy_help.xml b/res/layout/layout_wizard_proxy_help.xml deleted file mode 100644 index d5e1d563..00000000 --- a/res/layout/layout_wizard_proxy_help.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - diff --git a/res/layout/layout_wizard_stock.xml b/res/layout/layout_wizard_stock.xml deleted file mode 100644 index b8f15d10..00000000 --- a/res/layout/layout_wizard_stock.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - + + diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 406f15d7..886c2220 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -16,7 +16,7 @@ import org.torproject.android.settings.SettingsPreferences; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.Rotate3dAnimation; import org.torproject.android.ui.wizard.ChooseLocaleWizardActivity; -import org.torproject.android.ui.wizard.TipsAndTricks; +import org.torproject.android.ui.wizard.PromoAppsActivity; import android.annotation.TargetApi; import android.app.Activity; @@ -393,7 +393,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } else if (item.getItemId() == R.id.menu_wizard) { - startActivity(new Intent(OrbotMainActivity.this, ChooseLocaleWizardActivity.class)); + startActivity(new Intent(OrbotMainActivity.this, PromoAppsActivity.class)); } else if (item.getItemId() == R.id.menu_exit) @@ -629,6 +629,8 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon showWizard = mPrefs.getBoolean("show_wizard",showWizard); + //let's not show the wizard now for new users + /** if (showWizard) { Editor pEdit = mPrefs.edit(); @@ -638,7 +640,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon startActivity(new Intent(this, ChooseLocaleWizardActivity.class)); - } + }**/ } @@ -716,7 +718,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon public void onClick(DialogInterface dialog, int which) { //prompt to install Orweb - Intent intent = new Intent(OrbotMainActivity.this,TipsAndTricks.class); + Intent intent = new Intent(OrbotMainActivity.this,PromoAppsActivity.class); startActivity(intent); } diff --git a/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java index 3fdd7466..2c5470c9 100644 --- a/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java @@ -60,7 +60,7 @@ public class ChooseLocaleWizardActivity extends Activity implements OrbotConstan setLocalePref(arg2); finish(); - startActivity(new Intent(ChooseLocaleWizardActivity.this, TipsAndTricks.class)); + startActivity(new Intent(ChooseLocaleWizardActivity.this, PromoAppsActivity.class)); } }); @@ -70,7 +70,7 @@ public class ChooseLocaleWizardActivity extends Activity implements OrbotConstan public void onClick(View v) { setLocalePref(0); finish(); - startActivity(new Intent(ChooseLocaleWizardActivity.this, TipsAndTricks.class)); + startActivity(new Intent(ChooseLocaleWizardActivity.this, PromoAppsActivity.class)); } }); diff --git a/src/org/torproject/android/ui/wizard/TipsAndTricks.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java similarity index 95% rename from src/org/torproject/android/ui/wizard/TipsAndTricks.java rename to src/org/torproject/android/ui/wizard/PromoAppsActivity.java index d47a4fba..0a61d714 100644 --- a/src/org/torproject/android/ui/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java @@ -13,7 +13,7 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; -public class TipsAndTricks extends Activity implements OrbotConstants { +public class PromoAppsActivity extends Activity implements OrbotConstants { protected void onCreate(Bundle savedInstanceState) { @@ -148,16 +148,17 @@ public class TipsAndTricks extends Activity implements OrbotConstants { }); - Button back = ((Button)findViewById(R.id.btnWizard1)); + // Button back = ((Button)findViewById(R.id.btnWizard1)); Button next = ((Button)findViewById(R.id.btnWizard2)); + /* back.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { finish(); - startActivityForResult(new Intent(TipsAndTricks.this, ChooseLocaleWizardActivity.class), 1); + startActivityForResult(new Intent(PromoAppsActivity.this, ChooseLocaleWizardActivity.class), 1); } - }); + });*/ next.setOnClickListener(new View.OnClickListener() {