Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/main/external-url-ipc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { ipcMain, shell } from 'electron';
import { OPEN_EXTERNAL_URL_CHANNEL } from '../shared/ipc-channels';

export function registerExternalUrlIpc(): void {
ipcMain.handle(OPEN_EXTERNAL_URL_CHANNEL, async (_event, rawUrl: unknown): Promise<{ ok: boolean; reason?: string }> => {
if (typeof rawUrl !== 'string') return { ok: false, reason: 'invalid_url' };

let url: URL;
try {
url = new URL(rawUrl);
} catch {
return { ok: false, reason: 'invalid_url' };
}

if (url.protocol !== 'https:' && url.protocol !== 'http:') {
return { ok: false, reason: 'unsupported_protocol' };
}

try {
await shell.openExternal(url.toString());
return { ok: true };
} catch {
return { ok: false, reason: 'open_failed' };
}
});
}
2 changes: 2 additions & 0 deletions src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { CursorOverlay } from './cursor-overlay';
import { registerCursorOverlayIpc } from './cursor-overlay-ipc';
import { JsonCursorOverlaySettingsStore } from './cursor-overlay-settings-store';
import { registerAppWindowIpc } from './app-window-ipc';
import { registerExternalUrlIpc } from './external-url-ipc';
import { DesktopCommandExecutor } from './input/command-executor';
import { LibnutWin32InputAdapter } from './input/libnut-win32-adapter';
import { createPointerMovementProfile } from './input/pointer-profile';
Expand Down Expand Up @@ -282,6 +283,7 @@ app.whenReady().then(() => {
registerPairingApprovalIpc(controlService);
registerSettingsWindowIpc(showSettingsWindow);
registerAppWindowIpc();
registerExternalUrlIpc();
registerSystemStartupIpc(systemStartup);
registerUpdateIpc(
new UpdateService({
Expand Down
3 changes: 3 additions & 0 deletions src/preload/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
GET_SYSTEM_STARTUP_SETTINGS_CHANNEL,
GET_UPDATE_STATE_CHANNEL,
INSTALL_DOWNLOADED_UPDATE_CHANNEL,
OPEN_EXTERNAL_URL_CHANNEL,
OPEN_SETTINGS_WINDOW_CHANNEL,
RESPOND_TO_PAIRING_REQUEST_CHANNEL,
SERVER_STATUS_CHANNEL,
Expand Down Expand Up @@ -45,6 +46,8 @@ contextBridge.exposeInMainWorld('switchifyPc', {
setCursorOverlaySettings: (settings: CursorOverlaySettings): Promise<CursorOverlaySettings> =>
ipcRenderer.invoke(SET_CURSOR_OVERLAY_SETTINGS_CHANNEL, settings),
openSettingsWindow: (): Promise<void> => ipcRenderer.invoke(OPEN_SETTINGS_WINDOW_CHANNEL),
openExternalUrl: (url: string): Promise<{ ok: boolean }> =>
ipcRenderer.invoke(OPEN_EXTERNAL_URL_CHANNEL, url),
getPendingPairingRequests: (): Promise<PendingPairingApprovalView[]> =>
ipcRenderer.invoke(GET_PENDING_PAIRING_REQUESTS_CHANNEL),
respondToPairingRequest: (requestId: string, decision: PairingApprovalDecision): Promise<{ ok: boolean; reason?: string }> =>
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { ReactElement } from 'react';
import { AndroidDownloadPanel } from './components/AndroidDownloadPanel';
import { PairingApprovalRequests } from './components/PairingApprovalRequests';
import { PrimaryContent } from './components/PrimaryContent';
import { StatusHeader } from './components/StatusHeader';
Expand Down Expand Up @@ -42,6 +43,10 @@ function MainApp(): ReactElement {
onRefresh={status.refresh}
/>

{status.uiState === 'connected' ? null : (
<AndroidDownloadPanel onOpenDownload={bridge.openExternalUrl} />
)}

<TroubleshootingDetails
serverStatus={status.serverStatus}
pendingPairingRequests={status.pendingPairingRequests}
Expand Down
1 change: 1 addition & 0 deletions src/renderer/api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ declare global {
getCursorOverlaySettings: () => Promise<CursorOverlaySettings>;
setCursorOverlaySettings: (settings: CursorOverlaySettings) => Promise<CursorOverlaySettings>;
openSettingsWindow: () => Promise<void>;
openExternalUrl: (url: string) => Promise<{ ok: boolean }>;
getPendingPairingRequests: () => Promise<PendingPairingApprovalView[]>;
respondToPairingRequest: (
requestId: string,
Expand Down
1 change: 1 addition & 0 deletions src/renderer/assets/switchify-android-play-store-qr.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions src/renderer/components/AndroidDownloadPanel.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import type { MouseEvent, ReactElement } from 'react';
import androidQrCodeUrl from '../assets/switchify-android-play-store-qr.svg';

export const SWITCHIFY_ANDROID_DOWNLOAD_URL = 'https://play.google.com/store/apps/details?id=com.enaboapps.switchify';

export function AndroidDownloadPanel({
onOpenDownload
}: {
onOpenDownload: (url: string) => Promise<{ ok: boolean }>;
}): ReactElement {
const openDownload = (event: MouseEvent<HTMLAnchorElement>): void => {
event.preventDefault();
void onOpenDownload(SWITCHIFY_ANDROID_DOWNLOAD_URL);
};

return (
<section className="android-download-panel" aria-label="Download Switchify for Android">
<img src={androidQrCodeUrl} alt="QR code for Switchify on Google Play" />
<div>
<h2>Get Switchify for Android</h2>
<p>Scan the QR code or open the Google Play listing on your Android device.</p>
<a href={SWITCHIFY_ANDROID_DOWNLOAD_URL} onClick={openDownload}>
Download Switchify for Android
</a>
</div>
</section>
);
}
53 changes: 53 additions & 0 deletions src/renderer/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,49 @@ p {
background: var(--color-status-error);
}

.android-download-panel {
display: grid;
grid-template-columns: auto minmax(0, 1fr);
gap: var(--space-m);
align-items: center;
margin-top: var(--space-l);
border: 1px solid var(--color-border);
border-radius: var(--radius-control);
padding: var(--space-m);
background: var(--color-surface-muted);
text-align: left;
}

.android-download-panel img {
width: 112px;
height: 112px;
border: 1px solid var(--color-border);
border-radius: 8px;
padding: 6px;
background: #ffffff;
}

.android-download-panel div {
display: grid;
gap: var(--space-xs);
min-width: 0;
}

.android-download-panel h2 {
font-size: 1.05rem;
}

.android-download-panel a {
width: fit-content;
color: var(--brand-secondary);
font-weight: 800;
text-decoration: none;
}

.android-download-panel a:hover {
text-decoration: underline;
}

.settings-window-shell {
display: grid;
align-content: start;
Expand Down Expand Up @@ -935,6 +978,16 @@ p {
white-space: normal;
}

.android-download-panel {
grid-template-columns: 1fr;
justify-items: center;
text-align: center;
}

.android-download-panel a {
justify-self: center;
}

.detail-item {
grid-template-columns: 1fr;
gap: 3px;
Expand Down
1 change: 1 addition & 0 deletions src/shared/ipc-channels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const RESPOND_TO_PAIRING_REQUEST_CHANNEL = 'pairing-approval:respond';
export const OPEN_SETTINGS_WINDOW_CHANNEL = 'settings:open-window';
export const APP_WINDOW_MINIMIZE_CHANNEL = 'app-window:minimize';
export const APP_WINDOW_CLOSE_CHANNEL = 'app-window:close';
export const OPEN_EXTERNAL_URL_CHANNEL = 'shell:open-external-url';
export const GET_SYSTEM_STARTUP_SETTINGS_CHANNEL = 'system-startup:get-settings';
export const SET_START_WITH_SYSTEM_CHANNEL = 'system-startup:set-start-with-system';
export const GET_UPDATE_STATE_CHANNEL = 'updates:get-state';
Expand Down