InfoActivity: Zoom and ProgressBar for WebView (opacapp#34)

MPriess · Jan 23, 2013 · 7a4b499 · 7a4b499
1 parent 9841599
commit 7a4b499
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -100,6 +100,7 @@
         </activity>
         <activity
             android:name=".frontend.InfoActivity"
+            android:configChanges="orientation|keyboardHidden"
             android:label="@string/info" >
         </activity>
         <activity

diff --git a/res/layout/info_activity.xml b/res/layout/info_activity.xml
@@ -8,13 +8,23 @@
     <TextView
         android:id="@+id/tvErr"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:padding="10dp"
         android:visibility="gone" />
 
     <WebView
         android:id="@+id/wvInfo"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+    <org.holoeverywhere.widget.ProgressBar
+        android:id="@+id/pbWebProgress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="5dip" />
 
 </LinearLayout>
diff --git a/src/de/geeksfactory/opacclient/frontend/InfoActivity.java b/src/de/geeksfactory/opacclient/frontend/InfoActivity.java
@@ -1,9 +1,11 @@
 package de.geeksfactory.opacclient.frontend;
 
+import org.holoeverywhere.widget.ProgressBar;
 import org.json.JSONException;
 
 import android.os.Bundle;
 import android.view.View;
+import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.widget.TextView;
 
@@ -52,6 +54,21 @@ public void onCreate(Bundle savedInstanceState) {
 
 		SlidingMenu sm = getSlidingMenu();
 		sm.setTouchModeAbove(SlidingMenu.TOUCHMODE_MARGIN);
+
+		wvInfo = (WebView) findViewById(R.id.wvInfo);
+		wvInfo.getSettings().setSupportZoom(true);
+		wvInfo.setWebChromeClient(new WebChromeClient() {
+			public void onProgressChanged(WebView view, int progress) {
+				ProgressBar Pbar = (ProgressBar) findViewById(R.id.pbWebProgress);
+				if (progress < 100 && Pbar.getVisibility() == ProgressBar.GONE) {
+					Pbar.setVisibility(ProgressBar.VISIBLE);
+				}
+				Pbar.setProgress(progress);
+				if (progress == 100) {
+					Pbar.setVisibility(ProgressBar.GONE);
+				}
+			}
+		});
 	}
 
 	@Override