feat: revert notifications and audio list styles

RSSNext · Feb 14, 2025 · 9fb0aff · 9fb0aff
1 parent aff5486
commit 9fb0aff
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/apps/renderer/src/modules/entry-column/Items/article-item.tsx b/apps/renderer/src/modules/entry-column/Items/article-item.tsx
@@ -9,9 +9,7 @@ import { FeedTitle } from "~/modules/feed/feed-title"
 import type { EntryItemStatelessProps, UniversalItemProps } from "../types"
 
 export function ArticleItem({ entryId, entryPreview, translation }: UniversalItemProps) {
-  return (
-    <ListItem entryId={entryId} entryPreview={entryPreview} translation={translation} withDetails />
-  )
+  return <ListItem entryId={entryId} entryPreview={entryPreview} translation={translation} />
 }
 
 export function ArticleItemStateLess({ entry, feed }: EntryItemStatelessProps) {

diff --git a/apps/renderer/src/modules/entry-column/Items/audio-item.tsx b/apps/renderer/src/modules/entry-column/Items/audio-item.tsx
@@ -8,9 +8,7 @@ import { FeedTitle } from "~/modules/feed/feed-title"
 import type { EntryItemStatelessProps, UniversalItemProps } from "../types"
 
 export function AudioItem({ entryId, entryPreview, translation }: UniversalItemProps) {
-  return (
-    <ListItem entryId={entryId} entryPreview={entryPreview} translation={translation} withAudio />
-  )
+  return <ListItem entryId={entryId} entryPreview={entryPreview} translation={translation} />
 }
 
 export function AudioItemStateLess({ entry, feed }: EntryItemStatelessProps) {

diff --git a/apps/renderer/src/modules/entry-column/Items/notification-item.tsx b/apps/renderer/src/modules/entry-column/Items/notification-item.tsx
@@ -8,7 +8,7 @@ import { FeedTitle } from "~/modules/feed/feed-title"
 import type { EntryItemStatelessProps, UniversalItemProps } from "../types"
 
 export function NotificationItem({ entryId, entryPreview, translation }: UniversalItemProps) {
-  return <ListItem entryId={entryId} entryPreview={entryPreview} translation={translation} />
+  return <ListItem entryId={entryId} entryPreview={entryPreview} translation={translation} simple />
 }
 
 export function NotificationItemStateLess({ entry, feed }: EntryItemStatelessProps) {

diff --git a/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx b/apps/renderer/src/modules/entry-column/templates/list-item-template.tsx
@@ -24,11 +24,9 @@ export function ListItem({
   entryId,
   entryPreview,
   translation,
-  withDetails,
-  withAudio,
+  simple,
 }: UniversalItemProps & {
-  withDetails?: boolean
-  withAudio?: boolean
+  simple?: boolean
 }) {
   const isMobile = useMobile()
   const entry = useEntry(entryId) || entryPreview
@@ -61,10 +59,10 @@ export function ListItem({
     let lineClampTitle = settingWideMode ? 1 : 2
     let lineClampDescription = settingWideMode ? 1 : 2
 
-    if (translation?.title) {
+    if (translation?.title && !simple) {
       lineClampTitle += 1
     }
-    if (translation?.description) {
+    if (translation?.description && !simple) {
       lineClampDescription += 1
     }
 
@@ -73,7 +71,9 @@ export function ListItem({
 
     // FIXME: Safari bug, not support line-clamp cross elements
     return {
-      global: !envIsSafari ? `line-clamp-[${lineClampTitle + lineClampDescription}]` : "",
+      global: !envIsSafari
+        ? `line-clamp-[${simple ? lineClampTitle : lineClampTitle + lineClampDescription}]`
+        : "",
       title: envIsSafari ? `line-clamp-[${lineClampTitle}]` : "",
       description: envIsSafari ? `line-clamp-[${lineClampDescription}]` : "",
     }
@@ -86,8 +86,8 @@ export function ListItem({
 
   const related = feed || inbox
 
-  const hasAudio = entry.entries?.attachments?.[0]!.url
-  const hasMedia = entry.entries?.media?.[0]?.url
+  const hasAudio = simple ? false : !!entry.entries?.attachments?.[0]?.url
+  const hasMedia = simple ? false : !!entry.entries?.media?.[0]?.url
 
   const marginWidth = 8 * (isMobile ? 1.125 : 1)
   // calculate the max width to have a correct truncation
@@ -97,13 +97,13 @@ export function ListItem({
   const mediaWidth = (settingWideMode ? 48 : 80) * (isMobile ? 1.125 : 1) + marginWidth
 
   let savedWidth = 0
-  if (!withAudio) {
-    savedWidth += feedIconWidth
-  }
-  if (withAudio && hasAudio) {
+
+  savedWidth += feedIconWidth
+
+  if (hasAudio) {
     savedWidth += audioCoverWidth
   }
-  if (withDetails && hasMedia) {
+  if (hasMedia && !hasAudio) {
     savedWidth += mediaWidth
   }
 
@@ -116,7 +116,7 @@ export function ListItem({
         settingWideMode ? "py-3" : "py-4",
       )}
     >
-      {!withAudio && <FeedIcon feed={related} fallback entry={entry.entries} />}
+      <FeedIcon feed={related} fallback entry={entry.entries} />
       <div
         className={cn("-mt-0.5 flex-1 text-sm leading-tight", lineClamp.global)}
         style={{
@@ -144,7 +144,7 @@ export function ListItem({
           className={cn(
             "relative my-0.5 break-words",
             !!entry.collections && "pr-5",
-            entry.entries.title ? (withDetails || withAudio) && "font-medium" : "text-[13px]",
+            entry.entries.title ? "font-medium" : "text-[13px]",
           )}
         >
           {entry.entries.title ? (
@@ -162,7 +162,7 @@ export function ListItem({
           )}
           {!!entry.collections && <StarIcon className="absolute right-0 top-0" />}
         </div>
-        {withDetails && (
+        {!simple && (
           <div
             className={cn(
               "text-[13px]",
@@ -180,7 +180,7 @@ export function ListItem({
         )}
       </div>
 
-      {withAudio && !!hasAudio && (
+      {hasAudio && (
         <AudioCover
           entryId={entryId}
           src={entry.entries!.attachments![0]!.url}
@@ -211,7 +211,7 @@ export function ListItem({
         />
       )}
 
-      {withDetails && entry.entries.media?.[0] && (
+      {!simple && !hasAudio && entry.entries.media?.[0] && (
         <Media
           thumbnail
           src={entry.entries.media[0].url}