colordict 3 support

ChangeLog

@@ -1,3 +1,6 @@
+===== 0.99.10 (??? ??, 2011) =====
+* ColorDict3 support (floating window)
+
 ===== 0.99.6 (Jan 22, 2011) =====
 * Wallpaper drawing speed-up
 

src/org/geometerplus/android/fbreader/DictionaryUtil.java

@@ -24,10 +24,14 @@ import java.util.*;
 import android.app.*;
 import android.content.*;
 import android.net.Uri;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
 
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
+import org.geometerplus.zlibrary.text.view.ZLTextWordRegion;
+
 import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
 
 import org.geometerplus.android.util.UIUtil;
@@ -58,7 +62,7 @@ public abstract class DictionaryUtil {
 				"ColorDict",										// Id
 				null,												// Package
 				null,												// Class
-				"ColorDict",										// Title
+				"ColorDict 3",										// Title
 				ColorDict3.ACTION,
 				ColorDict3.QUERY,
 				"%s"
@@ -164,21 +168,14 @@ public abstract class DictionaryUtil {
 		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		text = dictionaryInfo.IntentDataPattern.replace("%s", text);
 		if (dictionaryInfo.IntentKey != null) {
-			intent.putExtra(ColorDict3.HEIGHT, 300);
-			intent.putExtra(ColorDict3.GRAVITY, android.view.Gravity.BOTTOM);
-			final ZLAndroidApplication application = ZLAndroidApplication.Instance();
-			intent.putExtra(ColorDict3.FULLSCREEN, !application.ShowStatusBarOption.getValue());
 			return intent.putExtra(dictionaryInfo.IntentKey, text);
 		} else {
 			return intent.setData(Uri.parse(text));
 		}			
 	}
 
-	public static void openWordInDictionary(Activity activity, String text) { 
+	public static void openWordInDictionary(Activity activity, ZLTextWordRegion region) { 
-		if (text == null) {
+		String text = region.Word.toString();
-			return;
-		}
-
 		int start = 0;
 		int end = text.length();
 		for (; start < end && !Character.isLetterOrDigit(text.charAt(start)); ++start);
@@ -187,8 +184,24 @@ public abstract class DictionaryUtil {
 			return;
 		}
 
-		final Intent intent = DictionaryUtil.getDictionaryIntent(text.substring(start, end));
+		final PackageInfo info = getCurrentDictionaryInfo();
+		final Intent intent = getDictionaryIntent(info, text.substring(start, end));
 		try {
+			if ("ColorDict".equals(info.Id)) {
+				final DisplayMetrics metrics = new DisplayMetrics();
+				activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+				final int screenHeight = metrics.heightPixels;
+				final int topSpace = region.getTop();
+				final int bottomSpace = metrics.heightPixels - region.getBottom();
+				final boolean showAtBottom = bottomSpace >= topSpace;
+				final int space = (showAtBottom ? bottomSpace : topSpace) - 20;
+				final int maxHeight = Math.min(400, screenHeight * 2 / 3);
+				final int minHeight = Math.min(200, screenHeight * 2 / 3);
+				intent.putExtra(ColorDict3.HEIGHT, Math.max(minHeight, Math.min(maxHeight, space)));
+				intent.putExtra(ColorDict3.GRAVITY, showAtBottom ? Gravity.BOTTOM : Gravity.TOP);
+				final ZLAndroidApplication application = ZLAndroidApplication.Instance();
+				intent.putExtra(ColorDict3.FULLSCREEN, !application.ShowStatusBarOption.getValue());
+			}
 			activity.startActivity(intent);
 		} catch(ActivityNotFoundException e){
 			DictionaryUtil.installDictionaryIfNotInstalled(activity);

src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java

@@ -63,7 +63,7 @@ class ProcessHyperlinkAction extends FBAction {
 			return;
 		} else if (region instanceof ZLTextWordRegion) {
 			DictionaryUtil.openWordInDictionary(
-				myBaseActivity, ((ZLTextWordRegion)region).Word.toString()
+				myBaseActivity, (ZLTextWordRegion)region
 			);
 		}
 	}

src/org/geometerplus/android/fbreader/preferences/DictionaryPreference.java

@@ -42,7 +42,7 @@ class DictionaryPreference extends ZLStringListPreference {
 		final String[] texts = new String[infos.size()];
 		int index = 0;
 		for (PackageInfo i : infos) {
-			values[index] = i.Title;
+			values[index] = i.Id;
 			texts[index] = i.Title;
 			++index;
 		}

src/org/geometerplus/zlibrary/text/view/ZLTextElementRegion.java

@@ -60,6 +60,14 @@ public abstract class ZLTextElementRegion {
 		return myHull;
 	}
 
+	public int getTop() {
+		return myList.get(myFromIndex).YStart;
+	}
+
+	public int getBottom() {
+		return myList.get(myToIndex - 1).YEnd;
+	}
+
 	void draw(ZLPaintContext context) {
 		convexHull().draw(context);
 	}