Fix "Max number of dynamics shortcuts exceed" error & add a few features

README.md

@@ -25,7 +25,7 @@ If your app targets Android 7.1 (API level 25) or higher, you can define shortcu
 
 #### Android
 
-1. Open up `android/app/src/main/java/[...]/MainActivity.java`
+1. Open up `android/app/src/main/java/[...]/MainApplication.java`
   - Add `import com.rnas.RNAppShortcutsPackage;` to the imports at the top of the file
   - Add `new RNAppShortcutsPackage()` to the list returned by the `getPackages()` method
 2. Append the following lines to `android/settings.gradle`:
@@ -65,7 +65,8 @@ RNAppShortcuts.addShortcut({
   shortLabel: 'sample',
   longLabel: 'sample label',
   iconFolderName: 'drawable',
-  iconName: 'icon'
+  iconName: 'icon',
+  order: 0
 })
 ```
 
@@ -76,7 +77,8 @@ RNAppShortcuts.updateShortcut({
   shortLabel: 'updated',
   longLabel: 'updated label',
   iconFolderName: 'drawable',
-  iconName: 'icon'
+  iconName: 'icon',
+  order: 1
 })
 ```
 
@@ -89,6 +91,7 @@ RNAppShortcuts.updateShortcut({
 | longLabel | String | Long label for the shortcut. |
 | iconFolderName | String | Folder name of the shortcut's icon. For example, if the icon is in `./android/app/src/res/drawable` folder of your prject, you should use `'drawable'` here.|
 | iconName | String | Name of the icon, without extension name. |
+| order | Number | Position of the shortcut. The lower the number is (0 being the minimum value), the higher the icon will positionned. |
 
 ### Remove App ShortCut
 

android/src/main/java/com/rnas/RNAppShortcutsModule.java

@@ -10,6 +10,7 @@
 import android.support.annotation.Nullable;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -30,6 +31,7 @@ public class RNAppShortcutsModule extends ReactContextBaseJavaModule {
     private final String ICON_FOLDER_KEY = "iconFolderName";
     private final String ICON_NAME_KEY = "iconName";
     private final String ACTIVITY_NAME_KEY = "activityName";
+    private final String ORDER_KEY = "order";
 
     public RNAppShortcutsModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -87,7 +89,16 @@ public void addShortcut(ReadableMap shortcutDetails) {
         ShortcutInfo shortcut = initShortcut(shortcutDetails);
 
         ShortcutManager shortcutManager = getShortCutManager();
-        shortcutManager.addDynamicShortcuts(Arrays.asList(shortcut));
+        List<ShortcutInfo> shortcuts = shortcutManager.getDynamicShortcuts();
+
+        if (shortcuts.size() >= shortcutManager.getMaxShortcutCountPerActivity() &&
+                shortcuts.size() > 0) {
+            shortcuts.remove(shortcuts.size() - 1);
+            shortcuts.add(0, shortcut);
+            shortcutManager.setDynamicShortcuts(shortcuts);
+        } else {
+            shortcutManager.addDynamicShortcuts(Collections.singletonList(shortcut));
+        }
     }
 
     @ReactMethod
@@ -130,9 +141,11 @@ private ShortcutInfo initShortcut(ReadableMap shortcutDetail) {
         ShortcutInfo shortcut = new ShortcutInfo.Builder(currentActivity, shortcutDetail.getString(ID_KEY))
                 .setShortLabel(shortcutDetail.getString(SHORT_LABEL_KEY))
                 .setLongLabel(shortcutDetail.getString(LONG_LABEL_KEY))
+                .setRank(shortcutDetail.getInt(ORDER_KEY))
                 .setIcon(Icon.createWithResource(currentActivity.getApplicationContext(), iconId))
                 .setIntent(intent)
                 .build();
+
         return shortcut;
     }
 
@@ -159,4 +172,4 @@ private ShortcutManager getShortCutManager() {
         return shortcutManager;
     }
 
-}
+}