From 296f35b8e21708974218faa9860a5978f04b56ff Mon Sep 17 00:00:00 2001 From: Kenny <27463495+Frontesque@users.noreply.github.com> Date: Wed, 22 Jun 2022 14:17:11 -0400 Subject: [PATCH] perf: :ambulance: Canary June 22nd, 2022 final bug fixes and changes before compile --- NUXT/nuxt.config.js | 1 + NUXT/pages/index.vue | 3 +- NUXT/pages/mods/about.vue | 3 +- NUXT/pages/mods/updates.vue | 2 +- android/app/build.gradle | 2 +- android/app/release/output-metadata.json | 4 +- .../app/src/main/assets/capacitor.config.json | 48 ++++----- .../src/main/assets/capacitor.plugins.json | 88 ++++++++--------- android/app/src/main/res/xml/config.xml | 4 - .../screenorientation/CDVOrientation.java | 98 ------------------- ios/App/App/capacitor.config.json | 48 ++++----- ios/App/App/config.xml | 4 - ios/App/Podfile | 23 +++-- 13 files changed, 111 insertions(+), 217 deletions(-) delete mode 100644 android/capacitor-cordova-android-plugins/src/main/java/cordova/plugins/screenorientation/CDVOrientation.java diff --git a/NUXT/nuxt.config.js b/NUXT/nuxt.config.js index 62c4b12..e629764 100644 --- a/NUXT/nuxt.config.js +++ b/NUXT/nuxt.config.js @@ -8,6 +8,7 @@ export default { //--- VueTube Stuff ---// env: { + release: "Unstable", appVersion: "dev-local", }, diff --git a/NUXT/pages/index.vue b/NUXT/pages/index.vue index 0272cd7..f80877b 100644 --- a/NUXT/pages/index.vue +++ b/NUXT/pages/index.vue @@ -29,8 +29,7 @@ export default { await this.theming(); //--- Update Screen ---// - if (localStorage.getItem("lastRunVersion") != process.env.appVersion) - return this.$router.replace("/activities/update"); + if ( (localStorage.getItem("lastRunVersion") != null) && (localStorage.getItem("lastRunVersion") != process.env.appVersion) ) return this.$router.replace("/activities/update"); //--- Start Innertube Connection ---// await this.$youtube.getAPI(); diff --git a/NUXT/pages/mods/about.vue b/NUXT/pages/mods/about.vue index 457a1a4..03fa234 100644 --- a/NUXT/pages/mods/about.vue +++ b/NUXT/pages/mods/about.vue @@ -25,7 +25,7 @@ {{ lang.appinformation }}

{{ lang.appversion }}

- {{ version.substring(0, 7) || "Unknown" }} + {{ version.substring(0, 7) || "Unknown" }} ({{ release }}) @@ -95,6 +95,7 @@ export default { data() { return { version: process.env.appVersion, + release: process.env.release, deviceInfo: "", lang: {}, }; diff --git a/NUXT/pages/mods/updates.vue b/NUXT/pages/mods/updates.vue index 0b4f4c1..0085ae2 100644 --- a/NUXT/pages/mods/updates.vue +++ b/NUXT/pages/mods/updates.vue @@ -29,7 +29,7 @@ >{{ lang.latest }} - - - - \ No newline at end of file diff --git a/android/capacitor-cordova-android-plugins/src/main/java/cordova/plugins/screenorientation/CDVOrientation.java b/android/capacitor-cordova-android-plugins/src/main/java/cordova/plugins/screenorientation/CDVOrientation.java deleted file mode 100644 index 5dc845e..0000000 --- a/android/capacitor-cordova-android-plugins/src/main/java/cordova/plugins/screenorientation/CDVOrientation.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package cordova.plugins.screenorientation; - -import org.apache.cordova.CallbackContext; -import org.apache.cordova.CordovaPlugin; - -import org.json.JSONArray; -import org.json.JSONException; - -import android.app.Activity; -import android.content.pm.ActivityInfo; -import android.util.Log; - -public class CDVOrientation extends CordovaPlugin { - - private static final String TAG = "YoikScreenOrientation"; - - /** - * Screen Orientation Constants - */ - - private static final String ANY = "any"; - private static final String PORTRAIT_PRIMARY = "portrait-primary"; - private static final String PORTRAIT_SECONDARY = "portrait-secondary"; - private static final String LANDSCAPE_PRIMARY = "landscape-primary"; - private static final String LANDSCAPE_SECONDARY = "landscape-secondary"; - private static final String PORTRAIT = "portrait"; - private static final String LANDSCAPE = "landscape"; - - @Override - public boolean execute(String action, JSONArray args, CallbackContext callbackContext) { - - Log.d(TAG, "execute action: " + action); - - // Route the Action - if (action.equals("screenOrientation")) { - return routeScreenOrientation(args, callbackContext); - } - - // Action not found - callbackContext.error("action not recognised"); - return false; - } - - private boolean routeScreenOrientation(JSONArray args, CallbackContext callbackContext) { - - String action = args.optString(0); - - - - String orientation = args.optString(1); - - Log.d(TAG, "Requested ScreenOrientation: " + orientation); - - Activity activity = cordova.getActivity(); - - if (orientation.equals(ANY)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); - } else if (orientation.equals(LANDSCAPE_PRIMARY)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } else if (orientation.equals(PORTRAIT_PRIMARY)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } else if (orientation.equals(LANDSCAPE)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); - } else if (orientation.equals(PORTRAIT)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT); - } else if (orientation.equals(LANDSCAPE_SECONDARY)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE); - } else if (orientation.equals(PORTRAIT_SECONDARY)) { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT); - } - - callbackContext.success(); - return true; - - - } -} \ No newline at end of file diff --git a/ios/App/App/capacitor.config.json b/ios/App/App/capacitor.config.json index 605b75b..88358f0 100644 --- a/ios/App/App/capacitor.config.json +++ b/ios/App/App/capacitor.config.json @@ -1,26 +1,26 @@ { - "appId": "com.Frontesque.vuetube", - "appName": "VueTube", - "webDir": "dist", - "bundledWebRuntime": false, - "server": { - "hostname": "youtube.com", - "androidScheme": "https" - }, - "android": { - "backgroundColor": "#000000" - }, - "ios": { - "backgroundColor": "#000000" - }, - "plugins": { - "SplashScreen": { - "launchShowDuration": 0, - "backgroundColor": "#000000", - "splashFullScreen": false, - "splashImmersive": false, - "launchAutoHide": true, - "showSpinner": false - } - } + "appId": "com.Frontesque.vuetube", + "appName": "VueTube", + "webDir": "dist", + "bundledWebRuntime": false, + "server": { + "hostname": "youtube.com", + "androidScheme": "https" + }, + "android": { + "backgroundColor": "#000000" + }, + "ios": { + "backgroundColor": "#000000" + }, + "plugins": { + "SplashScreen": { + "launchShowDuration": 0, + "backgroundColor": "#000000", + "splashFullScreen": false, + "splashImmersive": false, + "launchAutoHide": true, + "showSpinner": false + } + } } diff --git a/ios/App/App/config.xml b/ios/App/App/config.xml index b43c248..1b1b0e0 100644 --- a/ios/App/App/config.xml +++ b/ios/App/App/config.xml @@ -2,9 +2,5 @@ - - - - \ No newline at end of file diff --git a/ios/App/Podfile b/ios/App/Podfile index 323ce86..d3fc14a 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -9,18 +9,17 @@ 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 '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' - pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar' - pod 'CapacitorToast', :path => '../../node_modules/@capacitor/toast' - pod 'HugotomaziCapacitorNavigationBar', :path => '../../node_modules/@hugotomazi/capacitor-navigation-bar' - pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins' + 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 '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' + pod 'CapacitorStatusBar', :path => '..\..\node_modules\@capacitor\status-bar' + pod 'CapacitorToast', :path => '..\..\node_modules\@capacitor\toast' + pod 'HugotomaziCapacitorNavigationBar', :path => '..\..\node_modules\@hugotomazi\capacitor-navigation-bar' end target 'App' do