diff --git a/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/BookmarksActivity.java index a0b3fd991..57509aebb 100644 --- a/src/org/geometerplus/android/fbreader/BookmarksActivity.java +++ b/src/org/geometerplus/android/fbreader/BookmarksActivity.java @@ -88,7 +88,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte myThisBookBookmarks.add(bookmark); } } - + myThisBookView = createTab("thisBook", R.id.this_book); new BookmarksAdapter(myThisBookView, myThisBookBookmarks, true); } else { @@ -106,7 +106,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte if (!Intent.ACTION_SEARCH.equals(intent.getAction())) { return; } - String pattern = intent.getStringExtra(SearchManager.QUERY); + String pattern = intent.getStringExtra(SearchManager.QUERY); myBookmarkSearchPatternOption.setValue(pattern); final LinkedList bookmarks = new LinkedList(); @@ -192,8 +192,8 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte gotoBookmark(bookmark); return true; case EDIT_ITEM_ID: - final Intent intent = new Intent(this, BookmarkEditActivity.class); - startActivityForResult(intent, 1); + final Intent intent = new Intent(this, BookmarkEditActivity.class); + startActivityForResult(intent, 1); // TODO: implement return true; case DELETE_ITEM_ID: @@ -294,7 +294,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte public final long getItemId(int position) { return position; } - + public final Bookmark getItem(int position) { if (myCurrentBook) { --position; diff --git a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java b/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java index 1309b6cfb..2e32eaf61 100644 --- a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java +++ b/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java @@ -33,18 +33,18 @@ public class SelectionBookmarkAction extends FBAndroidAction { } @Override - protected void run(Object ... params) { + protected void run(Object ... params) { final FBView fbview = Reader.getTextView(); final String text = fbview.getSelectedText(); new Bookmark( Reader.Model.Book, fbview.getModel().getId(), - fbview.getSelectionStartPosition(), + fbview.getSelectionStartPosition(), text, true ).save(); - fbview.clearSelection(); + fbview.clearSelection(); UIUtil.showMessageText( BaseActivity, diff --git a/src/org/geometerplus/android/fbreader/SelectionPopup.java b/src/org/geometerplus/android/fbreader/SelectionPopup.java index aba79d395..232880468 100644 --- a/src/org/geometerplus/android/fbreader/SelectionPopup.java +++ b/src/org/geometerplus/android/fbreader/SelectionPopup.java @@ -46,26 +46,26 @@ class SelectionPopup extends ButtonsPopupPanel { myWindow = new PopupWindow(activity, root, PopupWindow.Location.Floating, false); - addButton(ActionCode.SELECTION_COPY_TO_CLIPBOARD, true, R.drawable.selection_copy); - addButton(ActionCode.SELECTION_SHARE, true, R.drawable.selection_share); - addButton(ActionCode.SELECTION_TRANSLATE, true, R.drawable.selection_translate); - addButton(ActionCode.SELECTION_BOOKMARK, true, R.drawable.selection_bookmark); - addButton(ActionCode.SELECTION_CLEAR, true, R.drawable.selection_close); - } - - public void move(int selectionStartY, int selectionEndY) { + addButton(ActionCode.SELECTION_COPY_TO_CLIPBOARD, true, R.drawable.selection_copy); + addButton(ActionCode.SELECTION_SHARE, true, R.drawable.selection_share); + addButton(ActionCode.SELECTION_TRANSLATE, true, R.drawable.selection_translate); + addButton(ActionCode.SELECTION_BOOKMARK, true, R.drawable.selection_bookmark); + addButton(ActionCode.SELECTION_CLEAR, true, R.drawable.selection_close); + } + + public void move(int selectionStartY, int selectionEndY) { if (myWindow == null) { return; } - RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( + RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams( RelativeLayout.LayoutParams.WRAP_CONTENT, - RelativeLayout.LayoutParams.WRAP_CONTENT + RelativeLayout.LayoutParams.WRAP_CONTENT ); - layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL); + layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL); - final int verticalPosition; - final int screenHeight = ((View)myWindow.getParent()).getHeight(); + final int verticalPosition; + final int screenHeight = ((View)myWindow.getParent()).getHeight(); final int diffTop = screenHeight - selectionEndY; final int diffBottom = selectionStartY; if (diffTop > diffBottom) { @@ -76,7 +76,7 @@ class SelectionPopup extends ButtonsPopupPanel { ? RelativeLayout.ALIGN_PARENT_TOP : RelativeLayout.CENTER_VERTICAL; } - layoutParams.addRule(verticalPosition); - myWindow.setLayoutParams(layoutParams); - } + layoutParams.addRule(verticalPosition); + myWindow.setLayoutParams(layoutParams); + } } diff --git a/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java b/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java index 6709203f2..63283f2ab 100644 --- a/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java +++ b/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java @@ -23,20 +23,20 @@ import org.geometerplus.fbreader.fbreader.FBReaderApp; import org.geometerplus.fbreader.fbreader.FBView; public class SelectionTranslateAction extends FBAndroidAction { - SelectionTranslateAction(FBReader baseActivity, FBReaderApp fbreader) { - super(baseActivity, fbreader); - } + SelectionTranslateAction(FBReader baseActivity, FBReaderApp fbreader) { + super(baseActivity, fbreader); + } @Override - protected void run(Object ... params) { - final FBView fbview = Reader.getTextView(); - DictionaryUtil.openTextInDictionary( + protected void run(Object ... params) { + final FBView fbview = Reader.getTextView(); + DictionaryUtil.openTextInDictionary( BaseActivity, - fbview.getSelectedText(), + fbview.getSelectedText(), fbview.getCountOfSelectedWords() == 1, - fbview.getSelectionStartY(), + fbview.getSelectionStartY(), fbview.getSelectionEndY() ); - fbview.clearSelection(); - } + fbview.clearSelection(); + } } diff --git a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java index bdd23303a..3ca4b4b97 100644 --- a/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/library/BookInfoActivity.java @@ -280,7 +280,7 @@ public class BookInfoActivity extends Activity { setupInfoPair(R.id.file_name, "name", book.File.getPath()); if (ENABLE_EXTENDED_FILE_INFO) { setupInfoPair(R.id.file_type, "type", book.File.getExtension()); - + final ZLPhysicalFile physFile = book.File.getPhysicalFile(); final File file = physFile == null ? null : physFile.javaFile(); if (file != null && file.exists() && file.isFile()) { diff --git a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java index a73099f40..2d6b761af 100644 --- a/src/org/geometerplus/android/fbreader/library/LibraryActivity.java +++ b/src/org/geometerplus/android/fbreader/library/LibraryActivity.java @@ -141,7 +141,7 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem } else { super.onActivityResult(requestCode, returnCode, intent); } - } + } // // Search @@ -177,7 +177,7 @@ public class LibraryActivity extends TreeActivity implements MenuItem.OnMenuItem final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position; final Book book = ((LibraryTree)getListAdapter().getItem(position)).getBook(); if (book != null) { - createBookContextMenu(menu, book); + createBookContextMenu(menu, book); } } diff --git a/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java b/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java index de4951e28..a8ae762a3 100644 --- a/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java +++ b/src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java @@ -66,7 +66,7 @@ public class AuthenticationActivity extends Activity { static final String PASSWORD_KEY = "password"; static final String ERROR_KEY = "error"; static final String CUSTOM_AUTH_KEY = "customAuth"; - + static void initCredentialsCreator(Context context) { final ZLNetworkManager manager = ZLNetworkManager.Instance(); if (manager.getCredentialsCreator() == null) { diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java index b01f52ff9..554f01c35 100644 --- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java +++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java @@ -101,7 +101,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary. } library.initialize(); } - + if (myBook == null) { final Uri url = getIntent().getData(); if (url != null && "litres-book".equals(url.getScheme())) { @@ -140,9 +140,9 @@ public class NetworkBookInfoActivity extends Activity implements NetworkLibrary. myConnection, BIND_AUTO_CREATE ); - + setTitle(myBook.Title); - + setupDescription(); setupExtraLinks(); setupInfo(); diff --git a/src/org/geometerplus/android/fbreader/network/Util.java b/src/org/geometerplus/android/fbreader/network/Util.java index ecc69fb48..a3cb69d2b 100644 --- a/src/org/geometerplus/android/fbreader/network/Util.java +++ b/src/org/geometerplus/android/fbreader/network/Util.java @@ -62,7 +62,7 @@ public abstract class Util implements UserRegistrationConstants { if (SQLiteNetworkDatabase.Instance() == null) { new SQLiteNetworkDatabase(activity.getApplication()); } - + library.initialize(); } }, activity); @@ -119,7 +119,7 @@ public abstract class Util implements UserRegistrationConstants { final BookUrlInfo ref = book.reference(resolvedType); if (ref != null) { activity.startService( - new Intent(Intent.ACTION_VIEW, Uri.parse(ref.Url), + new Intent(Intent.ACTION_VIEW, Uri.parse(ref.Url), activity.getApplicationContext(), BookDownloaderService.class) .putExtra(BookDownloaderService.BOOK_FORMAT_KEY, ref.BookFormat) .putExtra(BookDownloaderService.REFERENCE_TYPE_KEY, resolvedType) diff --git a/src/org/geometerplus/android/util/PackageUtil.java b/src/org/geometerplus/android/util/PackageUtil.java index 4490b52f9..173e35768 100644 --- a/src/org/geometerplus/android/util/PackageUtil.java +++ b/src/org/geometerplus/android/util/PackageUtil.java @@ -116,11 +116,11 @@ public abstract class PackageUtil { final ZLBooleanOption doNotInstallOption = new ZLBooleanOption("doNotInstall", plugin, false); if (!doNotInstallOption.getValue()) { final String pluginVersion = pluginData.get("androidPluginVersion"); - + String message = null; String positiveButtonKey = null; String titleResourceKey = null; - + if (!PackageUtil.isPluginInstalled(activity, plugin)) { message = pluginData.get("androidPluginInstallMessage"); positiveButtonKey = "install"; diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index 8811df9f8..115fe6c7d 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -235,7 +235,7 @@ public final class FBView extends ZLTextView { } else if (soul instanceof ZLTextHyperlinkRegionSoul) { doSelectRegion = true; } - + if (doSelectRegion) { selectRegion(region); myReader.getViewWidget().reset(); @@ -355,7 +355,7 @@ public final class FBView extends ZLTextView { if ("".equals(filePath)) { return null; } - + final ZLFile file = ZLFile.createFileByPath(filePath); if (file == null || !file.exists()) { return null;