[tor-commits] [orbot/master] We get a better material design dialog by not using a custom layout

[n8fr8@xxxxxxxxxxxxxx]

commit 0b15ae5c12a6940b5d1817a37f55f4aebeecef88
Author: lexi <bird.s.lex@xxxxxxxxx>
Date:   Sat May 19 15:03:26 2018 -0400

    We get a better material design dialog by not using a custom layout
---
 .../ui/onboarding/BridgeWizardActivity.java        | 53 ++++++++++------------
 app/src/main/res/layout/layout_diag.xml            | 14 ------
 2 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index da23a62a..66ea8f60 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -13,7 +13,6 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.RadioButton;
@@ -104,7 +103,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(LocaleHelper.onAttach(base));
-    }g
+    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -119,34 +118,28 @@ public class BridgeWizardActivity extends AppCompatActivity {
 
 
     private void showGetBridgePrompt() {
-        LayoutInflater li = LayoutInflater.from(this);
-        View view = li.inflate(R.layout.layout_diag, null);
-
-        TextView versionName = view.findViewById(R.id.diaglog);
-        versionName.setText(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_);
-
         new AlertDialog.Builder(this)
-                .setTitle(R.string.bridge_mode)
-                .setView(view)
-                .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        //do nothing
-                    }
-                })
-                .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        sendGetBridgeEmail();
-                    }
-
-                })
-                .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        openBrowser(OrbotConstants.URL_TOR_BRIDGES, true, null);
-                    }
-                }).show();
+            .setTitle(R.string.bridge_mode)
+            .setMessage(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_)
+            .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    //do nothing
+                }
+            })
+            .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    sendGetBridgeEmail();
+                }
+
+            })
+            .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    openBrowser(OrbotConstants.URL_TOR_BRIDGES, true);
+                }
+            }).show();
     }
 
     private void sendGetBridgeEmail()
@@ -163,7 +156,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
     /*
      * Launch the system activity for Uri viewing with the provided url
      */
-    private void openBrowser(final String browserLaunchUrl,boolean forceExternal, String pkgId)
+    private void openBrowser(final String browserLaunchUrl, boolean forceExternal)
     {
         startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)));
     }
diff --git a/app/src/main/res/layout/layout_diag.xml b/app/src/main/res/layout/layout_diag.xml
deleted file mode 100644
index 5b4ce215..00000000
--- a/app/src/main/res/layout/layout_diag.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:id="@+id/aboutscrollview" 
-    xmlns:android="http://schemas.android.com/apk/res/android";
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-	android:layout_height="match_parent">    
-    <TextView 
-        android:id="@+id/diaglog"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:layout_margin="6dp"
-		/>
-</ScrollView>
\ No newline at end of file



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits