aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/res/drawable-hdpi/ic_menu_account_list.pngbin0 -> 3662 bytes
-rw-r--r--main/res/drawable-ldpi/ic_menu_account_list.pngbin0 -> 1347 bytes
-rw-r--r--main/res/drawable-mdpi/ic_menu_account_list.pngbin0 -> 2394 bytes
-rw-r--r--main/res/menu/main_activity_options.xml5
-rw-r--r--main/res/values/strings.xml3
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java33
6 files changed, 20 insertions, 21 deletions
diff --git a/main/res/drawable-hdpi/ic_menu_account_list.png b/main/res/drawable-hdpi/ic_menu_account_list.png
new file mode 100644
index 0000000..f858d2c
--- /dev/null
+++ b/main/res/drawable-hdpi/ic_menu_account_list.png
Binary files differ
diff --git a/main/res/drawable-ldpi/ic_menu_account_list.png b/main/res/drawable-ldpi/ic_menu_account_list.png
new file mode 100644
index 0000000..04ededd
--- /dev/null
+++ b/main/res/drawable-ldpi/ic_menu_account_list.png
Binary files differ
diff --git a/main/res/drawable-mdpi/ic_menu_account_list.png b/main/res/drawable-mdpi/ic_menu_account_list.png
new file mode 100644
index 0000000..f0945b2
--- /dev/null
+++ b/main/res/drawable-mdpi/ic_menu_account_list.png
Binary files differ
diff --git a/main/res/menu/main_activity_options.xml b/main/res/menu/main_activity_options.xml
index e06e948..68fd227 100644
--- a/main/res/menu/main_activity_options.xml
+++ b/main/res/menu/main_activity_options.xml
@@ -12,6 +12,11 @@
android:title="@string/menu_history">
</item>
<item
+ android:id="@+id/menu_pocket_queries"
+ android:icon="@drawable/ic_menu_account_list"
+ android:title="@string/menu_pocket_queries">
+ </item>
+ <item
android:id="@+id/menu_helpers"
android:icon="@drawable/ic_menu_shopping"
android:title="@string/menu_helpers">
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index ca669ac..7c74481 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -254,7 +254,8 @@
<string name="menu_history">History</string>
<string name="menu_filter">Filter</string>
<string name="menu_scan_geo">Scan geocode</string>
-
+ <string name="menu_pocket_queries">Pocket queries</string>
+
<!-- main screen -->
<string name="live_map_button">Live map</string>
<string name="caches_nearby_button">Nearby</string>
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 5a1ca6f..4233d1f 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -268,6 +268,7 @@ public class MainActivity extends AbstractActivity {
public boolean onPrepareOptionsMenu(final Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.findItem(R.id.menu_scan).setEnabled(ProcessUtils.isIntentAvailable(SCAN_INTENT));
+ menu.findItem(R.id.menu_pocket_queries).setVisible(Settings.isPremiumMember());
return true;
}
@@ -290,6 +291,18 @@ public class MainActivity extends AbstractActivity {
case R.id.menu_scan:
startScannerApplication();
return true;
+ case R.id.menu_pocket_queries:
+ if (!Settings.isPremiumMember()) {
+ return true;
+ }
+ new PocketQueryList.UserInterface(MainActivity.this).promptForListSelection(new RunnableWithArgument<PocketQueryList>() {
+
+ @Override
+ public void run(final PocketQueryList pql) {
+ CacheListActivity.startActivityPocket(MainActivity.this, pql);
+ }
+ });
+ return true;
default:
return super.onOptionsItemSelected(item);
}
@@ -512,26 +525,6 @@ public class MainActivity extends AbstractActivity {
}
});
nearestView.setBackgroundResource(R.drawable.main_nearby);
-
- nearestView.setOnLongClickListener(new View.OnLongClickListener() {
-
- @Override
- public boolean onLongClick(View v) {
- if (!Settings.isPremiumMember()) {
- return true;
- }
- new PocketQueryList.UserInterface(MainActivity.this).promptForListSelection(new RunnableWithArgument<PocketQueryList>() {
-
- @Override
- public void run(final PocketQueryList pql) {
- CacheListActivity.startActivityPocket(MainActivity.this, pql);
- }
- });
- return true;
- }
- });
- nearestView.setLongClickable(true);
-
}
navType.setText(res.getString(geo.getLocationProvider().resourceId));