Merge pull request #140 from aniri/develop

added 2019 pdf observers guide
code4romania · Jun 28, 2019 · 9d16ca2 · 9d16ca2
2 parents 55e2978 + 36d6581
commit 9d16ca2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,6 @@ android {
         applicationId "ro.code4.monitorizarevot"
         minSdkVersion 17
         targetSdkVersion 28
-
         versionCode 22
         versionName "0.10.2"
     }
@@ -51,7 +50,7 @@ android {
         }
 
         prod {
-            buildConfigField "String", "WEB_BASE_URL", '"https://mv-mobile-prod.azurewebsites.net/"'
+            buildConfigField "String", "WEB_BASE_URL", '"https://mv-mobile-dev.azurewebsites.net/"'
         }
     }
 

diff --git a/app/src/main/java/ro/code4/monitorizarevot/constants/Constants.java b/app/src/main/java/ro/code4/monitorizarevot/constants/Constants.java
@@ -1,7 +1,7 @@
 package ro.code4.monitorizarevot.constants;
 
 public class Constants {
-    public static final String GUIDE_URL = "https://monitorizare-vot-ghid.azurewebsites.net/";
+    public static final String GUIDE_URL = "https://votcorect.ro/wp-content/uploads/2019/05/Manualul-Observatorului-FV-2019-1.pdf";
     public static final String ORGANISATION_WEB_URL = "https://code4.ro/";
     public static final String SERVICE_CENTER_PHONE_NUMBER = "0800 080 200";
     public static final String TIME_FORMAT = "HH:mm";

diff --git a/app/src/main/java/ro/code4/monitorizarevot/fragment/GuideFragment.java b/app/src/main/java/ro/code4/monitorizarevot/fragment/GuideFragment.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -35,7 +36,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ButterKnife.bind(this, view);
-        webView.loadUrl(Constants.GUIDE_URL);
+        webView.setWebViewClient(new WebViewClient());
+        webView.getSettings().setSupportZoom(true);
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.loadUrl("https://docs.google.com/gview?embedded=true&url="+Constants.GUIDE_URL);
     }
 
     @Override

diff --git a/app/src/main/res/layout/fragment_guide.xml b/app/src/main/res/layout/fragment_guide.xml
@@ -2,9 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin">
+    android:layout_height="match_parent">
 
     <WebView
         android:id="@+id/guide_web_view"