diff options
author | 2018-11-22 14:14:25 +0100 | |
---|---|---|
committer | 2018-11-22 14:14:25 +0100 | |
commit | 46b8c8c4b3a5b80e0187b284abc84566a7e784db (patch) | |
tree | 7fd378bcdd18e78c42dfeb61a15f89fd10106046 /src/containers/layout | |
parent | ADD features loading spinner (diff) | |
parent | feat(App): Add option to enable dark mode for supported services (diff) | |
download | ferdium-app-46b8c8c4b3a5b80e0187b284abc84566a7e784db.tar.gz ferdium-app-46b8c8c4b3a5b80e0187b284abc84566a7e784db.tar.zst ferdium-app-46b8c8c4b3a5b80e0187b284abc84566a7e784db.zip |
Merge branch 'develop' into feature/features-api
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 7a398ed2d..affc1a0a2 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -18,8 +18,7 @@ import Sidebar from '../../components/layout/Sidebar'; | |||
18 | import Services from '../../components/services/content/Services'; | 18 | import Services from '../../components/services/content/Services'; |
19 | import AppLoader from '../../components/ui/AppLoader'; | 19 | import AppLoader from '../../components/ui/AppLoader'; |
20 | 20 | ||
21 | @inject('stores', 'actions') @observer | 21 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
22 | export default class AppLayoutContainer extends Component { | ||
23 | static defaultProps = { | 22 | static defaultProps = { |
24 | children: null, | 23 | children: null, |
25 | }; | 24 | }; |
@@ -82,7 +81,7 @@ export default class AppLayoutContainer extends Component { | |||
82 | <Sidebar | 81 | <Sidebar |
83 | services={services.allDisplayed} | 82 | services={services.allDisplayed} |
84 | setActive={setActive} | 83 | setActive={setActive} |
85 | isAppMuted={settings.all.isAppMuted} | 84 | isAppMuted={settings.all.app.isAppMuted} |
86 | openSettings={openSettings} | 85 | openSettings={openSettings} |
87 | closeSettings={closeSettings} | 86 | closeSettings={closeSettings} |
88 | reorder={reorder} | 87 | reorder={reorder} |
@@ -92,25 +91,26 @@ export default class AppLayoutContainer extends Component { | |||
92 | deleteService={deleteService} | 91 | deleteService={deleteService} |
93 | updateService={updateService} | 92 | updateService={updateService} |
94 | toggleMuteApp={toggleMuteApp} | 93 | toggleMuteApp={toggleMuteApp} |
95 | showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted} | 94 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} |
96 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 95 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
97 | /> | 96 | /> |
98 | ); | 97 | ); |
99 | 98 | ||
100 | const servicesContainer = ( | 99 | const servicesContainer = ( |
101 | <Services | 100 | <Services |
102 | services={services.allDisplayed} | 101 | services={services.allDisplayedUnordered} |
103 | handleIPCMessage={handleIPCMessage} | 102 | handleIPCMessage={handleIPCMessage} |
104 | setWebviewReference={setWebviewReference} | 103 | setWebviewReference={setWebviewReference} |
105 | openWindow={openWindow} | 104 | openWindow={openWindow} |
106 | reload={reload} | 105 | reload={reload} |
107 | isAppMuted={settings.all.isAppMuted} | 106 | isAppMuted={settings.all.app.isAppMuted} |
108 | update={updateService} | 107 | update={updateService} |
109 | /> | 108 | /> |
110 | ); | 109 | ); |
111 | 110 | ||
112 | return ( | 111 | return ( |
113 | <AppLayout | 112 | <AppLayout |
113 | isFullScreen={app.isFullScreen} | ||
114 | isOnline={app.isOnline} | 114 | isOnline={app.isOnline} |
115 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} | 115 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} |
116 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 116 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} |
@@ -125,6 +125,7 @@ export default class AppLayoutContainer extends Component { | |||
125 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} | 125 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} |
126 | retryRequiredRequests={retryRequiredRequests} | 126 | retryRequiredRequests={retryRequiredRequests} |
127 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 127 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
128 | darkMode={settings.all.app.darkMode} | ||
128 | > | 129 | > |
129 | {React.Children.count(children) > 0 ? children : null} | 130 | {React.Children.count(children) > 0 ? children : null} |
130 | </AppLayout> | 131 | </AppLayout> |