commit e21474c8626ffaa28990af64941a59e4a2ea98d7 Author: n8fr8 nathan@freitas.net Date: Wed Jan 3 23:39:35 2018 -0500

updates to layout and strings for bridge wizard --- .../org/torproject/android/ui/BridgeSetupActivity.java | 5 ----- app/src/main/res/layout/activity_bridge_wizard.xml | 2 ++ app/src/main/res/layout/content_bridge_wizard.xml | 14 ++++++++------ app/src/main/res/layout/layout_main.xml | 15 ++------------- app/src/main/res/values/strings.xml | 5 +++++ 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/ui/BridgeSetupActivity.java b/app/src/main/java/org/torproject/android/ui/BridgeSetupActivity.java deleted file mode 100644 index 7cabe356..00000000 --- a/app/src/main/java/org/torproject/android/ui/BridgeSetupActivity.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.torproject.android.ui; - -public class BridgeSetupActivity { - -} diff --git a/app/src/main/res/layout/activity_bridge_wizard.xml b/app/src/main/res/layout/activity_bridge_wizard.xml index e44276cb..7ff470c9 100644 --- a/app/src/main/res/layout/activity_bridge_wizard.xml +++ b/app/src/main/res/layout/activity_bridge_wizard.xml @@ -4,6 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/dark_purple" + tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity">

<android.support.design.widget.AppBarLayout diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml index 609bcdf4..858bf065 100644 --- a/app/src/main/res/layout/content_bridge_wizard.xml +++ b/app/src/main/res/layout/content_bridge_wizard.xml @@ -18,9 +18,10 @@ android:layout_margin="12dp" android:textStyle="bold" android:textSize="16sp" + android:textColor="@color/panel_background_main" /> <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical">

@@ -28,7 +29,7 @@ android:id="@+id/btnBridgesDirect" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Connect directly to Tor\n(Best, if you can!)" + android:text="@string/bridge_direct_connect" android:layout_margin="12dp" />

@@ -36,7 +37,7 @@ android:id="@+id/btnBridgesObfs4" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Connect through community bridges\n(Second best option, if it works)" + android:text="@string/bridge_community" android:layout_margin="12dp"

/> @@ -45,7 +46,7 @@ android:id="@+id/btnBridgesMeek" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Hide traffic through cloud services\n(Slower, but harder to block)" + android:text="@string/bridge_cloud" android:layout_margin="12dp"

/> @@ -54,7 +55,7 @@ android:id="@+id/btnBridgesNew" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Request New Bridges...\n(If all the other options fail...)" + android:text="@string/bridges_get_new" android:layout_margin="12dp"

/> @@ -62,11 +63,12 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="testing..." + android:text="..." android:gravity="center" android:id="@+id/lbl_bridge_test_status" android:layout_margin="12dp" android:textStyle="bold" android:textSize="16sp" + android:textColor="@color/bright_green" /> </LinearLayout> diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 754bfc2a..2e29b298 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -145,17 +145,6 @@ app:switchPadding="9dp"

/> - <!-- - <Button - android:id="@+id/btnApps" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:text="@string/menu_apps" - android:ellipsize="end" - android:maxLines="1" - android:layout_gravity="center" - - />--> </LinearLayout>

</LinearLayout> @@ -257,7 +246,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:fontFamily="sans-serif-light" - android:text="Having trouble connecting?" + android:text="@string/trouble_connecting" android:layout_margin="3dp" android:lines="1"

@@ -266,7 +255,7 @@ android:id="@+id/btnBridges" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/bridges" + android:text="@string/use_bridges" android:layout_margin="3dp" android:singleLine="true" app:switchPadding="9dp" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 72a226a3..dded93bc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -394,4 +394,9 @@ <string name="testing_bridges">Testing bridge connection to Tor....</string> <string name="testing_bridges_success">Success. Bridge configuration is good!</string> <string name="testing_bridges_fail">FAILED. Try another option</string> + <string name="bridge_direct_connect">Connect directly to Tor (Best)</string> + <string name="bridge_community">Connect through community servers</string> + <string name="bridge_cloud">Connect through cloud servers</string> + <string name="bridges_get_new">Request New Bridges... (If all else fails)</string> + <string name="trouble_connecting">Trouble connecting?</string> </resources>