diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index ba57e166d..7adc11580 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -533,22 +533,23 @@ public final class FBView extends ZLTextView { final FooterOptions footerOptions = myViewOptions.getFooterOptions(); if (footerOptions.showProgressAsPages()) { - maybeAddSeparator(separator, info); + maybeAddSeparator(info, separator); info.append(pagePosition.Current); info.append("/"); info.append(pagePosition.Total); } - if (footerOptions.showProgressAsPercentage()) { - maybeAddSeparator(separator, info); - info.append(pagePosition.getPercentageString()); + if (footerOptions.showProgressAsPercentage() && pagePosition.Total != 0) { + maybeAddSeparator(info, separator); + info.append(String.valueOf((100 * pagePosition.Current + 49) / pagePosition.Total)); + info.append("%"); } if (footerOptions.ShowClock.getValue()) { - maybeAddSeparator(separator, info); + maybeAddSeparator(info, separator); info.append(ZLibrary.Instance().getCurrentTimeString()); } if (footerOptions.ShowBattery.getValue()) { - maybeAddSeparator(separator, info); + maybeAddSeparator(info, separator); info.append("⚡ "); info.append(myReader.getBatteryLevel()); info.append("%"); @@ -556,7 +557,7 @@ public final class FBView extends ZLTextView { return info.toString(); } - private void maybeAddSeparator(String separator, StringBuilder info) { + private void maybeAddSeparator(StringBuilder info, String separator) { if (info.length() > 0) { info.append(separator); } diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 6e6371ed1..2b948dafb 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -706,11 +706,6 @@ public abstract class ZLTextView extends ZLTextViewBase { Current = current; Total = total; } - - public String getPercentageString() { - float percentage = ((float) Current / Total) * 100; - return String.format("%.0f%%", percentage); - } } public final synchronized PagePosition pagePosition() {