diff options
| -rw-r--r-- | main/res/values/strings.xml | 17 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 133 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/utils/ClipboardUtils.java | 26 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/utils/TranslationUtils.java | 46 |
4 files changed, 187 insertions, 35 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index fa71c72..cd6bb8b 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -114,7 +114,20 @@ <string name="log_new_log">Log</string> <string name="log_new_log_text">Log Text</string> <string name="log_announcement">Announcement</string> - + + <!-- copy --> + <string name="options_context_menu_title">Options</string> + <string name="copy_coords">Copy Coordinates</string> + <string name="copy_desc">Copy Description</string> + <string name="copy_personalnote">Copy Personal Note</string> + <string name="copy_hint">Copy Hint</string> + <string name="copy_log">Copy Log</string> + + <!-- translation --> + <string name="translate_to_sys_lang">Translate to %s</string> + <string name="translate_to_english">Translate to English</string> + <string name="translate_length_warning">Translate may fail with large amounts of text.</string> + <!-- errors, warnings, info toasts --> <string name="err_none">OK</string> <string name="err_start">Communication not started</string> @@ -931,6 +944,7 @@ · blafoo (code)\n · Bonemaro (tester)\n · BudBundi (localization DE, tester)\n + · campbeb (code)\n · Charles (localization FR)\n · Denny (localization DA)\n · Eisbehr (code, open source project leader)\n @@ -982,6 +996,7 @@ · New: Changed markers in the map with additional informations for stored caches:\n Personal Note available, Modified coordinates, non-reliable coordinates (orange circle)\n · Fix: Caches with modified coordinates are displayed at the modified coords and not at the original coords\n + · New: Copy and translate available with long press\n · \n \n\n <b>04.01.2012</b>\n diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 9a7b60c..928b593 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -17,7 +17,9 @@ import cgeo.geocaching.network.HtmlImage; import cgeo.geocaching.network.Parameters; import cgeo.geocaching.utils.BaseUtils; import cgeo.geocaching.utils.CancellableHandler; +import cgeo.geocaching.utils.ClipboardUtils; import cgeo.geocaching.utils.CryptUtils; +import cgeo.geocaching.utils.TranslationUtils; import cgeo.geocaching.utils.UnknownTagsHandler; import com.viewpagerindicator.TitlePageIndicator; @@ -28,7 +30,9 @@ import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import android.R.color; +import android.app.AlertDialog; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Bitmap; @@ -84,6 +88,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Map.Entry; @@ -112,7 +117,7 @@ public class CacheDetailActivity extends AbstractActivity { private final Progress progress = new Progress(); private SearchResult search; private final LocationUpdater locationUpdater = new LocationUpdater(); - private String contextMenuUser = null; + private CharSequence clickedItemText = null; private int contextMenuWPIndex = -1; /** @@ -347,22 +352,35 @@ public class CacheDetailActivity extends AbstractActivity { final int viewId = view.getId(); contextMenuWPIndex = -1; switch (viewId) { - case R.id.author: - case R.id.value: - if (viewId == R.id.author) { // Author of a log entry - contextMenuUser = ((TextView) view).getText().toString(); - } else if (viewId == R.id.value) { // The owner of the cache - if (StringUtils.isNotBlank(cache.getOwnerReal())) { - contextMenuUser = cache.getOwnerReal(); - } else { - contextMenuUser = cache.getOwner(); - } + case R.id.value: // coordinates + clickedItemText = ((TextView) view).getText(); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_coords), true); + break; + case R.id.shortdesc: + clickedItemText = ((TextView) view).getText(); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_desc), false); + break; + case R.id.longdesc: + // combine short and long description + String shortDesc = cache.getShortDescription(); + if (shortDesc.compareTo("") == 0) { + clickedItemText = ((TextView) view).getText(); + } else { + clickedItemText = shortDesc + "\n\n" + ((TextView) view).getText(); } - - menu.setHeaderTitle(res.getString(R.string.user_menu_title) + " " + contextMenuUser); - menu.add(viewId, 1, 0, res.getString(R.string.user_menu_view_hidden)); - menu.add(viewId, 2, 0, res.getString(R.string.user_menu_view_found)); - menu.add(viewId, 3, 0, res.getString(R.string.user_menu_open_browser)); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_desc), false); + break; + case R.id.personalnote: + clickedItemText = ((TextView) view).getText(); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_personalnote), true); + break; + case R.id.hint: + clickedItemText = ((TextView) view).getText(); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_hint), false); + break; + case R.id.log: + clickedItemText = ((TextView) view).getText(); + buildOptionsContextmenu(menu, viewId, res.getString(R.string.copy_log), false); break; case -1: if (null != cache.getWaypoints()) { @@ -398,27 +416,46 @@ public class CacheDetailActivity extends AbstractActivity { } } + private void buildOptionsContextmenu(ContextMenu menu, int viewId, String copyPrompt, boolean copyOnly) { + menu.setHeaderTitle(res.getString(R.string.options_context_menu_title)); + menu.add(viewId, 1, 0, copyPrompt); + if (!copyOnly) { + if (clickedItemText.length() > TranslationUtils.translationTextLengthToWarn) { + showToast(res.getString(R.string.translate_length_warning)); + } + menu.add(viewId, 2, 0, res.getString(R.string.translate_to_sys_lang, Locale.getDefault().getDisplayLanguage())); + if (Settings.isUseEnglish() && Locale.getDefault() != Locale.ENGLISH) { + menu.add(viewId, 3, 0, res.getString(R.string.translate_to_english)); + } + + } + } + @Override public boolean onContextItemSelected(MenuItem item) { final int groupId = item.getGroupId(); final int index = item.getItemId(); switch (groupId) { - case R.id.author: case R.id.value: - final int itemId = item.getItemId(); - switch (itemId) { - case 1: - cgeocaches.startActivityOwner(this, contextMenuUser); + case R.id.shortdesc: + case R.id.longdesc: + case R.id.personalnote: + case R.id.hint: + case R.id.log: + switch (index) { + case 1: // copy + ClipboardUtils.copyToClipboard(clickedItemText); return true; - case 2: - cgeocaches.startActivityUserName(this, contextMenuUser); + case 2: // translate to system language + TranslationUtils.startActivityTranslate(this, Locale.getDefault().getLanguage(), clickedItemText.toString()); return true; - case 3: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/profile/?u=" + URLEncoder.encode(contextMenuUser)))); + case 3: // translate to English + TranslationUtils.startActivityTranslate(this, Locale.ENGLISH.getLanguage(), clickedItemText.toString()); return true; default: break; } + break; case CONTEXT_MENU_WAYPOINT_EDIT: if (cache.hasWaypoints() && index < cache.getWaypoints().size()) { @@ -818,7 +855,7 @@ public class CacheDetailActivity extends AbstractActivity { } /** - * Opens a context menu to do actions on an username + * Opens a dialog to do actions on an username */ private class UserActionsClickListener implements View.OnClickListener { @@ -830,12 +867,34 @@ public class CacheDetailActivity extends AbstractActivity { return; } - try { - registerForContextMenu(view); - openContextMenu(view); - } catch (Exception e) { - // nothing - } + clickedItemText = ((TextView) view).getText().toString(); + + final CharSequence[] items = {res.getString(R.string.user_menu_view_hidden), + res.getString(R.string.user_menu_view_found), + res.getString(R.string.user_menu_open_browser) + }; + + AlertDialog.Builder builder = new AlertDialog.Builder(CacheDetailActivity.this); + builder.setTitle(res.getString(R.string.user_menu_title) + " " + clickedItemText); + builder.setItems(items, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int item) { + switch (item) { + case 0: + cgeocaches.startActivityOwner(CacheDetailActivity.this, clickedItemText.toString()); + return; + case 1: + cgeocaches.startActivityUserName(CacheDetailActivity.this, clickedItemText.toString()); + return; + case 2: + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/profile/?u=" + URLEncoder.encode(clickedItemText.toString())))); + return; + default: + break; + } + } + }); + AlertDialog alert = builder.create(); + alert.show(); } } @@ -1357,8 +1416,8 @@ public class CacheDetailActivity extends AbstractActivity { // cache coordinates if (cache.getCoords() != null) { - addCacheDetail(R.string.cache_coordinates, cache.getCoords().toString()) - .setOnClickListener(new View.OnClickListener() { + TextView valueView = addCacheDetail(R.string.cache_coordinates, cache.getCoords().toString()); + valueView.setOnClickListener(new View.OnClickListener() { private int position = 0; private GeopointFormatter.Format[] availableFormats = new GeopointFormatter.Format[] { GeopointFormatter.Format.LAT_LON_DECMINUTE, @@ -1375,6 +1434,7 @@ public class CacheDetailActivity extends AbstractActivity { valueView.setText(cache.getCoords().format(availableFormats[position])); } }); + registerForContextMenu(valueView); } // cache attributes @@ -1842,6 +1902,7 @@ public class CacheDetailActivity extends AbstractActivity { // cache short description if (StringUtils.isNotBlank(cache.getShortDescription())) { new LoadDescriptionTask().execute(cache.getShortDescription(), view.findViewById(R.id.shortdesc), null); + registerForContextMenu(view.findViewById(R.id.shortdesc)); } // long description @@ -1867,6 +1928,7 @@ public class CacheDetailActivity extends AbstractActivity { personalNoteText.setVisibility(View.VISIBLE); personalNoteText.setText(cache.getPersonalNote(), TextView.BufferType.SPANNABLE); personalNoteText.setMovementMethod(LinkMovementMethod.getInstance()); + registerForContextMenu(personalNoteText); } else { ((LinearLayout) view.findViewById(R.id.personalnote_box)).setVisibility(View.GONE); @@ -1892,6 +1954,7 @@ public class CacheDetailActivity extends AbstractActivity { hintView.setText(CryptUtils.rot13(hintView.getText().toString())); } }); + registerForContextMenu(hintView); } else { TextView hintView = ((TextView) view.findViewById(R.id.hint)); hintView.setVisibility(View.GONE); @@ -1931,6 +1994,7 @@ public class CacheDetailActivity extends AbstractActivity { view.findViewById(R.id.loading).setVisibility(View.VISIBLE); new LoadDescriptionTask().execute(cache.getDescription(), view.findViewById(R.id.longdesc), view.findViewById(R.id.loading)); + registerForContextMenu(view.findViewById(R.id.longdesc)); } /** @@ -2205,6 +2269,7 @@ public class CacheDetailActivity extends AbstractActivity { TextView logView = (TextView) logLayout.findViewById(R.id.log); logView.setMovementMethod(LinkMovementMethod.getInstance()); logView.setOnClickListener(new DecryptLogClickListener()); + registerForContextMenu(logView); loglist.add(rowView); } diff --git a/main/src/cgeo/geocaching/utils/ClipboardUtils.java b/main/src/cgeo/geocaching/utils/ClipboardUtils.java new file mode 100644 index 0000000..865d8d6 --- /dev/null +++ b/main/src/cgeo/geocaching/utils/ClipboardUtils.java @@ -0,0 +1,26 @@ +package cgeo.geocaching.utils; + +import cgeo.geocaching.cgeoapplication; + +import android.content.Context; +import android.text.ClipboardManager; + +/** + * Clipboard Utilities. Functions to copy data to the Android clipboard. + * This class uses the deprecated function ClipboardManager.setText(CharSequence). + * API 11 introduced setPrimaryClip(ClipData) + */ +public final class ClipboardUtils { + + /** + * Places the text passed in onto the clipboard as text + * + * @param text + * The text to place in the clipboard. + */ + public static void copyToClipboard(final CharSequence text) { + final ClipboardManager clipboard = (ClipboardManager) cgeoapplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE); + clipboard.setText(text); + } + +} diff --git a/main/src/cgeo/geocaching/utils/TranslationUtils.java b/main/src/cgeo/geocaching/utils/TranslationUtils.java new file mode 100644 index 0000000..e086ab6 --- /dev/null +++ b/main/src/cgeo/geocaching/utils/TranslationUtils.java @@ -0,0 +1,46 @@ +package cgeo.geocaching.utils; + +import cgeo.geocaching.activity.AbstractActivity; + +import android.content.Intent; +import android.net.Uri; + +import java.net.URLEncoder; + +/** + * Utilities used for translating + */ +public final class TranslationUtils { + + private static final String translationWebsite = "http://translate.google.com/"; + private static final String translationForceClassicMode = "?vi=c"; + private static final String translationAutoSelect = "#auto"; + private static final String translationFieldSeparator = "|"; + + public static final int translationTextLengthToWarn = 500; + + /** + * Build a URI for Google Translate + * + * @param toLang + * The two-letter lowercase ISO language codes as defined by ISO 639-1 + * @param text + * The text to be translated + * @return URI ready to be parsed + */ + public static String buildTranslationURI(final String toLang, final String text) { + return translationWebsite + translationForceClassicMode + translationAutoSelect + translationFieldSeparator + toLang + translationFieldSeparator + URLEncoder.encode(text).replace("+", "%20"); + } + + /** + * Send Intent for Google Translate. Can be caught by Google Translate App or browser + * + * @param toLang + * The two-letter lowercase ISO language codes as defined by ISO 639-1 + * @param text + * The text to be translated + */ + public static void startActivityTranslate(final AbstractActivity context, final String toLang, final String text) { + context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(buildTranslationURI(toLang, text)))); + } +} |