dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more UI clean-up, removing old wizard code

This commit is contained in:
Nathan Freitas 2015-03-28 00:55:28 -04:00
parent 7b830a0df4
commit 8c5b38eeea
7 changed files with 16 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -88,7 +88,7 @@
/> />
<activity android:name="org.torproject.android.ui.wizard.TipsAndTricks" android:exported="false"/> <activity android:name="org.torproject.android.ui.wizard.PromoAppsActivity" android:exported="false"/>
org.torproject.android.ui.wizard.ChooseLocaleWizardActivityui.ChooseLocaleWizardActivity" android:exported="false"/> org.torproject.android.ui.wizard.ChooseLocaleWizardActivityui.ChooseLocaleWizardActivity" android:exported="false"/>
<activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/>

28
res/layout/layout_wizard_proxy_help.xml
View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ScrollView android:id="@+id/helpscrollview"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:orientation="vertical"
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>
</LinearLayout>
</ScrollView>
</LinearLayout>

31
res/layout/layout_wizard_stock.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ScrollView android:id="@+id/helpscrollview"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="3px">
<TextView android:text="@string/wizard_permissions_msg_stock" android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
<Button android:text="@string/wizard_permission_enable_root" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonEnable" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
<TextView android:text="@string/wizard_permissions_no_root" android:layout_marginTop="10px" android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
<CheckBox android:text="@string/wizard_permissions_consent" android:id="@+id/CheckBoxConsent" android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox>
</LinearLayout>
</ScrollView>
</LinearLayout>

4
res/layout/layout_wizard_tips.xml
View File

@ -115,8 +115,8 @@
</TableRow> </TableRow>
<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow02" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> <TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow02" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px">
<Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> <!-- <Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> -->
<Button android:text="@string/btn_next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> <Button android:text="@string/btn_okay" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</LinearLayout> </LinearLayout>

10
src/org/torproject/android/OrbotMainActivity.java
View File

@ -16,7 +16,7 @@ import org.torproject.android.settings.SettingsPreferences;
import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.ImageProgressView;
import org.torproject.android.ui.Rotate3dAnimation; import org.torproject.android.ui.Rotate3dAnimation;
import org.torproject.android.ui.wizard.ChooseLocaleWizardActivity; 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.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
@ -393,7 +393,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
} }
else if (item.getItemId() == R.id.menu_wizard) 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) 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); showWizard = mPrefs.getBoolean("show_wizard",showWizard);
//let's not show the wizard now for new users
/**
if (showWizard) if (showWizard)
{ {
Editor pEdit = mPrefs.edit(); Editor pEdit = mPrefs.edit();
@ -638,7 +640,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
startActivity(new Intent(this, ChooseLocaleWizardActivity.class)); 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) { public void onClick(DialogInterface dialog, int which) {
//prompt to install Orweb //prompt to install Orweb
Intent intent = new Intent(OrbotMainActivity.this,TipsAndTricks.class); Intent intent = new Intent(OrbotMainActivity.this,PromoAppsActivity.class);
startActivity(intent); startActivity(intent);
} }

4
src/org/torproject/android/ui/wizard/ChooseLocaleWizardActivity.java
View File

@ -60,7 +60,7 @@ public class ChooseLocaleWizardActivity extends Activity implements OrbotConstan
setLocalePref(arg2); setLocalePref(arg2);
finish(); 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) { public void onClick(View v) {
setLocalePref(0); setLocalePref(0);
finish(); finish();
startActivity(new Intent(ChooseLocaleWizardActivity.this, TipsAndTricks.class)); startActivity(new Intent(ChooseLocaleWizardActivity.this, PromoAppsActivity.class));
} }
}); });

9
src/org/torproject/android/ui/wizard/TipsAndTricks.java → src/org/torproject/android/ui/wizard/PromoAppsActivity.java
View File

@ -13,7 +13,7 @@ import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
public class TipsAndTricks extends Activity implements OrbotConstants { public class PromoAppsActivity extends Activity implements OrbotConstants {
protected void onCreate(Bundle savedInstanceState) 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)); Button next = ((Button)findViewById(R.id.btnWizard2));
/*
back.setOnClickListener(new View.OnClickListener() { back.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
finish(); finish();
startActivityForResult(new Intent(TipsAndTricks.this, ChooseLocaleWizardActivity.class), 1); startActivityForResult(new Intent(PromoAppsActivity.this, ChooseLocaleWizardActivity.class), 1);
} }
}); });*/
next.setOnClickListener(new View.OnClickListener() { next.setOnClickListener(new View.OnClickListener() {