1 files changed, 98 insertions, 15 deletions

diff --git a/main/src/cgeo/geocaching/CreateShortcutActivity.java b/main/src/cgeo/geocaching/CreateShortcutActivity.java
index ffcf81b..ecb7dc4 100644
--- a/main/src/cgeo/geocaching/CreateShortcutActivity.java
+++ b/main/src/cgeo/geocaching/CreateShortcutActivity.java
@@ -3,17 +3,53 @@ package cgeo.geocaching;
 import cgeo.geocaching.activity.AbstractActionBarActivity;
 import cgeo.geocaching.list.PseudoList;
 import cgeo.geocaching.list.StoredList;
+import cgeo.geocaching.maps.MapActivity;
+import cgeo.geocaching.ui.dialog.Dialogs;
+import cgeo.geocaching.ui.dialog.Dialogs.ItemWithIcon;
+import cgeo.geocaching.utils.ImageUtils;
 
 import rx.functions.Action1;
 
 import android.content.Intent;
 import android.content.Intent.ShortcutIconResource;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CreateShortcutActivity extends AbstractActionBarActivity {
 
+    private static class Shortcut implements ItemWithIcon {
+
+        private final int titleResourceId;
+        private final int drawableResourceId;
+        private final Intent intent;
+
+        /**
+         * shortcut with a separate icon
+         */
+        public Shortcut(final int titleResourceId, final int drawableResourceId, final Intent intent) {
+            this.titleResourceId = titleResourceId;
+            this.drawableResourceId = drawableResourceId;
+            this.intent = intent;
+        }
+
+        @Override
+        public int getIcon() {
+            return drawableResourceId;
+        }
+
+        @Override
+        public String toString() {
+            return CgeoApplication.getInstance().getString(titleResourceId);
+        }
+    }
+
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // init
@@ -23,35 +59,82 @@ public class CreateShortcutActivity extends AbstractActionBarActivity {
     }
 
     private void promptForShortcut() {
+        final List<Shortcut> shortcuts = new ArrayList<>();
+
+        shortcuts.add(new Shortcut(R.string.live_map_button, R.drawable.main_live, new Intent(this, MapActivity.class)));
+        shortcuts.add(new Shortcut(R.string.caches_nearby_button, R.drawable.main_nearby, CacheListActivity.getNearestIntent(this)));
+
+        // TODO: make logging activities ask for cache/trackable when being invoked externally
+        // shortcuts.add(new Shortcut(R.string.cache_menu_visit, new Intent(this, LogCacheActivity.class)));
+        // shortcuts.add(new Shortcut(R.string.trackable_log_touch, new Intent(this, LogTrackableActivity.class)));
+
+        final Shortcut offlineShortcut = new Shortcut(R.string.list_title, R.drawable.main_stored, null);
+        shortcuts.add(offlineShortcut);
+        final Intent allIntent = new Intent(this, CacheListActivity.class);
+        allIntent.putExtra(Intents.EXTRA_LIST_ID, PseudoList.ALL_LIST.id);
+        shortcuts.add(new Shortcut(R.string.list_all_lists, R.drawable.main_stored, allIntent));
+        shortcuts.add(new Shortcut(R.string.advanced_search_button, R.drawable.main_search, new Intent(this, SearchActivity.class)));
+        shortcuts.add(new Shortcut(R.string.any_button, R.drawable.main_any, new Intent(this, NavigateAnyPointActivity.class)));
+        shortcuts.add(new Shortcut(R.string.menu_history, R.drawable.main_stored, CacheListActivity.getHistoryIntent(this)));
+
+        Dialogs.select(this, getString(R.string.create_shortcut), shortcuts, new Action1<Shortcut>() {
+
+            @Override
+            public void call(final Shortcut shortcut) {
+                if (shortcut == offlineShortcut) {
+                    promptForListShortcut();
+                }
+                else {
+                    createShortcutAndFinish(shortcut.toString(), shortcut.intent, shortcut.drawableResourceId);
+                }
+            }
+        });
+    }
+
+    protected void promptForListShortcut() {
         new StoredList.UserInterface(this).promptForListSelection(R.string.create_shortcut, new Action1<Integer>() {
 
             @Override
             public void call(final Integer listId) {
-                final Intent shortcut = createShortcut(listId);
-                setResult(RESULT_OK, shortcut);
-
-                // finish activity to return the shortcut
-                finish();
+                createOfflineListShortcut(listId);
             }
-        }, false, PseudoList.HISTORY_LIST.id);
+        }, true, PseudoList.NEW_LIST.id);
     }
 
-    protected Intent createShortcut(int listId) {
+    protected void createOfflineListShortcut(final int listId) {
         final StoredList list = DataStore.getList(listId);
-        if (list == null) {
-            return null;
-        }
         // target to be executed by the shortcut
         final Intent targetIntent = new Intent(this, CacheListActivity.class);
         targetIntent.putExtra(Intents.EXTRA_LIST_ID, list.id);
-        final ShortcutIconResource iconResource = Intent.ShortcutIconResource.fromContext(this, R.drawable.cgeo);
 
         // shortcut to be returned
+        createShortcutAndFinish(list.title, targetIntent, R.drawable.main_stored);
+    }
+
+    private void createShortcutAndFinish(final String title, final Intent targetIntent, final int iconResourceId) {
         final Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, targetIntent);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, list.title);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-        return intent;
+        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, title);
+        if (iconResourceId == R.drawable.cgeo) {
+            final ShortcutIconResource iconResource = Intent.ShortcutIconResource.fromContext(this, iconResourceId);
+            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
+        }
+        else {
+            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createOverlay(iconResourceId));
+        }
+
+        setResult(RESULT_OK, intent);
+
+        // finish activity to return the shortcut
+        finish();
+    }
+
+    private Bitmap createOverlay(final int drawableResourceId) {
+        final LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] {
+                res.getDrawable(drawableResourceId), res.getDrawable(R.drawable.cgeo) });
+        layerDrawable.setLayerInset(0, 0, 0, 10, 10);
+        layerDrawable.setLayerInset(1, 50, 50, 0, 0);
+        return ImageUtils.convertToBitmap(layerDrawable);
     }
 
 }