From 803abe384b0948c530cd6b14bafdfcfd8812959c Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 08:03:37 +0530 Subject: [PATCH 01/36] feat: Add setting for toggling use Current File For Preview --- src/lib/commands.js | 2 +- src/lib/settings.js | 1 + src/settings/previewSettings.js | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/commands.js b/src/lib/commands.js index 2282dabfb..00f98d7cc 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -219,7 +219,7 @@ export default { editorManager.editor.resize(true); }, 'run'() { - editorManager.activeFile.run(); + editorManager.activeFile[appSettings.value.useCurrentFileForPreview ? runFile : run]?.(); }, 'run-file'() { editorManager.activeFile.runFile?.(); diff --git a/src/lib/settings.js b/src/lib/settings.js index 943a50a48..6d24bafe2 100644 --- a/src/lib/settings.js +++ b/src/lib/settings.js @@ -90,6 +90,7 @@ class Settings { showConsoleToggler: true, previewMode: this.PREVIEW_MODE_INAPP, disableCache: false, + useCurrentFileForPreview: false, host: 'localhost', search: this.#searchSettings, lang: 'en-us', diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index f6bdd0fb5..a1cca4ac7 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -1,3 +1,4 @@ +import Checkbox from 'components/checkbox'; import settingsPage from 'components/settingsPage'; import appSettings from 'lib/settings'; @@ -61,6 +62,11 @@ export default function previewSettings() { text: strings['disable in-app-browser caching'], checkbox: values.disableCache, }, + { + key: 'useCurrentAsPreview', + text: 'Should use Current File For preview instead of default (index.html)', + checkbox: values.useCurrentFileForPreview, + }, { key: 'showConsoleToggler', text: strings['show console toggler'], From 42939aed604a4cb5f3bdc377c735a4e025cab815 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 08:53:53 +0530 Subject: [PATCH 02/36] Add build-Android for testing --- .github/workflows/build-android.yaml | 62 ++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/build-android.yaml diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml new file mode 100644 index 000000000..43c7aea7b --- /dev/null +++ b/.github/workflows/build-android.yaml @@ -0,0 +1,62 @@ +name: Build Android + + on: [workflow_dispatch] + + jobs: + build: + name: Build APK + runs-on: ubuntu-latest + steps: + - name: Checkout source + uses: actions/checkout@v3 + + - name: Setup java + uses: actions/setup-java@v3 + with: + distribution: 'zulu' # See 'Supported distributions' for available options + java-version: '11' # only 11 works for this project + + - name: Setup Node.js + uses: actions/setup-node@v1 + with: + + node-version: 18.x + + + - name: Install Cordova + run: npm install -g cordova + + - name: Install yarn + run: npm install -g yarn + + - name: Install app dependencies + run: yarn setup + + - name: Configure the platform + run: yarn clean + + # - name: Add Android platform + # run: cordova platform add android + + - name: Build Android dev apk + run: yarn build android paid dev + + - name: Build Android prod aab + run: yarn build android paid prod + + - name: Sign + run: | + sudo chmod 777 ./sign.sh + ./sign.sh + + - name: Upload dev APK + uses: actions/upload-artifact@v3 + with: + name: app-dev + path: ./*.apk + + - name: Upload release bundle + uses: actions/upload-artifact@v3 + with: + name: app-release + path: ./*.aab From 81433042664e6f423824857cd36a131fc75a3652 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 08:57:55 +0530 Subject: [PATCH 03/36] Update build-android.yaml --- .github/workflows/build-android.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index 43c7aea7b..260f68987 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -1,8 +1,6 @@ name: Build Android - - on: [workflow_dispatch] - - jobs: +on: [push, workflow_dispatch] +jobs: build: name: Build APK runs-on: ubuntu-latest From d655f02f0300e0762a2ae315c5b68faa07acd66b Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:01:29 +0530 Subject: [PATCH 04/36] Update build-android.yaml --- .github/workflows/build-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index 260f68987..7efc78b42 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -12,7 +12,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' # See 'Supported distributions' for available options - java-version: '11' # only 11 works for this project + java-version: '17' # only 11 works for this project - name: Setup Node.js uses: actions/setup-node@v1 From 76cf90194e29da5ca7997d0dfaf781c8b049e702 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:07:53 +0530 Subject: [PATCH 05/36] Create sign.sh --- sign.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sign.sh diff --git a/sign.sh b/sign.sh new file mode 100644 index 000000000..52d4b7f66 --- /dev/null +++ b/sign.sh @@ -0,0 +1,29 @@ +## convert aab bundle to APK + + # grab tool for conversion + if [ ! -f bundletool-all-1.13.1.jar ]; then + wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar + fi + + # generate signature + if [ ! -f acode.keystore ]; then + # keytool -genkey -v -keystore acode.keystore -alias acode -keyalg RSA -keysize 2048 -validity 10000 -storepasswd acode123 -keypasswd acode123 + keytool -genkey -alias acode \ + -keyalg RSA -keystore acode.keystore \ + -dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US" \ + -validity 36500 \ + -keysize 4096 \ + -storepass password -keypass password + fi + + # cleanup if needed + rm -rf *.apks toc.pb + + # convert to apk + for aab in *.aab; do + java -jar "bundletool-all-1.13.1.jar" build-apks --bundle=$aab --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password + + # extract apk + unzip ${aab%.*}.apks + mv -v universal.apk ${aab%.*}.apk + done From 6e1bfd6ffdf37b330259bc84ff602d26481cf2c2 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:22:53 +0530 Subject: [PATCH 06/36] Add files via upload --- acode.keystore | Bin 0 -> 4390 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 acode.keystore diff --git a/acode.keystore b/acode.keystore new file mode 100644 index 0000000000000000000000000000000000000000..c247a87b2d1da80304e27048b748f2395e564842 GIT binary patch literal 4390 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 If1RBF05&-w8UO$Q literal 0 HcmV?d00001 From 3c11ad9c2d45caaca0e938989eb7b297c58b4c09 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:40:32 +0530 Subject: [PATCH 07/36] Update sign.sh --- sign.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sign.sh b/sign.sh index 52d4b7f66..6621f3940 100644 --- a/sign.sh +++ b/sign.sh @@ -18,7 +18,10 @@ # cleanup if needed rm -rf *.apks toc.pb - + + find **/**/*.aab + + # convert to apk for aab in *.aab; do java -jar "bundletool-all-1.13.1.jar" build-apks --bundle=$aab --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password From dc29f1efe513dbddb58781e9a9f8c9f97e0f84d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:03:18 +0530 Subject: [PATCH 08/36] Update build-android.yaml --- .github/workflows/build-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index 7efc78b42..be9d88dff 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -1,5 +1,5 @@ name: Build Android -on: [push, workflow_dispatch] +on: [workflow_dispatch] jobs: build: name: Build APK From ebb8c5a2ee7176a8dbe9fc008f61c6410777f544 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:03:58 +0530 Subject: [PATCH 09/36] Update sign.sh --- sign.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sign.sh b/sign.sh index 6621f3940..04ec1e631 100644 --- a/sign.sh +++ b/sign.sh @@ -1,5 +1,6 @@ ## convert aab bundle to APK - + pwd + # grab tool for conversion if [ ! -f bundletool-all-1.13.1.jar ]; then wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar From 1c69534850375abecc7434d846af5b775d8c30b3 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:15:46 +0530 Subject: [PATCH 10/36] Update build-android.yaml --- .github/workflows/build-android.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index be9d88dff..cdca89bbb 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -41,9 +41,12 @@ jobs: - name: Build Android prod aab run: yarn build android paid prod + id: android-aab-build - name: Sign run: | + pwd + echo "${{steps.android-aab-build.outputs}}" sudo chmod 777 ./sign.sh ./sign.sh From 9df55694986595ec5846e5087b877add2b7950aa Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:24:54 +0530 Subject: [PATCH 11/36] Update build-android.yaml --- .github/workflows/build-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index cdca89bbb..5edee4758 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -1,5 +1,5 @@ name: Build Android -on: [workflow_dispatch] +on: workflow_dispatch jobs: build: name: Build APK From 12e9d958b603dad7b18daaf334bf9be21a4abf4c Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:28:27 +0530 Subject: [PATCH 12/36] Update build-android.yaml --- .github/workflows/build-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index 5edee4758..0ac0db996 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -1,5 +1,5 @@ name: Build Android -on: workflow_dispatch +on: push jobs: build: name: Build APK From 915b383c9fc1c37f7c7db096b64fb77c8ee59f3e Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 11:14:34 +0530 Subject: [PATCH 13/36] add: File Structure Logging (For Debugging) --- sign.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sign.sh b/sign.sh index 04ec1e631..1d879174c 100644 --- a/sign.sh +++ b/sign.sh @@ -1,6 +1,6 @@ ## convert aab bundle to APK pwd - + tree # grab tool for conversion if [ ! -f bundletool-all-1.13.1.jar ]; then wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar @@ -20,7 +20,9 @@ # cleanup if needed rm -rf *.apks toc.pb - find **/**/*.aab + echo "🔎 Logging Tree(File Structure) & finding .aab" + tree + find /**/*.aab # convert to apk From 1981e4d34ff9453878aec2f10946575f15a42334 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 11:27:23 +0530 Subject: [PATCH 14/36] update --- sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sign.sh b/sign.sh index 1d879174c..a0ea28dad 100644 --- a/sign.sh +++ b/sign.sh @@ -21,7 +21,7 @@ rm -rf *.apks toc.pb echo "🔎 Logging Tree(File Structure) & finding .aab" - tree + tree -I "node_modules|plugins|src|res" find /**/*.aab From b5ab4eb781f5019a28a1e5acad972fb61893766c Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:44:08 +0530 Subject: [PATCH 15/36] Update sign.sh --- sign.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/sign.sh b/sign.sh index a0ea28dad..2085635d1 100644 --- a/sign.sh +++ b/sign.sh @@ -1,6 +1,5 @@ ## convert aab bundle to APK pwd - tree # grab tool for conversion if [ ! -f bundletool-all-1.13.1.jar ]; then wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar From f0102d8e689f951e5d44bbf47acd34f66f6dcfbf Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 12:24:17 +0530 Subject: [PATCH 16/36] fix: find cmd's expression/pattern matching --- sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sign.sh b/sign.sh index a0ea28dad..c41b21af0 100644 --- a/sign.sh +++ b/sign.sh @@ -22,7 +22,7 @@ echo "🔎 Logging Tree(File Structure) & finding .aab" tree -I "node_modules|plugins|src|res" - find /**/*.aab + find . -name "*.aab" # convert to apk From c5c07add8961e34f53b8ae22d56be9f0d241d41f Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 12:51:41 +0530 Subject: [PATCH 17/36] fix: convert to apk step of sign.sh --- sign.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sign.sh b/sign.sh index 5e47ed495..4b1e33d3d 100644 --- a/sign.sh +++ b/sign.sh @@ -25,10 +25,10 @@ # convert to apk - for aab in *.aab; do - java -jar "bundletool-all-1.13.1.jar" build-apks --bundle=$aab --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password + for aab in $(find . -name "*.aab"); do + java -jar "bundletool-all-1.13.1.jar" build-apks --bundle="$aab" --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password - # extract apk - unzip ${aab%.*}.apks - mv -v universal.apk ${aab%.*}.apk - done + # extract apk + unzip "${aab%.*}.apks" + mv -v universal.apk "${aab%.*}.apk" +done \ No newline at end of file From 4781331f5c67477a7a6f633c1e23efd10e843d29 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 13:03:08 +0530 Subject: [PATCH 18/36] fix: path of outputed apks --- sign.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sign.sh b/sign.sh index 4b1e33d3d..c9aa81110 100644 --- a/sign.sh +++ b/sign.sh @@ -30,5 +30,10 @@ # extract apk unzip "${aab%.*}.apks" + + # Extract just the file name from the path + filename=$(basename "$aab") + + # Move and rename the universal APK mv -v universal.apk "${aab%.*}.apk" done \ No newline at end of file From b5a87fdd29627ca7ed230a38c832900b6db9e966 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 13:03:08 +0530 Subject: [PATCH 19/36] fix: path of outputed apks --- sign.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sign.sh b/sign.sh index 4b1e33d3d..b92f045ba 100644 --- a/sign.sh +++ b/sign.sh @@ -19,8 +19,7 @@ # cleanup if needed rm -rf *.apks toc.pb - echo "🔎 Logging Tree(File Structure) & finding .aab" - tree -I "node_modules|plugins|src|res" + echo "🔎 finding .aab files" find . -name "*.aab" @@ -30,5 +29,10 @@ # extract apk unzip "${aab%.*}.apks" - mv -v universal.apk "${aab%.*}.apk" -done \ No newline at end of file + + # Extract just the file name from the path + filename=$(basename "$aab") + + # Move and rename the universal APK + mv -v universal.apk "${filename%.*}.apk" +done From d00572588b4495cc0d9a28951013165e40813b8a Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 15:28:16 +0530 Subject: [PATCH 20/36] fix: setup.js script not creating build dirs for `www` dir --- utils/setup.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/setup.js b/utils/setup.js index 71ad84ddf..178e3f599 100644 --- a/utils/setup.js +++ b/utils/setup.js @@ -18,6 +18,13 @@ try { } catch (error) { // ignore } + +try { + execSync('mkdir -p www/css/build www/js/build', { stdio: 'inherit' }) +} catch (error) { + console.log("Failed to create www/css/build & www/js/build directories (You may Try after reading The Error)", error) +} + execSync('cordova plugin add cordova-plugin-buildinfo', { stdio: 'inherit' }); execSync('cordova plugin add cordova-plugin-device', { stdio: 'inherit' }); execSync('cordova plugin add cordova-plugin-file', { stdio: 'inherit' }); From a093f054af98fa4782ec77bb29304615cb13ee6d Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 18:08:21 +0530 Subject: [PATCH 21/36] fix: run btn's single click not working after `useCurrentFileForPreview` feature --- src/lib/commands.js | 3 ++- src/settings/previewSettings.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/commands.js b/src/lib/commands.js index 00f98d7cc..3bd13afc6 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -219,7 +219,8 @@ export default { editorManager.editor.resize(true); }, 'run'() { - editorManager.activeFile[appSettings.value.useCurrentFileForPreview ? runFile : run]?.(); + console.log("[RUN]", `useCurrentFileForPreview: ${appSettings.value.useCurrentFileForPreview}`, editorManager.activeFile[appSettings.value.useCurrentFileForPreview ? "runFile" : "run"]) + editorManager.activeFile[appSettings.value.useCurrentFileForPreview ? "runFile" : "run"]?.(); }, 'run-file'() { editorManager.activeFile.runFile?.(); diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index a1cca4ac7..3f97382a6 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -64,7 +64,7 @@ export default function previewSettings() { }, { key: 'useCurrentAsPreview', - text: 'Should use Current File For preview instead of default (index.html)', + text: strings['Should use Current File For preview instead of default (index.html)'], checkbox: values.useCurrentFileForPreview, }, { From acb3580150780002863a30cf4d9f733e7a9bbbc1 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 18:08:39 +0530 Subject: [PATCH 22/36] add: rename util for testing --- utils/rename.js | 55 ++++++++++++++++++++++++++++++++++++++++++ utils/scripts/build.sh | 6 ++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 utils/rename.js diff --git a/utils/rename.js b/utils/rename.js new file mode 100644 index 000000000..4827e5a0b --- /dev/null +++ b/utils/rename.js @@ -0,0 +1,55 @@ +const path = require('path'); +const fs = require('fs'); +const { promisify } = require('util'); +const exec = promisify(require('child_process').exec); + +(async () => { + const platformsDir = path.resolve(__dirname, '../platforms/'); + const configpath = path.resolve(__dirname, '../config.xml'); + const APK_PATH = platformsDir + "/android/app/build/outputs/apk/debug/app-debug.apk"; + const AAB_PATH = platformsDir + "/android/app/build/outputs/bundle/release/app-release.aab"; + const ID_PAID = 'com.foxdebug.acode'; + const ID_FREE = 'com.foxdebug.acodefree'; + const CONFIG_VERSION = / " + target); + fs.rename(artifact, target, () => {}); + + process.exit(0); + } catch (error) { + console.error(error); + process.exit(1); + } +})(); \ No newline at end of file diff --git a/utils/scripts/build.sh b/utils/scripts/build.sh index 8fd108d1a..0dff65abc 100644 --- a/utils/scripts/build.sh +++ b/utils/scripts/build.sh @@ -34,6 +34,7 @@ script1="node ./utils/config.js $mode $app" script2="webpack --progress --mode $webpackmode " script3="node ./utils/loadStyles.js" script4="cordova build $platform $cordovamode" +script5="node ./utils/rename.js $mode $app" eval " echo \"${RED}$script1${NC}\"; $script1; @@ -42,5 +43,8 @@ $script2&& echo \"${RED}$script3${NC}\"; $script3; echo \"${RED}$script4${NC}\"; -$script4 +$script4; +echo \"${RED}$script5${NC}\"; +$script5 +" " \ No newline at end of file From 5acf13ad382132dcdb923192c2a28b50404ae3cc Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 18:12:48 +0530 Subject: [PATCH 23/36] fix: quote error in build.sh --- utils/scripts/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/scripts/build.sh b/utils/scripts/build.sh index 0dff65abc..9d9890d9c 100644 --- a/utils/scripts/build.sh +++ b/utils/scripts/build.sh @@ -46,5 +46,4 @@ echo \"${RED}$script4${NC}\"; $script4; echo \"${RED}$script5${NC}\"; $script5 -" " \ No newline at end of file From c9c33df630e03335d577269502c18cd6c2e16c1c Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 18:45:19 +0530 Subject: [PATCH 24/36] revert workflow & sign changes, Update the github actions version --- .github/workflows/build-android.yaml | 14 +++---- sign.sh | 60 ++++++++++++---------------- 2 files changed, 32 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index 0ac0db996..b3ec14a60 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -6,19 +6,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' # See 'Supported distributions' for available options java-version: '17' # only 11 works for this project - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: - node-version: 18.x + node-version: 20.x - name: Install Cordova @@ -45,19 +45,17 @@ jobs: - name: Sign run: | - pwd - echo "${{steps.android-aab-build.outputs}}" sudo chmod 777 ./sign.sh ./sign.sh - name: Upload dev APK - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: app-dev path: ./*.apk - name: Upload release bundle - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: app-release path: ./*.aab diff --git a/sign.sh b/sign.sh index b92f045ba..7fe25848b 100644 --- a/sign.sh +++ b/sign.sh @@ -1,38 +1,30 @@ -## convert aab bundle to APK - pwd - # grab tool for conversion - if [ ! -f bundletool-all-1.13.1.jar ]; then - wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar - fi - - # generate signature - if [ ! -f acode.keystore ]; then - # keytool -genkey -v -keystore acode.keystore -alias acode -keyalg RSA -keysize 2048 -validity 10000 -storepasswd acode123 -keypasswd acode123 - keytool -genkey -alias acode \ - -keyalg RSA -keystore acode.keystore \ - -dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US" \ - -validity 36500 \ - -keysize 4096 \ - -storepass password -keypass password - fi - - # cleanup if needed - rm -rf *.apks toc.pb - - echo "🔎 finding .aab files" - find . -name "*.aab" +## convert aab bundle to APK - # convert to apk - for aab in $(find . -name "*.aab"); do - java -jar "bundletool-all-1.13.1.jar" build-apks --bundle="$aab" --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password - - # extract apk - unzip "${aab%.*}.apks" +# grab tool for conversion +if [ ! -f bundletool-all-1.13.1.jar ]; then + wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar +fi - # Extract just the file name from the path - filename=$(basename "$aab") +# generate signature +if [ ! -f acode.keystore ]; then +# keytool -genkey -v -keystore acode.keystore -alias acode -keyalg RSA -keysize 2048 -validity 10000 -storepasswd acode123 -keypasswd acode123 +keytool -genkey -alias acode \ + -keyalg RSA -keystore acode.keystore \ + -dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US" \ + -validity 36500 \ + -keysize 4096 \ + -storepass password -keypass password +fi - # Move and rename the universal APK - mv -v universal.apk "${filename%.*}.apk" -done +# cleanup if needed +rm -rf *.apks toc.pb + +# convert to apk +for aab in *.aab; do +java -jar "bundletool-all-1.13.1.jar" build-apks --bundle=$aab --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password + +# extract apk +unzip ${aab%.*}.apks +mv -v universal.apk ${aab%.*}.apk +done \ No newline at end of file From be8360c631ab9c025833bbe838628f1f55476151 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 18:53:05 +0530 Subject: [PATCH 25/36] fix: `setup-node` github action version --- .github/workflows/build-android.yaml | 2 +- config.xml | 2 +- package-lock.json | 143 +++++++++++++++++- package.json | 13 +- res/android/values/ic_launcher_background.xml | 4 +- src/lang/en-us.json | 1 + 6 files changed, 151 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index b3ec14a60..5501da639 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -15,7 +15,7 @@ jobs: java-version: '17' # only 11 works for this project - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 20.x diff --git a/config.xml b/config.xml index 9f04e7552..021e9d8c2 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package-lock.json b/package-lock.json index 5cb9eca32..2820debb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,20 @@ { "name": "com.foxdebug.acode", - "version": "1.10.0", + "version": "1.10.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "com.foxdebug.acode", - "version": "1.10.0", + "version": "1.10.4", "license": "MIT", "dependencies": { "@deadlyjack/ajax": "^1.2.6", "@ungap/custom-elements": "^1.3.0", + "admob-plus-cordova": "1.28.0", "autosize": "^6.0.1", "cordova": "12.0.0", + "cordova-plugin-consent": "2.4.0", "core-js": "^3.37.1", "crypto-js": "^4.2.0", "escape-string-regexp": "^5.0.0", @@ -2932,6 +2934,35 @@ "acorn": "^8" } }, + "node_modules/admob-plus-cordova": { + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/admob-plus-cordova/-/admob-plus-cordova-1.28.0.tgz", + "integrity": "sha512-6VRF80XN/4pkJ4ATVd0FXJZYAmrWynbgBBqmZed9dPncskaGgVd+fTr+pltHuKU9oF9zmXofJb7u17L2U0pT6Q==", + "license": "MIT", + "dependencies": { + "fast-glob": "^3.2.11", + "fs-extra": "^10.1.0", + "plist": "^3.0.6", + "replace-in-file": "^6.3.5" + }, + "funding": { + "url": "https://admob-plus.github.io/funding" + } + }, + "node_modules/admob-plus-cordova/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/agent-base": { "version": "6.0.2", "license": "MIT", @@ -3016,9 +3047,9 @@ } }, "node_modules/android-versions/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { @@ -4091,9 +4122,9 @@ } }, "node_modules/cordova-android/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "license": "ISC", "bin": { @@ -4376,6 +4407,15 @@ } } }, + "node_modules/cordova-plugin-consent": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-consent/-/cordova-plugin-consent-2.4.0.tgz", + "integrity": "sha512-toKfFfLz9BwzazSoI5aj/HaMVBLK3xEenymjL6zl4MZRnE1eHA1iXPf5gCOVgJbzeaE9HDKlrTPTWf+Ni75EnQ==", + "license": "MIT", + "funding": { + "url": "https://admob-plus.github.io/funding" + } + }, "node_modules/cordova-plugin-device": { "version": "2.1.0", "dev": true, @@ -8608,6 +8648,93 @@ "jsesc": "bin/jsesc" } }, + "node_modules/replace-in-file": { + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-6.3.5.tgz", + "integrity": "sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg==", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.2", + "glob": "^7.2.0", + "yargs": "^17.2.1" + }, + "bin": { + "replace-in-file": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/replace-in-file/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/replace-in-file/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/replace-in-file/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/replace-in-file/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/replace-in-file/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/replace-in-file/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/request": { "version": "2.88.2", "license": "Apache-2.0", diff --git a/package.json b/package.json index a4d901354..fde3958dd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,14 @@ "cordova-plugin-sdcard": {}, "cordova-plugin-browser": {}, "cordova-plugin-system": {}, - "cordova-plugin-iap": {} + "cordova-plugin-iap": {}, + "cordova-plugin-consent": { + "UMP_VERSION": "1.0.0+" + }, + "admob-plus-cordova": { + "APP_ID_ANDROID": "ca-app-pub-5911839694379275~4255791238", + "PLAY_SERVICES_VERSION": "20.6.0" + } }, "platforms": [ "android" @@ -81,8 +88,10 @@ "dependencies": { "@deadlyjack/ajax": "^1.2.6", "@ungap/custom-elements": "^1.3.0", + "admob-plus-cordova": "1.28.0", "autosize": "^6.0.1", "cordova": "12.0.0", + "cordova-plugin-consent": "2.4.0", "core-js": "^3.37.1", "crypto-js": "^4.2.0", "escape-string-regexp": "^5.0.0", @@ -100,4 +109,4 @@ "yargs": "^17.7.2" }, "browserslist": "cover 100%,not android < 5" -} +} \ No newline at end of file diff --git a/res/android/values/ic_launcher_background.xml b/res/android/values/ic_launcher_background.xml index 228fb4634..eeefa7fa5 100644 --- a/res/android/values/ic_launcher_background.xml +++ b/res/android/values/ic_launcher_background.xml @@ -1,5 +1,5 @@ - #3a3e54 - #3a3e54 + #ffffff + #313131 \ No newline at end of file diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 70daded19..a44bcba3a 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -210,6 +210,7 @@ "normal": "Normal", "app settings": "App settings", "disable in-app-browser caching": "Disable in-app-browser caching", + "Should use Current File For preview instead of default (index.html)": "Should use Current File For preview instead of default (index.html)", "copied to clipboard": "Copied to clipboard", "remember opened files": "Remember opened files", "remember opened folders": "Remember opened folders", From 85e3c78150659982a104a2aaf10bb35b7974a82c Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:00:33 +0530 Subject: [PATCH 26/36] update: build-android workflow artifacts naming --- .github/workflows/build-android.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index 5501da639..be671f1ae 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -51,11 +51,11 @@ jobs: - name: Upload dev APK uses: actions/upload-artifact@v4 with: - name: app-dev + name: app-development-prod-included path: ./*.apk - name: Upload release bundle uses: actions/upload-artifact@v4 with: - name: app-release + name: app-release-aab path: ./*.aab From 6a67f5f67e3ee8d5f5f3368be6c4183818f6013d Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:02:43 +0530 Subject: [PATCH 27/36] fix: test previewSettings with boolean check --- src/settings/previewSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index 3f97382a6..258fa302b 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -65,7 +65,7 @@ export default function previewSettings() { { key: 'useCurrentAsPreview', text: strings['Should use Current File For preview instead of default (index.html)'], - checkbox: values.useCurrentFileForPreview, + checkbox: !!values.useCurrentFileForPreview, }, { key: 'showConsoleToggler', From a7c7dd05c3f92886885a020bc88562e2d8739a76 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:23:53 +0530 Subject: [PATCH 28/36] revert to paid build changes --- config.xml | 2 +- package-lock.json | 127 ------------------ package.json | 11 +- res/android/values/ic_launcher_background.xml | 4 +- 4 files changed, 4 insertions(+), 140 deletions(-) diff --git a/config.xml b/config.xml index 021e9d8c2..9f04e7552 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - diff --git a/package-lock.json b/package-lock.json index 2820debb7..7784e5548 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,10 +11,8 @@ "dependencies": { "@deadlyjack/ajax": "^1.2.6", "@ungap/custom-elements": "^1.3.0", - "admob-plus-cordova": "1.28.0", "autosize": "^6.0.1", "cordova": "12.0.0", - "cordova-plugin-consent": "2.4.0", "core-js": "^3.37.1", "crypto-js": "^4.2.0", "escape-string-regexp": "^5.0.0", @@ -2934,35 +2932,6 @@ "acorn": "^8" } }, - "node_modules/admob-plus-cordova": { - "version": "1.28.0", - "resolved": "https://registry.npmjs.org/admob-plus-cordova/-/admob-plus-cordova-1.28.0.tgz", - "integrity": "sha512-6VRF80XN/4pkJ4ATVd0FXJZYAmrWynbgBBqmZed9dPncskaGgVd+fTr+pltHuKU9oF9zmXofJb7u17L2U0pT6Q==", - "license": "MIT", - "dependencies": { - "fast-glob": "^3.2.11", - "fs-extra": "^10.1.0", - "plist": "^3.0.6", - "replace-in-file": "^6.3.5" - }, - "funding": { - "url": "https://admob-plus.github.io/funding" - } - }, - "node_modules/admob-plus-cordova/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/agent-base": { "version": "6.0.2", "license": "MIT", @@ -4407,15 +4376,6 @@ } } }, - "node_modules/cordova-plugin-consent": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/cordova-plugin-consent/-/cordova-plugin-consent-2.4.0.tgz", - "integrity": "sha512-toKfFfLz9BwzazSoI5aj/HaMVBLK3xEenymjL6zl4MZRnE1eHA1iXPf5gCOVgJbzeaE9HDKlrTPTWf+Ni75EnQ==", - "license": "MIT", - "funding": { - "url": "https://admob-plus.github.io/funding" - } - }, "node_modules/cordova-plugin-device": { "version": "2.1.0", "dev": true, @@ -8648,93 +8608,6 @@ "jsesc": "bin/jsesc" } }, - "node_modules/replace-in-file": { - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-6.3.5.tgz", - "integrity": "sha512-arB9d3ENdKva2fxRnSjwBEXfK1npgyci7ZZuwysgAp7ORjHSyxz6oqIjTEv8R0Ydl4Ll7uOAZXL4vbkhGIizCg==", - "license": "MIT", - "dependencies": { - "chalk": "^4.1.2", - "glob": "^7.2.0", - "yargs": "^17.2.1" - }, - "bin": { - "replace-in-file": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/replace-in-file/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/replace-in-file/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/replace-in-file/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/replace-in-file/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" - }, - "node_modules/replace-in-file/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/replace-in-file/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/request": { "version": "2.88.2", "license": "Apache-2.0", diff --git a/package.json b/package.json index fde3958dd..3e8e2b1c1 100644 --- a/package.json +++ b/package.json @@ -28,14 +28,7 @@ "cordova-plugin-sdcard": {}, "cordova-plugin-browser": {}, "cordova-plugin-system": {}, - "cordova-plugin-iap": {}, - "cordova-plugin-consent": { - "UMP_VERSION": "1.0.0+" - }, - "admob-plus-cordova": { - "APP_ID_ANDROID": "ca-app-pub-5911839694379275~4255791238", - "PLAY_SERVICES_VERSION": "20.6.0" - } + "cordova-plugin-iap": {} }, "platforms": [ "android" @@ -88,10 +81,8 @@ "dependencies": { "@deadlyjack/ajax": "^1.2.6", "@ungap/custom-elements": "^1.3.0", - "admob-plus-cordova": "1.28.0", "autosize": "^6.0.1", "cordova": "12.0.0", - "cordova-plugin-consent": "2.4.0", "core-js": "^3.37.1", "crypto-js": "^4.2.0", "escape-string-regexp": "^5.0.0", diff --git a/res/android/values/ic_launcher_background.xml b/res/android/values/ic_launcher_background.xml index eeefa7fa5..228fb4634 100644 --- a/res/android/values/ic_launcher_background.xml +++ b/res/android/values/ic_launcher_background.xml @@ -1,5 +1,5 @@ - #ffffff - #313131 + #3a3e54 + #3a3e54 \ No newline at end of file From c5142450efa8e33df53fa43f1151d6269d57d95a Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:24:38 +0530 Subject: [PATCH 29/36] update: [test/trying] keep the `key` and setting property same for previewSettings --- src/settings/previewSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index 258fa302b..b4505a974 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -63,7 +63,7 @@ export default function previewSettings() { checkbox: values.disableCache, }, { - key: 'useCurrentAsPreview', + key: 'useCurrentFileForPreview', text: strings['Should use Current File For preview instead of default (index.html)'], checkbox: !!values.useCurrentFileForPreview, }, From fd4dbf4aa2f5de6ed566cfdf2e674f88b4f723e5 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:40:44 +0530 Subject: [PATCH 30/36] add: apk files to git ignore list --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 43fae50d4..a27c685f1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ **/*/.DS_Store .DS_Store pnpm-lock.yaml +*.apk \ No newline at end of file From 3fa34188078e0a5194b1726a73c6474cc5750146 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:50:22 +0530 Subject: [PATCH 31/36] feat: ability to `forceRun` for build-android workflow --- .github/workflows/build-android.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml index be671f1ae..135feb3c4 100644 --- a/.github/workflows/build-android.yaml +++ b/.github/workflows/build-android.yaml @@ -1,9 +1,19 @@ name: Build Android -on: push +on: + push: + + workflow_dispatch: + inputs: + forceRun: + description: 'ForceRun - Forcefully runs the workflow regardless of whether its running in a fork or not' + required: false + default: false + type: boolean jobs: build: name: Build APK runs-on: ubuntu-latest + if: github.repository == 'deadlyjack/Acode' && !contains(github.event.head_commit.message, 'skip ci') || inputs.forceRun == true steps: - name: Checkout source uses: actions/checkout@v4 From 7e377060ef91d35a66804189801635b10925bd4d Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 20:56:57 +0530 Subject: [PATCH 32/36] add: del-old-builds workflow --- .github/workflows/del-old-builds.yaml | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/del-old-builds.yaml diff --git a/.github/workflows/del-old-builds.yaml b/.github/workflows/del-old-builds.yaml new file mode 100644 index 000000000..40246a214 --- /dev/null +++ b/.github/workflows/del-old-builds.yaml @@ -0,0 +1,29 @@ +name: Delete old workflow runs +on: + workflow_dispatch: + inputs: + days: + description: 'Number of days.' + required: true + default: "30" + minimum_runs: + description: 'The minimum runs to keep for each workflow.' + required: true + default: "6" + delete_workflow_pattern: + description: 'The name of the workflow. if not set then it will target all workflows.' + required: false + +jobs: + del_runs: + runs-on: ubuntu-latest + permissions: write-all + steps: + - name: Delete workflow runs + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: ${{ github.event.inputs.days }} + keep_minimum_runs: ${{ github.event.inputs.minimum_runs }} + delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }} \ No newline at end of file From 9fe14ac9477e403cf2c6e0e1f621db1e867b7830 Mon Sep 17 00:00:00 2001 From: UnschooledGamer Date: Mon, 12 Aug 2024 21:00:23 +0530 Subject: [PATCH 33/36] clean personal console logs --- src/lib/commands.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/commands.js b/src/lib/commands.js index 3bd13afc6..4a2697854 100644 --- a/src/lib/commands.js +++ b/src/lib/commands.js @@ -219,7 +219,6 @@ export default { editorManager.editor.resize(true); }, 'run'() { - console.log("[RUN]", `useCurrentFileForPreview: ${appSettings.value.useCurrentFileForPreview}`, editorManager.activeFile[appSettings.value.useCurrentFileForPreview ? "runFile" : "run"]) editorManager.activeFile[appSettings.value.useCurrentFileForPreview ? "runFile" : "run"]?.(); }, 'run-file'() { From 0df91e66df2c7679313060207210758292d43080 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Sat, 24 Aug 2024 14:59:47 +0530 Subject: [PATCH 34/36] Delete .github/workflows directory, Removed as (check description) Removed As [Ajit wants another PR](https://github.com/deadlyjack/Acode/pull/1006#issuecomment-2294636317) just for GitHub Actions version Update. And That's not suitable to me atleast. So Goodbye Workflows --- .github/workflows/build-android.yaml | 71 --------------------------- .github/workflows/del-old-builds.yaml | 29 ----------- 2 files changed, 100 deletions(-) delete mode 100644 .github/workflows/build-android.yaml delete mode 100644 .github/workflows/del-old-builds.yaml diff --git a/.github/workflows/build-android.yaml b/.github/workflows/build-android.yaml deleted file mode 100644 index 135feb3c4..000000000 --- a/.github/workflows/build-android.yaml +++ /dev/null @@ -1,71 +0,0 @@ -name: Build Android -on: - push: - - workflow_dispatch: - inputs: - forceRun: - description: 'ForceRun - Forcefully runs the workflow regardless of whether its running in a fork or not' - required: false - default: false - type: boolean -jobs: - build: - name: Build APK - runs-on: ubuntu-latest - if: github.repository == 'deadlyjack/Acode' && !contains(github.event.head_commit.message, 'skip ci') || inputs.forceRun == true - steps: - - name: Checkout source - uses: actions/checkout@v4 - - - name: Setup java - uses: actions/setup-java@v4 - with: - distribution: 'zulu' # See 'Supported distributions' for available options - java-version: '17' # only 11 works for this project - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - - node-version: 20.x - - - - name: Install Cordova - run: npm install -g cordova - - - name: Install yarn - run: npm install -g yarn - - - name: Install app dependencies - run: yarn setup - - - name: Configure the platform - run: yarn clean - - # - name: Add Android platform - # run: cordova platform add android - - - name: Build Android dev apk - run: yarn build android paid dev - - - name: Build Android prod aab - run: yarn build android paid prod - id: android-aab-build - - - name: Sign - run: | - sudo chmod 777 ./sign.sh - ./sign.sh - - - name: Upload dev APK - uses: actions/upload-artifact@v4 - with: - name: app-development-prod-included - path: ./*.apk - - - name: Upload release bundle - uses: actions/upload-artifact@v4 - with: - name: app-release-aab - path: ./*.aab diff --git a/.github/workflows/del-old-builds.yaml b/.github/workflows/del-old-builds.yaml deleted file mode 100644 index 40246a214..000000000 --- a/.github/workflows/del-old-builds.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Delete old workflow runs -on: - workflow_dispatch: - inputs: - days: - description: 'Number of days.' - required: true - default: "30" - minimum_runs: - description: 'The minimum runs to keep for each workflow.' - required: true - default: "6" - delete_workflow_pattern: - description: 'The name of the workflow. if not set then it will target all workflows.' - required: false - -jobs: - del_runs: - runs-on: ubuntu-latest - permissions: write-all - steps: - - name: Delete workflow runs - uses: Mattraks/delete-workflow-runs@v2 - with: - token: ${{ github.token }} - repository: ${{ github.repository }} - retain_days: ${{ github.event.inputs.days }} - keep_minimum_runs: ${{ github.event.inputs.minimum_runs }} - delete_workflow_pattern: ${{ github.event.inputs.delete_workflow_pattern }} \ No newline at end of file From 2943d9bca4a60c81acad76fb6d563b7873ec1f63 Mon Sep 17 00:00:00 2001 From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:49:24 +0530 Subject: [PATCH 35/36] =?UTF-8?q?cleanup=F0=9F=A7=B9:=20workflow=20related?= =?UTF-8?q?=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acode.keystore | Bin 4390 -> 0 bytes sign.sh | 30 -------------------------- utils/rename.js | 55 ------------------------------------------------ 3 files changed, 85 deletions(-) delete mode 100644 acode.keystore delete mode 100644 sign.sh delete mode 100644 utils/rename.js diff --git a/acode.keystore b/acode.keystore deleted file mode 100644 index c247a87b2d1da80304e27048b748f2395e564842..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4390 zcma)AS2P?9w>6AmjNXOlL^sT6(R;5EF``Eqy+*G?j22y#5N(LwCZZEUq7xFmcOoKs zl=ySkz3cndeY*GIth3JEXYbdu*MXua*l_`PP!#zH2+S9w5pzKTAOIAi$UA{3^47m_ z6BI=x@V_Xc`#=;C!(W)@Z&83C|Dz%%0^k;+z#pI}a0k@k9|b-M6akg|cO-`L1F1)v zzR0n;SQTGW=j2~StYuZnGHT)CJ|M>hutJGJg#Yb`3&zKR-UorLV>AHvct8Ljko@!2 z=M1wyf*&B}%u(>#cZ5I`*uX&BqJX3bEA-5lJ9KBpKN_j!zq(8eyarKwi)+*KA=%zM zpy#Ag3b?$CtJXv)+Ndo}m3Qb;&%IrVANa$zo5;03#ct*x*4Vf1%6(BaMcd0>zB|3aB7J+LW0CC*nF&L< z<_CgL>dM%|b^3t(icQY*R##~a*lVT94^Y4&F$aC}2s(B13qk9O{mySOApnm}F$Ayj zDPGYQ2{2>gu#%UlbkUz{nIV4|zyCeT$n%MqG6Ao#*>Yj4nhZW=^D5;*D|w0Tc?(C;FYP@qBK2N`18AnY%UaB< zYKAmI)xwmNH#wmU@Z3diEnF!e+5HK=N@43kO>=niPTGrw&1p}rMc2cl;k982M6 zI>uvbPiUJPJ2?r*HS9r zMIio=9UK0!kwor{83&h!#fYQHEd=I9tEE;?P9^i!syN z_N+r^mq^%r`V;R)*DvGN+2)!mo;HWl0bR@6q4s(hwNqX(MG4beR)IIFq$DwLCRylbowds)1ouNbddHU!YldmUG3 zAraU=$z#CqMRck|i9t2Hv0aUd>z$B<1X6`zIt9>`K(3xGeSZ}=%0F{#8O_RFMD6aw z1Q9S!Y(g#*2DFGP11^dgoE)ylv=KC)rUkMw?GbIo!QR@sWBOA)bdgr0Gm1L$Aj|YvswFdnkcEjk5thMB*-RL(>E&Y zAORdgwM3DXh+mnOP!RB%*f26Vmd}q`nhplTtr$&~u#^%KU&_uc@sa2U)(C$vAGFGT z!BWIvCp-la#&hkV70k`8c|WXAan5n1zWb^{2#$`JO#qJ?PdN8^>JZMp4xWNzT|Grzs_TrA9#T^$XIrYKC_f6`wq3rusRWskCp9udHesWxyIKT{?N`qY z=0}t|?Xq=BAI|)7X-Oo*Jk3a<00P#po+mF!A7ddoP7>{JGOJm-^KLy9Ds!%Def7@} zuQ>=}+P{ZyZDmC+&W`+v6I-{Yuww&CF&M>X3GQA8D zmgyE+eY#FIOtgo*OKQqQ;`ip;Tj$VxXG)5n3AJ5BU6M}tYfg%@1r+p^UD<&{9(vy4 zf!K@PVvW%qOcY~j?lt~En1VrZI`5FW&LEYqV`0$qx$4*Nwq&TDqzNwIWue6%BFiX> z05o6KZwD&&W@b7!=>6`?lE=!{j;XeX9ATxdV^JoP1HR&FZCY%1Ib_Z4RRje3R0r^_ zAtQ8W*+TGj4B9$RtE(!TT}eJ_MmAQI=UePvJ_{o2j)A)l=^u5zCRwz3xcse2ds9^2;9wJvT8!~in7mVZ(LNr4j7%^}Emb)>G%!M%oU)nV1jv zVJV@uFW+QJK9y2ub!5!hX(8Cb)9fIaFu8~!HHB2uyDdp}_6*QvsL4LJeH50D8}cxu zssx?jy)C|>HOX_4y)1M{)esRqjy`?k;oSFQZa<9<;W#>)8|6qcjP;SOKw6rY6Cbo* zj=-uL5m%61@Y55HZpNdZea&QNqyF8{sG~h~dkebY2x+o$(DLx?L$okY-Q?q{H$&T8bpj1ahr+2YhAsfga4GlU{6lb3bIi$GmPG6+JNHwU zR|zk7Na^zjdF-#g682xs35o?fgdxt|-nG09nRSsf=lH@2^K2{SI=^_*vw9ch4V}gI zJNBtE=ewuU%bEuPsx!`VUO(Yy#y9rfe?aR{?aaf#zqw?-SeBYysSRIq9LPxchD~i2 z7Qrn=23sttmW#+i8UBfDU}_O!W+EILoM$*5ICePpP_}<58WCzBrLmKnJ*$Yg1WZa? zR8&GjTvQ5*0!99_L;xy8fxQ1h?zjM)zs>Pq2JnA{#9!kjse6=r-6Z^_!-nI>9>abZ zvj0y=Ja--F@l@h|x|aU~KLp=KJpzS))C3|l#dNVND=kqMQv3U2eu0OQcm4c2ZJToLi0%N5YIxZ$;ozSsDb5mqfO2|dt>N5B$t zOg7^+gGrJTlZX0qqZ>`yBjQ^j{J`cVMk<=3+ zLv{-pM;_m1@LJr{ZA=MF>D_N-eqvAiP)Vx=KLL#i_{XY4Uss~cBTlU18kUx^wLP6t zxo#hl;I->eC+XYl)pHI(1aQWeLYzz76$P41g#jK)MDZR7naCa3WmX(O_&pcCi6uv! zSBEk^X%<0+W9Eg=7kxIbN+;$)Yk43)_c+~IDXUIpt zUQM^)Rs?vPB7LGA#oZO``Y<6*&0i`v{Q!Z~W8V;k2LJHN#$fO{p+b&7OkGJBWN+ z+Mzz*jFrpDcJmDuGaGUIN+TnP5UqFHnpWji_FgQ!7F|1fv*WJvZFOUNV)jhN9)6{* zWFGZE*96%ZxmS(Z!{C2pR#Iyb|5=Kc+<7msR%slLTcqE(uAEv-Nq-I^R^xTJcV_Mr zLx6D9-84Fl(aEjsawl*c!aZ7x5G|}^OBVN#r^ffez?;d_d@-rTiK?U-vVb>rI?r$PMzdi z2ULdlL)7%MBX6=M ze`l2vFyyoMAqzCgF-k(E4S)e)2_xI1#hz-ux9XP)+nbwZ3J*66!cJq%AbO8K4Vgo= zUP^yH28E`Vqb2Ycs6Q**PGk=?5i$nbSK!I#gQhiimTYuXQ~KWPB;2jGnY4!BH3dv_ zD`!gcfvj2*(XRI4s+`CoTf;;JWUykNr4&;}rV9_kP~BV(e@Z=cwq5CFINRA4eq)~^ zyp?}18IrhKaJ>m}iJplyeNo9n-ZbK2kt<=uu~hH*VB#*Ci`Jc>TKIB{!V~=c{UaSI%S4406gip5xRWV7#~7HWWDPkKX#XdWQ$48m!}t-%K*w zeJtRg-|voMwKwcFYI5Rof1$ZGjmT8pIsfiZ(5tea#hYcD=AEKlP_b=Qm&U%YBFE?n zdi*d+KbdAVw0(7ko|{#J|O5|*%w6r8W*`@!^Eq6lT*#=Uv)YCT}u_gq?9 zsC+BdI84*Xo$FORt%w@uhvg+T`=~m}%Wc$L%+1QPCh3IE^(N*_5CGZD-SE^Vg|YGcQ=l?gJk|b)h0ql7D^&xBz?{AgjW6 zmjil)MQOmbc>GGdc$p6u=&dTn?2I`RI#xluaT!Q0Jt{ZgwaC7&5Uid{@~l0%_@h46 If1RBF05&-w8UO$Q diff --git a/sign.sh b/sign.sh deleted file mode 100644 index 7fe25848b..000000000 --- a/sign.sh +++ /dev/null @@ -1,30 +0,0 @@ - -## convert aab bundle to APK - -# grab tool for conversion -if [ ! -f bundletool-all-1.13.1.jar ]; then - wget https://github.com/google/bundletool/releases/download/1.13.1/bundletool-all-1.13.1.jar -fi - -# generate signature -if [ ! -f acode.keystore ]; then -# keytool -genkey -v -keystore acode.keystore -alias acode -keyalg RSA -keysize 2048 -validity 10000 -storepasswd acode123 -keypasswd acode123 -keytool -genkey -alias acode \ - -keyalg RSA -keystore acode.keystore \ - -dname "CN=Mark Smith, OU=JavaSoft, O=Sun, L=Cupertino, S=California, C=US" \ - -validity 36500 \ - -keysize 4096 \ - -storepass password -keypass password -fi - -# cleanup if needed -rm -rf *.apks toc.pb - -# convert to apk -for aab in *.aab; do -java -jar "bundletool-all-1.13.1.jar" build-apks --bundle=$aab --mode=universal --output="${aab%.*}.apks" --ks=acode.keystore --ks-pass=pass:password --ks-key-alias=acode --key-pass=pass:password - -# extract apk -unzip ${aab%.*}.apks -mv -v universal.apk ${aab%.*}.apk -done \ No newline at end of file diff --git a/utils/rename.js b/utils/rename.js deleted file mode 100644 index 4827e5a0b..000000000 --- a/utils/rename.js +++ /dev/null @@ -1,55 +0,0 @@ -const path = require('path'); -const fs = require('fs'); -const { promisify } = require('util'); -const exec = promisify(require('child_process').exec); - -(async () => { - const platformsDir = path.resolve(__dirname, '../platforms/'); - const configpath = path.resolve(__dirname, '../config.xml'); - const APK_PATH = platformsDir + "/android/app/build/outputs/apk/debug/app-debug.apk"; - const AAB_PATH = platformsDir + "/android/app/build/outputs/bundle/release/app-release.aab"; - const ID_PAID = 'com.foxdebug.acode'; - const ID_FREE = 'com.foxdebug.acodefree'; - const CONFIG_VERSION = / " + target); - fs.rename(artifact, target, () => {}); - - process.exit(0); - } catch (error) { - console.error(error); - process.exit(1); - } -})(); \ No newline at end of file From ca852dc4c15f6937af80c4c434dbf2d91f36d623 Mon Sep 17 00:00:00 2001 From: Raunak Raj <71929976+bajrangCoder@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:54:25 +0530 Subject: [PATCH 36/36] cleaned unwanted stuff --- .gitignore | 1 - utils/scripts/build.sh | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a27c685f1..43fae50d4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ **/*/.DS_Store .DS_Store pnpm-lock.yaml -*.apk \ No newline at end of file diff --git a/utils/scripts/build.sh b/utils/scripts/build.sh index 9d9890d9c..066bb3ab3 100644 --- a/utils/scripts/build.sh +++ b/utils/scripts/build.sh @@ -34,7 +34,6 @@ script1="node ./utils/config.js $mode $app" script2="webpack --progress --mode $webpackmode " script3="node ./utils/loadStyles.js" script4="cordova build $platform $cordovamode" -script5="node ./utils/rename.js $mode $app" eval " echo \"${RED}$script1${NC}\"; $script1; @@ -44,6 +43,4 @@ echo \"${RED}$script3${NC}\"; $script3; echo \"${RED}$script4${NC}\"; $script4; -echo \"${RED}$script5${NC}\"; -$script5 -" \ No newline at end of file +"