Merge branch 'Acode-Foundation:main' into main

Author: hyperz111

CONTRIBUTING.md

@@ -181,29 +181,24 @@ Many font editing software and web-based tools exist for this purpose. Some of t
 
 ### Steps in Icomoon to add new Icons
 
-1. Download the `icons.ttf` file from https://github.com/Acode-Foundation/Acode/tree/main/src/res/icons
-2. Go to https://icomoon.io/ > Start a new Project
-3. Import the `icons.ttf` downloaded (in step 1)
+1. Download the `code-editor-icon.icomoon.json` file from https://github.com/Acode-Foundation/Acode/tree/main/utils
+2. Go to https://icomoon.io/ > Import
+3. Import the `code-editor-icon.icomoon.json` downloaded (in step 1)
 4. All icons will be displayed after importing.
 5. Import the SVG icon created/downloaded to be added to the Font Family.
-6. On the right side, press **enable Show Characters** to view the Unicode character for that icon.
-7. Copy the newly added icon's Unicode character (required for later steps)
+6. On the right side, press **enable Show Characters** & **Show Names** to view the Unicode character & Name for that icon.
+7. Provided the newly added SVG icon with a name (in the name box).
 8. Repeat Step 5 and Step 7 until all needed new icons are added.
 9. Press the export icon from the top left-hand side.
-10. Add **Font** in the formats section, expand the **Font**, enter **code-editor-icon** as the font-family for `icons.ttf` file.
-11. Press the download button, and a zip file will be downloaded.
-
-### Adding the Unicode characters to style.css
-
-1. Open the `style.css` file present at https://github.com/Acode-Foundation/Acode/tree/main/src/res/icons
-2. Add a new class called `.icon.icon-name:before` e.g ```.icon.all_inclusive:before { content: "\ea18"; }```
-3. `content` (i.e., `ea18` -> `\ea18`) property's value is the Unicode Character copied after importing the icon in the font family.
-4. Save the `style.css` file.
-5. Extract the downloaded zip file; navigate to the `fonts` folder inside it.
-6. Rename `code-editor-icon.ttf` to `icons.ttf`.
-7. Copy & paste the renamed `icons.ttf` into https://github.com/Acode-Foundation/Acode/tree/main/src/res/icons
-8. Commit the changes **ON A NEW branch** (by following: [Commit Messages guide](#commit-messages))
-5. commit the changes **ON A NEW branch** (by following: [Commit Messages guide](#commit-messages))
+10. Press the download button, and a zip file will be downloaded.
+11. Go to the Projects section of [icomoon](https://icomoon.io/new-app), uncollapse/expand the Project named `code-editor-icon`  and press the **save** button (this downloads the project file named: `code-editor-icon.icomoon.json`)
+
+### Updating Project files for Icon Contribution
+1. Extract the downloaded zip file; navigate to the `fonts` folder inside it.
+2. Rename `code-editor-icon.ttf` to `icons.ttf`.
+3. Copy & paste the renamed `icons.ttf` into https://github.com/Acode-Foundation/Acode/tree/main/src/res/icons
+4. Copy and paste the `code-editor-icon.icomoon.json` file (downloaded in the adding icons steps) onto https://github.com/Acode-Foundation/Acode/tree/main/utils (yes, replace it with the newer one; we downloaded!)
+4. Commit the changes **ON A NEW branch** (by following: [Commit Messages guide](#commit-messages))
 
 ## 🔌 Plugin Development
 

biome.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
+	"$schema": "https://biomejs.dev/schemas/2.4.6/schema.json",
 	"formatter": {
 		"enabled": true,
 		"indentStyle": "tab"

bun.lock

@@ -5,9 +5,13 @@ const prettier = require('prettier');
 main();
 
 async function main() {
+  const patchVersion = '2';
   const flagFile = path.resolve(__dirname, '../platforms/android/.flag_done');
   if (fs.existsSync(flagFile)) {
-    return;
+    const appliedVersion = fs.readFileSync(flagFile, 'utf8').trim();
+    if (appliedVersion === patchVersion) {
+      return;
+    }
   }
 
   const base = path.resolve(__dirname, `../platforms/android/CordovaLib/src/org/apache/cordova`);
@@ -31,6 +35,18 @@ async function main() {
     ],
   };
 
+  const nativeContextMenuInterfaceMethod = {
+    name: 'setNativeContextMenuDisabled',
+    modifier: 'public',
+    returnType: 'void',
+    params: [
+      {
+        type: 'boolean',
+        name: 'disabled',
+      }
+    ],
+  };
+
   const setInputTypeMethod = {
     name: 'setInputType',
     modifier: 'public',
@@ -44,12 +60,31 @@ async function main() {
     body: ['webView.setInputType(type);'],
   };
 
+  const setNativeContextMenuDisabledMethod = {
+    name: 'setNativeContextMenuDisabled',
+    modifier: 'public',
+    returnType: 'void',
+    params: [
+      {
+        type: 'boolean',
+        name: 'disabled',
+      }
+    ],
+    body: ['webView.setNativeContextMenuDisabled(disabled);'],
+  };
+
   const contentToAdd = {
     'SystemWebView.java': {
       'import': [
+        'android.graphics.Rect',
+        'android.os.Build',
         'android.text.InputType',
+        'android.view.ActionMode',
         'android.view.inputmethod.InputConnection',
         'android.view.inputmethod.EditorInfo',
+        'android.view.Menu',
+        'android.view.MenuItem',
+        'android.view.View',
       ],
       'fields': [
         {
@@ -70,12 +105,30 @@ async function main() {
           modifier: 'private',
           value: '1',
         },
+        {
+          type: 'boolean',
+          name: 'nativeContextMenuDisabled',
+          modifier: 'private',
+          value: 'false',
+        },
       ],
       methods: [
         {
           ...setInputTypeMethod,
           body: [`this.type = type;`]
         },
+        {
+          name: 'setNativeContextMenuDisabled',
+          modifier: 'public',
+          returnType: 'void',
+          params: [
+            {
+              type: 'boolean',
+              name: 'disabled',
+            }
+          ],
+          body: [`this.nativeContextMenuDisabled = disabled;`],
+        },
         {
           name: 'onCreateInputConnection',
           modifier: 'public',
@@ -102,28 +155,215 @@ async function main() {
           ],
           notation: '@Override',
         },
+        {
+          name: 'startActionMode',
+          modifier: 'public',
+          returnType: 'ActionMode',
+          params: [
+            {
+              type: 'ActionMode.Callback',
+              name: 'callback',
+            }
+          ],
+          body: [
+            `return suppressActionMode(super.startActionMode(wrapActionModeCallback(callback)));`,
+          ],
+          notation: '@Override',
+        },
+        {
+          name: 'startActionMode',
+          modifier: 'public',
+          returnType: 'ActionMode',
+          params: [
+            {
+              type: 'ActionMode.Callback',
+              name: 'callback',
+            },
+            {
+              type: 'int',
+              name: 'type',
+            }
+          ],
+          body: [
+            `return suppressActionMode(super.startActionMode(wrapActionModeCallback(callback), type));`,
+          ],
+          notation: '@Override',
+        },
+        {
+          name: 'startActionModeForChild',
+          modifier: 'public',
+          returnType: 'ActionMode',
+          params: [
+            {
+              type: 'View',
+              name: 'originalView',
+            },
+            {
+              type: 'ActionMode.Callback',
+              name: 'callback',
+            }
+          ],
+          body: [
+            `return suppressActionMode(super.startActionModeForChild(originalView, wrapActionModeCallback(callback)));`,
+          ],
+          notation: '@Override',
+        },
+        {
+          name: 'startActionModeForChild',
+          modifier: 'public',
+          returnType: 'ActionMode',
+          params: [
+            {
+              type: 'View',
+              name: 'originalView',
+            },
+            {
+              type: 'ActionMode.Callback',
+              name: 'callback',
+            },
+            {
+              type: 'int',
+              name: 'type',
+            }
+          ],
+          body: [
+            `return suppressActionMode(super.startActionModeForChild(originalView, wrapActionModeCallback(callback), type));`,
+          ],
+          notation: '@Override',
+        },
+        {
+          name: 'wrapActionModeCallback',
+          modifier: 'private',
+          returnType: 'ActionMode.Callback',
+          params: [
+            {
+              type: 'ActionMode.Callback',
+              name: 'callback',
+            }
+          ],
+          body: [
+            `if (!nativeContextMenuDisabled || callback == null) {
+              return callback;
+            }
+            return new ActionMode.Callback2() {
+              @Override
+              public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                boolean created = callback.onCreateActionMode(mode, menu);
+                if (created) {
+                  suppressActionModeUi(mode, menu);
+                }
+                return created;
+              }
+
+              @Override
+              public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                boolean prepared = callback.onPrepareActionMode(mode, menu);
+                suppressActionModeUi(mode, menu);
+                return prepared;
+              }
+
+              @Override
+              public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                return callback.onActionItemClicked(mode, item);
+              }
+
+              @Override
+              public void onDestroyActionMode(ActionMode mode) {
+                callback.onDestroyActionMode(mode);
+              }
+
+              @Override
+              public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+                if (callback instanceof ActionMode.Callback2) {
+                  ((ActionMode.Callback2) callback).onGetContentRect(mode, view, outRect);
+                  return;
+                }
+                super.onGetContentRect(mode, view, outRect);
+              }
+            };`,
+          ],
+        },
+        {
+          name: 'suppressActionMode',
+          modifier: 'private',
+          returnType: 'ActionMode',
+          params: [
+            {
+              type: 'ActionMode',
+              name: 'mode',
+            }
+          ],
+          body: [
+            `if (mode == null || !nativeContextMenuDisabled) {
+              return mode;
+            }
+            suppressActionModeUi(mode, mode.getMenu());
+            return mode;`,
+          ],
+        },
+        {
+          name: 'suppressActionModeUi',
+          modifier: 'private',
+          returnType: 'void',
+          params: [
+            {
+              type: 'ActionMode',
+              name: 'mode',
+            },
+            {
+              type: 'Menu',
+              name: 'menu',
+            }
+          ],
+          body: [
+            `if (mode == null || !nativeContextMenuDisabled || menu == null) {
+              return;
+            }
+            menu.clear();
+            mode.setTitle(null);
+            mode.setSubtitle(null);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+              post(() -> {
+                if (!nativeContextMenuDisabled) {
+                  return;
+                }
+                try {
+                  mode.hide(0);
+                } catch (Throwable ignored) {
+                }
+              });
+            }`,
+          ],
+        },
       ]
     },
     'SystemWebViewEngine.java': {
       methods: [
-        setInputTypeMethod
+        setInputTypeMethod,
+        setNativeContextMenuDisabledMethod,
       ]
     },
     'CordovaWebViewEngine.java': {
       methods: [
-        interfaceMethod
+        interfaceMethod,
+        nativeContextMenuInterfaceMethod,
       ]
     },
     'CordovaWebView.java': {
       methods: [
-        interfaceMethod
+        interfaceMethod,
+        nativeContextMenuInterfaceMethod,
       ]
     },
     'CordovaWebViewImpl.java': {
       methods: [
         {
           ...setInputTypeMethod,
           body: [`engine.setInputType(type);`]
+        },
+        {
+          ...setNativeContextMenuDisabledMethod,
+          body: [`engine.setNativeContextMenuDisabled(disabled);`]
         }
       ]
     }
@@ -198,7 +438,7 @@ async function main() {
     });
   }
 
-  fs.writeFile(flagFile, '', err => {
+  fs.writeFile(flagFile, patchVersion, err => {
     if (err) {
       console.log(err);
       process.exit(1);
@@ -254,4 +494,4 @@ async function main() {
   function removeComments(content) {
     return content.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '');
   }
-}
+}