Skip to content

Commit 477658f

Browse files
authored
refactor: platform shared util (#1736)
Signed-off-by: Adam Setch <[email protected]>
1 parent 694f08a commit 477658f

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

src/main/first-run.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import path from 'node:path';
33
import { app, dialog } from 'electron';
44

55
import { logError } from '../shared/logger';
6+
import { isMacOS } from '../shared/platform';
67

78
export async function onFirstRunMaybe() {
89
if (isFirstRun()) {
@@ -12,7 +13,7 @@ export async function onFirstRunMaybe() {
1213

1314
// Ask user if the app should be moved to the applications folder.
1415
async function promptMoveToApplicationsFolder() {
15-
if (process.platform !== 'darwin') return;
16+
if (!isMacOS()) return;
1617

1718
const isDevMode = !!process.defaultApp;
1819
if (isDevMode || app.isInApplicationsFolder()) return;

src/main/main.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import log from 'electron-log';
33
import { menubar } from 'menubar';
44

55
import { APPLICATION } from '../shared/constants';
6+
import { isMacOS, isWindows } from '../shared/platform';
67
import { onFirstRunMaybe } from './first-run';
78
import { TrayIcons } from './icons';
89
import MenuBuilder from './menu';
@@ -39,7 +40,7 @@ const contextMenu = menuBuilder.buildMenu();
3940
* Electron Auto Updater only supports macOS and Windows
4041
* https://github.com/electron/update-electron-app
4142
*/
42-
if (process.platform === 'darwin' || process.platform === 'win32') {
43+
if (isMacOS() || isWindows()) {
4344
const updater = new Updater(mb, menuBuilder);
4445
updater.initialize();
4546
}

src/main/menu.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Menu, MenuItem } from 'electron';
22
import { autoUpdater } from 'electron-updater';
33
import type { Menubar } from 'menubar';
4+
import { isMacOS } from '../shared/platform';
45
import { openLogsDirectory, resetApp, takeScreenshot } from './utils';
56

67
export default class MenuBuilder {
@@ -60,8 +61,7 @@ export default class MenuBuilder {
6061
},
6162
{
6263
role: 'toggleDevTools',
63-
accelerator:
64-
process.platform === 'darwin' ? 'Alt+Cmd+I' : 'Ctrl+Shift+I',
64+
accelerator: isMacOS() ? 'Alt+Cmd+I' : 'Ctrl+Shift+I',
6565
},
6666
{
6767
label: 'Take Screenshot',

src/renderer/components/settings/SystemSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { DeviceDesktopIcon } from '@primer/octicons-react';
22
import { type FC, useContext } from 'react';
3+
import { isLinux, isMacOS } from '../../../shared/platform';
34
import { AppContext } from '../../context/App';
45
import { OpenPreference } from '../../types';
56
import { Constants } from '../../utils/constants';
6-
import { isLinux, isMacOS } from '../../utils/platform';
77
import { Checkbox } from '../fields/Checkbox';
88
import { RadioGroup } from '../fields/RadioGroup';
99
import { Legend } from './Legend';

src/renderer/utils/notifications.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import path from 'node:path';
22

33
import { logError, logWarn } from '../../shared/logger';
4+
import { isWindows } from '../../shared/platform';
45
import type {
56
AccountNotifications,
67
GitifyState,
@@ -13,7 +14,6 @@ import { getAccountUUID } from './auth/utils';
1314
import { hideWindow, showWindow, updateTrayIcon } from './comms';
1415
import { Constants } from './constants';
1516
import { openNotification } from './links';
16-
import { isWindows } from './platform';
1717
import { getGitifySubjectDetails } from './subject';
1818

1919
export function setTrayIconColor(notifications: AccountNotifications[]) {

0 commit comments

Comments
 (0)