Merge branch 'VueTubeApp:main' into main

NUXT/nuxt.config.js

@@ -8,6 +8,7 @@
 export default {
   //---   VueTube Stuff   ---//
   env: {
+    release: "Unstable",
     appVersion: "dev-local",
   },
 

NUXT/pages/index.vue

@@ -29,8 +29,7 @@ export default {
     await this.theming();
 
     //---   Update Screen   ---//
-    if (localStorage.getItem("lastRunVersion") != process.env.appVersion)
+    if ( (localStorage.getItem("lastRunVersion") != null) && (localStorage.getItem("lastRunVersion") != process.env.appVersion) ) return this.$router.replace("/activities/update");
-      return this.$router.replace("/activities/update");
 
     //---   Start Innertube Connection   ---//
     await this.$youtube.getAPI();

NUXT/pages/mods/about.vue

@@ -25,7 +25,7 @@
       <v-card-title>{{ lang.appinformation }}</v-card-title>
       <v-card-text>
         <h3>{{ lang.appversion }}</h3>
-        {{ version.substring(0, 7) || "Unknown" }}
+        {{ version.substring(0, 7) || "Unknown" }}  ({{ release }})
       </v-card-text>
     </v-card>
     <!--   End App Information   -->
@@ -95,6 +95,7 @@ export default {
   data() {
     return {
       version: process.env.appVersion,
+      release: process.env.release,
       deviceInfo: "",
       lang: {},
     };

NUXT/pages/mods/updates.vue

@@ -29,7 +29,7 @@
             >{{ lang.latest }}</v-chip
           >
           <v-chip
-            v-if="item == installedVersion"
+            v-if="item.tag_name == installedVersion"
             class="tags"
             color="green"
             style="border-radius: 0.5rem; border: 2px var(--v-green-base)"

android/app/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0",
+      "versionName": "0.3",
       "outputFile": "app-release.apk"
     }
   ],

android/app/src/main/res/xml/config.xml

@@ -2,9 +2,5 @@
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
   
-  <feature name="CDVOrientation">
-    <param name="android-package" value="cordova.plugins.screenorientation.CDVOrientation"/>
-  </feature>
-
   
 </widget>

android/capacitor-cordova-android-plugins/src/main/java/cordova/plugins/screenorientation/CDVOrientation.java

@@ -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;
-        
-        
-    }
-}

ios/App/App/config.xml

@@ -2,9 +2,5 @@
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
   
-  <feature name="CDVOrientation">
-    <param name="ios-package" value="CDVOrientation"/>
-  </feature>
-
   
 </widget>

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 'CapacitorCommunityHttp', :path => '..\..\node_modules\@capacitor-community\http'
-  pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
+  pod 'CapacitorApp', :path => '..\..\node_modules\@capacitor\app'
-  pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser'
+  pod 'CapacitorBrowser', :path => '..\..\node_modules\@capacitor\browser'
-  pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'
+  pod 'CapacitorDevice', :path => '..\..\node_modules\@capacitor\device'
-  pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
+  pod 'CapacitorFilesystem', :path => '..\..\node_modules\@capacitor\filesystem'
-  pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
+  pod 'CapacitorHaptics', :path => '..\..\node_modules\@capacitor\haptics'
-  pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
+  pod 'CapacitorShare', :path => '..\..\node_modules\@capacitor\share'
-  pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
+  pod 'CapacitorSplashScreen', :path => '..\..\node_modules\@capacitor\splash-screen'
-  pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
+  pod 'CapacitorStatusBar', :path => '..\..\node_modules\@capacitor\status-bar'
-  pod 'CapacitorToast', :path => '../../node_modules/@capacitor/toast'
+  pod 'CapacitorToast', :path => '..\..\node_modules\@capacitor\toast'
-  pod 'HugotomaziCapacitorNavigationBar', :path => '../../node_modules/@hugotomazi/capacitor-navigation-bar'
+  pod 'HugotomaziCapacitorNavigationBar', :path => '..\..\node_modules\@hugotomazi\capacitor-navigation-bar'
-  pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 
 target 'App' do