diff --git a/README.md b/README.md index c2af9fc7..8e34f750 100644 --- a/README.md +++ b/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. +

diff --git a/docs/SETTINGS.md b/docs/SETTINGS.md index 362a9c29..891d02b6 100644 --- a/docs/SETTINGS.md +++ b/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 diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 108f1f0d..cad96aa0 100644 --- a/materialious/android/app/build.gradle +++ b/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. diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 25837734..c80e17e9 100644 --- a/materialious/electron/package.json +++ b/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", diff --git a/materialious/package.json b/materialious/package.json index d48a739f..7a72dc03 100644 --- a/materialious/package.json +++ b/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" } -} +} \ No newline at end of file diff --git a/materialious/src/lib/externalSettings.ts b/materialious/src/lib/externalSettings.ts index 6625f607..418bc37e 100644 --- a/materialious/src/lib/externalSettings.ts +++ b/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' } ]; diff --git a/materialious/src/lib/i18n/locales/en.json b/materialious/src/lib/i18n/locales/en.json index 8b8f0811..d6ae6c96 100644 --- a/materialious/src/lib/i18n/locales/en.json +++ b/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", diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts index be407891..52547b3d 100644 --- a/materialious/src/lib/store.ts +++ b/materialious/src/lib/store.ts @@ -28,6 +28,8 @@ export const authStore: Writable = export const darkModeStore: Writable = persisted('darkMode', null); export const themeColorStore: Writable = persisted('themeColor', null); +export const showWarningStore = persisted('showWarning', true); + export const activePageStore: Writable = writable('home'); export const playerAutoPlayStore = persisted('autoPlay', true); diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index ba2542e0..e98c47a2 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -18,6 +18,7 @@ darkModeStore, instanceStore, interfaceAmoledTheme, + showWarningStore, syncPartyPeerStore, themeColorStore } from '$lib/store'; @@ -284,6 +285,28 @@
+ {#if Capacitor.getPlatform() === 'web' && $showWarningStore} + +
Warning
+
+

+ {@html $_('invidiousBlockWarning', { + values: { + android: + 'Android', + desktop: + 'Desktop' + } + })} +

+
+ + + {/if} {#if $navigating} {:else} diff --git a/update_versions.py b/update_versions.py index ca9d36b6..344a2ae7 100644 --- a/update_versions.py +++ b/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")