Fix for external settings

This commit is contained in:
WardPearce
2025-12-08 17:10:51 +13:00
parent 3bbc495d9b
commit 59fad24e67
6 changed files with 29 additions and 21 deletions
+2 -2
View File
@@ -7,8 +7,8 @@ android {
applicationId "us.materialio.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 172
versionName "1.12.0"
versionCode 173
versionName "1.12.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -69,7 +69,11 @@
<releases>
<release version="1.12.0" date="2025-12-05">
<release version="1.12.1" date="2025-12-08">
<url>https://github.com/Materialious/Materialious/releases/tag/1.12.1</url>
</release>
<release version="1.12.0" date="2025-12-05">
<url>https://github.com/Materialious/Materialious/releases/tag/1.12.0</url>
</release>
<release version="1.11.10" date="2025-11-28">
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Materialious",
"version": "1.12.0",
"version": "1.12.1",
"description": "Modern material design for Invidious.",
"author": {
"name": "Ward Pearce",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "materialious",
"version": "1.12.0",
"version": "1.12.1",
"private": true,
"scripts": {
"dev": "vite dev",
+19 -15
View File
@@ -1,4 +1,4 @@
import { page } from '$app/stores';
import { page } from '$app/state';
import {
darkModeStore,
deArrowEnabledStore,
@@ -232,17 +232,10 @@ const persistedStores: {
}
];
function setStores(toSet: Record<string, any>) {
function setStores(toSet: Record<string, any>, overwriteExisting: boolean = false) {
persistedStores.forEach((store) => {
let userOverwritten: boolean = false;
try {
userOverwritten = localStorage.getItem(store.name) !== null;
} catch {
// Continue regardless of error
}
const paramValue = toSet[store.name];
if (typeof paramValue !== 'undefined' && !userOverwritten) {
if (typeof paramValue !== 'undefined' && overwriteExisting) {
let value: any;
if (store.type === 'array') {
@@ -274,9 +267,22 @@ export function loadSettingsFromEnv() {
defaultSettingsJson = defaultSettingsJson.slice(0, -1);
}
let isInitialLoad = false;
try {
const isInitialLoadStorage = localStorage.getItem('initialLoadState');
if (isInitialLoadStorage === null) {
isInitialLoad = true;
} else {
localStorage.setItem('initialLoadState', '1');
}
} catch {
// In an environment where localstorage isn't allowed, treat as initial load.
isInitialLoad = true;
}
try {
const defaultSettings = JSON.parse(defaultSettingsJson);
setStores(defaultSettings);
setStores(defaultSettings, isInitialLoad);
} catch (error) {
console.log(error);
}
@@ -296,13 +302,11 @@ export function bookmarkletSaveToUrl(): string {
}
export function bookmarkletLoadFromUrl() {
const currentPage = get(page);
const toSet: Record<string, string> = {};
currentPage.url.searchParams.forEach((value, key) => {
page.url.searchParams.forEach((value, key) => {
toSet[key] = value;
});
setStores(toSet);
setStores(toSet, true);
}
+1 -1
View File
@@ -3,7 +3,7 @@ import os
import re
from datetime import datetime
LATEST_VERSION = "1.12.0"
LATEST_VERSION = "1.12.1"
RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D
WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")