ANDROID: add shortcut option

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2016-02-11
 	Added export to mobile command (SDL)
+	Added Desktop shortcut command (android)
 
 2015-12-05
 	Implemented loading recent files via ALT+1 .. ALT+9

src/platform/android/jni/runtime.cpp

@@ -139,7 +139,7 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_r
 
 extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onResize
   (JNIEnv *env, jclass jclazz, jint width, jint height) {
-  if (runtime != NULL && runtime->isActive() && os_graphics) {
+  if (runtime != NULL && !runtime->isClosing() && runtime->isActive() && os_graphics) {
     runtime->onResize(width, height);
   }
 }
@@ -831,9 +831,6 @@ void System::editSource(strlib::String &loadPath) {
           saveFile(editWidget, loadPath);
         }
         break;
-      case SB_KEY_F(10):
-        runtime->addShortcut(loadPath.c_str());
-        break;
       case SB_KEY_CTRL('s'):
         saveFile(editWidget, loadPath);
         break;

src/platform/android/src/net/sourceforge/smallbasic/MainActivity.java

@@ -85,18 +85,21 @@ public class MainActivity extends NativeActivity {
   public static native void runFile(String fileName);
 
   public void addShortcut(final String path) {
-    Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-    intent.setAction(Intent.ACTION_MAIN);
-    Intent addIntent = new Intent();
-    addIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
-    addIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, "SmallBASIC");
-    addIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                       Intent.ShortcutIconResource.fromContext(getApplicationContext(),
-                                                               R.drawable.ic_launcher));
-    addIntent.putExtra("duplicate", false);
-    addIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
-    getApplicationContext().sendBroadcast(addIntent);
-    showToast("The shortcut was created and has been placed on your home screen", true);
+    Intent shortcut = new Intent(getApplicationContext(), MainActivity.class);
+    shortcut.setAction(Intent.ACTION_MAIN);
+    shortcut.setData(Uri.parse("smallbasic://" + path));
+    Intent intent = new Intent();
+    int index = path.lastIndexOf('/');
+    String name = (index == -1) ? path : path.substring(index + 1);
+    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcut);
+    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
+    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                    Intent.ShortcutIconResource.fromContext(getApplicationContext(),
+                                                            R.drawable.ic_launcher));
+    intent.putExtra("duplicate", false);
+    intent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+    getApplicationContext().sendBroadcast(intent);
+    showToast("The shortcut " + name + " was created and has been placed on your home screen", true);
   }
 
   public int ask(final String title, final String prompt, final boolean cancel) {

src/platform/sdl/runtime.h

@@ -21,6 +21,7 @@ struct Runtime : public System {
   Runtime(SDL_Window *window);
   virtual ~Runtime();
 
+  void addShortcut(const char *) {}
   void alert(const char *title, const char *message);
   int ask(const char *title, const char *prompt, bool cancel);
   void browseFile(const char *url);

src/ui/system.cpp

@@ -344,8 +344,9 @@ void System::handleMenu(MAEvent &event) {
     event.key = SB_KEY_F(1);
     break;
   case MENU_SHORTCUT:
-    event.type = EVENT_TYPE_KEY_PRESSED;
-    event.key = SB_KEY_F(10);
+    if (_activeFile.length() > 0) {
+      addShortcut(_activeFile.c_str());
+    }
     break;
   case MENU_COMPETION_0:
     completeKeyword(0);
@@ -839,9 +840,6 @@ void System::showMenu() {
         sprintf(buffer, "Control Mode [%s]", (controlMode ? "ON" : "OFF"));
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_CTRL_MODE;
-      } else {
-        items->add(new String("Desktop Shortcut"));
-        _systemMenu[index++] = MENU_SHORTCUT;
       }
 #endif
     } else {
@@ -879,6 +877,11 @@ void System::showMenu() {
 #if defined(_SDL)
       items->add(new String("Back"));
       _systemMenu[index++] = MENU_BACK;
+#else
+      if (!_mainBas && _activeFile.length() > 0) {
+        items->add(new String("Desktop Shortcut"));
+        _systemMenu[index++] = MENU_SHORTCUT;
+      }
 #endif
     }
     optionsBox(items);

src/ui/system.h

@@ -53,6 +53,7 @@ struct System {
     kHand, kArrow, kIBeam
   };
 
+  virtual void addShortcut(const char *path) = 0;
   virtual void alert(const char *title, const char *message) = 0;
   virtual int ask(const char *title, const char *prompt, bool cancel=true) = 0;
   virtual void debugStart(TextEditInput *edit, const char *file) = 0;