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 1c73a60dc6..4c62a96003 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -11,7 +11,6 @@
package io.highfidelity.hifiinterface;
-import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -273,7 +272,9 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
case "WebView":
runOnUiThread(() -> {
webSlidingDrawer.setVisibility(View.VISIBLE);
- webSlidingDrawer.animateOpen();
+ if (!webSlidingDrawer.isOpened()) {
+ 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));
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
index 9b48ce609d..50eae88784 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
@@ -56,9 +56,14 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
public void loadUrl(String url) {
mUrl = url;
- myWebView.getSettings().setLoadWithOverviewMode(true);
- myWebView.getSettings().setUseWideViewPort(true);
- myWebView.loadUrl(mUrl);
+ loadUrl(myWebView, url);
+ }
+
+ private void loadUrl(WebView webView, String url) {
+ webView.setVisibility(View.GONE);
+ webView.getSettings().setLoadWithOverviewMode(true);
+ webView.getSettings().setUseWideViewPort(true);
+ webView.loadUrl(url);
}
public void setToolbarVisible(boolean visible) {
@@ -165,7 +170,6 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
webSettings.setBuiltInZoomControls(true);
webSettings.setDisplayZoomControls(false);
- // TODO: add a toolbar (close, ...)
mToolbar = rootView.findViewById(R.id.toolbar);
mToolbar.findViewById(R.id.viewFullScreen).setOnClickListener(view -> {
openInFullScreen();
@@ -175,11 +179,9 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
mCloseAction.run();
}
});
-
+ mToolbar.setVisibility(mToolbarVisible ? View.VISIBLE : View.GONE);
if (mUrl != null) {
- myWebView.getSettings().setLoadWithOverviewMode(true);
- myWebView.getSettings().setUseWideViewPort(true);
- myWebView.loadUrl(mUrl);
+ loadUrl(myWebView, mUrl);
}
return rootView;
}
@@ -227,6 +229,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
}
}
if (mListener != null) {
+ myWebView.setVisibility(View.VISIBLE);
mListener.onWebLoaded(url, safenessLevel);
}
}
@@ -238,6 +241,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
mProgressBar.setVisibility(View.VISIBLE);
mProgressBar.setProgress(0);
if (mListener != null) {
+ myWebView.setVisibility(View.VISIBLE);
mListener.onWebLoaded(url, safenessLevel);
}
}
diff --git a/android/app/src/main/res/drawable/ic_close.xml b/android/app/src/main/res/drawable/ic_close.xml
index 086ced5f07..c80b106bf2 100644
--- a/android/app/src/main/res/drawable/ic_close.xml
+++ b/android/app/src/main/res/drawable/ic_close.xml
@@ -10,11 +10,13 @@
android:name="path"
android:pathData="M 86.5 173 C 134.273 173 173 134.273 173 86.5 C 173 38.727 134.273 0 86.5 0 C 38.727 0 0 38.727 0 86.5 C 0 134.273 38.727 173 86.5 173 Z"
android:fillColor="#181818"
+ android:fillAlpha="0.6"
android:strokeWidth="1"/>
diff --git a/android/app/src/main/res/drawable/ic_expand.xml b/android/app/src/main/res/drawable/ic_expand.xml
index 0e1d0cd5d4..283f13e24c 100644
--- a/android/app/src/main/res/drawable/ic_expand.xml
+++ b/android/app/src/main/res/drawable/ic_expand.xml
@@ -17,6 +17,7 @@
android:name="path"
android:pathData="M 86.5 173 C 134.273 173 173 134.273 173 86.5 C 173 38.727 134.273 0 86.5 0 C 38.727 0 0 38.727 0 86.5 C 0 134.273 38.727 173 86.5 173 Z"
android:fillColor="#181818"
+ android:fillAlpha="0.6"
android:strokeWidth="1"/>
+ android:visibility="gone">