From 73053015235f9e857e020e7fefeea31dba6af9fb Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Sat, 24 Oct 2015 00:44:55 -0700
Subject: [PATCH] Add the favorite icon to the addressBarLinearLayout.
---
app/src/main/AndroidManifest.xml | 3 +-
.../com/stoutner/privacybrowser/Webview.java | 74 +++++++++++--------
app/src/main/res/layout/activity_webview.xml | 27 +++++--
3 files changed, 66 insertions(+), 38 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b07addeb..02deefac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,11 +13,10 @@
<!-- configChanges orientation and screenSize makes the app not reload when the orientation changes. -->
<!-- windowSoftInputMode stateAlwaysHidden hides the keyboard when the app starts. -->
- <!-- Setting the label as null removes it from the action bar. -->
<activity
android:name=".Webview"
android:configChanges="orientation|screenSize"
- android:label=""
+ android:label="@string/privacy_browser"
android:windowSoftInputMode="stateAlwaysHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
index f920efa4..de16eae6 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java
@@ -17,10 +17,12 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewTreeObserver;
import android.view.inputmethod.InputMethodManager;
+import android.webkit.ClientCertRequest;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.ProgressBar;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
@@ -34,6 +36,7 @@ public class Webview extends AppCompatActivity {
static ProgressBar progressBar;
static SwipeRefreshLayout swipeToRefresh;
static EditText urlTextBox;
+ static ImageView favoriteIcon;
static final String homepage = "https://www.duckduckgo.com";
@Override
@@ -45,7 +48,9 @@ public class Webview extends AppCompatActivity {
swipeToRefresh = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayoutContainer);
mainWebView = (WebView) findViewById(R.id.mainWebView);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
+ favoriteIcon = (ImageView) findViewById(R.id.favoriteIcon);
+ // Remove the title from the action bar.
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setDisplayShowTitleEnabled(false);
@@ -73,19 +78,30 @@ public class Webview extends AppCompatActivity {
}
});
- // setWebViewClient makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps.
- // Save the URL to formattedUrlString and update urlTextBox before loading mainWebView.
mainWebView.setWebViewClient(new WebViewClient() {
+
+ // setWebViewClient makes this WebView the default handler for URLs inside the app, so that links are not kicked out to other apps.
+ // Save the URL to formattedUrlString and update urlTextBox before loading mainWebView.
+ @Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
formattedUrlString = url;
urlTextBox.setText(formattedUrlString);
mainWebView.loadUrl(formattedUrlString);
return true;
}
+
+ @Override
+ public void onPageFinished(WebView view, String url) {
+ // Update the URL in urlTextBox. It is necessary to do this after the page finishes loading to get the final URL, which can change during load.
+ formattedUrlString = mainWebView.getUrl();
+ urlTextBox.setText(formattedUrlString);
+ }
});
- // Update the progress bar when a page is loading.
mainWebView.setWebChromeClient(new WebChromeClient() {
+
+ // Update the progress bar when a page is loading.
+ @Override
public void onProgressChanged(WebView view, int progress) {
progressBar.setProgress(progress);
if (progress < 100) {
@@ -95,16 +111,34 @@ public class Webview extends AppCompatActivity {
// Stop the refreshing indicator if it is running.
swipeToRefresh.setRefreshing(false);
+ }
+ }
- // Update the URL in urlTextBox. It is necessary to do this after the page finishes loading to get the final URL, which can change during load.
- formattedUrlString = mainWebView.getUrl();
- urlTextBox.setText(formattedUrlString);
+ // Set the favorite icon if it changes.
+ @Override
+ public void onReceivedIcon(WebView view, Bitmap icon) {
+ favoriteIcon.setImageBitmap(icon);
+ }
+ });
+
+ // Set the "go" button on the keyboard to load the URL.
+ urlTextBox.setOnKeyListener(new View.OnKeyListener() {
+ public boolean onKey(View v, int keyCode, KeyEvent event) {
- // Set the favorite icon
- Bitmap favoriteIconBitmap = mainWebView.getFavicon();
- Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), favoriteIconBitmap);
- // TODO Display the favorite icon.
+ // If the event is a key-down event on the "enter" button, load the URL.
+ if ((event.getAction() == KeyEvent.ACTION_DOWN) &&
+ (keyCode == KeyEvent.KEYCODE_ENTER)) {
+ // Load the URL into the mainWebView and consume the event.
+ try {
+ loadUrlFromTextBox(mainWebView);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ // If the enter key was pressed, consume the event.
+ return true;
}
+ // If any other key was pressed, do not consume the event.
+ return false;
}
});
@@ -137,26 +171,6 @@ public class Webview extends AppCompatActivity {
// Place the formattedUrlString in the address bar and load the website.
urlTextBox.setText(formattedUrlString);
mainWebView.loadUrl(formattedUrlString);
-
- // Set the "go" button on the keyboard to load the URL.
- urlTextBox.setOnKeyListener(new View.OnKeyListener() {
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // If the event is a key-down event on the "enter" button
- if ((event.getAction() == KeyEvent.ACTION_DOWN) &&
- (keyCode == KeyEvent.KEYCODE_ENTER)) {
- // Load the URL into the mainWebView and consume the event.
- try {
- loadUrlFromTextBox(mainWebView);
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- return true;
- }
- // Do not consume the event.
- return false;
- }
- });
-
}
@Override
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 6e22c007..d235b83a 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -19,13 +19,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <!-- android:inputType="textUri" sets the keyboard to have a go arrow. -->
- <EditText
- android:id="@+id/urlTextBox"
+ <LinearLayout
+ android:id="@+id/addressBarLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="textUri"
- android:imeOptions="actionGo" />
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/favoriteIcon"
+ android:src="@drawable/ic_home_black_24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center" />
+
+ <!-- android:inputType="textUri" sets the keyboard to have a go arrow. -->
+ <!-- android:layout_weight="1" makes urlTextBox take up all the remaining space. -->
+ <EditText
+ android:id="@+id/urlTextBox"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:inputType="textUri"
+ android:imeOptions="actionGo" />
+ </LinearLayout>
<!-- android:max changes the maximum ProgressBar value from 10000 to 100 to match progress percentage. -->
<ProgressBar
@@ -40,7 +56,6 @@
android:visibility="gone" />
</FrameLayout>
-
<WebView
android:id="@+id/mainWebView"
android:layout_width="match_parent"
--
2.47.2