yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

new style key options (VolumeKeyOption and InvertVolumeKeysOption have gone)

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-22 02:15:06 +01:00
parent 06db42f28c
commit d8afa77319
7 changed files with 113 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -346,24 +346,55 @@ public class PreferenceActivity extends ZLPreferenceActivity {
//final Screen tapZonesScreen = createPreferenceScreen("tapZones");
//tapZonesScreen.addOption(scrollingPreferences.TapZonesSchemeOption, "tapZonesScheme");
final ZLKeyBindings keyBindings = fbReader.keyBindings();
final Screen scrollingScreen = createPreferenceScreen("scrolling");
scrollingScreen.addOption(scrollingPreferences.FingerScrollingOption, "fingerScrolling");
scrollingScreen.addOption(fbReader.EnableDoubleTapOption, "enableDoubleTapDetection");
final ZLPreferenceSet volumeKeysPreferences = new ZLPreferenceSet();
scrollingScreen.addPreference(new ZLBooleanPreference(
this, scrollingPreferences.VolumeKeysOption, scrollingScreen.Resource, "volumeKeys"
scrollingScreen.addPreference(new ZLCheckBoxPreference(
this, scrollingScreen.Resource, "volumeKeys"
) {
{
setChecked(fbReader.hasActionForKey(KeyEvent.KEYCODE_VOLUME_UP, false));
}
@Override
protected void onClick() {
super.onClick();
if (isChecked()) {
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_DOWN, false, ActionCode.VOLUME_KEY_SCROLL_FORWARD);
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_UP, false, ActionCode.VOLUME_KEY_SCROLL_BACK);
} else {
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_DOWN, false, FBReaderApp.NoAction);
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_UP, false, FBReaderApp.NoAction);
}
volumeKeysPreferences.setEnabled(isChecked());
}
});
volumeKeysPreferences.add(scrollingScreen.addOption(
scrollingPreferences.InvertVolumeKeysOption, "invertVolumeKeys"
));
volumeKeysPreferences.setEnabled(scrollingPreferences.VolumeKeysOption.getValue());
volumeKeysPreferences.add(scrollingScreen.addPreference(new ZLCheckBoxPreference(
this, scrollingScreen.Resource, "invertVolumeKeys"
) {
{
setChecked(ActionCode.VOLUME_KEY_SCROLL_FORWARD.equals(
keyBindings.getBinding(KeyEvent.KEYCODE_VOLUME_UP, false)
));
}
@Override
protected void onClick() {
super.onClick();
if (isChecked()) {
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_DOWN, false, ActionCode.VOLUME_KEY_SCROLL_BACK);
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_UP, false, ActionCode.VOLUME_KEY_SCROLL_FORWARD);
} else {
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_DOWN, false, ActionCode.VOLUME_KEY_SCROLL_FORWARD);
keyBindings.bindKey(KeyEvent.KEYCODE_VOLUME_UP, false, ActionCode.VOLUME_KEY_SCROLL_BACK);
}
}
}));
volumeKeysPreferences.setEnabled(fbReader.hasActionForKey(KeyEvent.KEYCODE_VOLUME_UP, false));
scrollingScreen.addOption(scrollingPreferences.AnimationOption, "animation");
scrollingScreen.addPreference(new AnimationSpeedPreference(
@ -402,20 +433,17 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final Screen cancelMenuScreen = createPreferenceScreen("cancelMenu");
cancelMenuScreen.addOption(fbReader.ShowPreviousBookInCancelMenuOption, "previousBook");
cancelMenuScreen.addOption(fbReader.ShowPositionsInCancelMenuOption, "positions");
final ZLKeyBindings bindings = fbReader.keyBindings();
final String[] backKeyActions =
//{ ActionCode.EXIT, ActionCode.GO_BACK, ActionCode.SHOW_CANCEL_MENU };
{ ActionCode.EXIT, ActionCode.SHOW_CANCEL_MENU };
cancelMenuScreen.addPreference(new ZLStringChoicePreference(
this, cancelMenuScreen.Resource, "backKeyAction",
bindings.getOption(KeyEvent.KEYCODE_BACK, false), backKeyActions
keyBindings.getOption(KeyEvent.KEYCODE_BACK, false), backKeyActions
));
final String[] backKeyLongPressActions =
//{ ActionCode.EXIT, ActionCode.GO_BACK, ActionCode.SHOW_CANCEL_MENU, FBReaderApp.NoAction };
{ ActionCode.EXIT, ActionCode.SHOW_CANCEL_MENU, FBReaderApp.NoAction };
cancelMenuScreen.addPreference(new ZLStringChoicePreference(
this, cancelMenuScreen.Resource, "backKeyLongPressAction",
bindings.getOption(KeyEvent.KEYCODE_BACK, true), backKeyLongPressActions
keyBindings.getOption(KeyEvent.KEYCODE_BACK, true), backKeyLongPressActions
));
}
}

13
src/org/geometerplus/android/fbreader/preferences/ZLBooleanPreference.java
View file

@ -20,22 +20,16 @@
package org.geometerplus.android.fbreader.preferences;
import android.content.Context;
import android.preference.CheckBoxPreference;
import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
import org.geometerplus.zlibrary.core.resources.ZLResource;
class ZLBooleanPreference extends CheckBoxPreference implements ZLPreference {
class ZLBooleanPreference extends ZLCheckBoxPreference {
private final ZLBooleanOption myOption;
ZLBooleanPreference(Context context, ZLBooleanOption option, ZLResource rootResource, String resourceKey) {
super(context);
super(context, rootResource, resourceKey);
myOption = option;
ZLResource resource = rootResource.getResource(resourceKey);
setTitle(resource.getValue());
setSummaryOn(resource.getResource("summaryOn").getValue());
setSummaryOff(resource.getResource("summaryOff").getValue());
setChecked(option.getValue());
}
@ -44,7 +38,4 @@ class ZLBooleanPreference extends CheckBoxPreference implements ZLPreference {
super.onClick();
myOption.setValue(isChecked());
}
public void onAccept() {
}
}

39
src/org/geometerplus/android/fbreader/preferences/ZLCheckBoxPreference.java Normal file
View file

@ -0,0 +1,39 @@
/*
* Copyright (C) 2009-2011 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.preferences;
import android.content.Context;
import android.preference.CheckBoxPreference;
import org.geometerplus.zlibrary.core.resources.ZLResource;
abstract class ZLCheckBoxPreference extends CheckBoxPreference implements ZLPreference {
ZLCheckBoxPreference(Context context, ZLResource rootResource, String resourceKey) {
super(context);
ZLResource resource = rootResource.getResource(resourceKey);
setTitle(resource.getValue());
setSummaryOn(resource.getResource("summaryOn").getValue());
setSummaryOff(resource.getResource("summaryOff").getValue());
}
public void onAccept() {
}
}

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

@ -37,11 +37,6 @@ public class ScrollingPreferences {
public final ZLEnumOption<FingerScrolling> FingerScrollingOption =
new ZLEnumOption<FingerScrolling>("Scrolling", "Finger", FingerScrolling.byTapAndFlick);
public final ZLBooleanOption VolumeKeysOption =
new ZLBooleanOption("Scrolling", "VolumeKeys", true);
public final ZLBooleanOption InvertVolumeKeysOption =
new ZLBooleanOption("Scrolling", "InvertVolumeKeys", false);
public final ZLEnumOption<ZLView.Animation> AnimationOption =
new ZLEnumOption<ZLView.Animation>("Scrolling", "Animation", ZLView.Animation.slide);
public final ZLIntegerRangeOption AnimationSpeedOption =

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

@ -27,20 +27,10 @@ class VolumeKeyTurnPageAction extends FBAction {
myForward = forward;
}
public boolean isEnabled() {
return ScrollingPreferences.Instance().VolumeKeysOption.getValue();
}
public void run() {
final ScrollingPreferences preferences = ScrollingPreferences.Instance();
boolean forward = myForward;
if (preferences.InvertVolumeKeysOption.getValue()) {
forward = !forward;
}
Reader.getViewWidget().startAnimatedScrolling(
forward ? FBView.PageIndex.next : FBView.PageIndex.previous,
myForward ? FBView.PageIndex.next : FBView.PageIndex.previous,
preferences.HorizontalOption.getValue()
? FBView.Direction.rightToLeft : FBView.Direction.up,
preferences.AnimationSpeedOption.getValue()

36
src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
View file

@ -21,6 +21,10 @@ package org.geometerplus.zlibrary.core.application;
import java.util.*;
import android.view.KeyEvent;
import org.geometerplus.fbreader.fbreader.ActionCode;
import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.zlibrary.core.options.ZLStringListOption;
import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
@ -42,16 +46,32 @@ public final class ZLKeyBindings {
new Reader(keys).readBindings();
Collections.sort(keys);
myKeysOption = new ZLStringListOption(name, "KeyList", keys);
// this code is here for migration from old versions;
// should be removed in FBReader 2.0
ZLStringOption oldBackKeyOption = new ZLStringOption(name + ":" + ACTION, "<Back>", "");
if (oldBackKeyOption.getValue() != null) {
new ZLStringOption(name + ":" + ACTION, "4", oldBackKeyOption.getValue());
// this code is for migration from FBReader versions <= 1.1.2
ZLStringOption oldBackKeyOption = new ZLStringOption(myName + ":" + ACTION, "<Back>", "");
if (!"".equals(oldBackKeyOption.getValue())) {
bindKey(KeyEvent.KEYCODE_BACK, false, oldBackKeyOption.getValue());
oldBackKeyOption.setValue("");
}
oldBackKeyOption = new ZLStringOption(name + ":" + LONG_PRESS_ACTION, "<Back>", "");
if (oldBackKeyOption.getValue() != null) {
new ZLStringOption(name + ":" + LONG_PRESS_ACTION, "4", oldBackKeyOption.getValue());
oldBackKeyOption = new ZLStringOption(myName + ":" + LONG_PRESS_ACTION, "<Back>", "");
if (!"".equals(oldBackKeyOption.getValue())) {
bindKey(KeyEvent.KEYCODE_BACK, true, oldBackKeyOption.getValue());
oldBackKeyOption.setValue("");
}
final ZLBooleanOption volumeKeysOption =
new ZLBooleanOption("Scrolling", "VolumeKeys", true);
final ZLBooleanOption invertVolumeKeysOption =
new ZLBooleanOption("Scrolling", "InvertVolumeKeys", false);
if (!volumeKeysOption.getValue()) {
bindKey(KeyEvent.KEYCODE_VOLUME_UP, false, ZLApplication.NoAction);
bindKey(KeyEvent.KEYCODE_VOLUME_DOWN, false, ZLApplication.NoAction);
} else if (invertVolumeKeysOption.getValue()) {
bindKey(KeyEvent.KEYCODE_VOLUME_UP, false, ActionCode.VOLUME_KEY_SCROLL_FORWARD);
bindKey(KeyEvent.KEYCODE_VOLUME_DOWN, false, ActionCode.VOLUME_KEY_SCROLL_BACK);
}
volumeKeysOption.setValue(true);
invertVolumeKeysOption.setValue(false);
// end of migration code
}

5
src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
View file

@ -438,7 +438,10 @@ public class ZLAndroidWidget extends View implements ZLViewWidget, View.OnLongCl
myKeyUnderTracking = -1;
return true;
} else {
return false;
final ZLApplication application = ZLApplication.Instance();
return
application.hasActionForKey(keyCode, false) ||
application.hasActionForKey(keyCode, true);
}
}