From 5d93431a2488081ecb6a2eb42a78a183238a6aea Mon Sep 17 00:00:00 2001 From: Kenny <27463495+Frontesque@users.noreply.github.com> Date: Fri, 1 Apr 2022 07:19:34 -0400 Subject: [PATCH 01/17] april first joke --- NUXT/pages/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NUXT/pages/index.vue b/NUXT/pages/index.vue index 9ece44f..f3a1b4c 100644 --- a/NUXT/pages/index.vue +++ b/NUXT/pages/index.vue @@ -49,6 +49,14 @@ export default { await theming; await this.$youtube.getAPI(); this.progressMsg = "Navigating Home"; + + //--- April First Joke ---// + if (Math.floor(Math.random() * 9 == 0)) { + this.$router.push("/watch?v=dQw4w9WgXcQ"); + return; + } + //----------------------------// + this.$router.push(`/${localStorage.getItem("startPage") || "home"}`); }, }; From 32279eae70580829a8543928eff3036184b109bd Mon Sep 17 00:00:00 2001 From: ImgBotApp Date: Sat, 2 Apr 2022 05:06:11 +0000 Subject: [PATCH 02/17] [ImgBot] Optimize images /resources/splash.png -- 130.87kb -> 3.22kb (97.54%) Signed-off-by: ImgBotApp --- resources/splash.png | Bin 134011 -> 3294 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/splash.png b/resources/splash.png index d815d82ef8906f3bb12dac23bb6b77df6677db69..0c90ccab6556d63fc856869108032fb430f24cbc 100644 GIT binary patch literal 3294 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 OHaT&6{PWS-OaB1Xl6yD+ From dfb5e2b5743a4763ffd4c78f725248c459727ea1 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Sun, 3 Apr 2022 19:31:22 -0400 Subject: [PATCH 03/17] fix: :ambulance: Disable linting on builds Fix the error occuring in automatic builds due to linting --- android/app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2b0340f..50b10a6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -20,6 +20,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + }, + lintOptions { + checkReleaseBuilds false } } From ce67e485b99ca477d77bf5168180395673337995 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Sun, 3 Apr 2022 19:38:13 -0400 Subject: [PATCH 04/17] fix: :ambulance: undo previous commit --- android/app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 50b10a6..2b0340f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -20,9 +20,6 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } - }, - lintOptions { - checkReleaseBuilds false } } From 0cd95a9bb01419f9987fceed45677dd4d9d588e7 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Sun, 3 Apr 2022 20:13:55 -0400 Subject: [PATCH 05/17] fix: :ambulance: Refactor some android stuff Fix android build compile due to alex messing some stuff up // but fr idk what went wrong but its been fixed // android linting sucks // if you cant tell, im mad at android studio --- android/app/release/output-metadata.json | 6 ++++-- android/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ios/App/Podfile | 18 +++++++++--------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json index 5ecac21..d20d3f0 100644 --- a/android/app/release/output-metadata.json +++ b/android/app/release/output-metadata.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "artifactType": { "type": "APK", "kind": "Directory" @@ -10,9 +10,11 @@ { "type": "SINGLE", "filters": [], + "attributes": [], "versionCode": 1, "versionName": "1.0", "outputFile": "app-release.apk" } - ] + ], + "elementType": "File" } \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index ad085c3..7d6ed44 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,8 +7,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.google.gms:google-services:4.3.5' + classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.google.gms:google-services:4.3.10' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c4101c..a0f7639 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ios/App/Podfile b/ios/App/Podfile index c5f1516..400f1e6 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -9,15 +9,15 @@ install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' - pod 'CapacitorCommunityHttp', :path => '../../node_modules/@capacitor-community/http' - pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' - pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser' - pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device' - pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics' - pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share' - pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen' - pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar' - pod 'HugotomaziCapacitorNavigationBar', :path => '../../node_modules/@hugotomazi/capacitor-navigation-bar' + pod 'CapacitorCommunityHttp', :path => '..\..\node_modules\@capacitor-community\http' + pod 'CapacitorApp', :path => '..\..\node_modules\@capacitor\app' + pod 'CapacitorBrowser', :path => '..\..\node_modules\@capacitor\browser' + pod 'CapacitorDevice', :path => '..\..\node_modules\@capacitor\device' + pod 'CapacitorHaptics', :path => '..\..\node_modules\@capacitor\haptics' + pod 'CapacitorShare', :path => '..\..\node_modules\@capacitor\share' + pod 'CapacitorSplashScreen', :path => '..\..\node_modules\@capacitor\splash-screen' + pod 'CapacitorStatusBar', :path => '..\..\node_modules\@capacitor\status-bar' + pod 'HugotomaziCapacitorNavigationBar', :path => '..\..\node_modules\@hugotomazi\capacitor-navigation-bar' end target 'App' do From 744b085e3ae82a66329892a9dd2cc596507fc1ce Mon Sep 17 00:00:00 2001 From: Kenny <27463495+Frontesque@users.noreply.github.com> Date: Sun, 3 Apr 2022 20:18:52 -0400 Subject: [PATCH 06/17] update to java 11 this is getting really fucking annoying. thanks java --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b3960b..9581785 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,10 +52,10 @@ jobs: node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm i - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Copy web assets to native platform run: npx cap copy android - name: Update native platform From 838447d3ffd7e6b3472e6670b89a5c4f9deb01df Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Sun, 3 Apr 2022 20:37:17 -0400 Subject: [PATCH 07/17] style: :art: Slight UI tweaks Fix some bugs on the updates page fix 215 --- NUXT/pages/mods/updates.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/NUXT/pages/mods/updates.vue b/NUXT/pages/mods/updates.vue index ee67c6c..1b7cd95 100644 --- a/NUXT/pages/mods/updates.vue +++ b/NUXT/pages/mods/updates.vue @@ -20,9 +20,7 @@ color="orange" style=" border-radius: 0.5rem; - border: 2px var(--v-oragnge-base); - margin-top: -1.5rem; - margin-right: -0.5rem; + border: 2px var(--v-orange-base); " > Latest @@ -34,8 +32,6 @@ style=" border-radius: 0.5rem; border: 2px var(--v-green-base); - margin-top: -1.5rem; - margin-right: -0.5rem; " > >Installed Date: Sun, 3 Apr 2022 20:39:48 -0400 Subject: [PATCH 08/17] style: :art: Lint --- NUXT/pages/mods/updates.vue | 138 +++++++++++++++++------------------- 1 file changed, 64 insertions(+), 74 deletions(-) diff --git a/NUXT/pages/mods/updates.vue b/NUXT/pages/mods/updates.vue index 1b7cd95..8fda1ad 100644 --- a/NUXT/pages/mods/updates.vue +++ b/NUXT/pages/mods/updates.vue @@ -1,49 +1,29 @@ From 19e9070e77139b0b7b811b511955878e5b217294 Mon Sep 17 00:00:00 2001 From: Kenny <27463495+Frontesque@users.noreply.github.com> Date: Mon, 4 Apr 2022 11:42:42 -0400 Subject: [PATCH 09/17] style: :art: Lint Lint topNavigation --- NUXT/components/topNavigation.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/NUXT/components/topNavigation.vue b/NUXT/components/topNavigation.vue index 72329d0..5c9416c 100644 --- a/NUXT/components/topNavigation.vue +++ b/NUXT/components/topNavigation.vue @@ -39,16 +39,18 @@ class="ml-3 mr-1 my-auto fill-height" style="border-radius: 0.25rem !important" @click="refreshRecommendations" - >mdi-refresh + mdi-refresh + mdi-magnify + mdi-magnify + mdi-cog-outline + mdi-cog-outline + @@ -108,6 +111,7 @@ export default { position: fixed; width: 100%; } + .topNavSearch { margin-bottom: -10em; margin-left: 2em; From 7503ae123ea3bb02d715dc9368e6bc0b95bc898c Mon Sep 17 00:00:00 2001 From: Kenny <27463495+Frontesque@users.noreply.github.com> Date: Mon, 4 Apr 2022 12:07:10 -0400 Subject: [PATCH 10/17] feat: :sparkles: Allow video links to be searched If you type a youtube link in the search bar (eg. youtu.be, youtube.com/watch, etc) you can directly open the video 136 --- NUXT/components/topNavigation.vue | 1 + NUXT/layouts/default.vue | 24 +++++++++++++++++++++--- NUXT/plugins/utils.js | 7 +++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/NUXT/components/topNavigation.vue b/NUXT/components/topNavigation.vue index 5c9416c..565823c 100644 --- a/NUXT/components/topNavigation.vue +++ b/NUXT/components/topNavigation.vue @@ -83,6 +83,7 @@ export default { methods: { refreshRecommendations() { this.$emit("scroll-to-top"); + const continuations = this.$store.state.recommendedVideos[ this.$store.state.recommendedVideos.length - 1 diff --git a/NUXT/layouts/default.vue b/NUXT/layouts/default.vue index 981f90b..389e446 100644 --- a/NUXT/layouts/default.vue +++ b/NUXT/layouts/default.vue @@ -45,7 +45,7 @@ @click="youtubeSearch(item)" > mdi-magnify - {{ item[0] }} + {{ item[0] || item.text }} @@ -62,7 +62,9 @@ diff --git a/NUXT/pages/settings.vue b/NUXT/pages/settings.vue index c58c6ab..099c6b4 100644 --- a/NUXT/pages/settings.vue +++ b/NUXT/pages/settings.vue @@ -51,7 +51,7 @@ export default { to: "/mods/tweaks", }, { name: "Startup Options", icon: "mdi-restart", to: "/mods/startup" }, - { name: "Plugins", icon: "mdi-puzzle", to: "", disabled: true }, + { name: "Plugins", icon: "mdi-puzzle", to: "", to: "/mods/plugins" }, { name: "Updates", icon: "mdi-cloud-download-outline", diff --git a/NUXT/plugins/demoPlugin.js b/NUXT/plugins/demoPlugin.js new file mode 100644 index 0000000..07c92b8 --- /dev/null +++ b/NUXT/plugins/demoPlugin.js @@ -0,0 +1,10 @@ +module.exports = { + manifest: { + name: "Test plugin", + version: "1.0", + author: "Frontesque", + description: "A plugin to test how vuetube handles plugins // Add 'Hello, World!' to the home page.", + homepage: "https://vuetube.app", + license: "GPL-3.0" + } +} From 0404734b81a643d8dfc0e8891432224083d2c35d Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Mon, 4 Apr 2022 16:06:08 -0400 Subject: [PATCH 12/17] plugin card ui --- NUXT/pages/mods/plugins.vue | 103 ++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/NUXT/pages/mods/plugins.vue b/NUXT/pages/mods/plugins.vue index baf32f0..b9cb18f 100644 --- a/NUXT/pages/mods/plugins.vue +++ b/NUXT/pages/mods/plugins.vue @@ -1,60 +1,59 @@ - - From 84e16926a012052ae4c1b3c6500e4466089078d7 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Mon, 4 Apr 2022 16:09:27 -0400 Subject: [PATCH 13/17] disabled plugin toggle since there's nothing to toggle (yet) --- NUXT/pages/mods/plugins.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NUXT/pages/mods/plugins.vue b/NUXT/pages/mods/plugins.vue index b9cb18f..4cfd12b 100644 --- a/NUXT/pages/mods/plugins.vue +++ b/NUXT/pages/mods/plugins.vue @@ -33,7 +33,7 @@ Date: Mon, 4 Apr 2022 16:10:44 -0400 Subject: [PATCH 14/17] fixes, fixes --- NUXT/pages/mods/plugins.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NUXT/pages/mods/plugins.vue b/NUXT/pages/mods/plugins.vue index 4cfd12b..09b6f03 100644 --- a/NUXT/pages/mods/plugins.vue +++ b/NUXT/pages/mods/plugins.vue @@ -12,7 +12,7 @@ margin: $store.state.tweaks.roundTweak > 0 ? '0 1rem' : '0', padding: $store.state.tweaks.roundTweak > 0 - ? '.75rem 1rem .75rem 0rem' + ? '.75rem 0rem .75rem 1rem' : '.75rem .75rem .75rem 1.5rem', }" > From 7d9d1bc96a454acab2cb3d88e104117560358f2c Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Mon, 4 Apr 2022 17:49:24 -0400 Subject: [PATCH 15/17] refactor: :sparkles: Add TPPL TPPL is how vuetube now manages third party plugins (Third Party Plugin Loader) --- NUXT/nuxt.config.js | 1 + NUXT/pages/mods/plugins.vue | 3 +-- NUXT/plugins/{ => tempPlugins}/demoPlugin.js | 1 + NUXT/plugins/thirdPartyPluginLoader.js | 26 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) rename NUXT/plugins/{ => tempPlugins}/demoPlugin.js (93%) create mode 100644 NUXT/plugins/thirdPartyPluginLoader.js diff --git a/NUXT/nuxt.config.js b/NUXT/nuxt.config.js index 1c333e1..7a5a7e9 100644 --- a/NUXT/nuxt.config.js +++ b/NUXT/nuxt.config.js @@ -15,6 +15,7 @@ export default { { src: "~/plugins/youtube", mode: "client" }, { src: "~/plugins/vuetube", mode: "client" }, { src: "~/plugins/ryd", mode: "client" }, + { src: "~/plugins/thirdPartyPluginLoader", mode: "client" }, ], generate: { dir: "../dist", diff --git a/NUXT/pages/mods/plugins.vue b/NUXT/pages/mods/plugins.vue index 09b6f03..f4ed81f 100644 --- a/NUXT/pages/mods/plugins.vue +++ b/NUXT/pages/mods/plugins.vue @@ -52,8 +52,7 @@ export default { }; }, async mounted() { - const temp = require("~/plugins/demoPlugin.js"); - this.plugins = [temp]; + this.plugins = await this.$tppl.list; }, }; diff --git a/NUXT/plugins/demoPlugin.js b/NUXT/plugins/tempPlugins/demoPlugin.js similarity index 93% rename from NUXT/plugins/demoPlugin.js rename to NUXT/plugins/tempPlugins/demoPlugin.js index 07c92b8..22a1db0 100644 --- a/NUXT/plugins/demoPlugin.js +++ b/NUXT/plugins/tempPlugins/demoPlugin.js @@ -1,6 +1,7 @@ module.exports = { manifest: { name: "Test plugin", + vuetube: "*", version: "1.0", author: "Frontesque", description: "A plugin to test how vuetube handles plugins // Add 'Hello, World!' to the home page.", diff --git a/NUXT/plugins/thirdPartyPluginLoader.js b/NUXT/plugins/thirdPartyPluginLoader.js new file mode 100644 index 0000000..8d94b50 --- /dev/null +++ b/NUXT/plugins/thirdPartyPluginLoader.js @@ -0,0 +1,26 @@ +//--- Modules/Imports ---// + +const module = { + + + //--- Get Plugins ---// + list: new Promise((resolve, reject) => { + let plugins = new Array(); + + // Temp Plugin List + plugins.push(require("~/plugins/tempPlugins/demoPlugin")) + // End Temp Plugin List + + resolve(plugins); + + }) + //--- End Get Plugins ---// + + + +}; + +//--- Start ---// +export default ({ app }, inject) => { + inject("tppl", module); +}; From d00421ff9af3ac517eef8dedf83db62dc4c9c361 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Mon, 4 Apr 2022 18:25:12 -0400 Subject: [PATCH 16/17] style: :sparkles: add dependancies --- NUXT/plugins/tempPlugins/demoPlugin.js | 31 +++++++++++++++---- android/app/capacitor.build.gradle | 1 + .../src/main/assets/capacitor.plugins.json | 4 +++ android/capacitor.settings.gradle | 3 ++ ios/App/Podfile | 1 + package.json | 1 + 6 files changed, 35 insertions(+), 6 deletions(-) diff --git a/NUXT/plugins/tempPlugins/demoPlugin.js b/NUXT/plugins/tempPlugins/demoPlugin.js index 22a1db0..94f5d66 100644 --- a/NUXT/plugins/tempPlugins/demoPlugin.js +++ b/NUXT/plugins/tempPlugins/demoPlugin.js @@ -1,11 +1,30 @@ module.exports = { manifest: { - name: "Test plugin", + name: "Test plugin", // Required vuetube: "*", - version: "1.0", - author: "Frontesque", - description: "A plugin to test how vuetube handles plugins // Add 'Hello, World!' to the home page.", - homepage: "https://vuetube.app", - license: "GPL-3.0" + version: "1.0", // Required + author: "Frontesque", // Required + description: "A plugin to test how vuetube handles plugins // Add 'Hello, World!' to the home page.", // Required + homepage: "https://github.com/Frontesque/VueTube-Example-Plugin", + license: "GPL-3.0" // Required + }, + + /************************* + * Execute code on ALL VueTube pages + ************************/ + global: function() { + + }, + + /************************* + * Execute code on SPECIFIC VueTube pages + * + * You can view what page you intend to inject code into by looking at `~/NUXT/pages/` in the main VueTube repo + ************************/ + pages: { + home: function() { // Execute code on JUST the home page + + } } + } diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 40f4113..0baaa26 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -13,6 +13,7 @@ dependencies { implementation project(':capacitor-app') implementation project(':capacitor-browser') implementation project(':capacitor-device') + implementation project(':capacitor-filesystem') implementation project(':capacitor-haptics') implementation project(':capacitor-share') implementation project(':capacitor-splash-screen') diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index 2f6bcbe..16515c0 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -15,6 +15,10 @@ "pkg": "@capacitor/device", "classpath": "com.capacitorjs.plugins.device.DevicePlugin" }, + { + "pkg": "@capacitor/filesystem", + "classpath": "com.capacitorjs.plugins.filesystem.FilesystemPlugin" + }, { "pkg": "@capacitor/haptics", "classpath": "com.capacitorjs.plugins.haptics.HapticsPlugin" diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 093d158..ab0818a 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -14,6 +14,9 @@ project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/ include ':capacitor-device' project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android') +include ':capacitor-filesystem' +project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android') + include ':capacitor-haptics' project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android') diff --git a/ios/App/Podfile b/ios/App/Podfile index 400f1e6..f1483d5 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -13,6 +13,7 @@ def capacitor_pods pod 'CapacitorApp', :path => '..\..\node_modules\@capacitor\app' pod 'CapacitorBrowser', :path => '..\..\node_modules\@capacitor\browser' pod 'CapacitorDevice', :path => '..\..\node_modules\@capacitor\device' + pod 'CapacitorFilesystem', :path => '..\..\node_modules\@capacitor\filesystem' pod 'CapacitorHaptics', :path => '..\..\node_modules\@capacitor\haptics' pod 'CapacitorShare', :path => '..\..\node_modules\@capacitor\share' pod 'CapacitorSplashScreen', :path => '..\..\node_modules\@capacitor\splash-screen' diff --git a/package.json b/package.json index eb63cc0..54d65a9 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "@capacitor/cli": "^3.4.0", "@capacitor/core": "^3.4.0", "@capacitor/device": "^1.1.2", + "@capacitor/filesystem": "^1.1.0", "@capacitor/haptics": "^1.1.4", "@capacitor/share": "^1.1.2", "@capacitor/splash-screen": "^1.2.2", From 08a3fb532b34fe3c7f8b34d1d0aa610e05015234 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Mon, 4 Apr 2022 18:33:34 -0400 Subject: [PATCH 17/17] build: :sparkles: add storage r/w permissions to android --- android/app/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a5785e8..b50480e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -52,6 +52,8 @@ - + + +