X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FWebview.java;h=9c51b446d8d7c88df530bc03ef4029c034a47464;hb=b72fd06c1e378ca01c1cccd83ed0c7ae5297b8f4;hp=116360d0e27448473af6a83540f79c6bee5ee562;hpb=3e02a4c1e5eb1639caad22b0ff229a6b4bc4aecd;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 116360d0..9c51b446 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/Webview.java +++ b/app/src/main/java/com/stoutner/privacybrowser/Webview.java @@ -1,6 +1,5 @@ package com.stoutner.privacybrowser; -import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; @@ -9,16 +8,14 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Environment; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import android.support.v4.app.DialogFragment; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.app.AppCompatDialogFragment; import android.util.Patterns; import android.view.KeyEvent; import android.view.Menu; @@ -32,17 +29,18 @@ import android.webkit.WebResourceRequest; import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.Toast; - -import java.io.File; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; -public class Webview extends AppCompatActivity { +public class Webview extends AppCompatActivity implements CreateHomeScreenShortcut.CreateHomeScreenSchortcutListener { + // favoriteIcon is public static so it can be accessed from CreateHomeScreenShortcut. + public static Bitmap favoriteIcon; private String formattedUrlString; private String homepage = "https://www.duckduckgo.com/"; @@ -56,6 +54,7 @@ public class Webview extends AppCompatActivity { setContentView(R.layout.activity_webview); final WebView mainWebView = (WebView) findViewById(R.id.mainWebView); + final FrameLayout fullScreenVideoFrameLayout = (FrameLayout) findViewById(R.id.fullScreenVideoFrameLayout); final Activity mainWebViewActivity = this; final ActionBar actionBar = getSupportActionBar(); @@ -72,8 +71,7 @@ public class Webview extends AppCompatActivity { 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)) { + if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { // Load the URL into the mainWebView and consume the event. try { loadUrlFromTextBox(); @@ -82,9 +80,10 @@ public class Webview extends AppCompatActivity { } // If the enter key was pressed, consume the event. return true; + } else { + // If any other key was pressed, do not consume the event. + return false; } - // If any other key was pressed, do not consume the event. - return false; } }); } @@ -141,12 +140,56 @@ public class Webview extends AppCompatActivity { // Set the favorite icon when it changes. @Override public void onReceivedIcon(WebView view, Bitmap icon) { - // Make sure that actionBar is not null. + // Save a copy of the favorite icon for use if a shortcut is added to the home screen. + favoriteIcon = icon; + + // Place the favorite icon in the actionBar if it is not null. if (actionBar != null) { - ImageView favoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon); - favoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); + ImageView imageViewFavoriteIcon = (ImageView) actionBar.getCustomView().findViewById(R.id.favoriteIcon); + imageViewFavoriteIcon.setImageBitmap(Bitmap.createScaledBitmap(icon, 64, 64, true)); + } + } + + // Enter full screen video + @Override + public void onShowCustomView(View view, CustomViewCallback callback) { + getSupportActionBar().hide(); + + fullScreenVideoFrameLayout.addView(view); + fullScreenVideoFrameLayout.setVisibility(View.VISIBLE); + + mainWebView.setVisibility(View.GONE); + + /* SYSTEM_UI_FLAG_HIDE_NAVIGATION hides the navigation bars on the bottom or right of the screen. + ** SYSTEM_UI_FLAG_FULLSCREEN hides the status bar across the top of the screen. + ** SYSTEM_UI_FLAG_IMMERSIVE_STICKY makes the navigation and status bars ghosted overlays and automatically rehides them. + */ + + // Set the one flag supported by API >= 14. + if (Build.VERSION.SDK_INT >= 14) { + view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); + } + + // Set the two flags that are supported by API >= 16. + if (Build.VERSION.SDK_INT >= 16) { + view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN); + } + + // Set all three flags that are supported by API >= 19. + if (Build.VERSION.SDK_INT >= 19) { + view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); } } + + // Exit full screen video + public void onHideCustomView() { + getSupportActionBar().show(); + + mainWebView.setVisibility(View.VISIBLE); + + fullScreenVideoFrameLayout.removeAllViews(); + fullScreenVideoFrameLayout.setVisibility(View.GONE); + } }); mainWebView.setDownloadListener(new DownloadListener() { @@ -269,6 +312,14 @@ public class Webview extends AppCompatActivity { } break; + case R.id.addToHomescreen: + // Show the CreateHomeScreenShortcut AlertDialog and name this instance createShortcut. + AppCompatDialogFragment shortcutDialog = new CreateHomeScreenShortcut(); + shortcutDialog.show(getSupportFragmentManager(), "createShortcut"); + + //Everything else will be handled by CreateHomeScreenShortcut and the associated listeners below. + break; + case R.id.downloads: // Launch the system Download Manager. Intent downloadManangerIntent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS); @@ -277,11 +328,36 @@ public class Webview extends AppCompatActivity { downloadManangerIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(downloadManangerIntent); + break; } return super.onOptionsItemSelected(menuItem); } + @Override + public void onCreateHomeScreenShortcutCancel(DialogFragment dialog) { + // Do nothing because the user selected "Cancel". + } + + @Override + public void onCreateHomeScreenShortcutCreate(DialogFragment dialog) { + // Get shortcutNameEditText from the alert dialog. + EditText shortcutNameEditText = (EditText) dialog.getDialog().findViewById(R.id.shortcutNameEditText); + + // Create the bookmark shortcut based on formattedUrlString. + Intent bookmarkShortcut = new Intent(); + bookmarkShortcut.setAction(Intent.ACTION_VIEW); + bookmarkShortcut.setData(Uri.parse(formattedUrlString)); + + // Place the bookmark shortcut on the home screen. + Intent placeBookmarkShortcut = new Intent(); + placeBookmarkShortcut.putExtra("android.intent.extra.shortcut.INTENT", bookmarkShortcut); + placeBookmarkShortcut.putExtra("android.intent.extra.shortcut.NAME", shortcutNameEditText.getText().toString()); + placeBookmarkShortcut.putExtra("android.intent.extra.shortcut.ICON", favoriteIcon); + placeBookmarkShortcut.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); + sendBroadcast(placeBookmarkShortcut); + } + // Override onBackPressed so that if mainWebView can go back it does when the system back button is pressed. @Override public void onBackPressed() { @@ -344,4 +420,4 @@ public class Webview extends AppCompatActivity { inputMethodManager.hideSoftInputFromWindow(mainWebView.getWindowToken(), 0); } } -} +} \ No newline at end of file