From ffe4775eeecd67fdca31654d21a6274d38cf2095 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 2 Sep 2024 01:53:26 +1200 Subject: [PATCH] 1.1.12 --- {logo => branding}/Materialious.png | Bin {logo => branding}/MaterialiousNoBg.svg | 0 {logo => branding}/MaterialiousNoBgNoCrop.svg | 0 {logo => branding}/MaterialiousS.png | Bin {logo => branding}/Meterialious.svg | 0 {logo => branding}/MeterialiousS.svg | 0 {logo => branding}/splash.png | Bin materialious/android/app/build.gradle | 4 ++-- materialious/electron/.gitignore | 2 +- materialious/electron/assets/appIcon.ico | Bin 0 -> 34494 bytes .../logo.png => assets/appIcon.png} | Bin materialious/electron/assets/splash.png | Bin 0 -> 38951 bytes materialious/electron/package.json | 20 ++++++++---------- materialious/electron/src/setup.ts | 4 ++-- materialious/package.json | 2 +- materialious/src/lib/Thumbnail.svelte | 10 ++++----- update_versions.py | 2 +- 17 files changed, 21 insertions(+), 23 deletions(-) rename {logo => branding}/Materialious.png (100%) rename {logo => branding}/MaterialiousNoBg.svg (100%) rename {logo => branding}/MaterialiousNoBgNoCrop.svg (100%) rename {logo => branding}/MaterialiousS.png (100%) rename {logo => branding}/Meterialious.svg (100%) rename {logo => branding}/MeterialiousS.svg (100%) rename {logo => branding}/splash.png (100%) create mode 100644 materialious/electron/assets/appIcon.ico rename materialious/electron/{resources/logo.png => assets/appIcon.png} (100%) create mode 100644 materialious/electron/assets/splash.png diff --git a/logo/Materialious.png b/branding/Materialious.png similarity index 100% rename from logo/Materialious.png rename to branding/Materialious.png diff --git a/logo/MaterialiousNoBg.svg b/branding/MaterialiousNoBg.svg similarity index 100% rename from logo/MaterialiousNoBg.svg rename to branding/MaterialiousNoBg.svg diff --git a/logo/MaterialiousNoBgNoCrop.svg b/branding/MaterialiousNoBgNoCrop.svg similarity index 100% rename from logo/MaterialiousNoBgNoCrop.svg rename to branding/MaterialiousNoBgNoCrop.svg diff --git a/logo/MaterialiousS.png b/branding/MaterialiousS.png similarity index 100% rename from logo/MaterialiousS.png rename to branding/MaterialiousS.png diff --git a/logo/Meterialious.svg b/branding/Meterialious.svg similarity index 100% rename from logo/Meterialious.svg rename to branding/Meterialious.svg diff --git a/logo/MeterialiousS.svg b/branding/MeterialiousS.svg similarity index 100% rename from logo/MeterialiousS.svg rename to branding/MeterialiousS.svg diff --git a/logo/splash.png b/branding/splash.png similarity index 100% rename from logo/splash.png rename to branding/splash.png diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 96b540df..21f63618 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 23 - versionName "1.1.11" + versionCode 24 + versionName "1.1.12" 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/.gitignore b/materialious/electron/.gitignore index 24fca05e..c340937a 100644 --- a/materialious/electron/.gitignore +++ b/materialious/electron/.gitignore @@ -3,6 +3,6 @@ # And the CLI then renames it app node_modules +build dist logs -build \ No newline at end of file diff --git a/materialious/electron/assets/appIcon.ico b/materialious/electron/assets/appIcon.ico new file mode 100644 index 0000000000000000000000000000000000000000..068307d311196d7c7a5470498fb24bb557c9687f GIT binary patch literal 34494 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 Rd(Jn}?*UwW{{O{+{{?@6)HwhE literal 0 HcmV?d00001 diff --git a/materialious/electron/resources/logo.png b/materialious/electron/assets/appIcon.png similarity index 100% rename from materialious/electron/resources/logo.png rename to materialious/electron/assets/appIcon.png diff --git a/materialious/electron/assets/splash.png b/materialious/electron/assets/splash.png new file mode 100644 index 0000000000000000000000000000000000000000..c480c02fdf528ac00a15d2774c75047e9438dfbb GIT binary patch literal 38951 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 X?skRVwTn(QR3QB20^XHn8-MvXXOgJ; literal 0 HcmV?d00001 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 97b2d998..3f083bd5 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,15 +1,14 @@ { "name": "Materialious", - "version": "1.1.11", + "version": "1.1.12", "description": "Modern material design for Invidious.", - "type": "commonjs", "author": { "name": "Ward Pearce", "email": "wardpearce@pm.me" }, "repository": { "type": "git", - "url": "https://github.com/WardPearce/Materialious" + "url": "https://github.com/Materialious/Materialious" }, "license": "MIT", "main": "build/src/index.js", @@ -22,17 +21,16 @@ }, "dependencies": { "@capacitor-community/electron": "^5.0.0", - "@types/node": "^22.5.0", - "chokidar": "~3.6.0", - "electron-is-dev": "~3.0.1", - "electron-serve": "~2.1.0", - "electron-unhandled": "~5.0.0", - "electron-updater": "^6.3.4", + "chokidar": "~3.5.3", + "electron-is-dev": "~2.0.0", + "electron-serve": "~1.1.0", + "electron-unhandled": "~4.0.1", + "electron-updater": "^5.3.0", "electron-window-state": "^5.0.3" }, "devDependencies": { - "electron": "^32.0.1", - "electron-builder": "^24.13.3", + "electron": "^26.2.2", + "electron-builder": "~23.6.0", "electron-rebuild": "^3.2.9", "typescript": "^5.0.4" }, diff --git a/materialious/electron/src/setup.ts b/materialious/electron/src/setup.ts index c0d4963f..dbfe60b2 100644 --- a/materialious/electron/src/setup.ts +++ b/materialious/electron/src/setup.ts @@ -1,12 +1,12 @@ import type { CapacitorElectronConfig } from '@capacitor-community/electron'; import { - CapElectronEventEmitter, CapacitorSplashScreen, + CapElectronEventEmitter, setupCapacitorElectronPlugins, } from '@capacitor-community/electron'; import chokidar from 'chokidar'; import type { MenuItemConstructorOptions } from 'electron'; -import { BrowserWindow, Menu, MenuItem, Tray, app, nativeImage, session } from 'electron'; +import { app, BrowserWindow, Menu, MenuItem, nativeImage, session, Tray } from 'electron'; import electronIsDev from 'electron-is-dev'; import electronServe from 'electron-serve'; import windowStateKeeper from 'electron-window-state'; diff --git a/materialious/package.json b/materialious/package.json index 12780cec..9b576ca6 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.1.11", + "version": "1.1.12", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte index a4f1c206..69f2501f 100644 --- a/materialious/src/lib/Thumbnail.svelte +++ b/materialious/src/lib/Thumbnail.svelte @@ -101,11 +101,6 @@ return; } - // Load author details in background. - if (!sideways) { - loadAuthor(); - } - // Check if sideways should be enabled or disabled. disableSideways(); @@ -113,6 +108,11 @@ disableSideways(); }); + // Load author details in background. + if (!sideways) { + loadAuthor(); + } + let imageSrc = getBestThumbnail(video.videoThumbnails) as string; if (get(deArrowEnabledStore)) { diff --git a/update_versions.py b/update_versions.py index 4cc72655..6f67d3ef 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.1.11" +LATEST_VERSION = "1.1.12" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")