fixing the news page

gotosleep · May 23, 2016 · 27df503 · 27df503
1 parent 79088de
commit 27df503
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 206 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,6 @@ proguard/
 .idea/libraries
 
 .DS_Store
+
+.idea
+*.iml
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/ItchDroid-AS.iml b/ItchDroid-AS.iml
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "io.itch"

diff --git a/app/src/main/java/io/itch/activities/NewsActivity.java b/app/src/main/java/io/itch/activities/NewsActivity.java
@@ -3,21 +3,27 @@
 import io.itch.R;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.widget.ProgressBar;
+import android.webkit.WebViewClient;
 
 @SuppressLint("SetJavaScriptEnabled")
 public class NewsActivity extends BaseActivity {
 
+    ProgressBar progressBar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_news);
         WebView webview = (WebView) findViewById(R.id.webViewNews);
+        progressBar = (ProgressBar) findViewById(R.id.progressBarWeb);
+
         webview.getSettings().setJavaScriptEnabled(true);
-        final ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBarWeb);
+
         webview.setWebChromeClient(new WebChromeClient() {
             public void onProgressChanged(WebView view, int progress) {
                 progressBar.setProgress(progress);
@@ -40,9 +46,14 @@ public void onProgressChanged(WebView view, int progress) {
                         "} catch (e) { " +
                         "}" +
                         "})();");
-                if (progress >= 100) {
-                    progressBar.setVisibility(View.GONE);
-                }
+            }
+        });
+
+        webview.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView webView, String url) {
+                webView.loadUrl(url);
+                return true;
             }
         });
 
@@ -53,5 +64,4 @@ public void onProgressChanged(WebView view, int progress) {
     protected String getScreenPath() {
         return "News";
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,3 +31,6 @@ proguard/ @@
     .idea/libraries
     .DS_Store
+    .idea
+    *.iml