From 1ec1f0edfaa98e234855cb2283f2a4bd0d3e8221 Mon Sep 17 00:00:00 2001 From: Sonu Sourav Date: Sat, 4 Apr 2020 22:22:34 +0530 Subject: [PATCH] Fixes #1938 Default value of zoom control --- .../org/kiwix/kiwixmobile/core/main/CoreMainActivity.java | 3 +-- .../java/org/kiwix/kiwixmobile/core/main/KiwixWebView.java | 7 +------ core/src/main/res/xml/preferences.xml | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java index 37392fa29..c8a89ef54 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java @@ -86,7 +86,6 @@ import java.util.Date; import java.util.List; import javax.inject.Inject; import kotlin.Unit; -import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.kiwix.kiwixmobile.core.BuildConfig; @@ -1564,7 +1563,7 @@ public abstract class CoreMainActivity extends BaseActivity int zoomScale = (int) sharedPreferenceUtil.getPrefZoom(); getCurrentWebView().setInitialScale(zoomScale); } else { - getCurrentWebView().setInitialScale(0); + getCurrentWebView().setInitialScale(100); } if (!isBackToTopEnabled) { diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.java index c435e4c7a..09d534a1b 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.java @@ -21,8 +21,6 @@ package org.kiwix.kiwixmobile.core.main; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; -import android.graphics.ColorMatrixColorFilter; -import android.graphics.Paint; import android.net.Uri; import android.os.Build; import android.os.Environment; @@ -42,7 +40,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import javax.inject.Inject; -import org.jetbrains.annotations.NotNull; import org.kiwix.kiwixmobile.core.BuildConfig; import org.kiwix.kiwixmobile.core.CoreApp; import org.kiwix.kiwixmobile.core.R; @@ -50,8 +47,6 @@ import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer; import org.kiwix.kiwixmobile.core.utils.LanguageUtils; import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil; -import static org.kiwix.kiwixmobile.core.main.CoreMainActivity.HOME_URL; - @SuppressLint("ViewConstructor") public class KiwixWebView extends VideoEnabledWebView { public static final float[] NIGHT_MODE_COLORS = { @@ -104,7 +99,7 @@ public class KiwixWebView extends VideoEnabledWebView { int zoomScale = (int) sharedPreferenceUtil.getPrefZoom(); setInitialScale(zoomScale); } else { - setInitialScale(0); + setInitialScale(100); } } diff --git a/core/src/main/res/xml/preferences.xml b/core/src/main/res/xml/preferences.xml index 02e1fef55..d7789d7ed 100644 --- a/core/src/main/res/xml/preferences.xml +++ b/core/src/main/res/xml/preferences.xml @@ -70,7 +70,7 @@ android:title="@string/pref_zoom_enable" />