v/deskreen
1
0
Fork 0
mirror of https://github.com/pavlobu/deskreen.git synced 2025-05-31 23:00:09 -07:00
Code Issues Projects Releases Wiki Activity

DeskreenStepper now works with invoke

Browse Source
This commit is contained in:
Pavlo Buidenkov 2022-05-29 12:11:02 +02:00
parent eac9649c5a
commit 2cbd71b9fa
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/containers/DeskreenStepper.tsx
View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable @typescript-eslint/ban-ts-comment */
import React, { useState, useCallback, useContext, useEffect } from 'react'; import React, { useState, useCallback, useContext, useEffect } from 'react';
import { ipcRenderer, remote, shell } from 'electron'; import { ipcRenderer, shell } from 'electron';
import { makeStyles, createStyles } from '@material-ui/core/styles'; import { makeStyles, createStyles } from '@material-ui/core/styles';
import Stepper from '@material-ui/core/Stepper'; import Stepper from '@material-ui/core/Stepper';
import Step from '@material-ui/core/Step'; import Step from '@material-ui/core/Step';
@ -32,24 +32,11 @@ import ColorlibStepIcon, {
} from '../components/StepperPanel/ColorlibStepIcon'; } from '../components/StepperPanel/ColorlibStepIcon';
import ColorlibConnector from '../components/StepperPanel/ColorlibConnector'; import ColorlibConnector from '../components/StepperPanel/ColorlibConnector';
import { SettingsContext } from './SettingsProvider'; import { SettingsContext } from './SettingsProvider';
import SharingSessionStatusEnum from '../features/SharingSessionService/SharingSessionStatusEnum';
import Logger from '../utils/LoggerWithFilePrefix';
import LanguageSelector from '../components/LanguageSelector'; import LanguageSelector from '../components/LanguageSelector';
import { getShuffledArrayOfHello } from '../configs/i18next.config.client'; import { getShuffledArrayOfHello } from '../configs/i18next.config.client';
import ToggleThemeBtnGroup from '../components/ToggleThemeBtnGroup'; import ToggleThemeBtnGroup from '../components/ToggleThemeBtnGroup';
import SharingSessionService from '../features/SharingSessionService';
import ConnectedDevicesService from '../features/ConnectedDevicesService';
import { IpcEvents } from '../main/IpcEvents.enum'; import { IpcEvents } from '../main/IpcEvents.enum';
const sharingSessionService = remote.getGlobal(
'sharingSessionService'
) as SharingSessionService;
const connectedDevicesService = remote.getGlobal(
'connectedDevicesService'
) as ConnectedDevicesService;
const log = new Logger(__filename);
const Fade = require('react-reveal/Fade'); const Fade = require('react-reveal/Fade');
const useStyles = makeStyles(() => const useStyles = makeStyles(() =>
@ -215,11 +202,7 @@ const DeskreenStepper = React.forwardRef((_props, ref) => {
setIsUserAllowedConnection(true); setIsUserAllowedConnection(true);
handleNext(); handleNext();
if (sharingSessionService.waitingForConnectionSharingSession !== null) { ipcRenderer.invoke(IpcEvents.SetDeviceConnectedStatus);
const sharingSession =
sharingSessionService.waitingForConnectionSharingSession;
sharingSession.setStatus(SharingSessionStatusEnum.CONNECTED);
}
}, [handleNext]); }, [handleNext]);
const handleUserClickedDeviceDisconnectButton = useCallback(async () => { const handleUserClickedDeviceDisconnectButton = useCallback(async () => {

1
app/main/IpcEvents.enum.ts
View File

@ -5,4 +5,5 @@ export enum IpcEvents {
UnmarkRoomIDAsTaken = 'unmark-room-id-as-taken', UnmarkRoomIDAsTaken = 'unmark-room-id-as-taken',
GetAppPath = 'get-app-path', GetAppPath = 'get-app-path',
ResetWaitingForConnectionSharingSession = 'reset-waiting-for-connection-sharing-session', ResetWaitingForConnectionSharingSession = 'reset-waiting-for-connection-sharing-session',
SetDeviceConnectedStatus = 'set-device-connected-status',
} }

11
app/main/ipcMainHandlers.ts
View File

@ -124,4 +124,15 @@ export default function initIpcMainHandlers(
); );
getDeskreenGlobal().sharingSessionService.waitingForConnectionSharingSession = null; getDeskreenGlobal().sharingSessionService.waitingForConnectionSharingSession = null;
}); });
ipcMain.handle(IpcEvents.SetDeviceConnectedStatus, () => {
if (
getDeskreenGlobal().sharingSessionService
.waitingForConnectionSharingSession !== null
) {
const sharingSession = getDeskreenGlobal().sharingSessionService
.waitingForConnectionSharingSession;
sharingSession?.setStatus(SharingSessionStatusEnum.CONNECTED);
}
});
} }