diff --git a/packages/app/src/screens/startup-splash-screen.tsx b/packages/app/src/screens/startup-splash-screen.tsx index cdd5077e2..1468c593c 100644 --- a/packages/app/src/screens/startup-splash-screen.tsx +++ b/packages/app/src/screens/startup-splash-screen.tsx @@ -11,8 +11,9 @@ const styles = StyleSheet.create((theme) => ({ backgroundColor: theme.colors.surface0, }, status: { + marginTop: theme.spacing[8], color: theme.colors.foregroundMuted, - fontSize: theme.fontSize.base, + fontSize: theme.fontSize.lg, }, })); diff --git a/packages/desktop/src-tauri/Cargo.lock b/packages/desktop/src-tauri/Cargo.lock index 94884871e..fdcdebfb6 100644 --- a/packages/desktop/src-tauri/Cargo.lock +++ b/packages/desktop/src-tauri/Cargo.lock @@ -2645,6 +2645,7 @@ dependencies = [ "tauri-plugin-log", "tauri-plugin-notification", "tauri-plugin-opener", + "tauri-plugin-single-instance", "tauri-plugin-updater", "tauri-plugin-websocket", "tokio", @@ -4299,6 +4300,21 @@ dependencies = [ "zbus", ] +[[package]] +name = "tauri-plugin-single-instance" +version = "2.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acba6b5ca527a96cdfcc96ae09b09ccb91ddff5e33978ca6873b96ea16bb404c" +dependencies = [ + "serde", + "serde_json", + "tauri", + "thiserror 2.0.18", + "tracing", + "windows-sys 0.60.2", + "zbus", +] + [[package]] name = "tauri-plugin-updater" version = "2.9.0" diff --git a/packages/desktop/src-tauri/Cargo.toml b/packages/desktop/src-tauri/Cargo.toml index 14e5e6941..73cd76332 100644 --- a/packages/desktop/src-tauri/Cargo.toml +++ b/packages/desktop/src-tauri/Cargo.toml @@ -35,6 +35,7 @@ tauri-plugin-dialog = "2" tauri-plugin-log = "2" tauri-plugin-notification = "2" tauri-plugin-opener = "2" +tauri-plugin-single-instance = "2" tauri-plugin-updater = "2" tauri-plugin-websocket = "2" tokio = { version = "1", features = ["net", "sync"] } @@ -48,4 +49,3 @@ tokio-tungstenite = "0.24" - diff --git a/packages/desktop/src-tauri/src/lib.rs b/packages/desktop/src-tauri/src/lib.rs index 3ad2a7807..aa7fa03e5 100644 --- a/packages/desktop/src-tauri/src/lib.rs +++ b/packages/desktop/src-tauri/src/lib.rs @@ -500,6 +500,13 @@ async fn garbage_collect_attachment_files( pub fn run() { tauri::Builder::default() .manage(LocalTransportState::default()) + .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| { + if let Some(window) = app.get_webview_window("main") { + let _ = window.show(); + let _ = window.unminimize(); + let _ = window.set_focus(); + } + })) .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_notification::init()) .plugin(tauri_plugin_opener::init()) diff --git a/packages/website/src/routes/index.tsx b/packages/website/src/routes/index.tsx index 4a93c6479..a93e9e3d6 100644 --- a/packages/website/src/routes/index.tsx +++ b/packages/website/src/routes/index.tsx @@ -7,6 +7,7 @@ import '~/styles.css' const desktopVersion = websitePackage.version const releaseBase = `https://github.com/getpaseo/paseo/releases/download/v${desktopVersion}` +const androidApkHref = `${releaseBase}/paseo-v${desktopVersion}-android.apk` type Platform = 'mac-silicon' | 'mac-intel' | 'windows' | 'linux' @@ -364,12 +365,18 @@ function GetStarted() { > - - + + - Coming soon + Download APK (Play Store coming soon) - +
@@ -593,26 +600,6 @@ function AppStoreIcon(props: React.SVGProps) { ) } -function GooglePlayIcon(props: React.SVGProps) { - return ( - - ) -} - function WindowsIcon(props: React.SVGProps) { return (