Better lingvo integration

plotn · plotn · commit 13b9353b4e21 · 2018-08-12T10:28:32.000+03:00
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -139,6 +139,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation files('libs/LingvoIntegration_2.5.2.12.jar')
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/android/build.gradle b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/android/res/layout/book_info_edit_dialog.xml b/android/res/layout/book_info_edit_dialog.xml
@@ -8,7 +8,8 @@
 	<LinearLayout
 	  android:orientation="vertical"
 	  android:layout_width="fill_parent"
-	  android:layout_height="wrap_content">
+	  android:layout_height="wrap_content"
+	  android:layout_margin="3dip">
 
 	    <!-- Dummy item to prevent AutoCompleteTextView from receiving focus -->
 	    <LinearLayout
@@ -280,6 +281,44 @@
 			        android:singleLine="true"
 			    />
 			</TableRow>
+			<TableRow >
+				<TextView
+					android:id="@+id/lbl_lang_translate"
+					style="@style/TextAppearance.Medium"
+					android:singleLine="true"
+					android:text="@string/book_info_book_translation"
+					android:layout_weight="2"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"/>
+				<EditText
+					android:id="@+id/book_lang_from"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="3"
+					android:text="en"
+					style="@style/TextAppearance.Widget.EditText"
+					android:editable="true"
+					android:singleLine="true"
+					/>
+				<TextView
+					android:id="@+id/lbl_lang_to"
+					style="@style/TextAppearance.Medium"
+					android:singleLine="true"
+					android:text="->"
+					android:layout_weight="1"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"/>
+				<EditText
+					android:id="@+id/book_lang_to"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="3"
+					android:text="ru"
+					style="@style/TextAppearance.Widget.EditText"
+					android:editable="true"
+					android:singleLine="true"
+					/>
+			</TableRow>
 	    </TableLayout>
 	</LinearLayout>
 </ScrollView>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
@@ -458,7 +458,8 @@
     <string name="dlg_goto_current_position">Текущая страница:</string>
     <string name="dlg_goto_input_page_number">Введите номер страницы для перехода:</string>
     <string name="dlg_goto_input_percent">Введите процент для перехода:</string>
-    <string name="book_info_book_language">Language</string>
+    <string name="book_info_book_language">Язык</string>
+    <string name="book_info_book_translation">Перевод</string>
     <string name="book_state_toread">К прочтению</string>
     <string name="book_state_reading">Читаю</string>
     <string name="book_state_none">Нет пометки</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
@@ -423,6 +423,7 @@
     <string name="win_title_confirm_history_record_delete">Do you really want to remove this book from recent list?</string>
     <string name="win_title_confirm_book_delete">Do you really want to delete this book?</string>
     <string name="book_info_book_language">Language</string>
+    <string name="book_info_book_translation">Translation</string>
     <string name="folder_name_books_by_series">Series</string>
     <string name="folder_name_books_by_title">Titles</string>
     <string name="dlg_about_donation_platinum">$30: buy Cool Reader Platinum Donation</string>
diff --git a/android/src/org/coolreader/Dictionaries.java b/android/src/org/coolreader/Dictionaries.java
@@ -1,6 +1,7 @@
 package org.coolreader;
 
 import org.coolreader.crengine.BaseActivity;
+import org.coolreader.crengine.BookInfo;
 import org.coolreader.crengine.DeviceInfo;
 import org.coolreader.crengine.L;
 import org.coolreader.crengine.Logger;
@@ -11,12 +12,32 @@
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.util.DisplayMetrics;
 
+import com.abbyy.mobile.lingvo.api.MinicardContract;
 import java.util.ArrayList;
 import java.util.List;
 
 public class Dictionaries {
 
+	public static class PopupFrameMetric {
+		public final int Height;
+		public final int Gravity;
+
+		PopupFrameMetric(DisplayMetrics metrics, int selectionTop, int selectionBottom) {
+			final int screenHeight = metrics.heightPixels;
+			final int topSpace = selectionTop;
+			final int bottomSpace = metrics.heightPixels - selectionBottom;
+			final boolean showAtBottom = bottomSpace >= topSpace;
+			final int space = (showAtBottom ? bottomSpace : topSpace) - metrics.densityDpi / 12;
+			final int maxHeight = Math.min(metrics.densityDpi * 20 / 12, screenHeight * 2 / 3);
+			final int minHeight = Math.min(metrics.densityDpi * 10 / 12, screenHeight * 2 / 3);
+
+			Height = Math.max(minHeight, Math.min(maxHeight, space));
+			Gravity = showAtBottom ? android.view.Gravity.BOTTOM : android.view.Gravity.TOP;
+		}
+	}
+
 	private Activity mActivity;
 
 	public Integer isiDic2IsActive() {
@@ -82,6 +103,7 @@ public DictInfo ( String id, String name, String packageName, String className,
 		new DictInfo("Dictan", "Dictan Dictionary", "info.softex.dictan", null, Intent.ACTION_VIEW, 2),
 		new DictInfo("FreeDictionary.org", "Free Dictionary . org", "org.freedictionary", "org.freedictionary.MainActivity", "android.intent.action.VIEW", 0),
 		new DictInfo("ABBYYLingvo", "ABBYY Lingvo", "com.abbyy.mobile.lingvo.market", null /*com.abbyy.mobile.lingvo.market.MainActivity*/, "com.abbyy.mobile.lingvo.intent.action.TRANSLATE", 0).setDataKey("com.abbyy.mobile.lingvo.intent.extra.TEXT"),
+		new DictInfo("ABBYYLingvo (minicard)", "ABBYY Lingvo (minicard)", "com.abbyy.mobile.lingvo.market", null, "com.abbyy.mobile.lingvo.intent.action.TRANSLATE", 5).setDataKey("com.abbyy.mobile.lingvo.intent.extra.TEXT"),
 		//new DictInfo("ABBYYLingvoLive", "ABBYY Lingvo Live", "com.abbyy.mobile.lingvolive", null, "com.abbyy.mobile.lingvo.intent.action.TRANSLATE", 0).setDataKey("com.abbyy.mobile.lingvo.intent.extra.TEXT"),
 		new DictInfo("LingoQuizLite", "Lingo Quiz Lite", "mnm.lite.lingoquiz", "mnm.lite.lingoquiz.ExchangeActivity", "lingoquiz.intent.action.ADD_WORD", 0).setDataKey("EXTRA_WORD"),
 		new DictInfo("LingoQuiz", "Lingo Quiz", "mnm.lingoquiz", "mnm.lingoquiz.ExchangeActivity", "lingoquiz.intent.action.ADD_WORD", 0).setDataKey("EXTRA_WORD"),
@@ -266,18 +288,6 @@ public void findInDictionary(String s) throws DictionaryException {
 			intent4.setType("text/plain");
 			intent4.putExtra(android.content.Intent.EXTRA_SUBJECT, "");
 			intent4.putExtra(android.content.Intent.EXTRA_TEXT, s);
-			//List<ResolveInfo> resInfo = mActivity.getPackageManager().queryIntentActivities(intent4, 0);
-			//for (resInfo : mActivity.getPackageManager().queryIntentActivities(intent4, 0)) {
-			//	if (resInfo.
-			//};
-			//startActivity(Intent.createChooser(intent4, null));
-			//intent4.setAction(Intent.ACTION_VIEW);
-			//intent4.putExtra("key_text_input", "What time is it?");
-			//intent4.putExtra("key_text_output", "");
-			//intent4.putExtra("key_language_from", "en");
-			//intent4.putExtra("key_language_to", "es");
-			//intent4.putExtra("key_suggest_translation", "");
-			//intent4.putExtra("key_from_floating_window", false);
 			intent4.setComponent(new ComponentName(curDict.packageName, curDict.className));
 			try
 			{
@@ -286,8 +296,72 @@ public void findInDictionary(String s) throws DictionaryException {
 				throw new DictionaryException("Dictionary \"" + curDict.name + "\" is not installed");
 			}
 			break;
+		case 5:
+			Intent intent5 = new Intent(curDict.action);
+			final DisplayMetrics metrics = new DisplayMetrics();
+			mActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+			int selectionTop = 0;
+			int selectionBottom = 0;
+			if (mActivity instanceof CoolReader) {
+				CoolReader cr = (CoolReader) mActivity;
+				if (cr.getReaderView()!=null) {
+					if (cr.getReaderView().lastSelection != null) {
+						selectionTop = cr.getReaderView().lastSelection.startY;
+						selectionBottom = cr.getReaderView().lastSelection.endY;
+					}
+					if (cr.getReaderView().getBookInfo()!=null) {
+						BookInfo book = cr.getReaderView().getBookInfo();
+						String lang = book.getFileInfo().lang_to;
+						if (lang==null) lang = "";
+						if (lang.equals("")) lang = "ru";
+						String langf = book.getFileInfo().lang_from;
+						if (langf==null) langf = "";
+						if (langf.equals("")) langf = book.getFileInfo().language;
+						if (langf==null) langf = "";
+						if (lang.equals("")) lang = "en";
+						intent5.putExtra(MinicardContract.EXTRA_LANGUAGE_TO, lang);
+						intent5.putExtra(MinicardContract.EXTRA_LANGUAGE_FROM, langf);
+					}
+				}
+			}
+			if (selectionBottom<selectionTop) {
+				int dummy = selectionBottom;
+				selectionBottom = selectionTop;
+				selectionTop = dummy;
+			}
+			final PopupFrameMetric frameMetrics =
+					new PopupFrameMetric(metrics, selectionTop, selectionBottom);
+			intent5.putExtra(MinicardContract.EXTRA_GRAVITY, frameMetrics.Gravity);
+			intent5.putExtra(MinicardContract.EXTRA_HEIGHT, frameMetrics.Height);
+			intent5.putExtra(MinicardContract.EXTRA_FORCE_LEMMATIZATION, true);
+			intent5.putExtra(MinicardContract.EXTRA_TRANSLATE_VARIANTS, true);
+			intent5.putExtra(MinicardContract.EXTRA_ENABLE_SUGGESTIONS, true);
+			//intent5.putExtra(MinicardContract.EXTRA_LIGHT_THEME, true);
+			intent5.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+			intent5.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+			if (curDict.className != null || DeviceInfo.getSDKLevel() == 3) {
+				intent5.setComponent(new ComponentName(
+						curDict.packageName, curDict.className));
+			} else {
+				intent5.setPackage(curDict.packageName);
+			}
+			intent5.addFlags(DeviceInfo.getSDKLevel() >= 7 ? Intent.FLAG_ACTIVITY_CLEAR_TASK : Intent.FLAG_ACTIVITY_NEW_TASK);
+			if (s!=null)
+				intent5.putExtra(curDict.dataKey, s);
+			try {
+				mActivity.startActivity( intent5 );
+			} catch ( ActivityNotFoundException e ) {
+				throw new DictionaryException("Dictionary \"" + curDict.name + "\" is not installed");
+			} catch ( Exception e ) {
+				throw new DictionaryException("Can't open dictionary \"" + curDict.name + "\"");
+			}
+			break;
+			//final String targetLanguage = DictionaryUtil.TargetLanguageOption.getValue();
+			//if (!Language.ANY_CODE.equals(targetLanguage)) {
+			//	intent.putExtra(MinicardContract.EXTRA_LANGUAGE_TO, targetLanguage);
+			//}
+			//InternalUtil.startDictionaryActivity(fbreader, intent, this);
 		}
-
 	}
 
     public void onActivityResult(int requestCode, int resultCode, Intent intent) throws DictionaryException {
diff --git a/android/src/org/coolreader/crengine/BookInfoDialog.java b/android/src/org/coolreader/crengine/BookInfoDialog.java
@@ -42,6 +42,7 @@ private void fillMap() {
 		mLabelMap.put("book.title", R.string.book_info_book_title);
 		mLabelMap.put("book.series", R.string.book_info_book_series_name);
 		mLabelMap.put("book.language", R.string.book_info_book_language);
+		mLabelMap.put("book.translation", R.string.book_info_book_translation);
 	}
 	
 	private void addItem(TableLayout table, String item) {
diff --git a/android/src/org/coolreader/crengine/BookInfoEditDialog.java b/android/src/org/coolreader/crengine/BookInfoEditDialog.java
@@ -235,6 +235,8 @@ public void setColorFilter(ColorFilter cf) {
 	AuthorList authors;
 	RatingBar rbBookRating;
 	RadioGroup rgState;
+	EditText edLangFrom;
+	EditText edLangTo;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -290,7 +292,9 @@ public void onClick(View v) {
         edSeriesNumber = (EditText)view.findViewById(R.id.book_series_number);
         rbBookRating = (RatingBar)view.findViewById(R.id.book_rating);
         rgState = (RadioGroup)view.findViewById(R.id.book_state);
-        int state = file.getReadingState();
+		edLangFrom = (EditText)view.findViewById(R.id.book_lang_from);
+		edLangTo = (EditText)view.findViewById(R.id.book_lang_to);
+		int state = file.getReadingState();
         int[] stateButtons = new int[] {R.id.book_state_new, R.id.book_state_toread, R.id.book_state_reading, R.id.book_state_finished};
         rgState.check(state >= 0 && state < stateButtons.length ? stateButtons[state] : R.id.book_state_new);
 
@@ -340,6 +344,8 @@ public void onCoverpageReady(CoverpageManager.ImageItem file, Bitmap bitmap) {
         edSeriesName.setText(file.series);
         if (file.series != null && file.series.trim().length() > 0 && file.seriesNumber > 0)
         	edSeriesNumber.setText(String.valueOf(file.seriesNumber));
+        edLangFrom.setText(file.lang_from);
+		edLangTo.setText(file.lang_to);
         LinearLayout llBookAuthorsList = (LinearLayout)view.findViewById(R.id.book_authors_list);
         authors = new AuthorList(llBookAuthorsList, file.authors);
         rbBookRating.setRating(file.getRate());
@@ -378,7 +384,16 @@ private void save() {
         modified = file.setTitle(edTitle.getText().toString().trim()) || modified;
         modified = file.setAuthors(authors.getAuthorsList()) || modified;
         modified = file.setSeriesName(edSeriesName.getText().toString().trim()) || modified;
-        int number = 0;
+        modified = file.setLangFrom(edLangFrom.getText().toString().trim()) || modified;
+        modified = file.setLangTo(edLangTo.getText().toString().trim()) || modified;
+		if (mActivity.getReaderView()!=null) {
+			if (mActivity.getReaderView().getBookInfo()!=null) {
+				BookInfo book = mActivity.getReaderView().getBookInfo();
+				book.getFileInfo().lang_from = edLangFrom.getText().toString().trim();
+				book.getFileInfo().lang_to = edLangTo.getText().toString().trim();
+			}
+		}
+		int number = 0;
         if (file.series != null && file.series.length() > 0) {
     	    String numberString = edSeriesNumber.getText().toString().trim();
     	    try {
@@ -403,7 +418,7 @@ else if (currentStateId == R.id.book_state_finished)
 			state = FileInfo.STATE_FINISHED;
         modified = file.setReadingState(state) || modified;
         if (modified) {
-        	mActivity.getDB().saveBookInfo(mBookInfo);
+			mActivity.getDB().saveBookInfo(mBookInfo);
         	mActivity.getDB().flush();
         	BookInfo bi = Services.getHistory().getBookInfo(file);
         	if (bi != null)
diff --git a/android/src/org/coolreader/crengine/FileInfo.java b/android/src/org/coolreader/crengine/FileInfo.java
@@ -43,6 +43,8 @@ public class FileInfo {
 	public String pathname; // full path+arcname+filename
 	public String arcname; // archive file name w/o path
 	public String language; // document language
+	public String lang_from; // translate from
+	public String lang_to; // translate to
 	public String username; // username for online catalogs
 	public String password; // password for online catalogs
 	public DocumentFormat format;
@@ -305,6 +307,8 @@ public void assign(FileInfo v)
 		createTime = v.createTime;
 		lastAccessTime = v.lastAccessTime;
 		language = v.language;
+		lang_from = v.lang_from;
+		lang_to = v.lang_to;
 		username = v.username;
 		password = v.password;
 		id = v.id;
@@ -873,6 +877,20 @@ public boolean setSeriesName(String series) {
 		this.series = series;
 		return true;
 	}
+
+	public boolean setLangFrom(String lang) {
+		if (eq(this.lang_from, lang))
+			return false;
+		this.lang_from = lang;
+		return true;
+	}
+
+	public boolean setLangTo(String lang) {
+		if (eq(this.lang_to, lang))
+			return false;
+		this.lang_to = lang;
+		return true;
+	}
 	
 	public boolean setSeriesNumber(int seriesNumber) {
 		if (this.seriesNumber == seriesNumber)
@@ -889,6 +907,14 @@ public String getLanguage() {
 		return language;
 	}
 
+	public String getLang_from() {
+		return lang_from;
+	}
+
+	public String getLang_to() {
+		return lang_to;
+	}
+
 	public void clear()
 	{
 		dirs = null;
@@ -1078,6 +1104,10 @@ public int hashCode() {
 		result = prime * result + (isScanned ? 1231 : 1237);
 		result = prime * result
 				+ ((language == null) ? 0 : language.hashCode());
+		result = prime * result
+				+ ((lang_from == null) ? 0 : lang_from.hashCode());
+		result = prime * result
+				+ ((lang_to == null) ? 0 : lang_to.hashCode());
 		result = prime * result
 				+ (int) (lastAccessTime ^ (lastAccessTime >>> 32));
 		result = prime * result + ((parent == null) ? 0 : parent.hashCode());
@@ -1146,6 +1176,16 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!language.equals(other.language))
 			return false;
+		if (lang_from == null) {
+			if (other.lang_from != null)
+				return false;
+		} else if (!lang_from.equals(other.lang_from))
+			return false;
+		if (lang_to == null) {
+			if (other.lang_to != null)
+				return false;
+		} else if (!lang_to.equals(other.lang_to))
+			return false;
 		if (lastAccessTime != other.lastAccessTime)
 			return false;
 		if (parent == null) {
diff --git a/android/src/org/coolreader/crengine/ReaderView.java b/android/src/org/coolreader/crengine/ReaderView.java
@@ -343,7 +343,7 @@ public T get()
 	private final CoolReader mActivity;
 	private final Engine mEngine;
 
-	private Selection lastSelection;
+	public Selection lastSelection;
 	private Bookmark hyplinkBookmark;
 
 	private BookInfo mBookInfo;
@@ -1854,6 +1854,7 @@ public void done() {
 				if ( fi.language != null) {
 					items.add("book.language=" + fi.language);
 				}
+                items.add("book.translation=" + fi.lang_from + " -> " + fi.lang_to);
 				BookInfoDialog dlg = new BookInfoDialog(mActivity, items);
 				dlg.show();
 			}
diff --git a/android/src/org/coolreader/db/MainDB.java b/android/src/org/coolreader/db/MainDB.java

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.1.3'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ private void fillMap() {`
`42`	`42`	`mLabelMap.put("book.title", R.string.book_info_book_title);`
`43`	`43`	`mLabelMap.put("book.series", R.string.book_info_book_series_name);`
`44`	`44`	`mLabelMap.put("book.language", R.string.book_info_book_language);`
	`45`	`+ mLabelMap.put("book.translation", R.string.book_info_book_translation);`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`private void addItem(TableLayout table, String item) {`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ public T get()`
`343`	`343`	`private final CoolReader mActivity;`
`344`	`344`	`private final Engine mEngine;`
`345`	`345`
`346`		`- private Selection lastSelection;`
	`346`	`+ public Selection lastSelection;`
`347`	`347`	`private Bookmark hyplinkBookmark;`
`348`	`348`
`349`	`349`	`private BookInfo mBookInfo;`
`@@ -1854,6 +1854,7 @@ public void done() {`
`1854`	`1854`	`if ( fi.language != null) {`
`1855`	`1855`	`items.add("book.language=" + fi.language);`
`1856`	`1856`	`}`
	`1857`	`+ items.add("book.translation=" + fi.lang_from + " -> " + fi.lang_to);`
`1857`	`1858`	`BookInfoDialog dlg = new BookInfoDialog(mActivity, items);`
`1858`	`1859`	`dlg.show();`
`1859`	`1860`	`}`