X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=affbc10ffc3c75f970d79c9f796ca386d80c5bf7;hb=57769d401f3c87d8db54acfa18d6e5cf2d07f5f1;hp=3c69aa70b469330ba1d4e46c5a85b0d05196a7d8;hpb=d4c20feb706c664c377409b36cf159424c0740b1;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/Webview.java b/app/src/main/java/com/stoutner/privacybrowser/Webview.java index 3c69aa70..affbc10f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -2,19 +2,27 @@ package com.stoutner.privacybrowser; import android.app.Activity; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; +import android.support.v4.widget.SwipeRefreshLayout; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.util.Patterns; import android.view.KeyEvent; import android.view.Menu; 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; @@ -26,6 +34,9 @@ public class Webview extends AppCompatActivity { static String formattedUrlString; static WebView mainWebView; static ProgressBar progressBar; + static SwipeRefreshLayout swipeToRefresh; + static EditText urlTextBox; + static ImageView favoriteIcon; static final String homepage = "https://www.duckduckgo.com"; @Override @@ -33,31 +44,106 @@ public class Webview extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_webview); - final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox); + urlTextBox = (EditText) findViewById(R.id.urlTextBox); + 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); + // actionBar.setHideOnContentScrollEnabled(true); + } + + // Implement swipe down to refresh. + swipeToRefresh.setColorSchemeColors(0xFF0097FF); + swipeToRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + mainWebView.loadUrl(formattedUrlString); + } + }); + + // Only enable swipeToRefresh if is mainWebView is scrolled to the top. + mainWebView.getViewTreeObserver().addOnScrollChangedListener(new ViewTreeObserver.OnScrollChangedListener() { + @Override + public void onScrollChanged() { + if (mainWebView.getScrollY() == 0) { + swipeToRefresh.setEnabled(true); + } else { + swipeToRefresh.setEnabled(false); + } + } + }); - // 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); + mainWebView.loadUrl(url); return true; } + + // Update the URL in urlTextBox when the page starts to load. + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + urlTextBox.setText(url); + } + + // Update formattedUrlString and urlTextBox. It is necessary to do this after the page finishes loading because the final URL can change during load. + @Override + public void onPageFinished(WebView view, String url) { + formattedUrlString = url; + 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) { progressBar.setVisibility(View.VISIBLE); } else { progressBar.setVisibility(View.GONE); + + // Stop the refreshing indicator if it is running. + swipeToRefresh.setRefreshing(false); } } + + // Set the favorite icon when 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) { + + // 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; + } }); // Allow pinch to zoom. @@ -78,7 +164,7 @@ public class Webview extends AppCompatActivity { if (intent.getData() != null) { // Get the intent data and convert it to a string. final Uri intentUriData = intent.getData(); - Webview.formattedUrlString = intentUriData.toString(); + formattedUrlString = intentUriData.toString(); } // If formattedUrlString is null assign the homepage to it. @@ -86,29 +172,8 @@ public class Webview extends AppCompatActivity { formattedUrlString = homepage; } - // Place the formattedUrlString in the address bar and load the website. - urlTextBox.setText(formattedUrlString); + // Load the initial website. 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 @@ -121,16 +186,17 @@ 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) { case R.id.home: mainWebView.loadUrl(homepage); break; + case R.id.back: mainWebView.goBack(); break; + case R.id.forward: mainWebView.goForward(); break; @@ -151,8 +217,6 @@ public class Webview extends AppCompatActivity { public void loadUrlFromTextBox(View view) throws UnsupportedEncodingException { // Get the text from urlTextInput and convert it to a string. - final EditText urlTextBox = (EditText) findViewById(R.id.urlTextBox); - final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); String unformattedUrlString = urlTextBox.getText().toString(); URL unformattedUrl = null; Uri.Builder formattedUri = new Uri.Builder(); @@ -194,7 +258,6 @@ public class Webview extends AppCompatActivity { } // Place formattedUrlString back in the address bar and load the website. - urlTextBox.setText(formattedUrlString); mainWebView.loadUrl(formattedUrlString); // Hides the keyboard so we can see the webpage.