feat(android): add progress property to Ti.UI.WebView

tidev · Apr 24, 2020 · 82a3579 · 82a3579
1 parent 1012309
commit 82a3579
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WebViewProxy.java
@@ -12,8 +12,6 @@
 import android.os.Message;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
-
-import java.util.Map;
 import java.util.HashMap;
 
 import org.appcelerator.kroll.KrollDict;
@@ -28,7 +26,6 @@
 import org.appcelerator.titanium.TiLifecycle.interceptOnBackPressedEvent;
 import org.appcelerator.titanium.util.TiConvert;
 import org.appcelerator.titanium.view.TiUIView;
-
 import ti.modules.titanium.ui.widget.webview.TiUIWebView;
 
 @Kroll.proxy(creatableInModule = UIModule.class,
@@ -430,6 +427,17 @@ public void setZoomLevel(float value)
 		}
 	}
 
+	@Kroll.getProperty
+	public double getProgress()
+	{
+		TiUIView v = peekView();
+		if (v != null) {
+			return (double) ((TiUIWebView) v).getProgress() / 100.0d;
+		} else {
+			return 0.0d;
+		}
+	}
+
 	public void clearBasicAuthentication()
 	{
 		fusername = null;

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiUIWebView.java
@@ -6,6 +6,22 @@
  */
 package ti.modules.titanium.ui.widget.webview;
 
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.FeatureInfo;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Build;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewParent;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import androidx.annotation.StringRes;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -16,12 +32,7 @@
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
-
-import androidx.annotation.StringRes;
-import android.view.ActionMode;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.ViewParent;
+import javax.crypto.CipherInputStream;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.common.Log;
@@ -37,22 +48,8 @@
 import org.appcelerator.titanium.view.TiBackgroundDrawable;
 import org.appcelerator.titanium.view.TiCompositeLayout;
 import org.appcelerator.titanium.view.TiUIView;
-
 import ti.modules.titanium.ui.WebViewProxy;
 import ti.modules.titanium.ui.android.AndroidModule;
-import android.content.Context;
-import android.content.pm.FeatureInfo;
-import android.content.pm.ApplicationInfo;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.os.Build;
-import android.view.MotionEvent;
-import android.view.View;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-
-import javax.crypto.CipherInputStream;
 
 @SuppressWarnings("deprecation")
 public class TiUIWebView extends TiUIView
@@ -1093,6 +1090,11 @@ public boolean interceptOnBackPressed()
 		return chromeClient.interceptOnBackPressed();
 	}
 
+	public int getProgress()
+	{
+		return getWebView().getProgress();
+	}
+
 	@Override
 	protected void disableHWAcceleration()
 	{