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

better pref enabling/disabling

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-24 21:10:06 +01:00
parent a8f4c69858
commit 01b8ed9c37
2 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/resources/application/en.xml
View file

@ -710,7 +710,7 @@
<node name="summaryOn" value="Show TOC marks in the footer bar"/> <node name="summaryOn" value="Show TOC marks in the footer bar"/>
<node name="summaryOff" value="Don't show TOC marks in the footer bar"/> <node name="summaryOff" value="Don't show TOC marks in the footer bar"/>
</node> </node>
<node name="displayProgress" value="Show reading progress"> <node name="showProgress" value="Show reading progress">
<node name="dontDisplay" value="Do not show"/> <node name="dontDisplay" value="Do not show"/>
<node name="asPages" value="As page numbers"/> <node name="asPages" value="As page numbers"/>
<node name="asPercentage" value="As percentage"/> <node name="asPercentage" value="As percentage"/>

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

@ -556,20 +556,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGForegroundOption, "footerForegroundColor")); newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGForegroundOption, "footerForegroundColor"));
newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGForegroundUnreadOption, "footerForegroundUnreadColor")); newStyleFooterPreferences.add(statusLineScreen.addOption(profile.FooterNGForegroundUnreadOption, "footerForegroundUnreadColor"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowTOCMarks, "tocMarks")); footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowTOCMarks, "tocMarks"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowProgress, "showProgress"));
statusLineScreen.addPreference(new ZLEnumPreference(
this,
footerOptions.ShowProgress,
statusLineScreen.Resource.getResource("showProgressTypes")
) {
@Override
public boolean isEnabled() {
int scrollbarType = viewOptions.ScrollbarType.getValue();
return scrollbarType == FBView.SCROLLBAR_SHOW_AS_FOOTER ||
scrollbarType == FBView.SCROLLBAR_SHOW_AS_FOOTER_OLD_STYLE;
}
});
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 FontPreference( footerPreferences.add(statusLineScreen.addPreference(new FontPreference(