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

changed extra fields order in footer: progress -- clock -- battery

Browse source
This commit is contained in:
Nikolay Pultsin 2013-12-12 08:36:36 +00:00
parent e47f71cd99
commit 9a89f63423
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -393,9 +393,9 @@ public class PreferenceActivity extends ZLPreferenceActivity {
footerPreferences.add(statusLineScreen.addOption(profile.FooterFillOption, "footerColor"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowTOCMarks, "tocMarks"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowProgress, "showProgress"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowClock, "showClock"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowBattery, "showBattery"));
footerPreferences.add(statusLineScreen.addOption(footerOptions.ShowProgress, "showProgress"));
footerPreferences.add(statusLineScreen.addPreference(new FontOption(
this, statusLineScreen.Resource, "font",
footerOptions.Font, false

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

@ -522,6 +522,12 @@ public final class FBView extends ZLTextView {
info.append("/");
info.append(pagePosition.Total);
}
if (reader.FooterOptions.ShowClock.getValue()) {
if (info.length() > 0) {
info.append(" ");
}
info.append(ZLibrary.Instance().getCurrentTimeString());
}
if (reader.FooterOptions.ShowBattery.getValue()) {
if (info.length() > 0) {
info.append(" ");
@ -529,12 +535,6 @@ public final class FBView extends ZLTextView {
info.append(reader.getBatteryLevel());
info.append("%");
}
if (reader.FooterOptions.ShowClock.getValue()) {
if (info.length() > 0) {
info.append(" ");
}
info.append(ZLibrary.Instance().getCurrentTimeString());
}
final String infoString = info.toString();
final int infoWidth = context.getStringWidth(infoString);