diff --git a/src/lib/assets/favicon.png b/src/lib/assets/favicon.png
new file mode 100644
index 00000000..9208ea8f
Binary files /dev/null and b/src/lib/assets/favicon.png differ
diff --git a/src/lib/assets/favicon.svg b/src/lib/assets/favicon.svg
deleted file mode 100644
index cc5dc66a..00000000
--- a/src/lib/assets/favicon.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/lib/assets/logo.png b/src/lib/assets/logo.png
new file mode 100644
index 00000000..ce2e9b3c
Binary files /dev/null and b/src/lib/assets/logo.png differ
diff --git a/src/lib/components/OfflinePill.svelte b/src/lib/components/OfflinePill.svelte
index 2900584c..60c3c411 100644
--- a/src/lib/components/OfflinePill.svelte
+++ b/src/lib/components/OfflinePill.svelte
@@ -6,7 +6,7 @@
+ import logo from '$lib/assets/logo.png';
+ import Button from '$lib/components/ui/button/button.svelte';
+ import { detectStorePlatform, storeUrl } from '$lib/utils/app-store';
+ import { Download } from '@lucide/svelte';
+
+ const storePlatform = detectStorePlatform(navigator.userAgent, navigator.maxTouchPoints);
+
+
+
diff --git a/src/lib/components/ui/map/MapControls.svelte b/src/lib/components/ui/map/MapControls.svelte
index add4a8e6..fa1b6dae 100644
--- a/src/lib/components/ui/map/MapControls.svelte
+++ b/src/lib/components/ui/map/MapControls.svelte
@@ -25,8 +25,8 @@
const loaded = $derived(mapCtx.isLoaded());
const positionClasses = {
- 'top-left': 'top-[calc(env(safe-area-inset-top)+8px)] left-2',
- 'top-right': 'top-[calc(env(safe-area-inset-top)+8px)] right-2',
+ 'top-left': 'top-[calc(env(safe-area-inset-top)+var(--web-header-height)+8px)] left-2',
+ 'top-right': 'top-[calc(env(safe-area-inset-top)+var(--web-header-height)+8px)] right-2',
'bottom-left': 'bottom-2 left-2',
'bottom-right': 'bottom-10 right-2',
};
diff --git a/src/lib/utils/app-store.test.ts b/src/lib/utils/app-store.test.ts
new file mode 100644
index 00000000..d4316d8d
--- /dev/null
+++ b/src/lib/utils/app-store.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest';
+import { detectStorePlatform, StorePlatform } from './app-store';
+
+const IPHONE =
+ 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1';
+const ANDROID =
+ 'Mozilla/5.0 (Linux; Android 15; Pixel 9) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Mobile Safari/537.36';
+const MAC =
+ 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15';
+const WINDOWS =
+ 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36';
+
+describe('detectStorePlatform', () => {
+ it('sends iPhones to the App Store', () => {
+ expect(detectStorePlatform(IPHONE, 5)).toBe(StorePlatform.IOS);
+ });
+
+ it('sends Android phones to the Play Store', () => {
+ expect(detectStorePlatform(ANDROID, 5)).toBe(StorePlatform.ANDROID);
+ });
+
+ it('treats a touch-capable Mac user agent as an iPad', () => {
+ expect(detectStorePlatform(MAC, 5)).toBe(StorePlatform.IOS);
+ });
+
+ it('has no store for desktop browsers', () => {
+ expect(detectStorePlatform(MAC, 0)).toBeNull();
+ expect(detectStorePlatform(WINDOWS, 0)).toBeNull();
+ });
+});
diff --git a/src/lib/utils/app-store.ts b/src/lib/utils/app-store.ts
new file mode 100644
index 00000000..129d5b29
--- /dev/null
+++ b/src/lib/utils/app-store.ts
@@ -0,0 +1,29 @@
+export enum StorePlatform {
+ IOS = 'ios',
+ ANDROID = 'android',
+}
+
+const STORE_URLS: Record = {
+ [StorePlatform.IOS]: 'https://apps.apple.com/app/id6475358068',
+ [StorePlatform.ANDROID]:
+ 'https://play.google.com/store/apps/details?id=com.maroonrides.maroonrides',
+};
+
+const IOS_USER_AGENT = /iPhone|iPad|iPod/;
+const ANDROID_USER_AGENT = /Android/;
+const MAC_USER_AGENT = /Macintosh/;
+
+export function storeUrl(platform: StorePlatform): string {
+ return STORE_URLS[platform];
+}
+
+// iPadOS Safari reports itself as a Mac, so touch support is what tells them apart.
+export function detectStorePlatform(
+ userAgent: string,
+ maxTouchPoints: number,
+): StorePlatform | null {
+ if (ANDROID_USER_AGENT.test(userAgent)) return StorePlatform.ANDROID;
+ if (IOS_USER_AGENT.test(userAgent)) return StorePlatform.IOS;
+ if (MAC_USER_AGENT.test(userAgent) && maxTouchPoints > 1) return StorePlatform.IOS;
+ return null;
+}
diff --git a/src/lib/utils/app-version.ts b/src/lib/utils/app-version.ts
index bf2bccaa..0b81da8c 100644
--- a/src/lib/utils/app-version.ts
+++ b/src/lib/utils/app-version.ts
@@ -1,17 +1,16 @@
import { AppLauncher } from '@capacitor/app-launcher';
import { Capacitor } from '@capacitor/core';
import semver from 'semver';
+import { StorePlatform, storeUrl } from './app-store';
export const APP_VERSION = __APP_VERSION__;
-const APP_STORE_URL = 'https://apps.apple.com/app/id6475358068';
-const PLAY_STORE_URL = 'https://play.google.com/store/apps/details?id=com.maroonrides.maroonrides';
-
export function isAppVersionSupported(minimumVersion: string): boolean {
return semver.gte(APP_VERSION, minimumVersion);
}
export async function openAppStore() {
- const url = Capacitor.getPlatform() === 'android' ? PLAY_STORE_URL : APP_STORE_URL;
- await AppLauncher.openUrl({ url });
+ const platform =
+ Capacitor.getPlatform() === StorePlatform.ANDROID ? StorePlatform.ANDROID : StorePlatform.IOS;
+ await AppLauncher.openUrl({ url: storeUrl(platform) });
}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 99e0d2f5..925ae4c2 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,9 +1,10 @@