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

cleanup: code re-ordering

Browse source
This commit is contained in:
Nikolay Pultsin 2013-12-31 15:15:40 +02:00
parent 794282a979
commit 5cdbd7378b
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,9 +74,14 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final FBReaderApp fbReader = (FBReaderApp)FBReaderApp.Instance(); final FBReaderApp fbReader = (FBReaderApp)FBReaderApp.Instance();
final ViewOptions viewOptions = fbReader.ViewOptions; final ViewOptions viewOptions = fbReader.ViewOptions;
final MiscOptions miscOptions = fbReader.MiscOptions; final MiscOptions miscOptions = fbReader.MiscOptions;
final FooterOptions footerOptions = fbReader.FooterOptions;
final PageTurningOptions pageTurningOptions = fbReader.PageTurningOptions;
final ImageOptions imageOptions = fbReader.ImageOptions;
final ColorProfile profile = fbReader.getColorProfile();
final ZLTextStyleCollection collection = fbReader.TextStyleCollection;
final ZLKeyBindings keyBindings = fbReader.keyBindings();
final ZLAndroidLibrary androidLibrary = (ZLAndroidLibrary)ZLAndroidLibrary.Instance(); final ZLAndroidLibrary androidLibrary = (ZLAndroidLibrary)ZLAndroidLibrary.Instance();
final ColorProfile profile = fbReader.getColorProfile();
// TODO: use user-defined locale, not the default one, // TODO: use user-defined locale, not the default one,
// or set user-defined locale as default // or set user-defined locale as default
final String decimalSeparator = final String decimalSeparator =
@ -168,7 +173,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
fontPropertiesScreen.addOption(ZLAndroidPaintContext.DitheringOption, "dithering"); fontPropertiesScreen.addOption(ZLAndroidPaintContext.DitheringOption, "dithering");
fontPropertiesScreen.addOption(ZLAndroidPaintContext.SubpixelOption, "subpixel"); fontPropertiesScreen.addOption(ZLAndroidPaintContext.SubpixelOption, "subpixel");
final ZLTextStyleCollection collection = fbReader.TextStyleCollection;
final ZLTextBaseStyle baseStyle = collection.getBaseStyle(); final ZLTextBaseStyle baseStyle = collection.getBaseStyle();
textScreen.addPreference(new FontOption( textScreen.addPreference(new FontOption(
this, textScreen.Resource, "font", this, textScreen.Resource, "font",
@ -338,9 +342,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
colorsScreen.addOption(profile.BackgroundOption, "backgroundColor") colorsScreen.addOption(profile.BackgroundOption, "backgroundColor")
); );
bgPreferences.setEnabled("".equals(profile.WallpaperOption.getValue())); bgPreferences.setEnabled("".equals(profile.WallpaperOption.getValue()));
/*
colorsScreen.addOption(profile.SelectionBackgroundOption, "selectionBackground");
*/
colorsScreen.addOption(profile.HighlightingOption, "highlighting"); colorsScreen.addOption(profile.HighlightingOption, "highlighting");
colorsScreen.addOption(profile.RegularTextOption, "text"); colorsScreen.addOption(profile.RegularTextOption, "text");
colorsScreen.addOption(profile.HyperlinkTextOption, "hyperlink"); colorsScreen.addOption(profile.HyperlinkTextOption, "hyperlink");
@ -387,7 +388,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
} }
}); });
final FooterOptions footerOptions = fbReader.FooterOptions;
footerPreferences.add(statusLineScreen.addPreference(new ZLIntegerRangePreference( footerPreferences.add(statusLineScreen.addPreference(new ZLIntegerRangePreference(
this, statusLineScreen.Resource.getResource("footerHeight"), this, statusLineScreen.Resource.getResource("footerHeight"),
viewOptions.FooterHeight viewOptions.FooterHeight
@ -417,10 +417,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
} }
*/ */
final PageTurningOptions pageTurningOptions = fbReader.PageTurningOptions;
final ZLKeyBindings keyBindings = fbReader.keyBindings();
final Screen scrollingScreen = createPreferenceScreen("scrolling"); final Screen scrollingScreen = createPreferenceScreen("scrolling");
scrollingScreen.addOption(pageTurningOptions.FingerScrolling, "fingerScrolling"); scrollingScreen.addOption(pageTurningOptions.FingerScrolling, "fingerScrolling");
scrollingScreen.addOption(miscOptions.EnableDoubleTap, "enableDoubleTapDetection"); scrollingScreen.addOption(miscOptions.EnableDoubleTap, "enableDoubleTapDetection");
@ -541,7 +537,6 @@ public class PreferenceActivity extends ZLPreferenceActivity {
} }
}); });
final ImageOptions imageOptions = fbReader.ImageOptions;
final Screen imagesScreen = createPreferenceScreen("images"); final Screen imagesScreen = createPreferenceScreen("images");
imagesScreen.addOption(imageOptions.TapAction, "tappingAction"); imagesScreen.addOption(imageOptions.TapAction, "tappingAction");
imagesScreen.addOption(imageOptions.FitToScreen, "fitImagesToScreen"); imagesScreen.addOption(imageOptions.FitToScreen, "fitImagesToScreen");