From 163cf09eabb51717db6c20ecfa941e53572e6514 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 9 Jun 2023 14:24:41 +0000 Subject: [PATCH] use new cores model --- packages/app/package.json | 5 ++- .../src/cores/api/{index.js => api.core.js} | 0 .../{index.js => context_menu.core.js} | 0 .../src/cores/i18n/{index.js => i18n.core.js} | 0 packages/app/src/cores/index.js | 38 ------------------- .../{index.jsx => notifications.core.jsx} | 0 .../{index.js => permissions.core.js} | 0 .../cores/player/{index.js => player.core.js} | 30 ++++++++++++++- .../{index.js => remoteStorage.core.js} | 0 .../settings/{index.js => settings.core.js} | 0 .../shortcuts/{index.js => shortcuts.core.js} | 0 .../cores/sound/{index.js => sound.core.js} | 0 .../cores/style/{index.jsx => style.core.jsx} | 1 + .../src/cores/sync/{index.js => sync.core.js} | 10 +++++ .../{index.js => tasksQueue.core.js} | 0 .../widgets/{index.js => widgets.core.js} | 0 16 files changed, 42 insertions(+), 42 deletions(-) rename packages/app/src/cores/api/{index.js => api.core.js} (100%) rename packages/app/src/cores/contextMenu/{index.js => context_menu.core.js} (100%) rename packages/app/src/cores/i18n/{index.js => i18n.core.js} (100%) delete mode 100755 packages/app/src/cores/index.js rename packages/app/src/cores/notifications/{index.jsx => notifications.core.jsx} (100%) rename packages/app/src/cores/permissions/{index.js => permissions.core.js} (100%) rename packages/app/src/cores/player/{index.js => player.core.js} (97%) rename packages/app/src/cores/remoteStorage/{index.js => remoteStorage.core.js} (100%) rename packages/app/src/cores/settings/{index.js => settings.core.js} (100%) rename packages/app/src/cores/shortcuts/{index.js => shortcuts.core.js} (100%) rename packages/app/src/cores/sound/{index.js => sound.core.js} (100%) rename packages/app/src/cores/style/{index.jsx => style.core.jsx} (99%) rename packages/app/src/cores/sync/{index.js => sync.core.js} (97%) rename packages/app/src/cores/tasksQueue/{index.js => tasksQueue.core.js} (100%) rename packages/app/src/cores/widgets/{index.js => widgets.core.js} (100%) diff --git a/packages/app/package.json b/packages/app/package.json index c9f2548b..7f653a91 100755 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -39,6 +39,7 @@ "@emotion/css": "11.0.0", "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", + "@ionic/react": "^7.0.12", "@loadable/component": "5.15.2", "@mui/material": "^5.11.9", "@paciolan/remote-component": "^2.13.0", @@ -53,7 +54,7 @@ "electron-is": "^3.0.0", "electron-log": "^4.4.8", "electron-squirrel-startup": "^1.0.0", - "evite": "0.15.3", + "evite": "^0.15.6", "fast-average-color": "^9.2.0", "faye": "1.4.0", "feather-reactjs": "2.0.13", @@ -175,4 +176,4 @@ ] } } -} \ No newline at end of file +} diff --git a/packages/app/src/cores/api/index.js b/packages/app/src/cores/api/api.core.js similarity index 100% rename from packages/app/src/cores/api/index.js rename to packages/app/src/cores/api/api.core.js diff --git a/packages/app/src/cores/contextMenu/index.js b/packages/app/src/cores/contextMenu/context_menu.core.js similarity index 100% rename from packages/app/src/cores/contextMenu/index.js rename to packages/app/src/cores/contextMenu/context_menu.core.js diff --git a/packages/app/src/cores/i18n/index.js b/packages/app/src/cores/i18n/i18n.core.js similarity index 100% rename from packages/app/src/cores/i18n/index.js rename to packages/app/src/cores/i18n/i18n.core.js diff --git a/packages/app/src/cores/index.js b/packages/app/src/cores/index.js deleted file mode 100755 index c85150ba..00000000 --- a/packages/app/src/cores/index.js +++ /dev/null @@ -1,38 +0,0 @@ -import SettingsCore from "./settings" -import TasksQueue from "./tasksQueue" -import APICore from "./api" -import StyleCore from "./style" -import PermissionsCore from "./permissions" -import ContextMenuCore from "./contextMenu" - -import I18nCore from "./i18n" -import NotificationsCore from "./notifications" -import ShortcutsCore from "./shortcuts" -import SoundCore from "./sound" - -import Player from "./player" -import RemoteStorage from "./remoteStorage" - -import WidgetsCore from "./widgets" - -import SyncCore from "./sync" - -// DEFINE LOAD ORDER HERE -export default [ - SettingsCore, - TasksQueue, - - APICore, - PermissionsCore, - StyleCore, - I18nCore, - SoundCore, - NotificationsCore, - ShortcutsCore, - RemoteStorage, - - Player, - ContextMenuCore, - WidgetsCore, - SyncCore, -] \ No newline at end of file diff --git a/packages/app/src/cores/notifications/index.jsx b/packages/app/src/cores/notifications/notifications.core.jsx similarity index 100% rename from packages/app/src/cores/notifications/index.jsx rename to packages/app/src/cores/notifications/notifications.core.jsx diff --git a/packages/app/src/cores/permissions/index.js b/packages/app/src/cores/permissions/permissions.core.js similarity index 100% rename from packages/app/src/cores/permissions/index.js rename to packages/app/src/cores/permissions/permissions.core.js diff --git a/packages/app/src/cores/player/index.js b/packages/app/src/cores/player/player.core.js similarity index 97% rename from packages/app/src/cores/player/index.js rename to packages/app/src/cores/player/player.core.js index 368f1c06..56d7af75 100755 --- a/packages/app/src/cores/player/index.js +++ b/packages/app/src/cores/player/player.core.js @@ -54,9 +54,9 @@ export default class Player extends Core { state = Observable.from({ loading: false, minimized: false, - audioMuted: AudioPlayerStorage.get("mute") ?? false, + audioMuted: app.isMobile ? false : (AudioPlayerStorage.get("mute") ?? false), playbackMode: AudioPlayerStorage.get("mode") ?? "repeat", - audioVolume: AudioPlayerStorage.get("volume") ?? 0.3, + audioVolume: app.isMobile ? 1 : (AudioPlayerStorage.get("volume") ?? 0.3), velocity: AudioPlayerStorage.get("velocity") ?? 1, coverColorAnalysis: null, @@ -340,6 +340,12 @@ export default class Player extends Core { this.observeStateChanges() } + async initializeBeforeRuntimeInitialize() { + if (app.isMobile) { + this.state.audioVolume = 1 + } + } + // // UI Methods // @@ -350,6 +356,11 @@ export default class Player extends Core { return false } + if (!app.layout.floatingStack) { + console.error("Floating stack not found") + return false + } + this.currentDomWindow = app.layout.floatingStack.add("mediaPlayer", EmbbededMediaPlayer) } @@ -359,6 +370,11 @@ export default class Player extends Core { return false } + if (!app.layout.floatingStack) { + console.error("Floating stack not found") + return false + } + app.layout.floatingStack.remove("mediaPlayer") this.currentDomWindow = null @@ -892,6 +908,11 @@ export default class Player extends Core { } toogleMute(to) { + if (app.isMobile) { + console.warn("Cannot mute on mobile") + return false + } + this.state.audioMuted = to ?? !this.state.audioMuted if (this.currentAudioInstance) { @@ -912,6 +933,11 @@ export default class Player extends Core { return this.state.audioVolume } + if (app.isMobile) { + console.warn("Cannot change volume on mobile") + return false + } + if (volume > 1) { console.log(app.cores.settings.get("player.allowVolumeOver100")) diff --git a/packages/app/src/cores/remoteStorage/index.js b/packages/app/src/cores/remoteStorage/remoteStorage.core.js similarity index 100% rename from packages/app/src/cores/remoteStorage/index.js rename to packages/app/src/cores/remoteStorage/remoteStorage.core.js diff --git a/packages/app/src/cores/settings/index.js b/packages/app/src/cores/settings/settings.core.js similarity index 100% rename from packages/app/src/cores/settings/index.js rename to packages/app/src/cores/settings/settings.core.js diff --git a/packages/app/src/cores/shortcuts/index.js b/packages/app/src/cores/shortcuts/shortcuts.core.js similarity index 100% rename from packages/app/src/cores/shortcuts/index.js rename to packages/app/src/cores/shortcuts/shortcuts.core.js diff --git a/packages/app/src/cores/sound/index.js b/packages/app/src/cores/sound/sound.core.js similarity index 100% rename from packages/app/src/cores/sound/index.js rename to packages/app/src/cores/sound/sound.core.js diff --git a/packages/app/src/cores/style/index.jsx b/packages/app/src/cores/style/style.core.jsx similarity index 99% rename from packages/app/src/cores/style/index.jsx rename to packages/app/src/cores/style/style.core.jsx index ad9730f2..b219a7e4 100755 --- a/packages/app/src/cores/style/index.jsx +++ b/packages/app/src/cores/style/style.core.jsx @@ -65,6 +65,7 @@ export class ThemeProvider extends React.Component { export default class StyleCore extends Core { static refName = "style" + static dependencies = ["settings"] static namespace = "style" diff --git a/packages/app/src/cores/sync/index.js b/packages/app/src/cores/sync/sync.core.js similarity index 97% rename from packages/app/src/cores/sync/index.js rename to packages/app/src/cores/sync/sync.core.js index 20ff59a6..71249033 100644 --- a/packages/app/src/cores/sync/index.js +++ b/packages/app/src/cores/sync/sync.core.js @@ -234,6 +234,11 @@ class MusicSyncSubCore { return false } + if (!app.layout.floatingStack) { + console.error("Floating stack not found") + return false + } + this.syncRoomCardRendered = app.layout.floatingStack.add("sync-room-card", SyncRoomCard) } @@ -242,6 +247,11 @@ class MusicSyncSubCore { return false } + if (!app.layout.floatingStack) { + console.error("Floating stack not found") + return false + } + app.layout.floatingStack.remove("sync-room-card") this.syncRoomCardRendered = null diff --git a/packages/app/src/cores/tasksQueue/index.js b/packages/app/src/cores/tasksQueue/tasksQueue.core.js similarity index 100% rename from packages/app/src/cores/tasksQueue/index.js rename to packages/app/src/cores/tasksQueue/tasksQueue.core.js diff --git a/packages/app/src/cores/widgets/index.js b/packages/app/src/cores/widgets/widgets.core.js similarity index 100% rename from packages/app/src/cores/widgets/index.js rename to packages/app/src/cores/widgets/widgets.core.js