kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 06:42:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1938 Default value of zoom control

Browse Source
This commit is contained in:
Sonu Sourav 2020-04-04 22:22:34 +05:30
parent 4fb6aa6ab6
commit 1ec1f0edfa
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreMainActivity.java
View File

@ -86,7 +86,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import kotlin.Unit; import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.json.JSONArray; import org.json.JSONArray;
import org.kiwix.kiwixmobile.core.BuildConfig; import org.kiwix.kiwixmobile.core.BuildConfig;
@ -1564,7 +1563,7 @@ public abstract class CoreMainActivity extends BaseActivity
int zoomScale = (int) sharedPreferenceUtil.getPrefZoom(); int zoomScale = (int) sharedPreferenceUtil.getPrefZoom();
getCurrentWebView().setInitialScale(zoomScale); getCurrentWebView().setInitialScale(zoomScale);
} else { } else {
getCurrentWebView().setInitialScale(0); getCurrentWebView().setInitialScale(100);
} }
if (!isBackToTopEnabled) { if (!isBackToTopEnabled) {

7
core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.java
View File

@ -21,8 +21,6 @@ package org.kiwix.kiwixmobile.core.main;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
@ -42,7 +40,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import javax.inject.Inject; import javax.inject.Inject;
import org.jetbrains.annotations.NotNull;
import org.kiwix.kiwixmobile.core.BuildConfig; import org.kiwix.kiwixmobile.core.BuildConfig;
import org.kiwix.kiwixmobile.core.CoreApp; import org.kiwix.kiwixmobile.core.CoreApp;
import org.kiwix.kiwixmobile.core.R; 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.LanguageUtils;
import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil; import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil;
import static org.kiwix.kiwixmobile.core.main.CoreMainActivity.HOME_URL;
@SuppressLint("ViewConstructor") @SuppressLint("ViewConstructor")
public class KiwixWebView extends VideoEnabledWebView { public class KiwixWebView extends VideoEnabledWebView {
public static final float[] NIGHT_MODE_COLORS = { public static final float[] NIGHT_MODE_COLORS = {
@ -104,7 +99,7 @@ public class KiwixWebView extends VideoEnabledWebView {
int zoomScale = (int) sharedPreferenceUtil.getPrefZoom(); int zoomScale = (int) sharedPreferenceUtil.getPrefZoom();
setInitialScale(zoomScale); setInitialScale(zoomScale);
} else { } else {
setInitialScale(0); setInitialScale(100);
} }
} }

2
core/src/main/res/xml/preferences.xml
View File

@ -70,7 +70,7 @@
android:title="@string/pref_zoom_enable" /> android:title="@string/pref_zoom_enable" />
<org.kiwix.kiwixmobile.core.settings.SliderPreference <org.kiwix.kiwixmobile.core.settings.SliderPreference
android:defaultValue="250.0" android:defaultValue="100.0"
android:dialogMessage="0" android:dialogMessage="0"
android:enabled="false" android:enabled="false"
android:key="pref_zoom_slider" android:key="pref_zoom_slider"