From 9c85c8a1c93128c2727eb63f5cccf463c9067f90 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Thu, 22 Oct 2015 15:59:10 -0700
Subject: [PATCH] Remove the "Go" button.

---
 app/src/main/AndroidManifest.xml              |  6 ++--
 .../com/stoutner/privacybrowser/Webview.java  |  3 +-
 app/src/main/res/layout/activity_webview.xml  | 33 +++++--------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fb445db0..02deefac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,8 +11,8 @@
         android:label="@string/privacy_browser"
         android:theme="@style/AppTheme" >
 
-        // configChanges orientation and screenSize makes the app not reload when the orientation changes.
-        // windowSoftInputMode stateAlwaysHidden hides the keyboard when the app starts.
+        <!-- configChanges orientation and screenSize makes the app not reload when the orientation changes. -->
+        <!-- windowSoftInputMode stateAlwaysHidden hides the keyboard when the app starts. -->
         <activity
             android:name=".Webview"
             android:configChanges="orientation|screenSize"
@@ -23,7 +23,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            // android.intent.action.VIEW with the schemes enables processing of web intents.
+            <!-- android.intent.action.VIEW with the schemes enables processing of web intents. -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />
diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
index a783262c..09ab722b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -154,7 +154,6 @@ public class Webview extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         int menuItemId = menuItem.getItemId();
-        final WebView mainWebView = (WebView) findViewById(R.id.mainWebView);
 
         // Sets the commands that relate to the menu entries.
         switch (menuItemId) {
@@ -163,6 +162,7 @@ public class Webview extends AppCompatActivity {
                 urlTextBox.setText(formattedUrlString);
                 mainWebView.loadUrl(formattedUrlString);
                 break;
+
             case R.id.back:
                 mainWebView.goBack();
 
@@ -170,6 +170,7 @@ public class Webview extends AppCompatActivity {
                 formattedUrlString = mainWebView.getOriginalUrl();
                 urlTextBox.setText(formattedUrlString);
                 break;
+
             case R.id.forward:
                 mainWebView.goForward();
 
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 4eb9901b..6e22c007 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    // SwipeRefreshLayout allows the user to swipe down to refresh.
+    <!-- SwipeRefreshLayout allows the user to swipe down to refresh. -->
 
     <RelativeLayout
         android:id="@+id/relativeLayoutContainer"
@@ -13,38 +13,21 @@
         android:layout_height="match_parent"
         tools:context=".Webview" >
 
-        // FrameLayout lets the ProgressBar float on top of the LinearLayout.
+        <!-- FrameLayout lets the ProgressBar float on top of urlTextBox. -->
         <FrameLayout
             android:id="@+id/addressBarFrameLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:id="@+id/addressBarLinearLayout"
+            <!-- android:inputType="textUri" sets the keyboard to have a go arrow. -->
+            <EditText
+                android:id="@+id/urlTextBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:inputType="textUri"
+                android:imeOptions="actionGo" />
 
-                // android:inputType="textUri" sets the keyboard to have a go arrow.
-                <EditText
-                    android:id="@+id/urlTextBox"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:inputType="textUri"
-                    android:imeOptions="actionGo"
-                    android:layout_weight="1"/>
-
-                <Button
-                    android:id="@+id/goButton"
-                    android:text="@string/go_button"
-                    android:onClick="loadUrlFromTextBox"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
-            // android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage.
+            <!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage. -->
             <ProgressBar
                 android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyleHorizontal"
-- 
2.43.0