yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

Navigation fixes

Browse source 
git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1597 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Vasiliy Bout 2010-07-14 21:21:09 +00:00
parent 1332db2858
commit a625013153
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/org/geometerplus/android/fbreader/FBReader.java
View file

@ -170,8 +170,9 @@ public final class FBReader extends ZLAndroidActivity {
public boolean onLongClick(View v) {
if (!myNavigatePanel.getVisibility()) {
navigate();
return true;
}
return true;
return false;
}
});
}
@ -284,7 +285,7 @@ public final class FBReader extends ZLAndroidActivity {
}
}
public boolean canNavigate() {
public final boolean canNavigate() {
final org.geometerplus.fbreader.fbreader.FBReader fbreader =
(org.geometerplus.fbreader.fbreader.FBReader)ZLApplication.Instance();
final ZLView view = fbreader.getCurrentView();
@ -295,7 +296,7 @@ public final class FBReader extends ZLAndroidActivity {
&& fbreader.Model.Book != null;
}
private void createNavigation() {
private final void createNavigation() {
final ControlPanel panel = myNavigatePanel.ControlPanel;
final View layout = getLayoutInflater().inflate(R.layout.navigate, panel, false);
@ -354,7 +355,7 @@ public final class FBReader extends ZLAndroidActivity {
panel.setExtension(layout);
}
private void setupNavigation() {
private final void setupNavigation() {
final ControlPanel panel = myNavigatePanel.ControlPanel;
final SeekBar slider = (SeekBar) panel.findViewById(R.id.book_position_slider);
@ -364,9 +365,12 @@ public final class FBReader extends ZLAndroidActivity {
final int page = textView.computeCurrentPage();
final int pagesNumber = textView.computePageNumber();
slider.setMax(pagesNumber - 1);
slider.setProgress(page - 1);
text.setText(makeProgressText(page, pagesNumber));
if (slider.getMax() != (pagesNumber - 1)
|| slider.getProgress() != (page - 1)) {
slider.setMax(pagesNumber - 1);
slider.setProgress(page - 1);
text.setText(makeProgressText(page, pagesNumber));
}
}
private static String makeProgressText(int page, int pagesNumber) {