From 762e8f4bf08adc8f70a88492f5faecb4856a39a4 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 29 Jun 2018 20:43:58 -0300
Subject: [PATCH] Refactor WebViewActivity using fragment. Try SlidingDrawer.

---
 android/app/src/main/AndroidManifest.xml      |   2 +-
 .../hifiinterface/InterfaceActivity.java      |  38 ++-
 .../hifiinterface/WebViewActivity.java        | 177 +++----------
 .../fragment/WebViewFragment.java             | 234 ++++++++++++++++++
 .../main/res/drawable/ic_full_screen_24dp.xml |   5 +
 .../src/main/res/layout/activity_web_view.xml |  19 +-
 .../src/main/res/layout/fragment_web_view.xml |  28 +++
 .../app/src/main/res/layout/web_drawer.xml    |  22 ++
 interface/src/Application.cpp                 |   1 +
 9 files changed, 366 insertions(+), 160 deletions(-)
 create mode 100644 android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
 create mode 100644 android/app/src/main/res/drawable/ic_full_screen_24dp.xml
 create mode 100644 android/app/src/main/res/layout/fragment_web_view.xml
 create mode 100644 android/app/src/main/res/layout/web_drawer.xml

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4a6e836d6e..b2979d79ab 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
         </activity>
         <activity android:name="io.highfidelity.hifiinterface.WebViewActivity"
             android:supportsPictureInPicture="true"
-            android:configChanges="orientation"
+            android:configChanges="orientation|screenSize"
             android:theme="@android:style/Theme.Material.Light.NoActionBar"/>
         <!-- We don't want to show this on Daydream yet (we need to fix the turn-around problem on this screen)
          <activity android:name="io.highfidelity.hifiinterface.GvrLoaderActivity">
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index 7488e29996..d2a7e46892 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -11,6 +11,8 @@
 
 package io.highfidelity.hifiinterface;
 
+import android.app.Fragment;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
@@ -23,9 +25,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
+import android.widget.SlidingDrawer;
 
 import org.qtproject.qt5.android.QtLayout;
 import org.qtproject.qt5.android.QtSurface;
@@ -34,11 +38,13 @@ import org.qtproject.qt5.android.bindings.QtActivity;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 
+import io.highfidelity.hifiinterface.fragment.WebViewFragment;
+
 /*import com.google.vr.cardboard.DisplaySynchronizer;
 import com.google.vr.cardboard.DisplayUtils;
 import com.google.vr.ndk.base.GvrApi;*/
 
-public class InterfaceActivity extends QtActivity {
+public class InterfaceActivity extends QtActivity implements WebViewFragment.OnWebViewInteractionListener {
 
     public static final String DOMAIN_URL = "url";
     private static final String TAG = "Interface";
@@ -57,6 +63,7 @@ public class InterfaceActivity extends QtActivity {
     private static boolean inVrMode;
 
     private boolean nativeEnterBackgroundCallEnqueued = false;
+    private SlidingDrawer webSlidingDrawer;
 //    private GvrApi gvrApi;
     // Opaque native pointer to the Application C++ object.
     // This object is owned by the InterfaceActivity instance and passed to the native methods.
@@ -117,6 +124,12 @@ public class InterfaceActivity extends QtActivity {
         });
         startActivity(new Intent(this, SplashActivity.class));
         mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE);
+
+        FrameLayout mainLayout = findViewById(android.R.id.content);
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        webSlidingDrawer = (SlidingDrawer) inflater.inflate(R.layout.web_drawer, mainLayout, false);
+        mainLayout.addView(webSlidingDrawer);
+        webSlidingDrawer.setVisibility(View.GONE);
     }
 
     @Override
@@ -258,11 +271,15 @@ public class InterfaceActivity extends QtActivity {
                 break;
             }
             case "WebView":
-                Intent intent = new Intent(this, WebViewActivity.class);
-                if (args != null && args.containsKey(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL)) {
-                    intent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, (String) args.get(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL));
-                }
-                startActivity(intent);
+                runOnUiThread(() -> {
+                    webSlidingDrawer.setVisibility(View.VISIBLE);
+                    webSlidingDrawer.animateOpen();
+                    if (args != null && args.containsKey(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL)) {
+                        WebViewFragment webViewFragment = (WebViewFragment) getFragmentManager().findFragmentByTag("webViewFragment");
+                        webViewFragment.loadUrl((String) args.get(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL));
+                        webViewFragment.setToolbarVisible(true);
+                    }
+                });
                 break;
             default: {
                 Log.w(TAG, "Could not open activity by name " + activityName);
@@ -288,4 +305,13 @@ public class InterfaceActivity extends QtActivity {
     public void onBackPressed() {
         openAndroidActivity("Home", false);
     }
+
+    @Override
+    public void processURL(String url) { }
+
+    @Override
+    public void onWebLoaded(String url, WebViewFragment.SafenessLevel safenessLevel) { }
+
+    @Override
+    public void onTitleReceived(String title) { }
 }
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java
index 47c3cf1704..1d21b409fc 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/WebViewActivity.java
@@ -12,56 +12,31 @@ package io.highfidelity.hifiinterface;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
-import android.net.http.SslError;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
 import android.widget.Toast;
-import android.widget.Toolbar;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-public class WebViewActivity extends Activity {
+import io.highfidelity.hifiinterface.fragment.WebViewFragment;
+
+public class WebViewActivity extends Activity implements WebViewFragment.OnWebViewInteractionListener {
 
     public static final String WEB_VIEW_ACTIVITY_EXTRA_URL = "url";
+    private static final String FRAGMENT_TAG = "WebViewActivity_WebFragment";
 
     private native void nativeProcessURL(String url);
 
-    private WebView myWebView;
-    private ProgressBar mProgressBar;
     private ActionBar mActionBar;
-    private String mUrl;
-
-    enum SafenessLevel {
-        NOT_ANALYZED_YET(""),
-        NOT_SECURE(""),
-        SECURE("\uD83D\uDD12 "),
-        BAD_SECURE("\uD83D\uDD13 ");
-
-        String icon;
-        SafenessLevel(String icon) {
-            this.icon = icon;
-        }
-    }
-
-    private SafenessLevel safenessLevel = SafenessLevel.NOT_ANALYZED_YET;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -72,24 +47,26 @@ public class WebViewActivity extends Activity {
         mActionBar = getActionBar();
         mActionBar.setDisplayHomeAsUpEnabled(true);
 
-        mProgressBar = findViewById(R.id.toolbarProgressBar);
-        mUrl = getIntent().getStringExtra(WEB_VIEW_ACTIVITY_EXTRA_URL);
-        myWebView = findViewById(R.id.web_view);
-        myWebView.setWebViewClient(new HiFiWebViewClient());
-        myWebView.setWebChromeClient(new HiFiWebChromeClient());
-        WebSettings webSettings = myWebView.getSettings();
-        webSettings.setJavaScriptEnabled(true);
-        webSettings.setBuiltInZoomControls(true);
-        webSettings.setDisplayZoomControls(false);
-        myWebView.loadUrl(mUrl);
-        enterPictureInPictureMode();
+        loadWebViewFragment(getIntent().getStringExtra(WEB_VIEW_ACTIVITY_EXTRA_URL));
+    }
+
+    private void loadWebViewFragment(String url) {
+        WebViewFragment fragment = WebViewFragment.newInstance();
+        Bundle bundle = new Bundle();
+        bundle.putString(WebViewFragment.URL, url);
+        bundle.putBoolean(WebViewFragment.TOOLBAR_VISIBLE, false);
+        fragment.setArguments(bundle);
+        FragmentManager fragmentManager = getFragmentManager();
+        FragmentTransaction ft = fragmentManager.beginTransaction();
+        ft.replace(R.id.content_frame, fragment, FRAGMENT_TAG);
+        ft.addToBackStack(null);
+        ft.commit();
     }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        // Check if the key event was the Back button and if there's history
-        if ((keyCode == KeyEvent.KEYCODE_BACK) && myWebView.canGoBack()) {
-            myWebView.goBack();
+        WebViewFragment fragment = (WebViewFragment) getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
+        if (fragment != null && fragment.onKeyDown(keyCode)) {
             return true;
         }
         // If it wasn't the Back key or there's no web page history, bubble up to the default
@@ -97,15 +74,6 @@ public class WebViewActivity extends Activity {
         return super.onKeyDown(keyCode, event);
     }
 
-    private void showSubtitleWithUrl(String url) {
-        try {
-            mActionBar.setSubtitle(safenessLevel.icon + new URL(url.toString()).getHost());
-        } catch (MalformedURLException e) {
-            Toast.makeText(WebViewActivity.this, "Error loading page: " + "bad url", Toast.LENGTH_LONG).show();
-            Log.e("openUrl", "bad url");
-        }
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
@@ -114,7 +82,7 @@ public class WebViewActivity extends Activity {
     }
 
     private String intentUrlOrWebUrl() {
-        return myWebView==null || myWebView.getUrl()==null?mUrl:myWebView.getUrl();
+        return ((WebViewFragment) getFragmentManager().findFragmentById(R.id.content_frame)).intentUrlOrWebUrl();
     }
 
     @Override
@@ -140,94 +108,25 @@ public class WebViewActivity extends Activity {
         return super.onOptionsItemSelected(item);
     }
 
-    class HiFiWebViewClient extends WebViewClient {
 
-        @Override
-        public void onPageFinished(WebView view, String url) {
-            super.onPageFinished(view, url);
-            mProgressBar.setVisibility(View.GONE);
-            if (safenessLevel!=SafenessLevel.BAD_SECURE) {
-                if (url.startsWith("https:")) {
-                    safenessLevel=SafenessLevel.SECURE;
-                } else {
-                    safenessLevel=SafenessLevel.NOT_SECURE;
-                }
-            }
-            showSubtitleWithUrl(url);
-        }
+    @Override
+    public void processURL(String url) {
+        nativeProcessURL(url);
+    }
 
-        @Override
-        public void onPageStarted(WebView view, String url, Bitmap favicon) {
-            super.onPageStarted(view, url, favicon);
-            safenessLevel = SafenessLevel.NOT_ANALYZED_YET;
-            mProgressBar.setVisibility(View.VISIBLE);
-            mProgressBar.setProgress(0);
-            showSubtitleWithUrl(url);
-        }
-
-        @Override
-        public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
-            Toast.makeText(WebViewActivity.this, "Error loading page: " + error.getDescription(), Toast.LENGTH_LONG).show();
-            if (ERROR_FAILED_SSL_HANDSHAKE == error.getErrorCode()) {
-                safenessLevel = SafenessLevel.BAD_SECURE;
-            }
-        }
-
-        @Override
-        public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
-            Toast.makeText(WebViewActivity.this, "Network Error loading page: " + errorResponse.getReasonPhrase(), Toast.LENGTH_LONG).show();
-        }
-
-        @Override
-        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-            super.onReceivedSslError(view, handler, error);
-            Toast.makeText(WebViewActivity.this, "SSL error loading page: " + error.toString(), Toast.LENGTH_LONG).show();
-            safenessLevel = SafenessLevel.BAD_SECURE;
-        }
-
-        private boolean isFst(WebResourceRequest request) {
-            return isFst(request.getUrl().toString());
-        }
-
-        private boolean isFst(String url) {
-            return url.endsWith(".fst");
-        }
-
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-            // managing avatar selections
-            if (isFst(request)) {
-                final String url = request.getUrl().toString();
-                new Thread(() -> nativeProcessURL(url)).start(); // Avoid deadlock in Qt dialog
-                WebViewActivity.this.finish();
-                return true;
-            }
-            return super.shouldOverrideUrlLoading(view, request);
-        }
-
-        @Override
-        public void onLoadResource(WebView view, String url) {
-            if (isFst(url)) {
-                // processed separately
-            } else {
-                super.onLoadResource(view, url);
-            }
+    @Override
+    public void onWebLoaded(String url, WebViewFragment.SafenessLevel safenessLevel) {
+        try {
+            mActionBar.setSubtitle(safenessLevel.icon + new URL(url.toString()).getHost());
+        } catch (MalformedURLException e) {
+            Toast.makeText(WebViewActivity.this, "Error loading page: " + "bad url", Toast.LENGTH_LONG).show();
+            Log.e("openUrl", "bad url");
         }
     }
 
-    class HiFiWebChromeClient extends WebChromeClient {
-
-        @Override
-        public void onProgressChanged(WebView view, int newProgress) {
-            super.onProgressChanged(view, newProgress);
-            mProgressBar.setProgress(newProgress);
-        }
-
-        @Override
-        public void onReceivedTitle(WebView view, String title) {
-            super.onReceivedTitle(view, title);
-            mActionBar.setTitle(title);
-        }
-
+    @Override
+    public void onTitleReceived(String title) {
+        mActionBar.setTitle(title);
     }
+
 }
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
new file mode 100644
index 0000000000..fec5eb324a
--- /dev/null
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
@@ -0,0 +1,234 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.http.SslError;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.SslErrorHandler;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import io.highfidelity.hifiinterface.R;
+import io.highfidelity.hifiinterface.WebViewActivity;
+
+public class WebViewFragment extends Fragment {
+
+    public static final String URL = "url";
+    public static final String TOOLBAR_VISIBLE = "toolbar_visible";
+
+    private WebView myWebView;
+    private View mToolbar;
+    private ProgressBar mProgressBar;
+    private String mUrl;
+    private boolean mToolbarVisible;
+
+    private OnWebViewInteractionListener mListener;
+
+    public boolean onKeyDown(int keyCode) {
+        // Check if the key event was the Back button and if there's history
+        if ((keyCode == KeyEvent.KEYCODE_BACK) && myWebView.canGoBack()) {
+            myWebView.goBack();
+            return true;
+        }
+        return false;
+    }
+
+    public String intentUrlOrWebUrl() {
+        return myWebView == null || myWebView.getUrl() == null ? mUrl : myWebView.getUrl();
+    }
+
+    public void loadUrl(String url) {
+        mUrl = url;
+        myWebView.loadUrl(mUrl);
+    }
+
+    public void setToolbarVisible(boolean visible) {
+        mToolbar.setVisibility(visible ? View.VISIBLE : View.GONE);
+    }
+
+    public enum SafenessLevel {
+        NOT_ANALYZED_YET(""),
+        NOT_SECURE(""),
+        SECURE("\uD83D\uDD12 "),
+        BAD_SECURE("\uD83D\uDD13 ");
+
+        public String icon;
+        SafenessLevel(String icon) {
+            this.icon = icon;
+        }
+    }
+
+    private SafenessLevel safenessLevel = SafenessLevel.NOT_ANALYZED_YET;
+
+
+    public WebViewFragment() {
+        // Required empty public constructor
+    }
+
+    public static WebViewFragment newInstance() {
+        WebViewFragment fragment = new WebViewFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mUrl = getArguments().getString(URL);
+            mToolbarVisible = getArguments().getBoolean(TOOLBAR_VISIBLE);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_web_view, container, false);
+        mProgressBar = rootView.findViewById(R.id.toolbarProgressBar);
+        myWebView = rootView.findViewById(R.id.web_view);
+        myWebView.setWebViewClient(new HiFiWebViewClient());
+        myWebView.setWebChromeClient(new HiFiWebChromeClient());
+        WebSettings webSettings = myWebView.getSettings();
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setBuiltInZoomControls(true);
+        webSettings.setDisplayZoomControls(false);
+
+        // TODO: add a toolbar (close, ...)
+        mToolbar = rootView.findViewById(R.id.viewFullScreen);
+        mToolbar.setOnClickListener(view -> {
+            openInFullScreen();
+        });
+
+        if (mUrl != null) {
+            myWebView.loadUrl(mUrl);
+        }
+        return rootView;
+    }
+
+    private void openInFullScreen() {
+        Intent intent = new Intent(getActivity(), WebViewActivity.class);
+        intent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, intentUrlOrWebUrl());
+        getActivity().startActivity(intent);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnWebViewInteractionListener) {
+            mListener = (OnWebViewInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnWebViewInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    public interface OnWebViewInteractionListener {
+        void processURL(String url);
+        void onWebLoaded(String url, SafenessLevel safenessLevel);
+        void onTitleReceived(String title);
+    }
+
+
+    class HiFiWebViewClient extends WebViewClient {
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            super.onPageFinished(view, url);
+            mProgressBar.setVisibility(View.GONE);
+            if (safenessLevel!= SafenessLevel.BAD_SECURE) {
+                if (url.startsWith("https:")) {
+                    safenessLevel = SafenessLevel.SECURE;
+                } else {
+                    safenessLevel = SafenessLevel.NOT_SECURE;
+                }
+            }
+            if (mListener != null) {
+                mListener.onWebLoaded(url, safenessLevel);
+            }
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            super.onPageStarted(view, url, favicon);
+            safenessLevel = SafenessLevel.NOT_ANALYZED_YET;
+            mProgressBar.setVisibility(View.VISIBLE);
+            mProgressBar.setProgress(0);
+            if (mListener != null) {
+                mListener.onWebLoaded(url, safenessLevel);
+            }
+        }
+
+        @Override
+        public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+            Toast.makeText(getActivity(), "Error loading page: " + error.getDescription(), Toast.LENGTH_LONG).show();
+            if (ERROR_FAILED_SSL_HANDSHAKE == error.getErrorCode()) {
+                safenessLevel = SafenessLevel.BAD_SECURE;
+            }
+        }
+
+        @Override
+        public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
+            Toast.makeText(getActivity(), "Network Error loading page: " + errorResponse.getReasonPhrase(), Toast.LENGTH_LONG).show();
+        }
+
+        @Override
+        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+            super.onReceivedSslError(view, handler, error);
+            Toast.makeText(getActivity(), "SSL error loading page: " + error.toString(), Toast.LENGTH_LONG).show();
+            safenessLevel = SafenessLevel.BAD_SECURE;
+        }
+
+        private boolean isFst(WebResourceRequest request) {
+            return isFst(request.getUrl().toString());
+        }
+
+        private boolean isFst(String url) {
+            return url.endsWith(".fst");
+        }
+
+        @Override
+        public void onLoadResource(WebView view, String url) {
+            if (isFst(url)) {
+                // processed separately
+            } else {
+                super.onLoadResource(view, url);
+            }
+        }
+    }
+
+    class HiFiWebChromeClient extends WebChromeClient {
+
+        @Override
+        public void onProgressChanged(WebView view, int newProgress) {
+            super.onProgressChanged(view, newProgress);
+            mProgressBar.setProgress(newProgress);
+        }
+
+        @Override
+        public void onReceivedTitle(WebView view, String title) {
+            super.onReceivedTitle(view, title);
+            if (mListener != null) {
+                mListener.onTitleReceived(title);
+            }
+        }
+
+    }
+
+}
diff --git a/android/app/src/main/res/drawable/ic_full_screen_24dp.xml b/android/app/src/main/res/drawable/ic_full_screen_24dp.xml
new file mode 100644
index 0000000000..4e3b3eeacd
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_full_screen_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#333333"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,5v4h2L5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2zM5,15L3,15v4c0,1.1 0.9,2 2,2h4v-2L5,19v-4zM19,19h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2v4zM19,3h-4v2h4v4h2L21,5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/android/app/src/main/res/layout/activity_web_view.xml b/android/app/src/main/res/layout/activity_web_view.xml
index 1e30b58676..e75d2ddfc7 100644
--- a/android/app/src/main/res/layout/activity_web_view.xml
+++ b/android/app/src/main/res/layout/activity_web_view.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
     <Toolbar
         android:id="@+id/toolbar_actionbar"
         android:layout_width="match_parent"
@@ -16,19 +17,9 @@
         android:contentInsetStartWithNavigation="0dp"
         android:title="">
     </Toolbar>
-
-    <WebView
-        android:id="@+id/web_view"
+    <FrameLayout
+        android:id="@+id/content_frame"
         android:layout_below="@id/toolbar_actionbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-    <ProgressBar
-        android:id="@+id/toolbarProgressBar"
-        android:layout_below="@id/toolbar_actionbar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:indeterminate="false"
-        android:padding="0dp" />
+        android:layout_height="match_parent" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/fragment_web_view.xml b/android/app/src/main/res/layout/fragment_web_view.xml
new file mode 100644
index 0000000000..fce955e514
--- /dev/null
+++ b/android/app/src/main/res/layout/fragment_web_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <WebView
+        android:id="@+id/web_view"
+        android:layout_below="@id/toolbar_actionbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+    <ImageView
+        android:id="@+id/viewFullScreen"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:visibility="gone"
+        android:src="@drawable/ic_full_screen_24dp"
+        />
+    <ProgressBar
+        android:id="@+id/toolbarProgressBar"
+        android:layout_below="@id/toolbar_actionbar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        android:indeterminate="false"
+        android:padding="0dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/web_drawer.xml b/android/app/src/main/res/layout/web_drawer.xml
new file mode 100644
index 0000000000..f25759bfd8
--- /dev/null
+++ b/android/app/src/main/res/layout/web_drawer.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<SlidingDrawer android:id="@+id/drawer"
+    android:layout_width="384dp"
+    android:layout_height="216dp"
+    android:layout_gravity="bottom|center_horizontal"
+    android:handle="@+id/handle"
+    android:content="@+id/content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ImageView
+        android:id="@id/handle"
+        android:layout_width="88dip"
+        android:layout_height="44dip"/>
+    <fragment
+        android:id="@id/content"
+        android:name="io.highfidelity.hifiinterface.fragment.WebViewFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:tag="webViewFragment"
+        />
+
+</SlidingDrawer>
\ No newline at end of file
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a60d72073c..6bf8759a00 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1074,6 +1074,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Regular.ttf");
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf");
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf");
     _window->setWindowTitle("High Fidelity Interface");
 
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us