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

preferences code cleanup

Browse source
This commit is contained in:
Nikolay Pultsin 2014-07-28 00:28:54 +01:00
parent 76bc6da867
commit 15febb11af
17 changed files with 89 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,15 +138,15 @@ public class PreferenceActivity extends ZLPreferenceActivity {
syncPreferences.run();
}
});
syncPreferences.add(syncScreen.addOption(syncOptions.UploadAllBooks, "uploadAllBooks"));
syncPreferences.add(syncScreen.addOption(syncOptions.Positions, "positions"));
//syncPreferences.add(syncScreen.addOption(syncOptions.Metainfo, "metainfo"));
//syncPreferences.add(syncScreen.addOption(syncOptions.Bookmarks, "bookmarks"));
syncPreferences.add(syncScreen.addOption(syncOptions.UploadAllBooks, "uploadAllBooks", "values"));
syncPreferences.add(syncScreen.addOption(syncOptions.Positions, "positions", "values"));
//syncPreferences.add(syncScreen.addOption(syncOptions.Metainfo, "metainfo", "values"));
//syncPreferences.add(syncScreen.addOption(syncOptions.Bookmarks, "bookmarks", "values"));
syncPreferences.run();
final Screen appearanceScreen = createPreferenceScreen("appearance");
appearanceScreen.addPreference(new LanguagePreference(
this, appearanceScreen.Resource, "language", ZLResource.interfaceLanguages()
this, appearanceScreen.Resource.getResource("language"), ZLResource.interfaceLanguages()
) {
@Override
protected void init() {
@ -166,7 +166,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
}
});
appearanceScreen.addPreference(new ZLStringChoicePreference(
this, appearanceScreen.Resource, "screenOrientation",
this, appearanceScreen.Resource.getResource("screenOrientation"),
androidLibrary.getOrientationOption(), androidLibrary.allOrientations()
));
appearanceScreen.addPreference(new ZLBooleanPreference(
@ -192,8 +192,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
appearanceScreen.addPreference(new BatteryLevelToTurnScreenOffPreference(
this,
androidLibrary.BatteryLevelToTurnScreenOffOption,
appearanceScreen.Resource,
"dontTurnScreenOff"
appearanceScreen.Resource.getResource("dontTurnScreenOff")
));
/*
appearanceScreen.addPreference(new ZLBooleanPreference(
@ -245,19 +244,16 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final ZLTextBaseStyle baseStyle = collection.getBaseStyle();
final FontPreference fontPreference = new FontPreference(
this, textScreen.Resource, "font",
fontReloader.add(textScreen.addPreference(new FontPreference(
this, textScreen.Resource.getResource("font"),
baseStyle.FontFamilyOption, false
);
textScreen.addPreference(fontPreference);
fontReloader.add(fontPreference);
)));
textScreen.addPreference(new ZLIntegerRangePreference(
this, textScreen.Resource.getResource("fontSize"),
baseStyle.FontSizeOption
));
textScreen.addPreference(new FontStylePreference(
this, textScreen.Resource, "fontStyle",
this, textScreen.Resource.getResource("fontStyle"),
baseStyle.BoldOption, baseStyle.ItalicOption
));
final ZLIntegerRangeOption spaceOption = baseStyle.LineSpaceOption;
@ -267,12 +263,12 @@ public class PreferenceActivity extends ZLPreferenceActivity {
spacings[i] = (char)(val / 10 + '0') + decimalSeparator + (char)(val % 10 + '0');
}
textScreen.addPreference(new ZLChoicePreference(
this, textScreen.Resource, "lineSpacing",
this, textScreen.Resource.getResource("lineSpacing"),
spaceOption, spacings
));
final String[] alignments = { "left", "right", "center", "justify" };
textScreen.addPreference(new ZLChoicePreference(
this, textScreen.Resource, "alignment",
this, textScreen.Resource.getResource("alignment"),
baseStyle.AlignmentOption, alignments
));
textScreen.addOption(baseStyle.AutoHyphenationOption, "autoHyphenations");
@ -281,7 +277,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
for (ZLTextNGStyleDescription description : collection.getDescriptionList()) {
final Screen ngScreen = moreStylesScreen.createPreferenceScreen(description.Name);
ngScreen.addPreference(new FontPreference(
this, textScreen.Resource, "font",
this, textScreen.Resource.getResource("font"),
description.FontFamilyOption, true
));
ngScreen.addPreference(new StringPreference(
@ -290,27 +286,27 @@ public class PreferenceActivity extends ZLPreferenceActivity {
textScreen.Resource, "fontSize"
));
ngScreen.addPreference(new ZLStringChoicePreference(
this, textScreen.Resource, "bold",
this, textScreen.Resource.getResource("bold"),
description.FontWeightOption,
new String[] { "inherit", "normal", "bold" }
));
ngScreen.addPreference(new ZLStringChoicePreference(
this, textScreen.Resource, "italic",
this, textScreen.Resource.getResource("italic"),
description.FontStyleOption,
new String[] { "inherit", "normal", "italic" }
));
ngScreen.addPreference(new ZLStringChoicePreference(
this, textScreen.Resource, "textDecoration",
this, textScreen.Resource.getResource("textDecoration"),
description.TextDecorationOption,
new String[] { "inherit", "none", "underline", "line-through" }
));
ngScreen.addPreference(new ZLStringChoicePreference(
this, textScreen.Resource, "allowHyphenations",
this, textScreen.Resource.getResource("allowHyphenations"),
description.HyphenationOption,
new String[] { "inherit", "none", "auto" }
));
ngScreen.addPreference(new ZLStringChoicePreference(
this, textScreen.Resource, "alignment",
this, textScreen.Resource.getResource("alignment"),
description.AlignmentOption,
new String[] { "inherit", "left", "right", "center", "justify" }
));
@ -373,7 +369,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final Screen colorsScreen = createPreferenceScreen("colors");
final WallpaperPreference wallpaperPreference = new WallpaperPreference(
this, profile, colorsScreen.Resource, "background"
this, profile, colorsScreen.Resource.getResource("background")
) {
@Override
protected void onDialogClosed(boolean result) {
@ -422,7 +418,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final String[] scrollBarTypes = {"hide", "show", "showAsProgress", "showAsFooter"};
statusLineScreen.addPreference(new ZLChoicePreference(
this, statusLineScreen.Resource, "scrollbarType",
this, statusLineScreen.Resource.getResource("scrollbarType"),
viewOptions.ScrollbarType, scrollBarTypes
) {
@Override
@ -443,7 +439,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowClock, "showClock"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowBattery, "showBattery"));
footerPreferences.add(statusLineScreen.addPreference(new FontPreference(
this, statusLineScreen.Resource, "font",
this, statusLineScreen.Resource.getResource("font"),
footerOptions.Font, false
)));
footerPreferences.run();
@ -533,7 +529,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
Language.ANY_CODE, dictionaryScreen.Resource.getResource("targetLanguage")
));
final LanguagePreference targetLanguagePreference = new LanguagePreference(
this, dictionaryScreen.Resource, "targetLanguage", languages
this, dictionaryScreen.Resource.getResource("targetLanguage"), languages
) {
@Override
protected void init() {
@ -550,8 +546,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
public void run() {
dictionaryScreen.addPreference(new DictionaryPreference(
PreferenceActivity.this,
dictionaryScreen.Resource,
"dictionary",
dictionaryScreen.Resource.getResource("dictionary"),
DictionaryUtil.singleWordTranslatorOption(),
DictionaryUtil.dictionaryInfos(PreferenceActivity.this, true)
) {
@ -565,8 +560,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
});
dictionaryScreen.addPreference(new DictionaryPreference(
PreferenceActivity.this,
dictionaryScreen.Resource,
"translator",
dictionaryScreen.Resource.getResource("translator"),
DictionaryUtil.multiWordTranslatorOption(),
DictionaryUtil.dictionaryInfos(PreferenceActivity.this, false)
));
@ -599,13 +593,13 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final String[] backKeyActions =
{ ActionCode.EXIT, ActionCode.SHOW_CANCEL_MENU };
cancelMenuScreen.addPreference(new ZLStringChoicePreference(
this, cancelMenuScreen.Resource, "backKeyAction",
this, cancelMenuScreen.Resource.getResource("backKeyAction"),
keyBindings.getOption(KeyEvent.KEYCODE_BACK, false), backKeyActions
));
final String[] backKeyLongPressActions =
{ ActionCode.EXIT, ActionCode.SHOW_CANCEL_MENU, FBReaderApp.NoAction };
cancelMenuScreen.addPreference(new ZLStringChoicePreference(
this, cancelMenuScreen.Resource, "backKeyLongPressAction",
this, cancelMenuScreen.Resource.getResource("backKeyLongPressAction"),
keyBindings.getOption(KeyEvent.KEYCODE_BACK, true), backKeyLongPressActions
));