Merge pull request #652 from Materialious/feature/readme-block-warning

Add warning to top of readme

README.md

@@ -1,3 +1,7 @@
+
+> [!WARNING]  
+> Invidious is currently being blocked by Google. Please use Materialious on [Android](https://github.com/Materialious/Materialious/releases/latest) or [Desktop](https://github.com/Materialious/Materialious/releases/latest) to get around this with local video fallback.
+
 <div align="center">
   <img src="./materialious/static/logo.svg" width="200px" />
   <br />

docs/SETTINGS.md

@@ -5,9 +5,11 @@ Materialious allows you to customize various settings by overwriting the default
 ## TOC
 
 - [Materialious Settings](#materialious-settings)
+   * [Show warning](#Show-Warning)
    * [Theme](#theme)
       + [Dark mode / Light mode](#dark-mode-light-mode)
       + [Color](#color)
+      + [Amoled](#color)
    * [Interface](#interface)
       + [Search suggestions](#search-suggestions)
       + [Preview video on hover](#preview-video-on-hover)
@@ -42,6 +44,14 @@ Materialious allows you to customize various settings by overwriting the default
       + [DeArrow Thumbnail Instance](#dearrow-thumbnail-instance)
       + [DeArrow Titles Only](#dearrow-titles-only)
 
+## Show Warning
+
+Show warning about Invidious being blocked.
+
+```json
+"showWarning": true
+```
+
 ## Theme
 
 ### Dark mode / Light mode
@@ -60,6 +70,14 @@ Sets the theme color using a hexadecimal value.
 "themeColor": "#ff0000"
 ```
 
+## Amoled
+
+Use pure black theme for Materialious, Dark mode must be true.
+
+```json
+"amoledTheme": true
+```
+
 ## Interface
 
 ### Search suggestions

materialious/android/app/build.gradle

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

materialious/electron/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.6.10",
+	"version": "1.6.11",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.6.10",
+	"version": "1.6.11",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
@@ -76,4 +76,4 @@
 		"vidstack": "^1.12.9",
 		"youtubei.js": "^10.5.0"
 	}
-}
+}

materialious/src/lib/externalSettings.ts

@@ -5,6 +5,7 @@ import {
 	deArrowInstanceStore,
 	deArrowThumbnailInstanceStore,
 	deArrowTitlesOnly,
+	interfaceAmoledTheme,
 	interfaceAutoExpandComments,
 	interfaceAutoExpandDesc,
 	interfaceForceCase,
@@ -21,6 +22,7 @@ import {
 	playerTheatreModeByDefaultStore,
 	returnYTDislikesInstanceStore,
 	returnYtDislikesStore,
+	showWarningStore,
 	silenceSkipperStore,
 	sponsorBlockCategoriesStore,
 	sponsorBlockDisplayToastStore,
@@ -177,6 +179,16 @@ const persistedStores = [
 		name: 'silenceSkipper',
 		store: silenceSkipperStore,
 		type: 'boolean'
+	},
+	{
+		name: 'amoledTheme',
+		store: interfaceAmoledTheme,
+		type: 'boolean'
+	},
+	{
+		name: 'showWarning',
+		store: showWarningStore,
+		type: 'boolean'
 	}
 ];
 

materialious/src/lib/i18n/locales/en.json

@@ -3,6 +3,7 @@
 	"copyUrl": "Copy URL",
 	"loadMore": "Load more",
 	"views": "views",
+	"invidiousBlockWarning": "Invidious is currently being blocked by Google. If videos aren't loading for this instance, please use this instance on Materialious on {android} or {desktop} to get around this with local video fallback.",
 	"videos": "videos",
 	"cancel": "Cancel",
 	"create": "Create",

materialious/src/lib/store.ts

@@ -28,6 +28,8 @@ export const authStore: Writable<null | { username: string; token: string; }> =
 export const darkModeStore: Writable<null | boolean> = persisted('darkMode', null);
 export const themeColorStore: Writable<null | string> = persisted('themeColor', null);
 
+export const showWarningStore = persisted('showWarning', true);
+
 export const activePageStore: Writable<string | null> = writable('home');
 
 export const playerAutoPlayStore = persisted('autoPlay', true);

materialious/src/routes/(app)/+layout.svelte

@@ -18,6 +18,7 @@
 		darkModeStore,
 		instanceStore,
 		interfaceAmoledTheme,
+		showWarningStore,
 		syncPartyPeerStore,
 		themeColorStore
 	} from '$lib/store';
@@ -284,6 +285,28 @@
 </dialog>
 
 <main class="responsive max root">
+	{#if Capacitor.getPlatform() === 'web' && $showWarningStore}
+		<dialog class="active small" style="height: fit-content;">
+			<h5>Warning</h5>
+			<div>
+				<p>
+					{@html $_('invidiousBlockWarning', {
+						values: {
+							android:
+								'<a href="https://github.com/Materialious/Materialious/releases/latest" target="_blank" class="link" rel="noopener noreferrer">Android</a>',
+							desktop:
+								'<a href="https://github.com/Materialious/Materialious/releases/latest" target="_blank" class="link" rel="noopener noreferrer">Desktop</a>'
+						}
+					})}
+				</p>
+			</div>
+			<nav class="right-align no-space">
+				<button class="transparent link" on:click={() => showWarningStore.set(false)}
+					>Don't show again</button
+				>
+			</nav>
+		</dialog>
+	{/if}
 	{#if $navigating}
 		<PageLoading />
 	{:else}

update_versions.py

@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.6.10"
+LATEST_VERSION = "1.6.11"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")