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

renaming

Browse source
This commit is contained in:
Nikolay Pultsin 2014-05-03 18:55:33 +01:00
parent 94ca72f937
commit 3ba4c5d991
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/org/geometerplus/android/fbreader/preferences/FontOption.java → src/org/geometerplus/android/fbreader/preferences/FontPreference.java
View file

@ -28,12 +28,12 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.view.AndroidFontUtil; import org.geometerplus.zlibrary.ui.android.view.AndroidFontUtil;
class FontOption extends ZLStringListPreference { class FontPreference extends ZLStringListPreference {
private final ZLStringOption myOption; private final ZLStringOption myOption;
private static String UNCHANGED = "unchanged"; private static String UNCHANGED = "unchanged";
FontOption(Context context, ZLResource resource, String resourceKey, ZLStringOption option, boolean includeDummyValue) { FontPreference(Context context, ZLResource resource, String resourceKey, ZLStringOption option, boolean includeDummyValue) {
super(context, resource, resourceKey); super(context, resource, resourceKey);
myOption = option; myOption = option;

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

@ -213,7 +213,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
fontPropertiesScreen.addOption(ZLAndroidPaintContext.SubpixelOption, "subpixel"); fontPropertiesScreen.addOption(ZLAndroidPaintContext.SubpixelOption, "subpixel");
final ZLTextBaseStyle baseStyle = collection.getBaseStyle(); final ZLTextBaseStyle baseStyle = collection.getBaseStyle();
textScreen.addPreference(new FontOption( textScreen.addPreference(new FontPreference(
this, textScreen.Resource, "font", this, textScreen.Resource, "font",
baseStyle.FontFamilyOption, false baseStyle.FontFamilyOption, false
)); ));
@ -284,7 +284,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
? (ZLTextFullStyleDecoration)decoration : null; ? (ZLTextFullStyleDecoration)decoration : null;
final Screen formatScreen = moreStylesScreen.createPreferenceScreen(decoration.getName()); final Screen formatScreen = moreStylesScreen.createPreferenceScreen(decoration.getName());
formatScreen.addPreference(new FontOption( formatScreen.addPreference(new FontPreference(
this, textScreen.Resource, "font", this, textScreen.Resource, "font",
decoration.FontFamilyOption, true decoration.FontFamilyOption, true
)); ));
@ -438,7 +438,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowProgress, "showProgress")); footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowProgress, "showProgress"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowClock, "showClock")); footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowClock, "showClock"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowBattery, "showBattery")); footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowBattery, "showBattery"));
footerPreferences.add(statusLineScreen.addPreference(new FontOption( footerPreferences.add(statusLineScreen.addPreference(new FontPreference(
this, statusLineScreen.Resource, "font", this, statusLineScreen.Resource, "font",
footerOptions.Font, false footerOptions.Font, false
))); )));