From 1ad247dbeec85988e34fa8404dd6d970e9ce37e4 Mon Sep 17 00:00:00 2001 From: cloudflypeng <44285412+cloudflypeng@users.noreply.github.com> Date: Fri, 20 Sep 2024 14:57:29 +0800 Subject: [PATCH] feat: change corner-player animation (#513) * feat: change corner-player animation * fix: corner-player style --- .../src/modules/feed-column/corner-player.tsx | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/apps/renderer/src/modules/feed-column/corner-player.tsx b/apps/renderer/src/modules/feed-column/corner-player.tsx index b45288cd2..6c216f107 100644 --- a/apps/renderer/src/modules/feed-column/corner-player.tsx +++ b/apps/renderer/src/modules/feed-column/corner-player.tsx @@ -144,7 +144,7 @@ const CornerPlayerImpl = () => { > {entry.entries.title} -
+
{feed.title}
@@ -154,7 +154,7 @@ const CornerPlayerImpl = () => {
{/* advanced controls */} -
+
{ } label={t("player.open_entry")} /> -
-
{ @@ -182,6 +180,9 @@ const CornerPlayerImpl = () => { > +
+ {/* audio control */} +
} labelDelayDuration={0}> @@ -222,20 +223,21 @@ const PlayerProgress = () => { setControlledCurrentTime(currentTime) }, [currentTime, isDraggingProgress]) - const currentTimeIndicator = dayjs() - .startOf("y") - .second(controlledCurrentTime) - .format(controlledCurrentTime > ONE_HOUR_IN_SECONDS ? "H:mm:ss" : "m:ss") + const getTimeIndicator = (time: number) => { + return dayjs() + .startOf("y") + .second(time) + .format(time > ONE_HOUR_IN_SECONDS ? "H:mm:ss" : "m:ss") + } + + const currentTimeIndicator = getTimeIndicator(controlledCurrentTime) const remainingTimeIndicator = duration - ? dayjs() - .startOf("y") - .second(duration - controlledCurrentTime) - .format(duration - controlledCurrentTime > ONE_HOUR_IN_SECONDS ? "H:mm:ss" : "m:ss") + ? getTimeIndicator(duration - controlledCurrentTime) : null return (
-
+
{currentTimeIndicator}
{!!remainingTimeIndicator &&
-{remainingTimeIndicator}
}