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

method ZLTextView.PagePosition.getPercentageString() has gone

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-24 21:33:06 +01:00
parent 1372fad1f0
commit 672c236e73
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -533,22 +533,23 @@ public final class FBView extends ZLTextView {
final FooterOptions footerOptions = myViewOptions.getFooterOptions(); final FooterOptions footerOptions = myViewOptions.getFooterOptions();
if (footerOptions.showProgressAsPages()) { if (footerOptions.showProgressAsPages()) {
maybeAddSeparator(separator, info); maybeAddSeparator(info, separator);
info.append(pagePosition.Current); info.append(pagePosition.Current);
info.append("/"); info.append("/");
info.append(pagePosition.Total); info.append(pagePosition.Total);
} }
if (footerOptions.showProgressAsPercentage()) { if (footerOptions.showProgressAsPercentage() && pagePosition.Total != 0) {
maybeAddSeparator(separator, info); maybeAddSeparator(info, separator);
info.append(pagePosition.getPercentageString()); info.append(String.valueOf((100 * pagePosition.Current + 49) / pagePosition.Total));
info.append("%");
} }
if (footerOptions.ShowClock.getValue()) { if (footerOptions.ShowClock.getValue()) {
maybeAddSeparator(separator, info); maybeAddSeparator(info, separator);
info.append(ZLibrary.Instance().getCurrentTimeString()); info.append(ZLibrary.Instance().getCurrentTimeString());
} }
if (footerOptions.ShowBattery.getValue()) { if (footerOptions.ShowBattery.getValue()) {
maybeAddSeparator(separator, info); maybeAddSeparator(info, separator);
info.append("⚡ "); info.append("⚡ ");
info.append(myReader.getBatteryLevel()); info.append(myReader.getBatteryLevel());
info.append("%"); info.append("%");
@ -556,7 +557,7 @@ public final class FBView extends ZLTextView {
return info.toString(); return info.toString();
} }
private void maybeAddSeparator(String separator, StringBuilder info) { private void maybeAddSeparator(StringBuilder info, String separator) {
if (info.length() > 0) { if (info.length() > 0) {
info.append(separator); info.append(separator);
} }

5
src/org/geometerplus/zlibrary/text/view/ZLTextView.java
View file

@ -706,11 +706,6 @@ public abstract class ZLTextView extends ZLTextViewBase {
Current = current; Current = current;
Total = total; Total = total;
} }
public String getPercentageString() {
float percentage = ((float) Current / Total) * 100;
return String.format("%.0f%%", percentage);
}
} }
public final synchronized PagePosition pagePosition() { public final synchronized PagePosition pagePosition() {