Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rashiq Ahmad 2013-12-20 17:38:07 +01:00
commit e0f774fec8
9 changed files with 21 additions and 17 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="10"
android:versionName="1.7"
android:versionCode="13"
android:versionName="1.8"
package="org.kiwix.kiwixmobile">
<supports-screens

View File

@ -296,6 +296,12 @@ for arch in ARCHS:
syscall('ln -sf %(src)s %(dest)s/'
% {'src': ln_src, 'dest': dest})
# add a link to android-support-v4.jar
ln_src = '%(SDK_PATH)s/extras/android/support/v4/android-support-v4.jar' % {'SDK_PATH': SDK_PATH}
dest = os.path.join(os.path.dirname(CURRENT_PATH), 'android', 'libs')
syscall('ln -sf %(src)s %(dest)s/'
% {'src': ln_src, 'dest': dest})
# check that the step went well
if CREATE_TOOLCHAIN or COMPILE_LIBLZMA or COMPILE_LIBZIM or \
COMPILE_LIBKIWIX or STRIP_LIBKIWIX:

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -15,12 +15,10 @@
<div id="content-wrapper">
<section id="step1">
<h2><span>1.</span> Download a Content</h2>
<p><strong>Kiwix</strong> is an Offline Content Reader, perfectly tailored for Wikipedia. Enjoying Kiwix is just <strong>2 steps</strong> away.</p>
<p>Why don't you try our Wikipedia Demo file?</p>
<h2><span>1.</span> Download Offline Files</h2>
<p><strong>Kiwix</strong> allows to read websites like Wikipedia off-line. Try our 2.4MB Wikipedia demo file containing a few articles about singer <em>Ray Charles</em> from the English Wikipedia:</p>
<a class="button" href="http://download.kiwix.org/zim/0.9/wikipedia_en_ray_charles_03_2013.zim">Ray-Charles-Demo.zim</a>
<p>It's a 2.4MB ZIM containing a few articles about singer <em>Ray Charles</em> from the English Wikipedia.</p>
<p>It's just a sample! Browse <a href="http://kiwix.org/m/">kiwix.org</a> and the <a href="content://org.kiwix.ui/gotohelp">Help</a> to download other contents; like Wikipedia.</p>
<p>Offline content is available at <a href="http://kiwix.org/m/">kiwix.org</a> or the <a href="https://en.wikipedia.org/wiki/Wikipedia:Bookshelf">Wikipedia bookshelf</a>. You can create your own books in Wikipedia, refer to the <a href="content://org.kiwix.ui/gotohelp">help</a> for further details.</p>
<div class="alert alert-info"><strong>Warning!</strong> This download will take place in your browser. Don't forget to come back to Kiwix once download is complete!</div>
</section>
@ -31,9 +29,9 @@
</section>
<section id="step3">
<h2><span>3.</span> Open the file up-there!</h2>
<p>Click the <span><a href="content://org.kiwix.ui/selectzimfile">Open File</a></span> button in the toolbar up there and select the ZIM file you downloaded. <strong>That's It!</strong></p>
<p>Now, Enjoy your content, and take a look at the <a href="content://org.kiwix.ui/gotohelp">Help</a> Page once bored.</p>
<h2><span>3.</span> Open the file in Kiwix!</h2>
<p>Click the <span><a href="content://org.kiwix.ui/selectzimfile">Open File</a></span> button in the toolbar at the top and select the ZIM file you downloaded. <strong>That's It!</strong></p>
<p>Now, enjoy your content, and take a look at the <a href="content://org.kiwix.ui/gotohelp">help</a> page once bored.</p>
</section>
</div>

View File

@ -24,7 +24,7 @@
android:key="pref_backtotop"
android:title="@string/pref_backtotop"
android:summary="@string/pref_backtotop_summary"
android:defaultValue="value"/>
android:defaultValue="false"/>
</PreferenceCategory>

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