From f65377127d6d335012da9ab51aeb1f30659b74e2 Mon Sep 17 00:00:00 2001
From: pablodekota <76634178+pablodekota@users.noreply.github.com>
Date: Sun, 10 Jan 2021 04:11:42 +0100
Subject: [PATCH] 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>
---
 .../distraction-settings.js                   |  4 +++
 .../distraction-settings.vue                  |  6 ++++
 src/renderer/components/side-nav/side-nav.js  |  3 ++
 src/renderer/components/side-nav/side-nav.vue | 34 +++++++++++--------
 src/renderer/store/modules/settings.js        | 20 ++++++++++-
 static/locales/en-US.yaml                     |  1 +
 static/locales/en_GB.yaml                     |  1 +
 7 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index 22a1f7d4..e00a68a7 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -39,6 +39,9 @@ export default Vue.extend({
     },
     hideLiveChat: function () {
       return this.$store.getters.getHideLiveChat
+    },
+    hideActiveSubscriptions: function () {
+      return this.$store.getters.getHideActiveSubscriptions
     }
   },
   methods: {
@@ -60,6 +63,7 @@ export default Vue.extend({
       'updateHideTrendingVideos',
       'updateHidePopularVideos',
       'updateHideLiveChat',
+      'updateHideActiveSubscriptions',
       'updatePlayNextVideo',
       'updateDefaultTheatreMode'
     ])
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 26707279..54781a1a 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -33,6 +33,12 @@
           :default-value="hideCommentLikes"
           @change="updateHideCommentLikes"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Active Subscriptions')"
+          :compact="true"
+          :default-value="hideActiveSubscriptions"
+          @change="updateHideActiveSubscriptions"
+        />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
index 4edf9fd3..88f2914b 100644
--- a/src/renderer/components/side-nav/side-nav.js
+++ b/src/renderer/components/side-nav/side-nav.js
@@ -50,6 +50,9 @@ export default Vue.extend({
     },
     hideTrendingVideos: function () {
       return this.$store.getters.getHideTrendingVideos
+    },
+    hideActiveSubscriptions: function () {
+      return this.$store.getters.getHideActiveSubscriptions
     }
   },
   methods: {
diff --git a/src/renderer/components/side-nav/side-nav.vue b/src/renderer/components/side-nav/side-nav.vue
index a5a6e35c..e9b63647 100644
--- a/src/renderer/components/side-nav/side-nav.vue
+++ b/src/renderer/components/side-nav/side-nav.vue
@@ -97,26 +97,30 @@
       </div>
       <hr>
       <div
-        v-for="(channel, index) in activeSubscriptions"
-        :key="index"
-        class="navChannel mobileHidden"
-        :title="channel.name"
-        @click="goToChannel(channel.id)"
+        v-if="!hideActiveSubscriptions"
       >
         <div
-          class="thumbnailContainer"
+          v-for="(channel, index) in activeSubscriptions"
+          :key="index"
+          class="navChannel mobileHidden"
+          :title="channel.name"
+          @click="goToChannel(channel.id)"
         >
-          <img
-            class="channelThumbnail"
-            :src="channel.thumbnail"
+          <div
+            class="thumbnailContainer"
           >
+            <img
+              class="channelThumbnail"
+              :src="channel.thumbnail"
+            >
+          </div>
+          <p
+            v-if="isOpen"
+            class="navLabel"
+          >
+            {{ channel.name }}
+          </p>
         </div>
-        <p
-          v-if="isOpen"
-          class="navLabel"
-        >
-          {{ channel.name }}
-        </p>
       </div>
     </div>
   </ft-flex-box>
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 0bfdf8b6..09cad179 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -71,7 +71,8 @@ const state = {
   hideRecommendedVideos: false,
   hideTrendingVideos: false,
   hidePopularVideos: false,
-  hideLiveChat: false
+  hideLiveChat: false,
+  hideActiveSubscriptions: false
 }
 
 const getters = {
@@ -224,6 +225,9 @@ const getters = {
   },
   getHideLiveChat: () => {
     return state.hideLiveChat
+  },
+  getHideActiveSubscriptions: () => {
+    return state.hideActiveSubscriptions
   }
 }
 
@@ -351,6 +355,9 @@ const actions = {
             case 'hideLiveChat':
               commit('setHideLiveChat', result.value)
               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) {
     settingsDb.update({ _id: 'hideLiveChat' }, { _id: 'hideLiveChat', value: hideLiveChat }, { upsert: true }, (err, numReplaced) => {
       if (!err) {
@@ -796,6 +811,9 @@ const mutations = {
   },
   setHideLiveChat (state, hideLiveChat) {
     state.hideLiveChat = hideLiveChat
+  },
+  setHideActiveSubscriptions (state, hideActiveSubscriptions) {
+    state.hideActiveSubscriptions = hideActiveSubscriptions
   }
 }
 
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 2f53e590..a4a710b5 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -213,6 +213,7 @@ Settings:
     Hide Trending Videos: Hide Trending Videos
     Hide Popular Videos: Hide Popular Videos
     Hide Live Chat: Hide Live Chat
+    Hide Active Subscriptions: Hide Active Subscriptions
   Data Settings:
     Data Settings: Data Settings
     Select Import Type: Select Import Type
diff --git a/static/locales/en_GB.yaml b/static/locales/en_GB.yaml
index 7cb6cec3..1631b101 100644
--- a/static/locales/en_GB.yaml
+++ b/static/locales/en_GB.yaml
@@ -275,6 +275,7 @@ Settings:
     Hide Channel Subscribers: Hide Channel Subscribers
     Hide Video Likes And Dislikes: Hide Video Likes And Dislikes
     Hide Video Views: Hide Video Views
+    Hide Active Subscriptions: Hide Active Subscriptions
     Distraction Free Settings: Distraction Free Settings
   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