Merge branch 'Materialious:main' into main

Author: Prince527GitHub

.github/workflows/prod-flathub.yml

@@ -39,13 +39,21 @@ jobs:
           CHECKSUM=$(curl -L ${{ steps.get_release.outputs.aarch64_url }} | sha256sum | awk '{ print $1 }')
           echo "aarch64_sha256=$CHECKSUM" >> "$GITHUB_OUTPUT"
 
+      - name: Generate SHA256 checksum for materialious.metainfo.xml
+        id: sha256_metainfo
+        run: |
+          METAINFO_URL="https://raw.githubusercontent.com/Materialious/Materialious/main/materialious/electron/materialious.metainfo.xml"
+          CHECKSUM=$(curl -L $METAINFO_URL | sha256sum | awk '{ print $1 }')
+          echo "metainfo_sha256=$CHECKSUM" >> "$GITHUB_OUTPUT"
+
       - name: Update manifest file with new urls and checksums
         run: |
           MANIFEST_FILE="us.materialio.Materialious.yml"
           yq eval -i ".modules[0].sources[0].url = \"${{ steps.get_release.outputs.x86_url }}\"" $MANIFEST_FILE
           yq eval -i ".modules[0].sources[0].sha256 = \"${{ steps.sha256_x86.outputs.x86_64_sha256 }}\"" $MANIFEST_FILE
           yq eval -i ".modules[0].sources[1].url = \"${{ steps.get_release.outputs.aarch64_url }}\"" $MANIFEST_FILE
           yq eval -i ".modules[0].sources[1].sha256 = \"${{ steps.sha256_arm.outputs.aarch64_sha256 }}\"" $MANIFEST_FILE
+          yq eval -i ".modules[0].sources[5].sha256 = \"${{ steps.sha256_metainfo.outputs.metainfo_sha256 }}\"" $MANIFEST_FILE
 
       - name: Set Git user identity
         run: |

README.md

@@ -25,7 +25,6 @@
 - [Invidious API extended integration!](https://github.com/Materialious/api-extended)
   - Sync your watch progress between Invidious sessions.
 - Watch sync parties!
-- Silence skipper (Experimental.)
 - [YouTube.js](https://github.com/LuanRT/YouTube.js) fallback if Invidious fails loading videos for Desktop & Android.
 - Preview video on hover.
 - Sponsorblock built-in.
@@ -120,7 +119,6 @@ Deploy Materialious for your Invidious instance using Docker. Follow the steps o
 - [SecularSteve](https://github.com/SecularSteve) for creating Materialious' logo.
 - [Invidious](https://github.com/iv-org)
 - [Clipious](https://github.com/lamarios/clipious) for inspiration & a good source for learning more about undocumented Invidious routes.
-- [Vidstack player](https://github.com/vidstack/player)
 - [Beer CSS](https://github.com/beercss/beercss) (Especially the [YouTube template](https://github.com/beercss/beercss/tree/main/src/youtube) what was used as the base for Materialious.)
 - Every dependency in [package.json](/materialious/package.json).
 

docs/DOCKER.md

@@ -273,94 +273,4 @@ Add these additional environment variables to Materialious.
 VITE_DEFAULT_PEERJS_HOST: "peerjs.example.com"
 VITE_DEFAULT_PEERJS_PATH: "/"
 VITE_DEFAULT_PEERJS_PORT: 443
-```
-
-
-## Step 7 (Optional): Enabling downloads
-
-### Step 1: Add the following to your reverse proxies
-
-#### Caddy
-
-```caddy
-# Materialious
-materialious.example.com {
-	reverse_proxy localhost:3001
-
-    header {
-      Cross-Origin-Opener-Policy "same-origin"
-      Cross-Origin-Embedder-Policy "require-corp"
-    }
-}
-
-# Invidious
-invidious.example.com {
-  # Other configurations
-
-  header /ggpht/* Cross-Origin-Resource-Policy cross-origin
-}
-```
-
-#### Nginx
-```nginx
-# Materialious
-server {
-    listen 80;
-    server_name materialious.example.com;
-
-    add_header Cross-Origin-Opener-Policy "same-origin" always;
-    add_header Cross-Origin-Embedder-Policy "require-corp" always;
-
-    location / {
-        proxy_pass http://localhost:3001;
-    }
-}
-
-# Invidious
-server {
-    listen 80;
-    server_name invidious.example.com;
-
-    location /ggpht/ {
-        add_header Cross-Origin-Resource-Policy cross-origin;
-    }
-}
-```
-
-#### Traefik
-Add the following to Materialious
-
-```yaml
-# Materialious
-http:
-  middlewares:
-    materialious-downloads:
-      headers:
-        customResponseHeaders:
-          Cross-Origin-Opener-Policy: "same-origin"
-          Cross-Origin-Embedder-Policy: "require-corp"
-
-# Invidious
-http:
-  routers:
-    ggpht-router:
-      rule: "PathPrefix(`/ggpht/`)"
-      service: ggpht-service
-      middlewares:
-        - headers-ggpht
-
-  middlewares:
-    headers-ggpht:
-      headers:
-        customResponseHeaders:
-          Cross-Origin-Resource-Policy: cross-origin
-```
-
-
-### Step 2: Modify docker compose.
-
-Add this environment variable to Materialious.
-```yaml
-VITE_DEFAULT_DOWNLOAD_ENABLED: true
-```
-
+```

materialious/android/.idea/other.xml

@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 96
-        versionName "1.7.14"
+        versionCode 101
+        versionName "1.7.19"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

materialious/android/app/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     implementation project(':capacitor-status-bar')
     implementation project(':capgo-inappbrowser')
     implementation project(':hugotomazi-capacitor-navigation-bar')
-    implementation project(':mediagrid-capacitor-native-audio')
     implementation project(':capacitor-nodejs')
 
 }

materialious/android/app/capacitor.build.gradle

@@ -23,8 +23,5 @@ project(':capgo-inappbrowser').projectDir = new File('../node_modules/@capgo/ina
 include ':hugotomazi-capacitor-navigation-bar'
 project(':hugotomazi-capacitor-navigation-bar').projectDir = new File('../node_modules/@hugotomazi/capacitor-navigation-bar/android')
 
-include ':mediagrid-capacitor-native-audio'
-project(':mediagrid-capacitor-native-audio').projectDir = new File('../node_modules/@mediagrid/capacitor-native-audio/android')
-
 include ':capacitor-nodejs'
 project(':capacitor-nodejs').projectDir = new File('../node_modules/capacitor-nodejs/android')

materialious/android/capacitor.settings.gradle

@@ -6,9 +6,13 @@ const config: CapacitorConfig = {
   webDir: 'build',
   plugins: {
     CapacitorNodeJS: {
-      nodeDir: 'nodejs-android'
+      nodeDir: 'nodejs-android',
     }
   },
+  server: {
+    hostname: 'www.youtube.com',
+    androidScheme: 'https'
+  }
 };
 
 export default config;

materialious/capacitor.config.ts

@@ -6,9 +6,13 @@ const config: CapacitorConfig = {
   webDir: 'build',
   plugins: {
     CapacitorNodeJS: {
-      nodeDir: 'nodejs-android'
+      nodeDir: 'nodejs-android',
     }
   },
+  server: {
+    hostname: 'www.youtube.com',
+    androidScheme: 'https'
+  }
 };
 
 export default config;

materialious/electron/capacitor.config.ts

@@ -57,7 +57,27 @@
 
 
 
-    <release version="1.7.14" date="2025-2-21">
+    
+    
+    
+    
+    
+    <release version="1.7.19" date="2025-4-04">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.7.19</url>
+    </release>
+<release version="1.7.18" date="2025-4-04">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.7.18</url>
+    </release>
+<release version="1.7.17" date="2025-4-02">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.7.17</url>
+    </release>
+<release version="1.7.16" date="2025-4-02">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.7.16</url>
+    </release>
+<release version="1.7.15" date="2025-2-23">
+      <url>https://github.com/Materialious/Materialious/releases/tag/1.7.15</url>
+    </release>
+<release version="1.7.14" date="2025-2-21">
       <url>https://github.com/Materialious/Materialious/releases/tag/1.7.14</url>
     </release>
 <release version="1.7.13" date="2025-2-21">