yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

ScrollingPreferences => PageTurningOptions

Browse source
This commit is contained in:
Nikolay Pultsin 2013-05-28 03:40:42 +01:00
parent 2bea3ddf7c
commit 7fb943f59f
7 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/org/geometerplus/android/fbreader/api/ApiServerImplementation.java
View file

@ -526,11 +526,11 @@ public class ApiServerImplementation extends ApiInterface.Stub implements Api, A
} }
public String getZoneMap() { public String getZoneMap() {
return getReader().ScrollingPreferences.TapZoneMapOption.getValue(); return getReader().PageTurningOptions.TapZoneMapOption.getValue();
} }
public void setZoneMap(String name) { public void setZoneMap(String name) {
getReader().ScrollingPreferences.TapZoneMapOption.setValue(name); getReader().PageTurningOptions.TapZoneMapOption.setValue(name);
} }
public int getZoneMapHeight(String name) { public int getZoneMapHeight(String name) {

11
src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
View file

@ -35,6 +35,7 @@ import org.geometerplus.zlibrary.ui.android.view.ZLAndroidPaintContext;
import org.geometerplus.fbreader.Paths; import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.bookmodel.FBTextKind; import org.geometerplus.fbreader.bookmodel.FBTextKind;
import org.geometerplus.fbreader.fbreader.*; import org.geometerplus.fbreader.fbreader.*;
import org.geometerplus.fbreader.fbreader.options.PageTurningOptions;
import org.geometerplus.fbreader.tips.TipsManager; import org.geometerplus.fbreader.tips.TipsManager;
import org.geometerplus.android.fbreader.DictionaryUtil; import org.geometerplus.android.fbreader.DictionaryUtil;
@ -397,12 +398,12 @@ public class PreferenceActivity extends ZLPreferenceActivity {
} }
*/ */
final ScrollingPreferences scrollingPreferences = fbReader.ScrollingPreferences; final PageTurningOptions pageTurningOptions = fbReader.PageTurningOptions;
final ZLKeyBindings keyBindings = fbReader.keyBindings(); final ZLKeyBindings keyBindings = fbReader.keyBindings();
final Screen scrollingScreen = createPreferenceScreen("scrolling"); final Screen scrollingScreen = createPreferenceScreen("scrolling");
scrollingScreen.addOption(scrollingPreferences.FingerScrollingOption, "fingerScrolling"); scrollingScreen.addOption(pageTurningOptions.FingerScrollingOption, "fingerScrolling");
scrollingScreen.addOption(fbReader.EnableDoubleTapOption, "enableDoubleTapDetection"); scrollingScreen.addOption(fbReader.EnableDoubleTapOption, "enableDoubleTapDetection");
final ZLPreferenceSet volumeKeysPreferences = new ZLPreferenceSet(); final ZLPreferenceSet volumeKeysPreferences = new ZLPreferenceSet();
@ -449,14 +450,14 @@ public class PreferenceActivity extends ZLPreferenceActivity {
})); }));
volumeKeysPreferences.setEnabled(fbReader.hasActionForKey(KeyEvent.KEYCODE_VOLUME_UP, false)); volumeKeysPreferences.setEnabled(fbReader.hasActionForKey(KeyEvent.KEYCODE_VOLUME_UP, false));
scrollingScreen.addOption(scrollingPreferences.AnimationOption, "animation"); scrollingScreen.addOption(pageTurningOptions.AnimationOption, "animation");
scrollingScreen.addPreference(new AnimationSpeedPreference( scrollingScreen.addPreference(new AnimationSpeedPreference(
this, this,
scrollingScreen.Resource, scrollingScreen.Resource,
"animationSpeed", "animationSpeed",
scrollingPreferences.AnimationSpeedOption pageTurningOptions.AnimationSpeedOption
)); ));
scrollingScreen.addOption(scrollingPreferences.HorizontalOption, "horizontal"); scrollingScreen.addOption(pageTurningOptions.HorizontalOption, "horizontal");
final Screen dictionaryScreen = createPreferenceScreen("dictionary"); final Screen dictionaryScreen = createPreferenceScreen("dictionary");
try { try {

3
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -35,6 +35,7 @@ import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.book.*; import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.fbreader.bookmodel.*;
import org.geometerplus.fbreader.fbreader.options.*;
public final class FBReaderApp extends ZLApplication { public final class FBReaderApp extends ZLApplication {
public final ZLBooleanOption AllowScreenBrightnessAdjustmentOption = public final ZLBooleanOption AllowScreenBrightnessAdjustmentOption =
@ -113,7 +114,7 @@ public final class FBReaderApp extends ZLApplication {
public final ZLBooleanOption ShowPositionsInCancelMenuOption = public final ZLBooleanOption ShowPositionsInCancelMenuOption =
new ZLBooleanOption("CancelMenu", "positions", true); new ZLBooleanOption("CancelMenu", "positions", true);
public final ScrollingPreferences ScrollingPreferences = new ScrollingPreferences(); public final PageTurningOptions PageTurningOptions = new PageTurningOptions();
private final ZLKeyBindings myBindings = new ZLKeyBindings("Keys"); private final ZLKeyBindings myBindings = new ZLKeyBindings("Keys");

17
src/org/geometerplus/fbreader/fbreader/FBView.java
View file

@ -33,6 +33,7 @@ import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.bookmodel.FBHyperlinkType; import org.geometerplus.fbreader.bookmodel.FBHyperlinkType;
import org.geometerplus.fbreader.bookmodel.TOCTree; import org.geometerplus.fbreader.bookmodel.TOCTree;
import org.geometerplus.fbreader.fbreader.options.PageTurningOptions;
public final class FBView extends ZLTextView { public final class FBView extends ZLTextView {
private FBReaderApp myReader; private FBReaderApp myReader;
@ -56,7 +57,7 @@ public final class FBView extends ZLTextView {
private TapZoneMap myZoneMap; private TapZoneMap myZoneMap;
private TapZoneMap getZoneMap() { private TapZoneMap getZoneMap() {
final ScrollingPreferences prefs = myReader.ScrollingPreferences; final PageTurningOptions prefs = myReader.PageTurningOptions;
String id = prefs.TapZoneMapOption.getValue(); String id = prefs.TapZoneMapOption.getValue();
if ("".equals(id)) { if ("".equals(id)) {
id = prefs.HorizontalOption.getValue() ? "right_to_left" : "up"; id = prefs.HorizontalOption.getValue() ? "right_to_left" : "up";
@ -138,11 +139,11 @@ public final class FBView extends ZLTextView {
} }
private boolean isFlickScrollingEnabled() { private boolean isFlickScrollingEnabled() {
final ScrollingPreferences.FingerScrolling fingerScrolling = final PageTurningOptions.FingerScrolling fingerScrolling =
myReader.ScrollingPreferences.FingerScrollingOption.getValue(); myReader.PageTurningOptions.FingerScrollingOption.getValue();
return return
fingerScrolling == ScrollingPreferences.FingerScrolling.byFlick || fingerScrolling == PageTurningOptions.FingerScrolling.byFlick ||
fingerScrolling == ScrollingPreferences.FingerScrolling.byTapAndFlick; fingerScrolling == PageTurningOptions.FingerScrolling.byTapAndFlick;
} }
private void startManualScrolling(int x, int y) { private void startManualScrolling(int x, int y) {
@ -150,7 +151,7 @@ public final class FBView extends ZLTextView {
return; return;
} }
final boolean horizontal = myReader.ScrollingPreferences.HorizontalOption.getValue(); final boolean horizontal = myReader.PageTurningOptions.HorizontalOption.getValue();
final Direction direction = horizontal ? Direction.rightToLeft : Direction.up; final Direction direction = horizontal ? Direction.rightToLeft : Direction.up;
myReader.getViewWidget().startManualScrolling(x, y, direction); myReader.getViewWidget().startManualScrolling(x, y, direction);
} }
@ -203,7 +204,7 @@ public final class FBView extends ZLTextView {
if (isFlickScrollingEnabled()) { if (isFlickScrollingEnabled()) {
myReader.getViewWidget().startAnimatedScrolling( myReader.getViewWidget().startAnimatedScrolling(
x, y, myReader.ScrollingPreferences.AnimationSpeedOption.getValue() x, y, myReader.PageTurningOptions.AnimationSpeedOption.getValue()
); );
return true; return true;
} }
@ -642,6 +643,6 @@ public final class FBView extends ZLTextView {
@Override @Override
public Animation getAnimationType() { public Animation getAnimationType() {
return myReader.ScrollingPreferences.AnimationOption.getValue(); return myReader.PageTurningOptions.AnimationOption.getValue();
} }
} }

12
src/org/geometerplus/fbreader/fbreader/TurnPageAction.java
View file

@ -19,6 +19,8 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
import org.geometerplus.fbreader.fbreader.options.PageTurningOptions;
class TurnPageAction extends FBAction { class TurnPageAction extends FBAction {
private final boolean myForward; private final boolean myForward;
@ -29,16 +31,16 @@ class TurnPageAction extends FBAction {
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
final ScrollingPreferences.FingerScrolling fingerScrolling = final PageTurningOptions.FingerScrolling fingerScrolling =
Reader.ScrollingPreferences.FingerScrollingOption.getValue(); Reader.PageTurningOptions.FingerScrollingOption.getValue();
return return
fingerScrolling == ScrollingPreferences.FingerScrolling.byTap || fingerScrolling == PageTurningOptions.FingerScrolling.byTap ||
fingerScrolling == ScrollingPreferences.FingerScrolling.byTapAndFlick; fingerScrolling == PageTurningOptions.FingerScrolling.byTapAndFlick;
} }
@Override @Override
protected void run(Object ... params) { protected void run(Object ... params) {
final ScrollingPreferences preferences = Reader.ScrollingPreferences; final PageTurningOptions preferences = Reader.PageTurningOptions;
if (params.length == 2 && params[0] instanceof Integer && params[1] instanceof Integer) { if (params.length == 2 && params[0] instanceof Integer && params[1] instanceof Integer) {
final int x = (Integer)params[0]; final int x = (Integer)params[0];
final int y = (Integer)params[1]; final int y = (Integer)params[1];

4
src/org/geometerplus/fbreader/fbreader/VolumeKeyTurnPageAction.java
View file

@ -19,6 +19,8 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
import org.geometerplus.fbreader.fbreader.options.PageTurningOptions;
class VolumeKeyTurnPageAction extends FBAction { class VolumeKeyTurnPageAction extends FBAction {
private final boolean myForward; private final boolean myForward;
@ -29,7 +31,7 @@ class VolumeKeyTurnPageAction extends FBAction {
@Override @Override
protected void run(Object ... params) { protected void run(Object ... params) {
final ScrollingPreferences preferences = Reader.ScrollingPreferences; final PageTurningOptions preferences = Reader.PageTurningOptions;
Reader.getViewWidget().startAnimatedScrolling( Reader.getViewWidget().startAnimatedScrolling(
myForward ? FBView.PageIndex.next : FBView.PageIndex.previous, myForward ? FBView.PageIndex.next : FBView.PageIndex.previous,
preferences.HorizontalOption.getValue() preferences.HorizontalOption.getValue()

4
src/org/geometerplus/fbreader/fbreader/ScrollingPreferences.java → src/org/geometerplus/fbreader/fbreader/options/PageTurningOptions.java
View file

@ -17,12 +17,12 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader.options;
import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.options.*;
import org.geometerplus.zlibrary.core.view.ZLView; import org.geometerplus.zlibrary.core.view.ZLView;
public class ScrollingPreferences { public class PageTurningOptions {
public static enum FingerScrolling { public static enum FingerScrolling {
byTap, byFlick, byTapAndFlick byTap, byFlick, byTapAndFlick
} }