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 00000000..068307d3 Binary files /dev/null and b/materialious/electron/assets/appIcon.ico differ 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 00000000..c480c02f Binary files /dev/null and b/materialious/electron/assets/splash.png differ 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")