Skip to content

Merge upstream main and resolve app icon conflicts - #2

Merged
RohitKushvaha01 merged 40 commits into
RohitKushvaha01:add-app-iconsfrom
Acode-Foundation:add-app-icons
Sep 8, 2026
Merged

RohitKushvaha01 merged 40 commits into
RohitKushvaha01:add-app-iconsfrom
Acode-Foundation:add-app-icons

Conversation

@deadlyjack

Copy link
Copy Markdown

Merge upstream main (ddbc0c6a) into add-app-icons to resolve the conflicts blocking Acode-Foundation#2732. This preserves the existing icon, Pro purchase, and rewarded-ad changes while bringing the branch up to date with upstream.

  • Preserve both branches' translation values and regenerate typings for the combined 876 English keys.
  • Add English fallback text for the seven icon strings missing from the new Lingala locale; leave its pre-existing translation gaps unchanged.
  • Combine confirmation cancellation and unique Back-handler IDs with RTL and overlay support, retaining tests for both behaviors using the real action stack.

Validation: 119 tests passed across 14 affected suites. Translation checks cover all 32 locales, with no duplicate keys or newly missing keys. The AdMob bundle and diff checks pass.

Please use Create a merge commit when merging this PR to preserve the upstream main ancestry.

ulite-Amr and others added 30 commits August 22, 2026 02:34
…le (#2781)

* fix: fall back to internal storage when external storage is unavailable

The app used to pick the external data directory unconditionally and then
create the plugins directory without guarding against failures. On devices
where the external filesystem cannot be created (e.g. Android/data dir is
not creatable), the unhandled rejection aborted startup, leaving users stuck
on the splash screen with a misleading "Update Android System WebView or
Chrome" message.

- Probe external storage with fs.stat() and fall back to internal storage
- Wrap plugins directory creation in try/catch and fall back to internal
- Request storage permissions only on SDK < 33, guarded by hasPermission
- Guard editorManager.hasUnsavedFiles() access in exitAppMessage
- Show an honest "storage is unavailable" startup message for storage errors

* fix: detect storage errors via FileError instanceof instead of numeric code range
* fix(sftp): cancel stalled connections and prevent delayed errors

* fix race cases
* fix: admob issues

* fix: restore Android build commands

---------

Co-authored-by: Ajit Kumar <dellevenjack@gmail>
* fix(session): restore picker documents and skip intent files tab

* feat(file-browser): expose document picker(icon) from nested folders

* fix
* feat(console): isolate execution and improve mobile REPL UX

- run console JavaScript in a cancellable Web Worker
- protect the app from infinite loops and recursion
- preserve history with variable-height virtualization
- restore the inline REPL layout
- fix mobile keyboard resizing and viewport gaps
- add clear and stop controls

* fix(console): address execution context and bottom pinning

* address the pinning regression

* remove stop, run btn
* feat(console): follow active Acode theme

* fix

* fix
* fix: preserve MIME type for plugin icons on plugin details page

* fix
* fix(console): run JavaScript files in isolated worker

* fix
* feat: plugin commit

Allow logged in user to review plugins from the app.

* fix: api url

---------

Co-authored-by: Ajit Kumar <dellevenjack@gmail>
* feat(editor): improve mobile selection menu overflow UX

* fix(editor): prevent selection actions during overflow scrolling

* fix(editor): validate pointer displacement on release
* fix(search): include restored files in global search

* fix
)

Replace the plain object container used for cached directories with an ES6 `Map` to improve key management semantics.

Update cached directory data structure (`src/pages/fileBrowser/fileBrowser.js`):
- Re-initialize `cachedDir` variable as a `Map`
- Replace object property lookups with `Map.prototype.has()` and `Map.prototype.get()`
- Update cache writes to use `Map.prototype.set()`
- Update directory deletion calls to use `Map.prototype.delete()`

(AI generated commit message)
…tes (#2832)

* chore(community-release-notifier): Change sed parsing - TG release notes

This commit fixes Release notes not being sed escaped properly leading towards Telegram notifier failing for Stable Releases as they were auto-generated by git.

* Disable markdown format in community release notifier

Commented out the markdown format option in the Telegram notifier.
* fix(editor): restore cursor state and prevent tab-switch flash

* fix
- advertise code action resolve support
- clamp LSP positions beyond document bounds
- support LocationLink and multiple navigation results
- add LSP operations to the selection menu
- fix navigation scrolling after switching files
- use shared position and location normalization helpers
* Translation: Update hu-hu.json

Fixing AI-translated strings

* Translation: Update hu-hu.json

Fix typos
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5 to 6.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: improved pluginContext

* Update src/lib/pluginContext.js

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* format

* fix: holes

* format

* .

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
* fix(webview): retain instance when destroy fails

* test(webview): cover destroy failure lifecycle

* fix(webview): serialize concurrent destruction

* test(webview): cover concurrent destruction
* fix(sftp): recover from failed profile migration

* fix(sftp): migrate folder-state URL keys

* fix

* fix
bajrangCoder and others added 10 commits September 1, 2026 12:04
* fix(editor): treat missing write capability as editable

* fix
* fix: race condition when moving to exact line/col

* fix(search): cancel obsolete result navigation

* fix(search): preserve loader during concurrent file opens
* Update keyBindings.js

* Fix formatting of welcomeTab key binding

* Added new shortcut to open welcome window

* Shortcut For Opening Welcome Tab

* Update keyBindings.js

* Modify welcomeTab key binding description

Updated the description for the welcomeTab key binding.

* Fix changes

* Rename welcomeTab to acode:showWelcome

fix cmd description and rename the command name to "acode:showWelcome" so that it matches the existing command and adds the keybind to it instead of a possibly new command.

---------

Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
* Update Lingala translation

* Add Lingala translation

* Complete Lingala translation strings

* chore: update Lingala translations

* chore: update more Lingala translations

* Complete Lingala translations

* Update Lingala translation

* Translate remaining strings to Lingala

* Fix French strings in Lingala translation

* Fix French strings in Lingala translation

* Improve Lingala translation
@github-actions github-actions Bot added enhancement New feature or request translations docs labels Sep 7, 2026
@RohitKushvaha01
RohitKushvaha01 merged commit b69fd4e into RohitKushvaha01:add-app-icons Sep 8, 2026
4 of 5 checks passed
deadlyjack pushed a commit that referenced this pull request Sep 8, 2026
Preserve the conflict-resolution merge after PR #2 was squash-merged. The resulting file tree is unchanged.
RohitKushvaha01 added a commit that referenced this pull request Sep 8, 2026
* feat: added icons and api

* Update src/plugins/system/android/com/foxdebug/system/System.java

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* feat: added frontend

* feat: added frontend

* fix: add missing entries

* fix: icons, new pro icon, icons for free version

* Merge upstream main and resolve app icon conflicts (#2)

* fix: fall back to internal storage when external storage is unavailable (Acode-Foundation#2781)

* fix: fall back to internal storage when external storage is unavailable

The app used to pick the external data directory unconditionally and then
create the plugins directory without guarding against failures. On devices
where the external filesystem cannot be created (e.g. Android/data dir is
not creatable), the unhandled rejection aborted startup, leaving users stuck
on the splash screen with a misleading "Update Android System WebView or
Chrome" message.

- Probe external storage with fs.stat() and fall back to internal storage
- Wrap plugins directory creation in try/catch and fall back to internal
- Request storage permissions only on SDK < 33, guarded by hasPermission
- Guard editorManager.hasUnsavedFiles() access in exitAppMessage
- Show an honest "storage is unavailable" startup message for storage errors

* fix: detect storage errors via FileError instanceof instead of numeric code range

* fix(theme): prevent freeze when switching to system theme (Acode-Foundation#2790)

* fix(sftp): cancel stalled connections and prevent delayed errors (Acode-Foundation#2791)

* fix(sftp): cancel stalled connections and prevent delayed errors

* fix race cases

* fix: admob issues (Acode-Foundation#2800)

* fix: admob issues

* fix: restore Android build commands

---------

Co-authored-by: Ajit Kumar <dellevenjack@gmail>

* fix(android): avoid splash surface crash on realme Android 13 (Acode-Foundation#2805)

* fix(session): restore picker documents and skip intent files tab (Acode-Foundation#2809)

* fix(session): restore picker documents and skip intent files tab

* feat(file-browser): expose document picker(icon) from nested folders

* fix

* feat(console): isolate execution and improve mobile REPL UX (Acode-Foundation#2808)

* feat(console): isolate execution and improve mobile REPL UX

- run console JavaScript in a cancellable Web Worker
- protect the app from infinite loops and recursion
- preserve history with variable-height virtualization
- restore the inline REPL layout
- fix mobile keyboard resizing and viewport gaps
- add clear and stop controls

* fix(console): address execution context and bottom pinning

* address the pinning regression

* remove stop, run btn

* feat(console): follow active Acode theme (Acode-Foundation#2814)

* feat(console): follow active Acode theme

* fix

* fix

* chore: update deps

* Enhanced: Indonesian (id) language translations (Acode-Foundation#2798)

* update deps

* fix: preserve MIME type for plugin icons on plugin details page (Acode-Foundation#2818)

* fix: preserve MIME type for plugin icons on plugin details page

* fix

* fix(console): run JavaScript files in isolated worker (Acode-Foundation#2819)

* fix(console): run JavaScript files in isolated worker

* fix

* feat: plugin review (Acode-Foundation#2826)

* feat: plugin commit

Allow logged in user to review plugins from the app.

* fix: api url

---------

Co-authored-by: Ajit Kumar <dellevenjack@gmail>

* Improve selection menu UX and plugin action overflow (Acode-Foundation#2813)

* feat(editor): improve mobile selection menu overflow UX

* fix(editor): prevent selection actions during overflow scrolling

* fix(editor): validate pointer displacement on release

* fix(search): include restored files in global search (Acode-Foundation#2830)

* fix(search): include restored files in global search

* fix

* chore: v1.13.2

* refactor(file-browser): Convert directory cache to `Map` instance (Acode-Foundation#2831)

Replace the plain object container used for cached directories with an ES6 `Map` to improve key management semantics.

Update cached directory data structure (`src/pages/fileBrowser/fileBrowser.js`):
- Re-initialize `cachedDir` variable as a `Map`
- Replace object property lookups with `Map.prototype.has()` and `Map.prototype.get()`
- Update cache writes to use `Map.prototype.set()`
- Update directory deletion calls to use `Map.prototype.delete()`

(AI generated commit message)

* fix(editor): stabilize selection menu sizing and transitions (Acode-Foundation#2833)

* fix(editor): keep fullscreen controls above bottom pane tabs (Acode-Foundation#2834)

* chore(community-release-notifier): Change sed parsing - TG release notes (Acode-Foundation#2832)

* chore(community-release-notifier): Change sed parsing - TG release notes

This commit fixes Release notes not being sed escaped properly leading towards Telegram notifier failing for Stable Releases as they were auto-generated by git.

* Disable markdown format in community release notifier

Commented out the markdown format option in the Telegram notifier.

* fix(editor): restore cursor state and prevent tab-switch flash (Acode-Foundation#2835)

* fix(editor): restore cursor state and prevent tab-switch flash

* fix

* feat(lsp): improve actions, navigation, and position handling (Acode-Foundation#2837)

- advertise code action resolve support
- clamp LSP positions beyond document bounds
- support LocationLink and multiple navigation results
- add LSP operations to the selection menu
- fix navigation scrolling after switching files
- use shared position and location normalization helpers

* fix(editor): highlight all visible search matches (Acode-Foundation#2838)

* Translation: Update hu-hu.json (Acode-Foundation#2828)

* Translation: Update hu-hu.json

Fixing AI-translated strings

* Translation: Update hu-hu.json

Fix typos

* chore(deps): bump actions/setup-java from 5 to 6 (Acode-Foundation#2821)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5 to 6.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: improved pluginContext (Acode-Foundation#2806)

* feat: improved pluginContext

* Update src/lib/pluginContext.js

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* format

* fix: holes

* format

* .

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* fix(webview): retain instance when destroy fails (Acode-Foundation#2836)

* fix(webview): retain instance when destroy fails

* test(webview): cover destroy failure lifecycle

* fix(webview): serialize concurrent destruction

* test(webview): cover concurrent destruction

* fix(sftp): recover from failed profile migration (Acode-Foundation#2840)

* fix(sftp): recover from failed profile migration

* fix(sftp): migrate folder-state URL keys

* fix

* fix

* chore: v1.13.3

* fix: typo

* fix: prevent Cordova exec startup race (Acode-Foundation#2851)

* fix(editor): improve selection contrast on active lines (Acode-Foundation#2852)

* fix(editor): treat missing write capability as editable (Acode-Foundation#2853)

* fix(editor): treat missing write capability as editable

* fix

* fix: race condition when moving to exact line/col (Acode-Foundation#2856)

* fix: race condition when moving to exact line/col

* fix(search): cancel obsolete result navigation

* fix(search): preserve loader during concurrent file opens

* Add GitHub Actions workflow for congratulating Community PRs (Acode-Foundation#2855)

* Shortcut For Opening Welcome Tab  (Acode-Foundation#2773)

* Update keyBindings.js

* Fix formatting of welcomeTab key binding

* Added new shortcut to open welcome window

* Shortcut For Opening Welcome Tab

* Update keyBindings.js

* Modify welcomeTab key binding description

Updated the description for the welcomeTab key binding.

* Fix changes

* Rename welcomeTab to acode:showWelcome

fix cmd description and rename the command name to "acode:showWelcome" so that it matches the existing command and adds the keybind to it instead of a possibly new command.

---------

Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>

* chore: Add Lingala (ln) translation (Acode-Foundation#2775)

* Update Lingala translation

* Add Lingala translation

* Complete Lingala translation strings

* chore: update Lingala translations

* chore: update more Lingala translations

* Complete Lingala translations

* Update Lingala translation

* Translate remaining strings to Lingala

* Fix French strings in Lingala translation

* Fix French strings in Lingala translation

* Improve Lingala translation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Amr Ayman <48989143+ulite-Amr@users.noreply.github.com>
Co-authored-by: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com>
Co-authored-by: Ajit Kumar <dellevenjack@gmail>
Co-authored-by: TM <anonymous.matrixtm26.dev@gmail.com>
Co-authored-by: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com>
Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Co-authored-by: summoner <summoner001@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rohit Kushvaha <oldisg131@gmail.com>
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Co-authored-by: azamkassim <azam.kassim.work@gmail.com>
Co-authored-by: Game-Dev-Shubham <shubhamyadav1247878@gmail.com>
Co-authored-by: Degrace <kiminoudegrace64@gmail.com>

* fix: lang

* format

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Co-authored-by: Ajit Kumar <dellevenjack@gmail>
Co-authored-by: Ajit Kumar <dellevenjack@gmail.com>
Co-authored-by: Amr Ayman <48989143+ulite-Amr@users.noreply.github.com>
Co-authored-by: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com>
Co-authored-by: TM <anonymous.matrixtm26.dev@gmail.com>
Co-authored-by: AuDevTist1C <114492072+AuDevTist1C@users.noreply.github.com>
Co-authored-by: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Co-authored-by: summoner <summoner001@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: azamkassim <azam.kassim.work@gmail.com>
Co-authored-by: Game-Dev-Shubham <shubhamyadav1247878@gmail.com>
Co-authored-by: Degrace <kiminoudegrace64@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.