diff options
author | Vijay A <avijayr@protonmail.com> | 2021-08-13 00:45:01 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-08-13 00:45:01 +0530 |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /src/components/services/tabs/Tabbar.js | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'src/components/services/tabs/Tabbar.js')
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index 5e8260ad0..ab1e46c9f 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -15,8 +15,11 @@ export default @observer class TabBar extends Component { | |||
15 | reload: PropTypes.func.isRequired, | 15 | reload: PropTypes.func.isRequired, |
16 | toggleNotifications: PropTypes.func.isRequired, | 16 | toggleNotifications: PropTypes.func.isRequired, |
17 | toggleAudio: PropTypes.func.isRequired, | 17 | toggleAudio: PropTypes.func.isRequired, |
18 | toggleDarkMode: PropTypes.func.isRequired, | ||
18 | deleteService: PropTypes.func.isRequired, | 19 | deleteService: PropTypes.func.isRequired, |
19 | updateService: PropTypes.func.isRequired, | 20 | updateService: PropTypes.func.isRequired, |
21 | hibernateService: PropTypes.func.isRequired, | ||
22 | wakeUpService: PropTypes.func.isRequired, | ||
20 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 23 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
21 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 24 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
22 | }; | 25 | }; |
@@ -31,7 +34,7 @@ export default @observer class TabBar extends Component { | |||
31 | reorder({ oldIndex, newIndex }); | 34 | reorder({ oldIndex, newIndex }); |
32 | }; | 35 | }; |
33 | 36 | ||
34 | shouldPreventSorting = event => event.target.tagName !== 'LI'; | 37 | shouldPreventSorting = (event) => event.target.tagName !== 'LI'; |
35 | 38 | ||
36 | toggleService = ({ serviceId, isEnabled }) => { | 39 | toggleService = ({ serviceId, isEnabled }) => { |
37 | const { updateService } = this.props; | 40 | const { updateService } = this.props; |
@@ -55,6 +58,18 @@ export default @observer class TabBar extends Component { | |||
55 | this.toggleService({ serviceId, isEnabled: true }); | 58 | this.toggleService({ serviceId, isEnabled: true }); |
56 | } | 59 | } |
57 | 60 | ||
61 | hibernateService({ serviceId }) { | ||
62 | if (serviceId) { | ||
63 | this.props.hibernateService({ serviceId }); | ||
64 | } | ||
65 | } | ||
66 | |||
67 | wakeUpService({ serviceId }) { | ||
68 | if (serviceId) { | ||
69 | this.props.wakeUpService({ serviceId }); | ||
70 | } | ||
71 | } | ||
72 | |||
58 | render() { | 73 | render() { |
59 | const { | 74 | const { |
60 | services, | 75 | services, |
@@ -64,6 +79,7 @@ export default @observer class TabBar extends Component { | |||
64 | reload, | 79 | reload, |
65 | toggleNotifications, | 80 | toggleNotifications, |
66 | toggleAudio, | 81 | toggleAudio, |
82 | toggleDarkMode, | ||
67 | deleteService, | 83 | deleteService, |
68 | showMessageBadgeWhenMutedSetting, | 84 | showMessageBadgeWhenMutedSetting, |
69 | showMessageBadgesEvenWhenMuted, | 85 | showMessageBadgesEvenWhenMuted, |
@@ -80,9 +96,12 @@ export default @observer class TabBar extends Component { | |||
80 | reload={reload} | 96 | reload={reload} |
81 | toggleNotifications={toggleNotifications} | 97 | toggleNotifications={toggleNotifications} |
82 | toggleAudio={toggleAudio} | 98 | toggleAudio={toggleAudio} |
99 | toggleDarkMode={toggleDarkMode} | ||
83 | deleteService={deleteService} | 100 | deleteService={deleteService} |
84 | disableService={args => this.disableService(args)} | 101 | disableService={(args) => this.disableService(args)} |
85 | enableService={args => this.enableService(args)} | 102 | enableService={(args) => this.enableService(args)} |
103 | hibernateService={(args) => this.hibernateService(args)} | ||
104 | wakeUpService={(args) => this.wakeUpService(args)} | ||
86 | openSettings={openSettings} | 105 | openSettings={openSettings} |
87 | distance={20} | 106 | distance={20} |
88 | axis="y" | 107 | axis="y" |