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

separate dir for DictionaryUtil

Browse source
This commit is contained in:
Nikolay Pultsin 2015-06-11 18:43:23 +01:00
parent a280cc9feb
commit fd88c95c85
7 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java
View file

@ -29,7 +29,7 @@ import android.util.Log;
import com.paragon.open.dictionary.api.*;
import org.geometerplus.android.fbreader.DictionaryUtil;
import org.geometerplus.android.fbreader.dict.DictionaryUtil;
public class OpenDictionaryFlyout {
private final Direction myDirection;

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

@ -60,6 +60,7 @@ import org.geometerplus.fbreader.formats.ExternalFormatPlugin;
import org.geometerplus.fbreader.tips.TipsManager;
import org.geometerplus.android.fbreader.api.*;
import org.geometerplus.android.fbreader.dict.DictionaryUtil;
import org.geometerplus.android.fbreader.formatPlugin.PluginUtil;
import org.geometerplus.android.fbreader.httpd.DataService;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
@ -1073,7 +1074,7 @@ public final class FBReader extends Activity implements ZLApplicationWindow {
}
}
void showToast(SuperActivityToast toast) {
public void showToast(SuperActivityToast toast) {
hideToast();
myToast = toast;
toast.show();

3
src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
View file

@ -39,9 +39,10 @@ import org.geometerplus.fbreader.bookmodel.FBHyperlinkType;
import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.fbreader.util.AutoTextSnippet;
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.fbreader.image.ImageViewActivity;
import org.geometerplus.android.util.UIUtil;
class ProcessHyperlinkAction extends FBAndroidAction {

1
src/org/geometerplus/android/fbreader/SelectionTranslateAction.java
View file

@ -21,6 +21,7 @@ package org.geometerplus.android.fbreader;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.fbreader.FBView;
import org.geometerplus.android.fbreader.dict.DictionaryUtil;
public class SelectionTranslateAction extends FBAndroidAction {
SelectionTranslateAction(FBReader baseActivity, FBReaderApp fbreader) {

5
src/org/geometerplus/android/fbreader/DictionaryUtil.java → src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader;
package org.geometerplus.android.fbreader.dict;
import java.io.InputStream;
import java.util.*;
@ -56,6 +56,7 @@ import org.geometerplus.zlibrary.text.view.ZLTextWord;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.util.PackageUtil;
@ -518,7 +519,7 @@ public abstract class DictionaryUtil {
}
}
static void onActivityResult(final FBReader fbreader, int resultCode, final Intent data) {
public static void onActivityResult(final FBReader fbreader, int resultCode, final Intent data) {
if (data == null) {
fbreader.hideOutline();
return;

2
src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java
View file

@ -26,7 +26,7 @@ import android.content.Context;
import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.android.fbreader.DictionaryUtil;
import org.geometerplus.android.fbreader.dict.DictionaryUtil;
class DictionaryPreference extends ZLStringListPreference {
private final ZLStringOption myOption;

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

@ -46,8 +46,8 @@ import org.geometerplus.fbreader.network.sync.SyncData;
import org.geometerplus.fbreader.network.sync.SyncUtil;
import org.geometerplus.fbreader.tips.TipsManager;
import org.geometerplus.android.fbreader.DictionaryUtil;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.dict.DictionaryUtil;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.network.auth.ActivityNetworkContext;
import org.geometerplus.android.fbreader.preferences.fileChooser.FileChooserCollection;