From f5b057e09eac52aba8fc073d6a89d8367c05e278 Mon Sep 17 00:00:00 2001 From: Sasikanth Miriyampalli Date: Sun, 11 Aug 2024 05:20:03 +0530 Subject: [PATCH] Revert "Add feed icon to reader screen" This reverts commit a9a0af03aa28312019620b9d9d319b82218d322a. --- .../composeResources/files/reader/styles.css | 13 ------------- .../sasikanth/rss/reader/reader/ui/ReaderHTML.kt | 12 ++---------- .../sasikanth/rss/reader/reader/ui/ReaderScreen.kt | 1 - 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/shared/src/commonMain/composeResources/files/reader/styles.css b/shared/src/commonMain/composeResources/files/reader/styles.css index ece95a4c6..154b5e8c0 100644 --- a/shared/src/commonMain/composeResources/files/reader/styles.css +++ b/shared/src/commonMain/composeResources/files/reader/styles.css @@ -12,25 +12,12 @@ figcaption { font-size: 14px; line-height: 1.6; } -.row { - display: flex; - justify-content: center; - align-items: center; -} -.column { - margin-inline-start: 16px; - flex: 1; -} .caption { font-size: 12px; } .feedName { margin-bottom: 8px; } -.feedIcon { - width: 32px; - height: auto; -} img, figure, video, div, object { max-width: 100%; height: auto !important; diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt index bca2c1c85..f5fbcecfc 100644 --- a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt +++ b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt @@ -24,7 +24,6 @@ object ReaderHTML { title: String, feedName: String, feedHomePageLink: String, - feedIcon: String, publishedAt: String ): String { val readabilityJS = readFile("readability.js") @@ -35,7 +34,6 @@ object ReaderHTML { postMetadata( feedName = feedName, feedHomePageLink = feedHomePageLink, - feedIcon = feedIcon, publishedAt = publishedAt, hasTitle = title.isNotBlank() ) @@ -69,7 +67,6 @@ object ReaderHTML { private fun postMetadata( feedName: String, feedHomePageLink: String, - feedIcon: String, publishedAt: String, hasTitle: Boolean, ): String { @@ -81,13 +78,8 @@ object ReaderHTML { // language=HTML appendLine( """ -
- Feed Icon -
- -
$publishedAt
-
-
+
$feedName
+
$publishedAt

""" .trimIndent() diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt index 0491f5b30..aa4050ad2 100644 --- a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt +++ b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt @@ -253,7 +253,6 @@ internal fun ReaderScreen( title = state.title!!, feedName = state.feed!!.name, feedHomePageLink = state.feed!!.homepageLink, - feedIcon = state.feed!!.icon, publishedAt = state.publishedAt!! )