From c843dad047d3e43948f781cb905fdcad0cf9a99c Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 30 Aug 2024 17:34:26 +1200 Subject: [PATCH 1/7] Remove margin comment --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/src/lib/Comment.svelte | 2 +- update_versions.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index d2e897e6..aa43c503 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 21 - versionName "1.1.9" + versionCode 22 + versionName "1.1.10" 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 8dd5d4de..0b6ad8c4 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.1.9", + "version": "1.1.10", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 76286031..728880d7 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.1.9", + "version": "1.1.10", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/Comment.svelte b/materialious/src/lib/Comment.svelte index ee7ac4ed..89c0bc82 100644 --- a/materialious/src/lib/Comment.svelte +++ b/materialious/src/lib/Comment.svelte @@ -53,7 +53,7 @@ edit {/if} -

+

{@html commentTimestamps(comment.contentHtml)}

diff --git a/update_versions.py b/update_versions.py index c05eb719..f73f6b21 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.1.9" +LATEST_VERSION = "1.1.10" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From 081208036d1b4efaf81fe133e7ba0e5ea9402c41 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 30 Aug 2024 18:28:24 +1200 Subject: [PATCH 2/7] Fixes to thumbnail truncating --- materialious/src/lib/Thumbnail.svelte | 106 ++++++++++---------------- 1 file changed, 42 insertions(+), 64 deletions(-) diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte index 58ba6301..23d75746 100644 --- a/materialious/src/lib/Thumbnail.svelte +++ b/materialious/src/lib/Thumbnail.svelte @@ -5,14 +5,7 @@ import { getDeArrow, getThumbnail, getVideo, getVideoProgress } from './Api'; import type { Notification, PlaylistPageVideo, Video, VideoBase, VideoPlay } from './Api/model'; import ShareVideo from './ShareVideo.svelte'; - import { - cleanNumber, - getBestThumbnail, - letterCase, - proxyVideoUrl, - truncate, - videoLength - } from './misc'; + import { cleanNumber, getBestThumbnail, letterCase, proxyVideoUrl, videoLength } from './misc'; import type { PlayerEvents } from './player'; import { authStore, @@ -90,7 +83,9 @@ // Check if sideways should be enabled or disabled. disableSideways(); - addEventListener('resize', disableSideways); + addEventListener('resize', () => { + disableSideways(); + }); let imageSrc = getBestThumbnail(video.videoThumbnails) as string; @@ -236,7 +231,6 @@ {#if !thumbnailHidden}
(showVideoPreview = false)} on:focus={() => {}} @@ -318,47 +312,35 @@ {/if}
-
- +
+ {video.author} + + {#if !('publishedText' in video) && 'viewCountText' in video} +  • {video.viewCountText}{/if} + + +
{/if} @@ -367,19 +349,6 @@