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

refactoring: FBReader -> FBReaderApp, FBReaderActivity -> FBReader

Browse source
This commit is contained in:
Nikolay Pultsin 2010-10-21 20:31:15 +01:00
parent 05ec6c3861
commit d3b6c30fd8
36 changed files with 75 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -8,7 +8,7 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader"> <application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" /> <activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.FBReaderActivity" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden"> <activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

2
AndroidManifest.xml.pattern
View file

@ -8,7 +8,7 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader"> <application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" /> <activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.FBReaderActivity" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden"> <activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

4
src/org/geometerplus/android/fbreader/BookInfoAction.java
View file

@ -19,12 +19,12 @@
package org.geometerplus.android.fbreader; package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.preferences.BookInfoActivity; import org.geometerplus.android.fbreader.preferences.BookInfoActivity;
class BookInfoAction extends RunActivityAction { class BookInfoAction extends RunActivityAction {
BookInfoAction(FBReaderActivity baseActivity, FBReader fbreader) { BookInfoAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader, BookInfoActivity.class); super(baseActivity, fbreader, BookInfoActivity.class);
} }

4
src/org/geometerplus/android/fbreader/BookmarkSearchActivity.java
View file

@ -24,7 +24,7 @@ import java.util.LinkedList;
import android.app.Activity; import android.app.Activity;
import org.geometerplus.zlibrary.core.util.ZLMiscUtil; import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
public class BookmarkSearchActivity extends SearchActivity { public class BookmarkSearchActivity extends SearchActivity {
@ -51,7 +51,7 @@ public class BookmarkSearchActivity extends SearchActivity {
@Override @Override
boolean runSearch(String pattern) { boolean runSearch(String pattern) {
final FBReader fbreader = (FBReader)FBReader.Instance(); final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
fbreader.BookmarkSearchPatternOption.setValue(pattern); fbreader.BookmarkSearchPatternOption.setValue(pattern);
pattern = pattern.toLowerCase(); pattern = pattern.toLowerCase();
myBookmarks.clear(); myBookmarks.clear();

10
src/org/geometerplus/android/fbreader/BookmarksActivity.java
View file

@ -32,7 +32,7 @@ import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener { public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener {
@ -73,7 +73,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
AllBooksBookmarks = Bookmark.bookmarks(); AllBooksBookmarks = Bookmark.bookmarks();
Collections.sort(AllBooksBookmarks, new Bookmark.ByTimeComparator()); Collections.sort(AllBooksBookmarks, new Bookmark.ByTimeComparator());
final FBReader fbreader = (FBReader)FBReader.Instance(); final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
if (fbreader.Model != null) { if (fbreader.Model != null) {
final long bookId = fbreader.Model.Book.getId(); final long bookId = fbreader.Model.Book.getId();
@ -129,7 +129,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
@Override @Override
public boolean onSearchRequested() { public boolean onSearchRequested() {
final FBReader fbreader = (FBReader)FBReader.Instance(); final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
startSearch(fbreader.BookmarkSearchPatternOption.getValue(), true, null, false); startSearch(fbreader.BookmarkSearchPatternOption.getValue(), true, null, false);
return true; return true;
} }
@ -279,7 +279,7 @@ mainLoop:
} }
private void addBookmark() { private void addBookmark() {
final FBReader fbreader = (FBReader)FBReader.Instance(); final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
final ZLTextView textView = fbreader.getTextView(); final ZLTextView textView = fbreader.getTextView();
final ZLTextWordCursor cursor = textView.getStartCursor(); final ZLTextWordCursor cursor = textView.getStartCursor();
@ -302,7 +302,7 @@ mainLoop:
private void gotoBookmark(Bookmark bookmark) { private void gotoBookmark(Bookmark bookmark) {
bookmark.onOpen(); bookmark.onOpen();
final FBReader fbreader = (FBReader)FBReader.Instance(); final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
final long bookId = bookmark.getBookId(); final long bookId = bookmark.getBookId();
if ((fbreader.Model == null) || (fbreader.Model.Book.getId() != bookId)) { if ((fbreader.Model == null) || (fbreader.Model.Book.getId() != bookId)) {
final Book book = Book.getById(bookId); final Book book = Book.getById(bookId);

11
src/org/geometerplus/android/fbreader/FBReaderActivity.java → src/org/geometerplus/android/fbreader/FBReader.java
View file

@ -43,12 +43,12 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.fbreader.ActionCode; import org.geometerplus.fbreader.fbreader.ActionCode;
import org.geometerplus.fbreader.library.Library; import org.geometerplus.fbreader.library.Library;
public final class FBReaderActivity extends ZLAndroidActivity { public final class FBReader extends ZLAndroidActivity {
static FBReaderActivity Instance; static FBReader Instance;
private int myFullScreenFlag; private int myFullScreenFlag;
@ -184,7 +184,7 @@ public final class FBReaderActivity extends ZLAndroidActivity {
new SQLiteBooksDatabase(); new SQLiteBooksDatabase();
final String[] args = (fileName != null) ? new String[] { fileName } : new String[0]; final String[] args = (fileName != null) ? new String[] { fileName } : new String[0];
final FBReader fbReader = new FBReader(args); final FBReaderApp fbReader = new FBReaderApp(args);
fbReader.addAction(ActionCode.SHOW_LIBRARY, new ShowLibraryAction(this, fbReader)); fbReader.addAction(ActionCode.SHOW_LIBRARY, new ShowLibraryAction(this, fbReader));
fbReader.addAction(ActionCode.SHOW_PREFERENCES, new PreferencesAction(this, fbReader)); fbReader.addAction(ActionCode.SHOW_PREFERENCES, new PreferencesAction(this, fbReader));
@ -210,8 +210,7 @@ public final class FBReaderActivity extends ZLAndroidActivity {
manager.setOnCancelListener(null); manager.setOnCancelListener(null);
} }
}); });
final org.geometerplus.fbreader.fbreader.FBReader fbreader = final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance();
(org.geometerplus.fbreader.fbreader.FBReader)ZLApplication.Instance();
startSearch(fbreader.TextSearchPatternOption.getValue(), true, null, false); startSearch(fbreader.TextSearchPatternOption.getValue(), true, null, false);
return true; return true;
} }

2
src/org/geometerplus/android/fbreader/LibraryTabActivity.java
View file

@ -258,7 +258,7 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
} }
private Intent getFBReaderIntent(final File file) { private Intent getFBReaderIntent(final File file) {
final Intent intent = new Intent(getApplicationContext(), FBReaderActivity.class); final Intent intent = new Intent(getApplicationContext(), FBReader.class);
intent.setAction(Intent.ACTION_VIEW); intent.setAction(Intent.ACTION_VIEW);
if (file != null) { if (file != null) {
intent.setData(Uri.fromFile(file)); intent.setData(Uri.fromFile(file));

4
src/org/geometerplus/android/fbreader/PreferencesAction.java
View file

@ -19,12 +19,12 @@
package org.geometerplus.android.fbreader; package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.preferences.PreferenceActivity; import org.geometerplus.android.fbreader.preferences.PreferenceActivity;
class PreferencesAction extends RunActivityAction { class PreferencesAction extends RunActivityAction {
PreferencesAction(FBReaderActivity baseActivity, FBReader fbreader) { PreferencesAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader, PreferenceActivity.class); super(baseActivity, fbreader, PreferenceActivity.class);
} }
} }

6
src/org/geometerplus/android/fbreader/RunActivityAction.java
View file

@ -22,13 +22,13 @@ package org.geometerplus.android.fbreader;
import android.content.Intent; import android.content.Intent;
import org.geometerplus.fbreader.fbreader.FBAction; import org.geometerplus.fbreader.fbreader.FBAction;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
abstract class RunActivityAction extends FBAction { abstract class RunActivityAction extends FBAction {
private final FBReaderActivity myBaseActivity; private final FBReader myBaseActivity;
private final Class<?> myActivityClass; private final Class<?> myActivityClass;
RunActivityAction(FBReaderActivity baseActivity, FBReader fbreader, Class<?> activityClass) { RunActivityAction(FBReader baseActivity, FBReaderApp fbreader, Class<?> activityClass) {
super(fbreader); super(fbreader);
myBaseActivity = baseActivity; myBaseActivity = baseActivity;
myActivityClass = activityClass; myActivityClass = activityClass;

4
src/org/geometerplus/android/fbreader/ShowBookmarks.java → src/org/geometerplus/android/fbreader/ShowBookmarksAction.java
View file

@ -19,10 +19,10 @@
package org.geometerplus.android.fbreader; package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
class ShowBookmarksAction extends RunActivityAction { class ShowBookmarksAction extends RunActivityAction {
ShowBookmarksAction(FBReaderActivity baseActivity, FBReader fbreader) { ShowBookmarksAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader, BookmarksActivity.class); super(baseActivity, fbreader, BookmarksActivity.class);
} }
} }

6
src/org/geometerplus/android/fbreader/ShowLibraryAction.java
View file

@ -24,15 +24,15 @@ import java.util.HashMap;
import android.content.Intent; import android.content.Intent;
import org.geometerplus.fbreader.fbreader.FBAction; import org.geometerplus.fbreader.fbreader.FBAction;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager;
class ShowLibraryAction extends FBAction { class ShowLibraryAction extends FBAction {
private final FBReaderActivity myBaseActivity; private final FBReader myBaseActivity;
ShowLibraryAction(FBReaderActivity baseActivity, FBReader fbreader) { ShowLibraryAction(FBReader baseActivity, FBReaderApp fbreader) {
super(fbreader); super(fbreader);
myBaseActivity = baseActivity; myBaseActivity = baseActivity;
} }

6
src/org/geometerplus/android/fbreader/ShowNavigationAction.java
View file

@ -23,12 +23,12 @@ import org.geometerplus.zlibrary.text.model.ZLTextModel;
import org.geometerplus.zlibrary.text.view.ZLTextView; import org.geometerplus.zlibrary.text.view.ZLTextView;
import org.geometerplus.fbreader.fbreader.FBAction; import org.geometerplus.fbreader.fbreader.FBAction;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
class ShowNavigationAction extends FBAction { class ShowNavigationAction extends FBAction {
private final FBReaderActivity myActivity; private final FBReader myActivity;
ShowNavigationAction(FBReaderActivity activity, FBReader fbreader) { ShowNavigationAction(FBReader activity, FBReaderApp fbreader) {
super(fbreader); super(fbreader);
myActivity = activity; myActivity = activity;
} }

4
src/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
View file

@ -19,12 +19,12 @@
package org.geometerplus.android.fbreader; package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity; import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
class ShowNetworkLibraryAction extends RunActivityAction { class ShowNetworkLibraryAction extends RunActivityAction {
ShowNetworkLibraryAction(FBReaderActivity baseActivity, FBReader fbreader) { ShowNetworkLibraryAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader, NetworkLibraryActivity.class); super(baseActivity, fbreader, NetworkLibraryActivity.class);
} }
} }

4
src/org/geometerplus/android/fbreader/ShowTOCAction.java
View file

@ -19,10 +19,10 @@
package org.geometerplus.android.fbreader; package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
class ShowTOCAction extends RunActivityAction { class ShowTOCAction extends RunActivityAction {
ShowTOCAction(FBReaderActivity baseActivity, FBReader fbreader) { ShowTOCAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader, TOCActivity.class); super(baseActivity, fbreader, TOCActivity.class);
} }

6
src/org/geometerplus/android/fbreader/TOCActivity.java
View file

@ -32,7 +32,7 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.text.view.ZLTextWordCursor; import org.geometerplus.zlibrary.text.view.ZLTextWordCursor;
import org.geometerplus.fbreader.bookmodel.TOCTree; import org.geometerplus.fbreader.bookmodel.TOCTree;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
public class TOCActivity extends ListActivity { public class TOCActivity extends ListActivity {
private TOCAdapter myAdapter; private TOCAdapter myAdapter;
@ -46,7 +46,7 @@ public class TOCActivity extends ListActivity {
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
final FBReader fbreader = (FBReader)ZLApplication.Instance(); final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance();
final TOCTree root = fbreader.Model.TOCTree; final TOCTree root = fbreader.Model.TOCTree;
myAdapter = new TOCAdapter(root); myAdapter = new TOCAdapter(root);
final ZLTextWordCursor cursor = fbreader.BookTextView.getStartCursor(); final ZLTextWordCursor cursor = fbreader.BookTextView.getStartCursor();
@ -121,7 +121,7 @@ public class TOCActivity extends ListActivity {
final TOCTree.Reference reference = tree.getReference(); final TOCTree.Reference reference = tree.getReference();
if (reference != null) { if (reference != null) {
finish(); finish();
final FBReader fbreader = (FBReader)ZLApplication.Instance(); final FBReaderApp fbreader = (FBReaderApp)ZLApplication.Instance();
fbreader.BookTextView.gotoPosition(reference.ParagraphIndex, 0, 0); fbreader.BookTextView.gotoPosition(reference.ParagraphIndex, 0, 0);
fbreader.showBookTextView(); fbreader.showBookTextView();
} }

10
src/org/geometerplus/android/fbreader/TextSearchActivity.java
View file

@ -21,17 +21,17 @@ package org.geometerplus.android.fbreader;
import android.app.Activity; import android.app.Activity;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
public class TextSearchActivity extends SearchActivity { public class TextSearchActivity extends SearchActivity {
@Override @Override
void onSuccess() { void onSuccess() {
FBReaderActivity.Instance.showTextSearchControls(true); FBReader.Instance.showTextSearchControls(true);
} }
/*@Override /*@Override
void onFailure() { void onFailure() {
FBReaderActivity.Instance.showTextSearchControls(false); FBReader.Instance.showTextSearchControls(false);
}*/ }*/
@Override @Override
@ -46,13 +46,13 @@ public class TextSearchActivity extends SearchActivity {
@Override @Override
boolean runSearch(final String pattern) { boolean runSearch(final String pattern) {
final FBReader fbReader = (FBReader)FBReader.Instance(); final FBReaderApp fbReader = (FBReaderApp)FBReaderApp.Instance();
fbReader.TextSearchPatternOption.setValue(pattern); fbReader.TextSearchPatternOption.setValue(pattern);
return fbReader.getTextView().search(pattern, true, false, false, false) != 0; return fbReader.getTextView().search(pattern, true, false, false, false) != 0;
} }
@Override @Override
Activity getParentActivity() { Activity getParentActivity() {
return FBReaderActivity.Instance; return FBReader.Instance;
} }
} }

4
src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
View file

@ -42,7 +42,7 @@ import org.geometerplus.zlibrary.core.network.*;
import org.geometerplus.fbreader.network.BookReference; import org.geometerplus.fbreader.network.BookReference;
import org.geometerplus.android.fbreader.FBReaderActivity; import org.geometerplus.android.fbreader.FBReader;
public class BookDownloaderService extends Service { public class BookDownloaderService extends Service {
public static final String BOOK_FORMAT_KEY = "org.geometerplus.android.fbreader.network.BookFormat"; public static final String BOOK_FORMAT_KEY = "org.geometerplus.android.fbreader.network.BookFormat";
@ -191,7 +191,7 @@ public class BookDownloaderService extends Service {
} }
private Intent getFBReaderIntent(final File file) { private Intent getFBReaderIntent(final File file) {
final Intent intent = new Intent(getApplicationContext(), FBReaderActivity.class); final Intent intent = new Intent(getApplicationContext(), FBReader.class);
if (file != null) { if (file != null) {
intent.setAction(Intent.ACTION_VIEW).setData(Uri.fromFile(file)); intent.setAction(Intent.ACTION_VIEW).setData(Uri.fromFile(file));
} }

4
src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
View file

@ -39,7 +39,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.AndroidUtil;
import org.geometerplus.android.fbreader.FBReaderActivity; import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkBookTree; import org.geometerplus.fbreader.network.tree.NetworkBookTree;
@ -307,7 +307,7 @@ class NetworkBookActions extends NetworkTreeActions {
new Intent(Intent.ACTION_VIEW, new Intent(Intent.ACTION_VIEW,
Uri.fromFile(new File(local)), Uri.fromFile(new File(local)),
activity.getApplicationContext(), activity.getApplicationContext(),
FBReaderActivity.class FBReader.class
).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) ).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
); );
} }

6
src/org/geometerplus/android/fbreader/preferences/BookInfoActivity.java
View file

@ -29,7 +29,7 @@ import org.geometerplus.zlibrary.core.language.ZLLanguageList;
import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
import org.geometerplus.fbreader.fbreader.FBReader; import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.library.Book;
class BookTitlePreference extends ZLStringPreference { class BookTitlePreference extends ZLStringPreference {
@ -93,7 +93,7 @@ public class BookInfoActivity extends ZLPreferenceActivity {
@Override @Override
protected void init() { protected void init() {
final Category commonCategory = createCategory(null); final Category commonCategory = createCategory(null);
myBook = ((FBReader)FBReader.Instance()).Model.Book; myBook = ((FBReaderApp)FBReaderApp.Instance()).Model.Book;
if (myBook.File.getPhysicalFile() != null) { if (myBook.File.getPhysicalFile() != null) {
commonCategory.addPreference(new InfoPreference( commonCategory.addPreference(new InfoPreference(
this, this,
@ -109,7 +109,7 @@ public class BookInfoActivity extends ZLPreferenceActivity {
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if (myBook.save()) { if (myBook.save()) {
((FBReader)FBReader.Instance()).clearTextCaches(); ((FBReaderApp)FBReaderApp.Instance()).clearTextCaches();
ZLTextHyphenator.Instance().load(myBook.getLanguage()); ZLTextHyphenator.Instance().load(myBook.getLanguage());
} }
} }

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

@ -33,7 +33,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
} }
/*private static final class ColorProfilePreference extends ZLSimplePreference { /*private static final class ColorProfilePreference extends ZLSimplePreference {
private final FBReader myFBReader; private final FBReaderApp myFBReader;
private final Screen myScreen; private final Screen myScreen;
private final String myKey; private final String myKey;
@ -42,7 +42,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
return r.hasValue() ? r.getValue() : resourceKey; return r.hasValue() ? r.getValue() : resourceKey;
} }
ColorProfilePreference(Context context, FBReader fbreader, Screen screen, String key, String title) { ColorProfilePreference(Context context, FBReaderApp fbreader, Screen screen, String key, String title) {
super(context); super(context);
myFBReader = fbreader; myFBReader = fbreader;
myScreen = screen; myScreen = screen;
@ -57,7 +57,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
@Override @Override
public void onClick() { public void onClick() {
myScreen.setSummary(getTitle()); myScreen.setSummary(getTitle());
myFBReader.setColorProfileName(myKey); myFBReaderApp.setColorProfileName(myKey);
myScreen.close(); myScreen.close();
} }
}*/ }*/
@ -74,7 +74,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final Category lookNFeelCategory = createCategory("LookNFeel"); final Category lookNFeelCategory = createCategory("LookNFeel");
final FBReader fbReader = (FBReader)FBReader.Instance(); final FBReaderApp fbReader = (FBReaderApp)FBReaderApp.Instance();
final Screen appearanceScreen = lookNFeelCategory.createPreferenceScreen("appearanceSettings"); final Screen appearanceScreen = lookNFeelCategory.createPreferenceScreen("appearanceSettings");
appearanceScreen.setSummary( appearanceScreen.Resource.getResource("summary").getValue() ); appearanceScreen.setSummary( appearanceScreen.Resource.getResource("summary").getValue() );

2
src/org/geometerplus/fbreader/fbreader/CancelAction.java
View file

@ -20,7 +20,7 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
class CancelAction extends FBAction { class CancelAction extends FBAction {
CancelAction(FBReader fbreader) { CancelAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java
View file

@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection;
class ChangeFontSizeAction extends FBAction { class ChangeFontSizeAction extends FBAction {
private final int myDelta; private final int myDelta;
ChangeFontSizeAction(FBReader fbreader, int delta) { ChangeFontSizeAction(FBReaderApp fbreader, int delta) {
super(fbreader); super(fbreader);
myDelta = delta; myDelta = delta;
} }

2
src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java
View file

@ -20,7 +20,7 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
class ClearFindResultsAction extends FBAction { class ClearFindResultsAction extends FBAction {
ClearFindResultsAction(FBReader fbreader) { ClearFindResultsAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

4
src/org/geometerplus/fbreader/fbreader/FBAction.java
View file

@ -22,9 +22,9 @@ package org.geometerplus.fbreader.fbreader;
import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
public abstract class FBAction extends ZLApplication.ZLAction { public abstract class FBAction extends ZLApplication.ZLAction {
protected final FBReader Reader; protected final FBReaderApp Reader;
public FBAction(FBReader fbreader) { public FBAction(FBReaderApp fbreader) {
Reader = fbreader; Reader = fbreader;
} }
} }

4
src/org/geometerplus/fbreader/fbreader/FBReader.java → src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -32,7 +32,7 @@ import org.geometerplus.fbreader.library.Book;
import org.geometerplus.fbreader.library.Bookmark; import org.geometerplus.fbreader.library.Bookmark;
import org.geometerplus.fbreader.optionsDialog.OptionsDialog; import org.geometerplus.fbreader.optionsDialog.OptionsDialog;
public final class FBReader extends ZLApplication { public final class FBReaderApp extends ZLApplication {
public final ZLStringOption TextSearchPatternOption = public final ZLStringOption TextSearchPatternOption =
new ZLStringOption("TextSearch", "Pattern", ""); new ZLStringOption("TextSearch", "Pattern", "");
public final ZLStringOption BookmarkSearchPatternOption = public final ZLStringOption BookmarkSearchPatternOption =
@ -68,7 +68,7 @@ public final class FBReader extends ZLApplication {
private final String myArg0; private final String myArg0;
public FBReader(String[] args) { public FBReaderApp(String[] args) {
myArg0 = (args.length > 0) ? args[0] : null; myArg0 = (args.length > 0) ? args[0] : null;
addAction(ActionCode.QUIT, new QuitAction(this)); addAction(ActionCode.QUIT, new QuitAction(this));

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

@ -28,9 +28,9 @@ import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.bookmodel.FBHyperlinkType; import org.geometerplus.fbreader.bookmodel.FBHyperlinkType;
public final class FBView extends ZLTextView { public final class FBView extends ZLTextView {
private FBReader myReader; private FBReaderApp myReader;
FBView(FBReader reader) { FBView(FBReaderApp reader) {
super(ZLibrary.Instance().getPaintContext()); super(ZLibrary.Instance().getPaintContext());
myReader = reader; myReader = reader;
} }
@ -82,7 +82,7 @@ public final class FBView extends ZLTextView {
ZLibrary.Instance().openInBrowser(hyperlink.Id); ZLibrary.Instance().openInBrowser(hyperlink.Id);
break; break;
case FBHyperlinkType.INTERNAL: case FBHyperlinkType.INTERNAL:
((FBReader)ZLApplication.Instance()).tryOpenFootnote(hyperlink.Id); ((FBReaderApp)ZLApplication.Instance()).tryOpenFootnote(hyperlink.Id);
break; break;
} }
} }

2
src/org/geometerplus/fbreader/fbreader/FindNextAction.java
View file

@ -20,7 +20,7 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
class FindNextAction extends FBAction { class FindNextAction extends FBAction {
FindNextAction(FBReader fbreader) { FindNextAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java
View file

@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader;
import org.geometerplus.zlibrary.text.view.ZLTextView; import org.geometerplus.zlibrary.text.view.ZLTextView;
class FindPreviousAction extends FBAction { class FindPreviousAction extends FBAction {
FindPreviousAction(FBReader fbreader) { FindPreviousAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/FollowHyperlinkAction.java
View file

@ -20,7 +20,7 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
public class FollowHyperlinkAction extends FBAction { public class FollowHyperlinkAction extends FBAction {
FollowHyperlinkAction(FBReader fbreader) { FollowHyperlinkAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/QuitAction.java
View file

@ -20,7 +20,7 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
class QuitAction extends FBAction { class QuitAction extends FBAction {
QuitAction(FBReader fbreader) { QuitAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/RotateAction.java
View file

@ -20,7 +20,7 @@
package org.geometerplus.fbreader.fbreader; package org.geometerplus.fbreader.fbreader;
class RotateAction extends FBAction { class RotateAction extends FBAction {
RotateAction(FBReader fbreader) { RotateAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/SearchAction.java
View file

@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader;
import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
class SearchAction extends FBAction { class SearchAction extends FBAction {
SearchAction(FBReader fbreader) { SearchAction(FBReaderApp fbreader) {
super(fbreader); super(fbreader);
} }

2
src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java
View file

@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader;
class SwitchProfileAction extends FBAction { class SwitchProfileAction extends FBAction {
private String myProfileName; private String myProfileName;
SwitchProfileAction(FBReader fbreader, String profileName) { SwitchProfileAction(FBReaderApp fbreader, String profileName) {
super(fbreader); super(fbreader);
myProfileName = profileName; myProfileName = profileName;
} }

2
src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java
View file

@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader;
class TrackballScrollingAction extends FBAction { class TrackballScrollingAction extends FBAction {
private final boolean myForward; private final boolean myForward;
TrackballScrollingAction(FBReader fbreader, boolean forward) { TrackballScrollingAction(FBReaderApp fbreader, boolean forward) {
super(fbreader); super(fbreader);
myForward = forward; myForward = forward;
} }

2
src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java
View file

@ -22,7 +22,7 @@ package org.geometerplus.fbreader.fbreader;
class VolumeKeyScrollingAction extends FBAction { class VolumeKeyScrollingAction extends FBAction {
private final boolean myForward; private final boolean myForward;
VolumeKeyScrollingAction(FBReader fbreader, boolean forward) { VolumeKeyScrollingAction(FBReaderApp fbreader, boolean forward) {
super(fbreader); super(fbreader);
myForward = forward; myForward = forward;
} }

6
src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java
View file

@ -30,7 +30,7 @@ import org.geometerplus.fbreader.fbreader.*;
public class OptionsDialog { public class OptionsDialog {
private ZLOptionsDialog myDialog; private ZLOptionsDialog myDialog;
public OptionsDialog(FBReader fbreader) { public OptionsDialog(FBReaderApp fbreader) {
myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog", null, new OptionsApplyRunnable(fbreader), true); myDialog = ZLDialogManager.Instance().createOptionsDialog("OptionsDialog", null, new OptionsApplyRunnable(fbreader), true);
ZLDialogContent marginTab = myDialog.createTab("Margins"); ZLDialogContent marginTab = myDialog.createTab("Margins");
@ -67,9 +67,9 @@ public class OptionsDialog {
} }
private static class OptionsApplyRunnable implements Runnable { private static class OptionsApplyRunnable implements Runnable {
private final FBReader myFBReader; private final FBReaderApp myFBReader;
public OptionsApplyRunnable(FBReader fbreader) { public OptionsApplyRunnable(FBReaderApp fbreader) {
myFBReader = fbreader; myFBReader = fbreader;
} }