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

navigaion code has been simplified

Browse source
This commit is contained in:
Nikolay Pultsin 2010-10-20 23:55:08 +01:00
parent dfb63f1961
commit 142b5c06eb
7 changed files with 9 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ import org.geometerplus.fbreader.fbreader.ActionCode;
import org.geometerplus.fbreader.library.Library; import org.geometerplus.fbreader.library.Library;
public final class FBReader extends ZLAndroidActivity { public final class FBReader extends ZLAndroidActivity {
static FBReader Instance; public static FBReader Instance;
private int myFullScreenFlag; private int myFullScreenFlag;
@ -203,7 +203,6 @@ public final class FBReader extends ZLAndroidActivity {
return true; return true;
} }
public void navigate() { public void navigate() {
final ZLTextView textView = (ZLTextView)ZLApplication.Instance().getCurrentView(); final ZLTextView textView = (ZLTextView)ZLApplication.Instance().getCurrentView();
myNavigatePanel.NavigateDragging = false; myNavigatePanel.NavigateDragging = false;
@ -211,23 +210,6 @@ public final class FBReader extends ZLAndroidActivity {
myNavigatePanel.show(true); myNavigatePanel.show(true);
} }
public final boolean canNavigate() {
final org.geometerplus.fbreader.fbreader.FBReader fbreader =
(org.geometerplus.fbreader.fbreader.FBReader)ZLApplication.Instance();
final ZLView view = fbreader.getCurrentView();
if (!(view instanceof ZLTextView)) {
return false;
}
final ZLTextModel textModel = ((ZLTextView) view).getModel();
if (textModel == null || textModel.getParagraphsNumber() == 0) {
return false;
}
final BookModel bookModel = fbreader.Model;
return bookModel != null && bookModel.Book != null;
}
private final void createNavigation(View layout) { private final void createNavigation(View layout) {
final SeekBar slider = (SeekBar) layout.findViewById(R.id.book_position_slider); final SeekBar slider = (SeekBar) layout.findViewById(R.id.book_position_slider);
final TextView text = (TextView) layout.findViewById(R.id.book_position_text); final TextView text = (TextView) layout.findViewById(R.id.book_position_text);

9
src/org/geometerplus/fbreader/fbreader/ShowNavigationAction.java
View file

@ -19,6 +19,9 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
import org.geometerplus.zlibrary.text.model.ZLTextModel;
import org.geometerplus.zlibrary.text.view.ZLTextView;
class ShowNavigationAction extends FBAction { class ShowNavigationAction extends FBAction {
ShowNavigationAction(FBReader fbreader) { ShowNavigationAction(FBReader fbreader) {
super(fbreader); super(fbreader);
@ -26,10 +29,12 @@ class ShowNavigationAction extends FBAction {
@Override @Override
public boolean isVisible() { public boolean isVisible() {
return Reader.canNavigate(); final ZLTextView view = (ZLTextView)Reader.getCurrentView();
final ZLTextModel textModel = view.getModel();
return textModel != null && textModel.getParagraphsNumber() != 0;
} }
public void run() { public void run() {
Reader.navigate(); org.geometerplus.android.fbreader.FBReader.Instance.navigate();
} }
} }

13
src/org/geometerplus/zlibrary/core/application/ZLApplication.java
View file

@ -144,19 +144,6 @@ public abstract class ZLApplication {
return false; return false;
} }
public void navigate() {
if (myWindow != null) {
myWindow.navigate();
}
}
public boolean canNavigate() {
if (myWindow != null) {
return myWindow.canNavigate();
}
return false;
}
public void rotateScreen() { public void rotateScreen() {
if (myWindow != null) { if (myWindow != null) {
myWindow.rotate(); myWindow.rotate();

2
src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java
View file

@ -44,8 +44,6 @@ abstract public class ZLApplicationWindow {
abstract protected void rotate(); abstract protected void rotate();
abstract protected boolean canRotate(); abstract protected boolean canRotate();
abstract protected void navigate();
abstract protected boolean canNavigate();
abstract protected void close(); abstract protected void close();
} }

8
src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
View file

@ -125,14 +125,6 @@ public final class ZLAndroidApplicationWindow extends ZLApplicationWindow {
return !ZLAndroidApplication.Instance().AutoOrientationOption.getValue(); return !ZLAndroidApplication.Instance().AutoOrientationOption.getValue();
} }
public void navigate() {
((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).navigate();
}
public boolean canNavigate() {
return ((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).canNavigate();
}
public void close() { public void close() {
((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).finish(); ((ZLAndroidLibrary)ZLAndroidLibrary.Instance()).finish();
} }

3
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
View file

@ -255,7 +255,4 @@ public abstract class ZLAndroidActivity extends Activity {
myChangeCounter = 0; myChangeCounter = 0;
} }
} }
abstract protected void navigate();
abstract protected boolean canNavigate();
} }

13
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
View file

@ -59,19 +59,6 @@ public final class ZLAndroidLibrary extends ZLibrary {
} }
} }
public void navigate() {
if (myActivity != null) {
myActivity.navigate();
}
}
public boolean canNavigate() {
if (myActivity != null) {
return myActivity.canNavigate();
}
return false;
}
public void finish() { public void finish() {
if ((myActivity != null) && !myActivity.isFinishing()) { if ((myActivity != null) && !myActivity.isFinishing()) {
myActivity.finish(); myActivity.finish();