diff --git a/src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java b/src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java index f3f831175..b331a5862 100644 --- a/src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java +++ b/src/com/paragon/dictionary/fbreader/OpenDictionaryFlyout.java @@ -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; diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index 9ac6adfe0..6e51904ff 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -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(); diff --git a/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java b/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java index d6c0188c7..4ee39dc98 100644 --- a/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java +++ b/src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java @@ -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 { diff --git a/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java b/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java index edb066b9a..768e01279 100644 --- a/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java +++ b/src/org/geometerplus/android/fbreader/SelectionTranslateAction.java @@ -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) { diff --git a/src/org/geometerplus/android/fbreader/DictionaryUtil.java b/src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java similarity index 99% rename from src/org/geometerplus/android/fbreader/DictionaryUtil.java rename to src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java index 3d52e41e7..48d7a7cc3 100644 --- a/src/org/geometerplus/android/fbreader/DictionaryUtil.java +++ b/src/org/geometerplus/android/fbreader/dict/DictionaryUtil.java @@ -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; diff --git a/src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java b/src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java index c5787f66f..ae8e59ea8 100644 --- a/src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java +++ b/src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java @@ -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; diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index e4e0136fc..9c4b6cad5 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -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;