From b6182298438ee900187c14843ed3923086d5a6a3 Mon Sep 17 00:00:00 2001
From: Suraj Kumar Mahto <suraj.mahto49@gmail.com>
Date: Wed, 31 Mar 2021 14:43:53 +0000
Subject: [PATCH] Fix the wrapping of entry heading and description and replace
 emojis with icons

---
 src/qml/EntryListPage.qml     |  6 ++++++
 src/qml/FeedDetailsPage.qml   | 14 ++++++++++++++
 src/qml/PodcastPlayerPage.qml |  7 ++++---
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/qml/EntryListPage.qml b/src/qml/EntryListPage.qml
index 7f531bc5..a4319f46 100644
--- a/src/qml/EntryListPage.qml
+++ b/src/qml/EntryListPage.qml
@@ -93,12 +93,18 @@ Kirigami.ScrollablePage {
                 ColumnLayout {
                     Kirigami.Heading {
                         text: page.feed.name
+                        wrapMode: Text.WordWrap
+                        Layout.fillWidth: true
                     }
                     Controls.Label {
                         text: page.feed.description
+                        wrapMode: Text.WordWrap
+                        Layout.fillWidth: true
                     }
                     Controls.Label {
                         text: page.feed.authors.length === 0 ? "" : " " + i18nc("by <author(s)>", "by") + " " + page.feed.authors[0].name
+                        wrapMode: Text.WordWrap
+                        Layout.fillWidth: true
                     }
                 }
             }
diff --git a/src/qml/FeedDetailsPage.qml b/src/qml/FeedDetailsPage.qml
index 90ed656e..88d2d30b 100644
--- a/src/qml/FeedDetailsPage.qml
+++ b/src/qml/FeedDetailsPage.qml
@@ -27,27 +27,41 @@ Kirigami.ScrollablePage {
         }
         Kirigami.Heading {
             text: feed.name
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
         Kirigami.Heading {
             text: feed.description;
             level: 3
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
         Controls.Label {
             text: i18nc("by <author(s)>", "by %1", feed.authors[0].name)
             visible: feed.authors.length !== 0
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
         Controls.Label {
             text: "<a href='%1'>%1</a>".arg(feed.link)
             onLinkActivated: Qt.openUrlExternally(link)
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
         Controls.Label {
             text: i18n("Subscribed since: %1", feed.subscribed.toLocaleString(Qt.locale(), Locale.ShortFormat))
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
         Controls.Label {
             text: i18n("last updated: %1", feed.lastUpdated.toLocaleString(Qt.locale(), Locale.ShortFormat))
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
         Controls.Label {
             text: i18n("%1 posts, %2 unread", feed.entryCount, feed.unreadEntryCount)
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
         }
     }
 }
diff --git a/src/qml/PodcastPlayerPage.qml b/src/qml/PodcastPlayerPage.qml
index 245b4617..4aea7d72 100644
--- a/src/qml/PodcastPlayerPage.qml
+++ b/src/qml/PodcastPlayerPage.qml
@@ -25,11 +25,11 @@ Kirigami.Page {
         initialIndex: 1
 
         Kirigami.Page {
-
             property var entry: podcastPlayerPage.entry
             Component.onCompleted: audio.entry = entry
 
-            title: "▶️"
+            icon.name: "media-playback-start"
+            title: "Play"
 
             ColumnLayout {
                 anchors.fill: parent
@@ -130,7 +130,8 @@ Kirigami.Page {
 
         EntryPage {
             entry: podcastPlayerPage.entry
-            title: "📃"
+            icon.name: "help-about"
+            title: "Info"
         }
     }
     actions.main: Kirigami.Action {