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

sync with premium version

Browse source
This commit is contained in:
Nikolay Pultsin 2015-09-30 19:49:14 +01:00
parent d8094cc0da
commit 2be210d0bb
25 changed files with 71 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
View file

@ -44,6 +44,7 @@ import org.geometerplus.android.fbreader.dict.DictionaryUtil;
import org.geometerplus.android.fbreader.image.ImageViewActivity;
import org.geometerplus.android.fbreader.network.*;
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.UIMessageUtil;
class ProcessHyperlinkAction extends FBAndroidAction {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/RunPluginAction.java
View file

@ -26,6 +26,7 @@ import android.net.Uri;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.api.PluginApi;
import org.geometerplus.android.util.OrientationUtil;
class RunPluginAction extends FBAndroidAction {
private final Uri myUri;

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
View file

@ -34,6 +34,7 @@ import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.bookmark.EditBookmarkActivity;
import org.geometerplus.android.util.OrientationUtil;
public class SelectionBookmarkAction extends FBAndroidAction {
SelectionBookmarkAction(FBReader baseApplication, FBReaderApp fbreader) {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookInfoAction.java
View file

@ -25,6 +25,7 @@ import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.library.BookInfoActivity;
import org.geometerplus.android.util.OrientationUtil;
class ShowBookInfoAction extends FBAndroidAction {
ShowBookInfoAction(FBReader baseActivity, FBReaderApp fbreader) {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowBookmarksAction.java
View file

@ -26,6 +26,7 @@ import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.bookmark.BookmarksActivity;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.PackageUtil;
class ShowBookmarksAction extends FBAndroidAction {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowLibraryAction.java
View file

@ -26,6 +26,7 @@ import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.library.LibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.PackageUtil;
class ShowLibraryAction extends FBAndroidAction {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowNetworkLibraryAction.java
View file

@ -24,6 +24,7 @@ import android.content.Intent;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.network.NetworkLibraryPrimaryActivity;
import org.geometerplus.android.util.OrientationUtil;
class ShowNetworkLibraryAction extends FBAndroidAction {
ShowNetworkLibraryAction(FBReader baseActivity, FBReaderApp fbreader) {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowPreferencesAction.java
View file

@ -24,6 +24,7 @@ import android.content.Intent;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.fbreader.preferences.PreferenceActivity;
import org.geometerplus.android.util.OrientationUtil;
class ShowPreferencesAction extends FBAndroidAction {
ShowPreferencesAction(FBReader baseActivity, FBReaderApp fbreader) {

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/ShowTOCAction.java
View file

@ -24,6 +24,8 @@ import android.content.Intent;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.util.OrientationUtil;
class ShowTOCAction extends FBAndroidAction {
ShowTOCAction(FBReader baseActivity, FBReaderApp fbreader) {
super(baseActivity, fbreader);

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/TOCActivity.java
View file

@ -35,6 +35,7 @@ import org.geometerplus.zlibrary.text.view.ZLTextWordCursor;
import org.geometerplus.fbreader.bookmodel.TOCTree;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.ViewUtil;
public class TOCActivity extends ListActivity {

1
fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
View file

@ -38,7 +38,6 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.util.*;

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
View file

@ -43,9 +43,9 @@ import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.ViewUtil;
public class EditBookmarkActivity extends Activity implements IBookCollection.Listener<Book> {

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java
View file

@ -33,7 +33,7 @@ import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;
import org.geometerplus.zlibrary.ui.android.util.ZLAndroidColorUtil;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.util.OrientationUtil;
public class ImageViewActivity extends Activity {
public static final String URL_KEY = "fbreader.imageview.url";

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/BookInfoActivity.java
View file

@ -53,11 +53,11 @@ import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.fbreader.network.HtmlUtil;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.preferences.EditBookInfoActivity;
import org.geometerplus.android.fbreader.util.AndroidImageSynchronizer;
import org.geometerplus.android.util.OrientationUtil;
public class BookInfoActivity extends Activity implements IBookCollection.Listener<Book> {
private static final boolean ENABLE_EXTENDED_FILE_INFO = false;

4
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
View file

@ -49,14 +49,12 @@ import org.geometerplus.fbreader.network.tree.NetworkBookTree;
import org.geometerplus.fbreader.network.urlInfo.RelatedUrlInfo;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.network.action.NetworkBookActions;
import org.geometerplus.android.fbreader.network.action.OpenCatalogAction;
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
import org.geometerplus.android.fbreader.util.AndroidImageSynchronizer;
import org.geometerplus.android.util.UIMessageUtil;
import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.util.*;
public class NetworkBookInfoActivity extends Activity implements NetworkLibrary.ChangeListener {
private NetworkBookTree myTree;

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java
View file

@ -29,9 +29,9 @@ import org.geometerplus.fbreader.network.tree.ManageCatalogsItemTree;
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.network.CatalogManagerActivity;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
public class ManageCatalogsAction extends RootAction {
public ManageCatalogsAction(Activity activity) {

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/OpenCatalogAction.java
View file

@ -30,8 +30,8 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkContext;
import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.*;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.network.*;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.PackageUtil;
public class OpenCatalogAction extends Action {

3
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ShowBookInfoAction.java
View file

@ -30,10 +30,9 @@ import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.android.fbreader.network.NetworkBookInfoActivity;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.fbreader.OrientationUtil;
public class ShowBookInfoAction extends BookAction {
private final ZLNetworkContext myNetworkContext;

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/ActivityNetworkContext.java
View file

@ -30,8 +30,8 @@ import android.net.Uri;
import android.text.TextUtils;
import org.geometerplus.zlibrary.core.network.*;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
public final class ActivityNetworkContext extends AndroidNetworkContext {
private final Activity myActivity;

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/auth/WebAuthorisationScreen.java
View file

@ -36,7 +36,7 @@ import org.apache.http.impl.cookie.BasicClientCookie2;
import org.geometerplus.zlibrary.core.network.ZLNetworkManager;
import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.util.OrientationUtil;
public class WebAuthorisationScreen extends Activity {
public static final String COMPLETE_URL_KEY = "android.fbreader.data.complete.url";

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/preferences/ZLPreferenceActivity.java
View file

@ -31,7 +31,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.util.OrientationUtil;
abstract class ZLPreferenceActivity extends android.preference.PreferenceActivity {
public static String SCREEN_KEY = "screen";

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java
View file

@ -31,8 +31,8 @@ import org.geometerplus.android.util.UIUtil;
import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.android.fbreader.OrientationUtil;
import org.geometerplus.android.fbreader.util.AndroidImageSynchronizer;
import org.geometerplus.android.util.OrientationUtil;
public abstract class TreeActivity<T extends FBTree> extends ListActivity {
private static final String OPEN_TREE_ACTION = "android.fbreader.action.OPEN_TREE";

2
fbreader/app/src/main/java/org/geometerplus/android/fbreader/OrientationUtil.java → fbreader/app/src/main/java/org/geometerplus/android/util/OrientationUtil.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader;
package org.geometerplus.android.util;
import android.app.Activity;
import android.content.Intent;

50
fbreader/app/src/main/java/org/geometerplus/fbreader/book/AbstractBook.java
View file

@ -94,8 +94,28 @@ public abstract class AbstractBook extends TitledEntity<AbstractBook> {
}
}
public List<Author> authors() {
return (myAuthors != null) ? Collections.unmodifiableList(myAuthors) : Collections.<Author>emptyList();
public final List<Author> authors() {
return myAuthors != null
? Collections.unmodifiableList(myAuthors)
: Collections.<Author>emptyList();
}
public final String authorsString(String separator) {
final List<Author> authors = myAuthors;
if (authors == null || authors.isEmpty()) {
return null;
}
final StringBuilder buffer = new StringBuilder();
boolean first = true;
for (Author a : authors) {
if (!first) {
buffer.append(separator);
}
buffer.append(a.DisplayName);
first = false;
}
return buffer.toString();
}
void addAuthorWithNoCheck(Author author) {
@ -227,7 +247,31 @@ public abstract class AbstractBook extends TitledEntity<AbstractBook> {
}
public List<Tag> tags() {
return myTags != null ? Collections.unmodifiableList(myTags) : Collections.<Tag>emptyList();
return myTags != null
? Collections.unmodifiableList(myTags)
: Collections.<Tag>emptyList();
}
public final String tagsString(String separator) {
final List<Tag> tags = myTags;
if (tags == null || tags.isEmpty()) {
return null;
}
final HashSet<String> tagNames = new HashSet<String>();
final StringBuilder buffer = new StringBuilder();
boolean first = true;
for (Tag t : tags) {
if (!first) {
buffer.append(separator);
}
if (!tagNames.contains(t.Name)) {
tagNames.add(t.Name);
buffer.append(t.Name);
first = false;
}
}
return buffer.toString();
}
void addTagWithNoCheck(Tag tag) {

2
fbreader/app/src/main/java/org/geometerplus/fbreader/book/Label.java
View file

@ -22,7 +22,7 @@ package org.geometerplus.fbreader.book;
import java.util.UUID;
public class Label {
public final String Uid;
public final String Uid;
public final String Name;
public Label(String uid, String name) {