diff --git a/config.xml b/config.xml index 0b49a15..efd0237 100644 --- a/config.xml +++ b/config.xml @@ -24,6 +24,8 @@ + + @@ -43,6 +45,7 @@ + diff --git a/package-lock.json b/package-lock.json index f3b8e88..1bd951a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,24 +11,24 @@ "dependencies": { "cordova-browser": "^6.0.0", "cordova-plugin-facebook-connect": "3.2.0", - "electron-devtools-installer": "^3.1.1", + "electron-devtools-installer": "^3.2.0", "properties-parser": "0.3.1" }, "devDependencies": { "cboard-speech-tts": "github:cboard-org/cboard-speech-tts", "com.lampa.startapp": "^6.1.6", - "cordova-android": "^10.1.1", + "cordova-android": "^11.0.0", "cordova-clipboard": "^1.3.0", "cordova-electron": "^3.0.0", - "cordova-plugin-android-permissions": "^1.0.2", + "cordova-plugin-android-permissions": "^1.1.3", "cordova-plugin-androidx": "^3.0.0", "cordova-plugin-androidx-adapter": "^1.1.3", "cordova-plugin-file": "^6.0.2", "cordova-plugin-file-opener2": "^2.2.1", "cordova-plugin-fullscreen": "^1.3.0", - "cordova-plugin-google-analytics": "^1.9.0", + "cordova-plugin-google-analytics": "github:danwilson/google-analytics-plugin", "cordova-plugin-googleplus": "^8.5.2", - "cordova-plugin-market": "github:xmartlabs/cordova-plugin-market", + "cordova-plugin-market": "git+https://github.com/xmartlabs/cordova-plugin-market.git", "cordova-plugin-media": "^5.0.3", "cordova-plugin-media-capture": "^3.0.3", "cordova-plugin-network-information": "^3.0.0", @@ -509,9 +509,9 @@ } }, "node_modules/android-versions": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz", - "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.8.1.tgz", + "integrity": "sha512-5a0YyylAk6pPM2Ezi0vWaPPNbS6tSNRs+micbgk5NpHEN5YW1ez+T94G5orysfwBEBDMHoxm5GNc5ZDUPgRrhw==", "dev": true, "dependencies": { "semver": "^5.7.1" @@ -1661,25 +1661,25 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, "node_modules/cordova-android": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz", - "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-11.0.0.tgz", + "integrity": "sha512-ZhvSF5BYY8gmrAu1PtMPdHFsRoom/emT4OtTcecmh3Zj22900y4Golg5whhBPcYcTPC7BU6PG/EmG9BBHcX9tQ==", "dev": true, "dependencies": { "android-versions": "^1.7.0", "cordova-common": "^4.0.2", "execa": "^5.1.1", - "fast-glob": "^3.2.7", - "fs-extra": "^10.0.0", + "fast-glob": "^3.2.11", + "fs-extra": "^10.1.0", "is-path-inside": "^3.0.3", "nopt": "^5.0.0", "properties-parser": "^0.3.1", - "semver": "^7.3.5", + "semver": "^7.3.7", "untildify": "^4.0.0", "which": "^2.0.2" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/cordova-browser": { @@ -1974,10 +1974,10 @@ ] }, "node_modules/cordova-plugin-google-analytics": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/cordova-plugin-google-analytics/-/cordova-plugin-google-analytics-1.9.1.tgz", - "integrity": "sha512-Lng6S0t748TCdIQZydSMv9rjNmYDPsmG5ozQk5jeaK+ndKBciG3fpS530StmlM866z11QJLOEcP1CEq7T4xcvQ==", - "dev": true + "version": "1.9.2", + "resolved": "git+ssh://git@github.com/danwilson/google-analytics-plugin.git#aaf70726ac7506e30725f80a18a6b2f9d25f2e75", + "dev": true, + "license": "MIT" }, "node_modules/cordova-plugin-googleplus": { "version": "8.5.2", @@ -7652,9 +7652,9 @@ "requires": {} }, "android-versions": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz", - "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.8.1.tgz", + "integrity": "sha512-5a0YyylAk6pPM2Ezi0vWaPPNbS6tSNRs+micbgk5NpHEN5YW1ez+T94G5orysfwBEBDMHoxm5GNc5ZDUPgRrhw==", "dev": true, "requires": { "semver": "^5.7.1" @@ -8520,20 +8520,20 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, "cordova-android": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-10.1.2.tgz", - "integrity": "sha512-F28+NvgKO4ZhKFkqctCOh62mhVoNyUuRQh/F/nqp+Sti4ODv2rUa6UeW18khhdYTjlDeihHQsPqxvB7mI6fVYA==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-11.0.0.tgz", + "integrity": "sha512-ZhvSF5BYY8gmrAu1PtMPdHFsRoom/emT4OtTcecmh3Zj22900y4Golg5whhBPcYcTPC7BU6PG/EmG9BBHcX9tQ==", "dev": true, "requires": { "android-versions": "^1.7.0", "cordova-common": "^4.0.2", "execa": "^5.1.1", - "fast-glob": "^3.2.7", - "fs-extra": "^10.0.0", + "fast-glob": "^3.2.11", + "fs-extra": "^10.1.0", "is-path-inside": "^3.0.3", "nopt": "^5.0.0", "properties-parser": "^0.3.1", - "semver": "^7.3.5", + "semver": "^7.3.7", "untildify": "^4.0.0", "which": "^2.0.2" } @@ -8761,10 +8761,9 @@ "dev": true }, "cordova-plugin-google-analytics": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/cordova-plugin-google-analytics/-/cordova-plugin-google-analytics-1.9.1.tgz", - "integrity": "sha512-Lng6S0t748TCdIQZydSMv9rjNmYDPsmG5ozQk5jeaK+ndKBciG3fpS530StmlM866z11QJLOEcP1CEq7T4xcvQ==", - "dev": true + "version": "git+ssh://git@github.com/danwilson/google-analytics-plugin.git#aaf70726ac7506e30725f80a18a6b2f9d25f2e75", + "dev": true, + "from": "cordova-plugin-google-analytics@https://github.com/danwilson/google-analytics-plugin.git" }, "cordova-plugin-googleplus": { "version": "8.5.2", @@ -8778,7 +8777,7 @@ "cordova-plugin-market": { "version": "git+ssh://git@github.com/xmartlabs/cordova-plugin-market.git#44b058abf668c0f810389d96598579ef729853b4", "dev": true, - "from": "cordova-plugin-market@github:xmartlabs/cordova-plugin-market" + "from": "cordova-plugin-market@git+https://github.com/xmartlabs/cordova-plugin-market.git" }, "cordova-plugin-media": { "version": "5.0.4", diff --git a/package.json b/package.json index 29348d2..861b297 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "devDependencies": { "cboard-speech-tts": "github:cboard-org/cboard-speech-tts", "com.lampa.startapp": "^6.1.6", - "cordova-android": "^10.1.1", + "cordova-android": "^11.0.0", "cordova-clipboard": "^1.3.0", "cordova-electron": "^3.0.0", "cordova-plugin-android-permissions": "^1.1.3", @@ -27,7 +27,7 @@ "cordova-plugin-file": "^6.0.2", "cordova-plugin-file-opener2": "^2.2.1", "cordova-plugin-fullscreen": "^1.3.0", - "cordova-plugin-google-analytics": "^1.9.0", + "cordova-plugin-google-analytics": "github:danwilson/google-analytics-plugin", "cordova-plugin-googleplus": "^8.5.2", "cordova-plugin-market": "git+https://github.com/xmartlabs/cordova-plugin-market.git", "cordova-plugin-media": "^5.0.3", @@ -59,7 +59,6 @@ "cordova-plugin-market": {}, "cordova-plugin-network-information": {}, "com.lampa.startapp": {}, - "cordova-plugin-androidx": {}, "cordova-plugin-androidx-adapter": {}, "cordova-plugin-facebook-connect": { "APP_ID": "123456789", @@ -76,8 +75,8 @@ }, "platforms": [ "browser", - "android", - "electron" + "electron", + "android" ] }, "build": { diff --git a/public/res/screen/android/splashscreen.xml b/public/res/screen/android/splashscreen.xml new file mode 100644 index 0000000..5c2bb73 --- /dev/null +++ b/public/res/screen/android/splashscreen.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/public/res/values/colors.xml b/public/res/values/colors.xml index 8c7a6cf..4cff95d 100644 --- a/public/res/values/colors.xml +++ b/public/res/values/colors.xml @@ -1,4 +1,5 @@ #744EFE + #ac2f8a \ No newline at end of file