Skip to content

Commit dd428d9

Browse files
authored
Merge branch 'main' into ai-agent
2 parents 3a33bf0 + fe1e003 commit dd428d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2018
-1528
lines changed

CHANGELOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
# Change Log
22

3+
## v1.11.6 (965)
4+
5+
* fix: Terminal in F-Droid flavour by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1478
6+
* feat: update target SDK to API 35 and fix edge-to-edge compatibility by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1486
7+
* improve German translation by @brian200508 in https://github.com/Acode-Foundation/Acode/pull/1487
8+
* Translation: Update hu-hu.json by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1489
9+
* chore(update IAP library to lateset version) by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1405
10+
* feat: font manager ui for managing custom fonts by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1491
11+
* feat: add package updated time display on plugin page by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1494
12+
* chore: update id-id.json by @hyperz111 in https://github.com/Acode-Foundation/Acode/pull/1495
13+
* fix: document provider by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1497
14+
* feat(sponsor page) by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1496
15+
* fix: load custom fonts on restart by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1499
16+
* Update hu-hu.json by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1498
17+
* fix: resolve GitHub URI preview issues in server by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1501
18+
* fix: plugins page scrolling by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1505
19+
* [chore] bump workflow dependencies to latest versions by @Jvr2022 in https://github.com/Acode-Foundation/Acode/pull/1506
20+
* fix: load base app stylesheet in custom editor tab by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1507
21+
* update src/lang/pt-br.json by @sebastianjnuwu in https://github.com/Acode-Foundation/Acode/pull/1510
22+
* Add code formatter keybind by @UnschooledGamer in https://github.com/Acode-Foundation/Acode/pull/1511
23+
* Added hyphen in quicktools and more strings for i18n by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1516
24+
* chore(i18n): update id-id.json with new strings by @hyperz111 in https://github.com/Acode-Foundation/Acode/pull/1521
25+
* chore(i18n): update hu-hu.json with new strings by @summoner001 in https://github.com/Acode-Foundation/Acode/pull/1520
26+
* Add/Update Bengali (bn-BD) Translation File by @thebadhonbiswas in https://github.com/Acode-Foundation/Acode/pull/1522
27+
* feat: take confirmation before uninstalling terminal by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1528
28+
* fix ui issue by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1527
29+
* fix: disable changing editor theme when system is selected by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1529
30+
* fix: svg render issue by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1530
31+
* fix: encoding detection by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1533
32+
* fix: big screen ui and global search worker issue by @deadlyjack in https://github.com/Acode-Foundation/Acode/pull/1534
33+
* fix: improved terminal mounts by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1537
34+
* chore(i18n): refine Russian (ru-ru.json) localization with updated and new strings by @Nein-Ich-wurde-Gewinnen in https://github.com/Acode-Foundation/Acode/pull/1541
35+
* Fixed Plugin installation issues(in some cases) by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1546
36+
* feat: add option to auto detect encoding by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1547
37+
* fix: ftp infinite loading by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1552
38+
* fix: tab active state when switching tab with api by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1557
39+
* fix: resize of terminal and some small patches by @bajrangCoder in https://github.com/Acode-Foundation/Acode/pull/1562
40+
* fix: fdroid builds by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1565
41+
342
## v1.11.5 (963)
443

544
* Alpine Linux Backend by @RohitKushvaha01 in https://github.com/Acode-Foundation/Acode/pull/1401

config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8' ?>
2-
<widget id="com.foxdebug.acode" android-versionCode="963" version="1.11.5"
2+
<widget id="com.foxdebug.acode" android-versionCode="965" version="1.11.6"
33
xmlns="http://www.w3.org/ns/widgets"
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:cdv="http://cordova.apache.org/ns/1.0">

hooks/post-process.js

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,28 @@ enableStaticContext();
3434
patchTargetSdkVersion();
3535

3636

37+
function getTmpDir() {
38+
const tmpdirEnv = process.env.TMPDIR;
39+
40+
if (tmpdirEnv) {
41+
try {
42+
fs.accessSync(tmpdirEnv, fs.constants.R_OK | fs.constants.W_OK);
43+
return tmpdirEnv;
44+
} catch {
45+
// TMPDIR exists but not accessible
46+
}
47+
}
48+
49+
try {
50+
fs.accessSync("/tmp", fs.constants.R_OK | fs.constants.W_OK);
51+
return "/tmp";
52+
} catch {
53+
console.log("Error: No usable temporary directory found (TMPDIR or /tmp not accessible).");
54+
return null;
55+
// process.exit(1);
56+
}
57+
}
58+
3759
function patchTargetSdkVersion() {
3860
const prefix = execSync('npm prefix').toString().trim();
3961
const gradleFile = path.join(prefix, 'platforms/android/app/build.gradle');
@@ -49,15 +71,32 @@ function patchTargetSdkVersion() {
4971

5072
if (sdkRegex.test(content)) {
5173
let api = "35";
52-
const froidFlag = path.join(prefix, 'fdroid.bool');
53-
54-
if (fs.existsSync(froidFlag)) {
55-
const fdroid = fs.readFileSync(froidFlag, 'utf-8').trim();
56-
if (fdroid == "true") {
74+
const tmp = getTmpDir();
75+
if (tmp == null) {
76+
console.warn("---------------------------------------------------------------------------------\n\n\n\n");
77+
console.warn(`⚠️ fdroid.bool not found`);
78+
console.warn("⚠️ Fdroid flavour will be built");
79+
api = "28";
80+
console.warn("\n\n\n\n---------------------------------------------------------------------------------");
81+
} else {
82+
const froidFlag = path.join(getTmpDir(), 'fdroid.bool');
83+
84+
if (fs.existsSync(froidFlag)) {
85+
const fdroid = fs.readFileSync(froidFlag, 'utf-8').trim();
86+
if (fdroid == "true") {
87+
api = "28";
88+
}
89+
} else {
90+
console.warn("---------------------------------------------------------------------------------\n\n\n\n");
91+
console.warn(`⚠️ fdroid.bool not found`);
92+
console.warn("⚠️ Fdroid flavour will be built");
5793
api = "28";
94+
console.warn("\n\n\n\n---------------------------------------------------------------------------------");
95+
//process.exit(1);
5896
}
5997
}
6098

99+
61100
content = content.replace(sdkRegex, 'targetSdkVersion ' + api);
62101
fs.writeFileSync(gradleFile, content, 'utf-8');
63102
console.log('[Cordova Hook] ✅ Patched targetSdkVersion to ' + api);

package-lock.json

Lines changed: 3 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.foxdebug.acode",
33
"displayName": "Acode",
4-
"version": "1.11.5",
4+
"version": "1.11.6",
55
"description": "Acode is a code editor for android",
66
"scripts": {
77
"lang": "node ./utils/lang.js",
@@ -36,10 +36,9 @@
3636
"cordova-sqlite-storage": {},
3737
"cordova-plugin-websocket": {},
3838
"cordova-plugin-buildinfo": {},
39-
"com.foxdebug.acode.rk.exec.terminal": {},
40-
"com.foxdebug.acode.rk.exec.proot": {},
39+
"cordova-plugin-system": {},
4140
"cordova-plugin-browser": {},
42-
"cordova-plugin-system": {}
41+
"com.foxdebug.acode.rk.exec.terminal": {}
4342
},
4443
"platforms": [
4544
"android"
@@ -64,7 +63,6 @@
6463
"@types/url-parse": "^1.4.11",
6564
"autoprefixer": "^10.4.21",
6665
"babel-loader": "^10.0.0",
67-
"com.foxdebug.acode.rk.exec.proot": "file:src/plugins/proot",
6866
"com.foxdebug.acode.rk.exec.terminal": "file:src/plugins/terminal",
6967
"cordova-android": "^14.0.1",
7068
"cordova-clipboard": "^1.3.0",

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ yarn setup
6060
2. Build the project:
6161

6262
```shell
63-
yarn build <free|paid> <p|prod|d|dev> [fdroid]
63+
yarn build <free|paid> <p|prod|d|dev> [fdroid] <apk/bundle>
6464
```
6565

6666
**Note**: Add the fdroid flag only if you want to build the F-Droid-compatible version of Acode.

src/components/collapsableList.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ export default function collapsableList(
6868

6969
[$title, $mainWrapper].forEach(defineProperties);
7070

71+
$mainWrapper.dataset.id = `${Math.random().toString(36).substring(2, 15)}`;
72+
7173
return $mainWrapper;
7274

7375
function onUlScroll() {

src/components/contextmenu/style.scss

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,7 @@ body.no-animation {
2929
border: solid 1px transparent;
3030
border: solid 1px var(--popup-border-color);
3131

32-
@media (min-width: 769px) {
33-
min-width: 260px;
34-
max-width: 400px;
35-
min-height: 48px;
36-
box-shadow: 0 0 8px var(--box-shadow-color);
37-
}
38-
39-
@media (min-width: 1024px) {
40-
min-width: 300px;
41-
max-width: 480px;
42-
min-height: 56px;
43-
box-shadow: 0 0 16px var(--box-shadow-color);
44-
}
45-
46-
& + .mask {
32+
&+.mask {
4733
z-index: 110;
4834
}
4935

@@ -109,48 +95,10 @@ body.no-animation {
10995
pointer-events: none;
11096
opacity: 0.5;
11197
}
112-
113-
@media (min-width: 769px) {
114-
height: 56px;
115-
font-size: 1.05em;
116-
117-
&.notice::after {
118-
font-size: 1.3em;
119-
}
120-
121-
.text {
122-
.value {
123-
font-size: 0.85em;
124-
}
125-
}
126-
127-
.icon {
128-
font-size: 1.1em;
129-
}
130-
}
131-
132-
@media (min-width: 1024px) {
133-
height: 64px;
134-
font-size: 1.1em;
135-
136-
&.notice::after {
137-
font-size: 1.4em;
138-
}
139-
140-
.text {
141-
.value {
142-
font-size: 0.9em;
143-
}
144-
}
145-
146-
.icon {
147-
font-size: 1.2em;
148-
}
149-
}
15098
}
15199

152100
&.hide {
153101
transition: all 100ms ease;
154102
opacity: 0;
155103
}
156-
}
104+
}

src/components/searchbar/style.scss

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -44,38 +44,4 @@
4444
opacity: 0;
4545
transform: translate(0, -100%, 0);
4646
}
47-
48-
@media (min-width: 769px) {
49-
height: 60px;
50-
51-
input {
52-
margin: 8px;
53-
border-radius: 6px;
54-
font-size: 1.1em;
55-
padding: 0 12px;
56-
}
57-
58-
.icon {
59-
height: 60px;
60-
width: 60px;
61-
font-size: 1.4em;
62-
}
63-
}
64-
65-
@media (min-width: 1024px) {
66-
height: 70px;
67-
68-
input {
69-
margin: 10px;
70-
border-radius: 8px;
71-
font-size: 1.2em;
72-
padding: 0 16px;
73-
}
74-
75-
.icon {
76-
height: 70px;
77-
width: 70px;
78-
font-size: 1.6em;
79-
}
80-
}
81-
}
47+
}

src/components/sidebar/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import toast from "components/toast";
21
import "./style.scss";
2+
import toast from "components/toast";
33
import Ref from "html-tag-js/ref";
44
import actionStack from "lib/actionStack";
55
import auth, { loginEvents } from "lib/auth";

0 commit comments

Comments
 (0)