Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Tabs to subscriptions page for live streams and shorts #3725

Merged
merged 23 commits into from
Jul 21, 2023
Merged

Add Tabs to subscriptions page for live streams and shorts #3725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
33d11e7
Add Tabs to subscriptions page for live streams and shorts
PrestonN Jul 3, 2023
563b1f6
Fix naming issue with fetching live streams via Invidious RSS
PrestonN Jul 3, 2023
18187f5
Remove console log
PrestonN Jul 3, 2023
10d149b
Better error handling and better live stream sorting
PrestonN Jul 4, 2023
e66157a
Fix linter issues
PrestonN Jul 4, 2023
efe335e
Change videos RSS feed. Make live stream call more efficient.
PrestonN Jul 4, 2023
315d2fb
Store last used tab in memory. Return to last used tab on mount
PrestonN Jul 4, 2023
efae20b
Fix live sorting. Reorganize tabs and check for currentTab via create…
PrestonN Jul 7, 2023
0bc9e7c
Fix linting issue
PrestonN Jul 7, 2023
8b35f29
Start Global locales object, add distraction free checks for subscrip…
PrestonN Jul 9, 2023
05fbfc7
Merge branch 'development' into subscription-tabs
absidue Jul 14, 2023
4c651bd
Start Global locales object for all locales
absidue Jul 14, 2023
6d41fe0
Cleanup and reduce duplicate code
absidue Jul 16, 2023
3bf312b
Undo original distraction free settings change
absidue Jul 16, 2023
fe5d7fd
Fix missing change in previous commit
absidue Jul 16, 2023
1f7c856
Add distraction free settings to hide tabs
absidue Jul 16, 2023
847be94
Improve accessibility
absidue Jul 16, 2023
d0748d6
Merge branch 'development' into subscription-tabs
absidue Jul 20, 2023
020ff86
Make app-wide hide live streams setting override hide subscriptions live
absidue Jul 20, 2023
d0530a4
Fix incorrect all tabs disabled message
absidue Jul 20, 2023
163a379
Fix arrow key navigation
absidue Jul 20, 2023
1699e30
Create shared UI component for the subscription tabs
absidue Jul 20, 2023
a7ec716
Merge branch 'development' into subscription-tabs
absidue Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/renderer/components/distraction-settings/distraction-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,27 @@ export default defineComponent({
hideChannelCommunity: function() {
return this.$store.getters.getHideChannelCommunity
},
hideSubscriptionsVideos: function() {
return this.$store.getters.getHideSubscriptionsVideos
},
hideSubscriptionsShorts: function() {
return this.$store.getters.getHideSubscriptionsShorts
},
hideSubscriptionsLive: function() {
return this.$store.getters.getHideSubscriptionsLive
},
showDistractionFreeTitles: function () {
return this.$store.getters.getShowDistractionFreeTitles
},
channelsHidden: function () {
return JSON.parse(this.$store.getters.getChannelsHidden)
},
hideSubscriptionsLiveTooltip: function () {
return this.$t('Tooltips.Distraction Free Settings.Hide Subscriptions Live', {
appWideSetting: this.$t('Settings.Distraction Free Settings.Hide Live Streams'),
subsection: this.$t('Settings.Distraction Free Settings.Sections.General'),
settingsSection: this.$t('Settings.Distraction Free Settings.Distraction Free Settings')
})
}
},
methods: {
Expand Down Expand Up @@ -125,7 +141,10 @@ export default defineComponent({
'updateHideChannelPlaylists',
'updateHideChannelCommunity',
'updateHideChannelPodcasts',
'updateHideChannelReleases'
'updateHideChannelReleases',
'updateHideSubscriptionsVideos',
'updateHideSubscriptionsShorts',
'updateHideSubscriptionsLive'
])
}
})
31 changes: 31 additions & 0 deletions src/renderer/components/distraction-settings/distraction-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,37 @@
/>
</div>
</div>
<h4
class="groupTitle"
>
{{ $t('Settings.Distraction Free Settings.Sections.Subscriptions Page') }}
</h4>
<div class="switchColumnGrid">
<div class="switchColumn">
<ft-toggle-switch
:label="$t('Settings.Distraction Free Settings.Hide Subscriptions Videos')"
:compact="true"
:default-value="hideSubscriptionsVideos"
@change="updateHideSubscriptionsVideos"
/>
<ft-toggle-switch
:label="$t('Settings.Distraction Free Settings.Hide Subscriptions Shorts')"
:compact="true"
:default-value="hideSubscriptionsShorts"
@change="updateHideSubscriptionsShorts"
/>
</div>
<div class="switchColumn">
<ft-toggle-switch
:label="$t('Settings.Distraction Free Settings.Hide Subscriptions Live')"
:compact="true"
:disabled="hideLiveStreams"
:default-value="hideLiveStreams || hideSubscriptionsLive"
:tooltip="hideLiveStreams ? hideSubscriptionsLiveTooltip : ''"
v-on="!hideLiveStreams ? { change: updateHideSubscriptionsLive } : {}"
/>
</div>
</div>
<h4
class="groupTitle"
>
Expand Down