From 47a693cdd3f8fa1b3a807c1481a1bd1464b05a4e Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Thu, 29 May 2014 07:32:29 +0200 Subject: new: contextual action bar for cache details and trackable This is surely not complete (as we still use other local context menus in the same actions), but a start for converting all context menus to contextual action bars. --- main/res/drawable-mdpi/ic_menu_copy.png | Bin 0 -> 758 bytes main/res/menu/details_context.xml | 19 ++- main/src/cgeo/geocaching/CacheDetailActivity.java | 144 +++++++++++++-------- main/src/cgeo/geocaching/TrackableActivity.java | 118 +++++++++++------ .../cgeo/geocaching/activity/AbstractActivity.java | 15 ++- 5 files changed, 193 insertions(+), 103 deletions(-) create mode 100644 main/res/drawable-mdpi/ic_menu_copy.png diff --git a/main/res/drawable-mdpi/ic_menu_copy.png b/main/res/drawable-mdpi/ic_menu_copy.png new file mode 100644 index 0000000..eee5540 Binary files /dev/null and b/main/res/drawable-mdpi/ic_menu_copy.png differ diff --git a/main/res/menu/details_context.xml b/main/res/menu/details_context.xml index 53f326a..fc61d5d 100644 --- a/main/res/menu/details_context.xml +++ b/main/res/menu/details_context.xml @@ -1,27 +1,34 @@ + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > + android:icon="@drawable/ic_menu_copy" + android:title="@android:string/copy" + cgeo:showAsAction="always|withText"> + android:title="@string/translate_to_sys_lang" + cgeo:showAsAction="ifRoom"> + android:title="@string/translate_to_english" + cgeo:showAsAction="ifRoom"> + android:title="@string/cache_share_field" + cgeo:showAsAction="ifRoom"> + android:visible="false" + cgeo:showAsAction="ifRoom"> \ No newline at end of file diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 9b17377..ea02171 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -84,6 +84,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.v4.app.FragmentManager; +import android.support.v7.view.ActionMode; import android.text.Editable; import android.text.Html; import android.text.Spannable; @@ -97,6 +98,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; +import android.view.View.OnLongClickListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.ViewParent; @@ -336,49 +338,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity