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

no static ScrollingPreferences instance

Browse source
This commit is contained in:
Nikolay Pultsin 2013-05-28 03:29:09 +01:00
parent 37390e3eba
commit 2bea3ddf7c
7 changed files with 14 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 ScrollingPreferences.Instance().TapZoneMapOption.getValue(); return getReader().ScrollingPreferences.TapZoneMapOption.getValue();
} }
public void setZoneMap(String name) { public void setZoneMap(String name) {
ScrollingPreferences.Instance().TapZoneMapOption.setValue(name); getReader().ScrollingPreferences.TapZoneMapOption.setValue(name);
} }
public int getZoneMapHeight(String name) { public int getZoneMapHeight(String name) {

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

@ -397,7 +397,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
} }
*/ */
final ScrollingPreferences scrollingPreferences = ScrollingPreferences.Instance(); final ScrollingPreferences scrollingPreferences = fbReader.ScrollingPreferences;
final ZLKeyBindings keyBindings = fbReader.keyBindings(); final ZLKeyBindings keyBindings = fbReader.keyBindings();

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

@ -113,6 +113,8 @@ 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();
private final ZLKeyBindings myBindings = new ZLKeyBindings("Keys"); private final ZLKeyBindings myBindings = new ZLKeyBindings("Keys");
public final FBView BookTextView; public final FBView BookTextView;

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

@ -56,10 +56,10 @@ public final class FBView extends ZLTextView {
private TapZoneMap myZoneMap; private TapZoneMap myZoneMap;
private TapZoneMap getZoneMap() { private TapZoneMap getZoneMap() {
final ScrollingPreferences prefs = ScrollingPreferences.Instance(); final ScrollingPreferences prefs = myReader.ScrollingPreferences;
String id = prefs.TapZoneMapOption.getValue(); String id = prefs.TapZoneMapOption.getValue();
if ("".equals(id)) { if ("".equals(id)) {
id = ScrollingPreferences.Instance().HorizontalOption.getValue() ? "right_to_left" : "up"; id = prefs.HorizontalOption.getValue() ? "right_to_left" : "up";
} }
if (myZoneMap == null || !id.equals(myZoneMap.Name)) { if (myZoneMap == null || !id.equals(myZoneMap.Name)) {
myZoneMap = TapZoneMap.zoneMap(id); myZoneMap = TapZoneMap.zoneMap(id);
@ -139,7 +139,7 @@ public final class FBView extends ZLTextView {
private boolean isFlickScrollingEnabled() { private boolean isFlickScrollingEnabled() {
final ScrollingPreferences.FingerScrolling fingerScrolling = final ScrollingPreferences.FingerScrolling fingerScrolling =
ScrollingPreferences.Instance().FingerScrollingOption.getValue(); myReader.ScrollingPreferences.FingerScrollingOption.getValue();
return return
fingerScrolling == ScrollingPreferences.FingerScrolling.byFlick || fingerScrolling == ScrollingPreferences.FingerScrolling.byFlick ||
fingerScrolling == ScrollingPreferences.FingerScrolling.byTapAndFlick; fingerScrolling == ScrollingPreferences.FingerScrolling.byTapAndFlick;
@ -150,7 +150,7 @@ public final class FBView extends ZLTextView {
return; return;
} }
final boolean horizontal = ScrollingPreferences.Instance().HorizontalOption.getValue(); final boolean horizontal = myReader.ScrollingPreferences.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 +203,7 @@ public final class FBView extends ZLTextView {
if (isFlickScrollingEnabled()) { if (isFlickScrollingEnabled()) {
myReader.getViewWidget().startAnimatedScrolling( myReader.getViewWidget().startAnimatedScrolling(
x, y, ScrollingPreferences.Instance().AnimationSpeedOption.getValue() x, y, myReader.ScrollingPreferences.AnimationSpeedOption.getValue()
); );
return true; return true;
} }
@ -642,6 +642,6 @@ public final class FBView extends ZLTextView {
@Override @Override
public Animation getAnimationType() { public Animation getAnimationType() {
return ScrollingPreferences.Instance().AnimationOption.getValue(); return myReader.ScrollingPreferences.AnimationOption.getValue();
} }
} }

10
src/org/geometerplus/fbreader/fbreader/ScrollingPreferences.java
View file

@ -23,12 +23,6 @@ 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 ScrollingPreferences {
private static ScrollingPreferences ourInstance;
public static ScrollingPreferences Instance() {
return (ourInstance != null) ? ourInstance : new ScrollingPreferences();
}
public static enum FingerScrolling { public static enum FingerScrolling {
byTap, byFlick, byTapAndFlick byTap, byFlick, byTapAndFlick
} }
@ -44,8 +38,4 @@ public class ScrollingPreferences {
new ZLBooleanOption("Scrolling", "Horizontal", true); new ZLBooleanOption("Scrolling", "Horizontal", true);
public final ZLStringOption TapZoneMapOption = public final ZLStringOption TapZoneMapOption =
new ZLStringOption("Scrolling", "TapZoneMap", ""); new ZLStringOption("Scrolling", "TapZoneMap", "");
private ScrollingPreferences() {
ourInstance = this;
}
} }

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

@ -29,10 +29,8 @@ class TurnPageAction extends FBAction {
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
final ScrollingPreferences preferences = ScrollingPreferences.Instance();
final ScrollingPreferences.FingerScrolling fingerScrolling = final ScrollingPreferences.FingerScrolling fingerScrolling =
preferences.FingerScrollingOption.getValue(); Reader.ScrollingPreferences.FingerScrollingOption.getValue();
return return
fingerScrolling == ScrollingPreferences.FingerScrolling.byTap || fingerScrolling == ScrollingPreferences.FingerScrolling.byTap ||
fingerScrolling == ScrollingPreferences.FingerScrolling.byTapAndFlick; fingerScrolling == ScrollingPreferences.FingerScrolling.byTapAndFlick;
@ -40,7 +38,7 @@ class TurnPageAction extends FBAction {
@Override @Override
protected void run(Object ... params) { protected void run(Object ... params) {
final ScrollingPreferences preferences = ScrollingPreferences.Instance(); final ScrollingPreferences preferences = Reader.ScrollingPreferences;
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];

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

@ -29,7 +29,7 @@ class VolumeKeyTurnPageAction extends FBAction {
@Override @Override
protected void run(Object ... params) { protected void run(Object ... params) {
final ScrollingPreferences preferences = ScrollingPreferences.Instance(); final ScrollingPreferences preferences = Reader.ScrollingPreferences;
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()