Hide active subscriptions (#918)

* Update distraction-settings.js

* Update side-nav.js

* added hiding subscription activity

* Update distraction-settings.js

* Update distraction-settings.js

* Update side-nav.js

* Update side-nav.vue

* Update distraction-settings.vue

* Update settings.js

* Update side-nav.vue

* Update distraction-settings.js

* Update en-US.yaml

* Update en_GB.yaml

* Update distraction-settings.js

* Update settings.js

* Update side-nav.vue

* Update side-nav.vue

* Update side-nav.vue

Co-authored-by: Pablo <8d1d1de7-176f-4d40-b5f0-5a552aabd433@4wrd.cc>
This commit is contained in:
pablodekota 2021-01-10 04:11:42 +01:00 committed by GitHub
parent 0f03cbc739
commit f65377127d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 53 additions and 16 deletions

View File

@ -39,6 +39,9 @@ export default Vue.extend({
}, },
hideLiveChat: function () { hideLiveChat: function () {
return this.$store.getters.getHideLiveChat return this.$store.getters.getHideLiveChat
},
hideActiveSubscriptions: function () {
return this.$store.getters.getHideActiveSubscriptions
} }
}, },
methods: { methods: {
@ -60,6 +63,7 @@ export default Vue.extend({
'updateHideTrendingVideos', 'updateHideTrendingVideos',
'updateHidePopularVideos', 'updateHidePopularVideos',
'updateHideLiveChat', 'updateHideLiveChat',
'updateHideActiveSubscriptions',
'updatePlayNextVideo', 'updatePlayNextVideo',
'updateDefaultTheatreMode' 'updateDefaultTheatreMode'
]) ])

View File

@ -33,6 +33,12 @@
:default-value="hideCommentLikes" :default-value="hideCommentLikes"
@change="updateHideCommentLikes" @change="updateHideCommentLikes"
/> />
<ft-toggle-switch
:label="$t('Settings.Distraction Free Settings.Hide Active Subscriptions')"
:compact="true"
:default-value="hideActiveSubscriptions"
@change="updateHideActiveSubscriptions"
/>
</div> </div>
<div class="switchColumn"> <div class="switchColumn">
<ft-toggle-switch <ft-toggle-switch

View File

@ -50,6 +50,9 @@ export default Vue.extend({
}, },
hideTrendingVideos: function () { hideTrendingVideos: function () {
return this.$store.getters.getHideTrendingVideos return this.$store.getters.getHideTrendingVideos
},
hideActiveSubscriptions: function () {
return this.$store.getters.getHideActiveSubscriptions
} }
}, },
methods: { methods: {

View File

@ -96,6 +96,9 @@
</p> </p>
</div> </div>
<hr> <hr>
<div
v-if="!hideActiveSubscriptions"
>
<div <div
v-for="(channel, index) in activeSubscriptions" v-for="(channel, index) in activeSubscriptions"
:key="index" :key="index"
@ -119,6 +122,7 @@
</p> </p>
</div> </div>
</div> </div>
</div>
</ft-flex-box> </ft-flex-box>
</template> </template>

View File

@ -71,7 +71,8 @@ const state = {
hideRecommendedVideos: false, hideRecommendedVideos: false,
hideTrendingVideos: false, hideTrendingVideos: false,
hidePopularVideos: false, hidePopularVideos: false,
hideLiveChat: false hideLiveChat: false,
hideActiveSubscriptions: false
} }
const getters = { const getters = {
@ -224,6 +225,9 @@ const getters = {
}, },
getHideLiveChat: () => { getHideLiveChat: () => {
return state.hideLiveChat return state.hideLiveChat
},
getHideActiveSubscriptions: () => {
return state.hideActiveSubscriptions
} }
} }
@ -351,6 +355,9 @@ const actions = {
case 'hideLiveChat': case 'hideLiveChat':
commit('setHideLiveChat', result.value) commit('setHideLiveChat', result.value)
break break
case 'hideActiveSubscriptions':
commit('setHideActiveSubscriptions', result.value)
break
} }
}) })
} }
@ -655,6 +662,14 @@ const actions = {
}) })
}, },
updateHideActiveSubscriptions ({ commit }, hideActiveSubscriptions) {
settingsDb.update({ _id: 'hideActiveSubscriptions' }, { _id: 'hideActiveSubscriptions', value: hideActiveSubscriptions }, { upsert: true }, (err, numReplaced) => {
if (!err) {
commit('setHideActiveSubscriptions', hideActiveSubscriptions)
}
})
},
updateHideLiveChat ({ commit }, hideLiveChat) { updateHideLiveChat ({ commit }, hideLiveChat) {
settingsDb.update({ _id: 'hideLiveChat' }, { _id: 'hideLiveChat', value: hideLiveChat }, { upsert: true }, (err, numReplaced) => { settingsDb.update({ _id: 'hideLiveChat' }, { _id: 'hideLiveChat', value: hideLiveChat }, { upsert: true }, (err, numReplaced) => {
if (!err) { if (!err) {
@ -796,6 +811,9 @@ const mutations = {
}, },
setHideLiveChat (state, hideLiveChat) { setHideLiveChat (state, hideLiveChat) {
state.hideLiveChat = hideLiveChat state.hideLiveChat = hideLiveChat
},
setHideActiveSubscriptions (state, hideActiveSubscriptions) {
state.hideActiveSubscriptions = hideActiveSubscriptions
} }
} }

View File

@ -213,6 +213,7 @@ Settings:
Hide Trending Videos: Hide Trending Videos Hide Trending Videos: Hide Trending Videos
Hide Popular Videos: Hide Popular Videos Hide Popular Videos: Hide Popular Videos
Hide Live Chat: Hide Live Chat Hide Live Chat: Hide Live Chat
Hide Active Subscriptions: Hide Active Subscriptions
Data Settings: Data Settings:
Data Settings: Data Settings Data Settings: Data Settings
Select Import Type: Select Import Type Select Import Type: Select Import Type

View File

@ -275,6 +275,7 @@ Settings:
Hide Channel Subscribers: Hide Channel Subscribers Hide Channel Subscribers: Hide Channel Subscribers
Hide Video Likes And Dislikes: Hide Video Likes And Dislikes Hide Video Likes And Dislikes: Hide Video Likes And Dislikes
Hide Video Views: Hide Video Views Hide Video Views: Hide Video Views
Hide Active Subscriptions: Hide Active Subscriptions
Distraction Free Settings: Distraction Free Settings Distraction Free Settings: Distraction Free Settings
The app needs to restart for changes to take effect. Restart and apply change?: The The app needs to restart for changes to take effect. Restart and apply change?: The
app needs to restart for changes to take effect. Do you want to restart and apply app needs to restart for changes to take effect. Do you want to restart and apply