double tap is now always supported; menu call by douple tap; 0.98.10

AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="9809" android:versionName="0.98.9" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="9810" android:versionName="0.98.10" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="4" />
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
 	<uses-permission android:name="android.permission.INTERNET" />

VERSION

@@ -1 +1 @@
-0.98.9
+0.98.10

src/org/geometerplus/android/fbreader/FBReader.java

@@ -133,6 +133,7 @@ public final class FBReader extends ZLAndroidActivity {
 		fbReader.addAction(ActionCode.SHOW_BOOKMARKS, new ShowBookmarksAction(this, fbReader));
 		fbReader.addAction(ActionCode.SHOW_NETWORK_LIBRARY, new ShowNetworkLibraryAction(this, fbReader));
 		
+		fbReader.addAction(ActionCode.SHOW_MENU, new ShowMenuAction(this, fbReader));
 		fbReader.addAction(ActionCode.SHOW_NAVIGATION, new ShowNavigationAction(this, fbReader));
 		fbReader.addAction(ActionCode.SEARCH, new SearchAction(this, fbReader));
 

src/org/geometerplus/android/fbreader/ShowMenuAction.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2007-2010 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+package org.geometerplus.android.fbreader;
+
+import org.geometerplus.fbreader.fbreader.FBAction;
+import org.geometerplus.fbreader.fbreader.FBReaderApp;
+
+class ShowMenuAction extends FBAction {
+	private final FBReader myActivity;
+
+	ShowMenuAction(FBReader activity, FBReaderApp fbreader) {
+		super(fbreader);
+		myActivity = activity;
+	}
+
+	public void run() {
+		myActivity.openOptionsMenu();
+	}
+}

src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java

@@ -58,9 +58,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 
 		final Screen appearanceScreen = createPreferenceScreen("appearance");
 		appearanceScreen.addOption(androidApp.AutoOrientationOption, "autoOrientation");
-		if (!androidApp.isAlwaysShowStatusBar()) {
+		appearanceScreen.addOption(androidApp.ShowStatusBarOption, "showStatusBar");
-			appearanceScreen.addOption(androidApp.ShowStatusBarOption, "showStatusBar");
-		}
 
 		final Screen textScreen = createPreferenceScreen("text");
 		final ZLTextStyleCollection collection = ZLTextStyleCollection.Instance();
@@ -335,7 +333,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 		final Screen scrollingScreen = createPreferenceScreen("scrolling");
 		final ScrollingPreferences scrollingPreferences = ScrollingPreferences.Instance();
 		scrollingScreen.addOption(scrollingPreferences.FingerScrollingOption, "fingerScrolling");
-		scrollingScreen.addOption(scrollingPreferences.DoubleTapNavigationOption, "doubleTapNavigation");
+		//scrollingScreen.addOption(scrollingPreferences.DoubleTapNavigationOption, "doubleTapNavigation");
 		scrollingScreen.addOption(scrollingPreferences.VolumeKeysOption, "volumeKeys");
 		scrollingScreen.addOption(scrollingPreferences.InvertVolumeKeysOption, "invertVolumeKeys");
 		scrollingScreen.addOption(scrollingPreferences.AnimateOption, "animated");

src/org/geometerplus/fbreader/fbreader/ActionCode.java

@@ -40,13 +40,12 @@ public interface ActionCode {
 
 	String VOLUME_KEY_SCROLL_FORWARD = "volumeKeyScrollForward";
 	String VOLUME_KEY_SCROLL_BACKWARD = "volumeKeyScrollBackward";
+	String SHOW_MENU = "menu";
 	String SHOW_NAVIGATION = "navigate";
 	String CANCEL = "cancel";
 	String ROTATE = "rotate";
 	String INCREASE_FONT = "increaseFont";
 	String DECREASE_FONT = "decreaseFont";
-	String TOGGLE_FULLSCREEN = "toggleFullscreen";
-	String FULLSCREEN_ON = "onFullscreen";
 
 	String COPY_SELECTED_TEXT_TO_CLIPBOARD = "copyToClipboard";
 	String CLEAR_SELECTION = "clearSelection";

src/org/geometerplus/fbreader/fbreader/FBView.java

@@ -126,15 +126,20 @@ public final class FBView extends ZLTextView {
 
 	@Override
 	public boolean isDoubleTapSupported() {
-		return ScrollingPreferences.Instance().DoubleTapNavigationOption.getValue();
+		return true;
+		//return ScrollingPreferences.Instance().DoubleTapNavigationOption.getValue();
 	}
 
 	@Override
-	public boolean onFingerDoubleTap() {
+	public boolean onFingerDoubleTap(int x, int y) {
-		if (super.onFingerDoubleTap()) {
+		if (super.onFingerDoubleTap(x, y)) {
 			return true;
 		}
-		myReader.doAction(ActionCode.SHOW_NAVIGATION);
+		if (y <= myContext.getHeight() / 2) {
+			myReader.doAction(ActionCode.SHOW_NAVIGATION);
+		} else {
+			myReader.doAction(ActionCode.SHOW_MENU);
+		}
 		return true;
 	}
 

src/org/geometerplus/fbreader/fbreader/ScrollingPreferences.java

@@ -37,7 +37,7 @@ public class ScrollingPreferences {
 	public final ZLEnumOption<FingerScrolling> FingerScrollingOption =
 		new ZLEnumOption<FingerScrolling>("Scrolling", "Finger", FingerScrolling.byTapAndFlick);
 
-	public final ZLBooleanOption DoubleTapNavigationOption = new ZLBooleanOption("Scrolling", "DoubleTapNavigation", false);
+	//public final ZLBooleanOption DoubleTapNavigationOption = new ZLBooleanOption("Scrolling", "DoubleTapNavigation", false);
 	public final ZLBooleanOption VolumeKeysOption = new ZLBooleanOption("Scrolling", "VolumeKeys", true);
 	public final ZLBooleanOption AnimateOption = new ZLBooleanOption("Scrolling", "ShowAnimated", true);
 	public final ZLBooleanOption HorizontalOption = new ZLBooleanOption("Scrolling", "Horizontal", true);

src/org/geometerplus/zlibrary/core/view/ZLView.java

@@ -70,7 +70,7 @@ abstract public class ZLView {
 		return false;
 	}
 
-	public boolean onFingerDoubleTap() {
+	public boolean onFingerDoubleTap(int x, int y) {
 		return false;
 	}
 

src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java

@@ -34,7 +34,7 @@ public class ZLAndroidApplication extends Application {
 	private static ZLAndroidApplication ourApplication;
 
 	public final ZLBooleanOption AutoOrientationOption = new ZLBooleanOption("LookNFeel", "AutoOrientation", false);
-	public final ZLBooleanOption ShowStatusBarOption = new ZLBooleanOption("LookNFeel", "ShowStatusBar", false);
+	public final ZLBooleanOption ShowStatusBarOption = new ZLBooleanOption("LookNFeel", "ShowStatusBar", hasNoHardwareMenuButton());
 	public final ZLIntegerRangeOption BatteryLevelToTurnScreenOffOption = new ZLIntegerRangeOption("LookNFeel", "BatteryLevelToTurnScreenOff", 0, 100, 50);
 	public final ZLBooleanOption DontTurnScreenOffDuringChargingOption = new ZLBooleanOption("LookNFeel", "DontTurnScreenOffDuringCharging", true);
 	public final ZLIntegerRangeOption ScreenBrightnessLevelOption = new ZLIntegerRangeOption("LookNFeel", "ScreenBrightnessLevel", 0, 100, 0);
@@ -47,13 +47,11 @@ public class ZLAndroidApplication extends Application {
 		ourApplication = this;
 	}
 
-	public boolean isAlwaysShowStatusBar() {
+	private boolean hasNoHardwareMenuButton() {
 		return
 			// Eken M001
 			(Build.DISPLAY != null && Build.DISPLAY.contains("simenxie")) ||
-			// Eken M003
+			// PanDigital
-			(Build.DISPLAY != null && Build.DISPLAY.contains("Donut.eng.howayhuo")) ||
-			// Eken PanDigital
 			"PD_Novel".equals(Build.MODEL);
 	}
 
@@ -62,9 +60,6 @@ public class ZLAndroidApplication extends Application {
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		if (isAlwaysShowStatusBar()) {
-			ShowStatusBarOption.setValue(true);
-		}
 		new ZLSQLiteConfig(this);
 		new ZLAndroidImageManager();
 		new ZLAndroidDialogManager();

src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java

@@ -374,7 +374,7 @@ public class ZLAndroidWidget extends View implements View.OnLongClickListener {
 		switch (event.getAction()) {
 			case MotionEvent.ACTION_UP:
 				if (myPendingDoubleTap) {
-					view.onFingerDoubleTap();
+					view.onFingerDoubleTap(x, y);
 				} if (myLongClickPerformed) {
 					view.onFingerReleaseAfterLongPress(x, y);
 				} else {