+ version 1.7 new build (ready for 1.8)

This commit is contained in:
kelson42 2013-12-20 01:12:38 +01:00
parent 095d8847e7
commit 2a5d49eaea
5 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="11" android:versionCode="12"
android:versionName="1.8" android:versionName="1.8"
package="org.kiwix.kiwixmobile"> package="org.kiwix.kiwixmobile">

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -101,7 +101,7 @@ public class KiwixMobileFragment extends Fragment {
private static final String PREF_KIWIX_MOBILE = "kiwix-mobile"; private static final String PREF_KIWIX_MOBILE = "kiwix-mobile";
private static final String PREF_BACK_TO_TOP = "pref_back_to_top"; private static final String PREF_BACKTOTOP = "pref_backtotop";
private static final String AUTOMATIC = "automatic"; private static final String AUTOMATIC = "automatic";
@ -135,7 +135,7 @@ public class KiwixMobileFragment extends Fragment {
protected int requestWebReloadOnFinished; protected int requestWebReloadOnFinished;
private boolean isButtonEnabled; private boolean isBacktotopEnabled;
private SharedPreferences mySharedPreferences; private SharedPreferences mySharedPreferences;
@ -158,7 +158,7 @@ public class KiwixMobileFragment extends Fragment {
requestWebReloadOnFinished = 0; requestWebReloadOnFinished = 0;
requestInitAllMenuItems = false; requestInitAllMenuItems = false;
nightMode = false; nightMode = false;
isButtonEnabled = true; isBacktotopEnabled = false;
isFullscreenOpened = false; isFullscreenOpened = false;
} }
@ -385,7 +385,7 @@ public class KiwixMobileFragment extends Fragment {
@Override @Override
public void onPageChanged(int page, int maxPages) { public void onPageChanged(int page, int maxPages) {
if (isButtonEnabled) { if (isBacktotopEnabled) {
if (webView.getScrollY() > 200) { if (webView.getScrollY() > 200) {
if (mBackToTopButton.getVisibility() == View.INVISIBLE) { if (mBackToTopButton.getVisibility() == View.INVISIBLE) {
mBackToTopButton.setText(R.string.button_backtotop); mBackToTopButton.setText(R.string.button_backtotop);
@ -653,7 +653,7 @@ public class KiwixMobileFragment extends Fragment {
String pref_zoom = mySharedPreferences.getString(PREF_ZOOM, AUTOMATIC); String pref_zoom = mySharedPreferences.getString(PREF_ZOOM, AUTOMATIC);
Boolean pref_zoom_enabled = mySharedPreferences.getBoolean(PREF_ZOOM_ENABLED, false); Boolean pref_zoom_enabled = mySharedPreferences.getBoolean(PREF_ZOOM_ENABLED, false);
Boolean pref_nightmode = mySharedPreferences.getBoolean(PREF_NIGHTMODE, false); Boolean pref_nightmode = mySharedPreferences.getBoolean(PREF_NIGHTMODE, false);
isButtonEnabled = mySharedPreferences.getBoolean(PREF_BACK_TO_TOP, isButtonEnabled); isBacktotopEnabled = mySharedPreferences.getBoolean(PREF_BACKTOTOP, false);
if (pref_zoom.equals(AUTOMATIC)) { if (pref_zoom.equals(AUTOMATIC)) {
setDefaultZoom(); setDefaultZoom();
@ -674,7 +674,7 @@ public class KiwixMobileFragment extends Fragment {
webView.getSettings().setBuiltInZoomControls(true); webView.getSettings().setBuiltInZoomControls(true);
webView.getSettings().setDisplayZoomControls(pref_zoom_enabled); webView.getSettings().setDisplayZoomControls(pref_zoom_enabled);
if (!isButtonEnabled) { if (!isBacktotopEnabled) {
mBackToTopButton.setVisibility(View.INVISIBLE); mBackToTopButton.setVisibility(View.INVISIBLE);
} }