Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable subscribe button when feed has been added

Browse Source 
This disables the subscribe button once a feed has been added, i.e. when
the button has been clicked.
Additionally, when clicking on an already subscribed feed on the
discover page will now open the full details including the episode list.

BUG: 458560
This commit is contained in:
Bart De Vries 2022-12-13 14:21:30 +01:00
parent 16178b6441
commit 19a6e382db
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/datamanager.h
View File

@ -28,7 +28,7 @@ public:
}
Feed *getFeed(const int index) const;
Feed *getFeed(const QString &feedurl) const;
Q_INVOKABLE Feed *getFeed(const QString &feedurl) const;
Entry *getEntry(const int feed_index, const int entry_index) const;
Entry *getEntry(const Feed *feed, const int entry_index) const;
Q_INVOKABLE Entry *getEntry(const QString &id) const;

7
src/qml/DiscoverPage.qml
View File

@ -63,20 +63,23 @@ Kirigami.ScrollablePage {
}
actions: [
Kirigami.Action {
id: subscribeAction
text: enabled ? i18n("Subscribe") : i18n("Subscribed")
icon.name: "kt-add-feeds"
enabled: !DataManager.feedExists(model.url)
onTriggered: {
DataManager.addFeed(model.url)
DataManager.addFeed(model.url);
enabled = false;
}
}
]
onClicked: {
pageStack.push("qrc:/FeedDetailsPage.qml", {"feed": model, isSubscribed: false})
pageStack.push("qrc:/FeedDetailsPage.qml", {"feed": subscribeAction.enabled ? model : DataManager.getFeed(model.url), "isSubscribed": !subscribeAction.enabled, "subscribeAction": subscribeAction})
}
}
}
ListView {
id: listView
anchors.fill: parent
reuseItems: true

10
src/qml/FeedDetailsPage.qml
View File

@ -22,6 +22,7 @@ Kirigami.ScrollablePage {
property QtObject feed;
property bool isSubscribed: true
property var subscribeAction: undefined // this is only used if instantiated from the discoverpage
property string author: isSubscribed ? (page.feed.authors.length === 0 ? "" : page.feed.authors[0].name) : feed.author
property bool showMoreInfo: false
@ -142,7 +143,14 @@ Kirigami.ScrollablePage {
text: enabled ? i18n("Subscribe") : i18n("Subscribed")
enabled: !DataManager.feedExists(feed.url)
visible: !isSubscribed
onTriggered: DataManager.addFeed(feed.url)
onTriggered: {
DataManager.addFeed(feed.url);
enabled = false;
// Also disable button on discoverpage
if (subscribeAction !== undefined) {
subscribeAction.enabled = false;
}
}
},
Kirigami.Action {
iconName: "documentinfo"