diff --git a/client/src/mobile/components/MWalletButton.tsx b/client/src/mobile/components/MWalletButton.tsx
index 32ea37107..e687aaa5a 100644
--- a/client/src/mobile/components/MWalletButton.tsx
+++ b/client/src/mobile/components/MWalletButton.tsx
@@ -2,7 +2,7 @@ import { Loader2, Wallet } from 'lucide-react';
import { useState } from 'react';
import { useTranslation } from '../../i18n';
import { useNativeCapabilities } from '../../native/capabilities';
-import { addReservationToWallet, canAddToWallet } from '../../native/wallet';
+import { addReservationToGoogleWallet, addReservationToWallet, bookingWallet } from '../../native/wallet';
interface MWalletButtonProps {
tripId: number;
@@ -15,23 +15,28 @@ interface MWalletButtonProps {
}
/**
- * "Add to Apple Wallet" on a booking, in the iOS app only (feature wallet): the
- * booking becomes a TREK pass that shows up on the lock screen around its time
- * and place. Black like Apple's own badge, so it reads as Wallet at a glance.
+ * "Add to Apple Wallet" on a booking in the iOS app (feature wallet), "Add to
+ * Google Wallet" in the Android app (feature googleWallet): the booking becomes a
+ * TREK pass that shows up around its time and place. Black like both stores' own
+ * badges, so it reads as the wallet at a glance.
*/
export default function MWalletButton({ tripId, reservationId, onError, className }: MWalletButtonProps) {
const { t, language } = useTranslation();
// Re-renders once the app binary has said what it can do.
useNativeCapabilities();
const [busy, setBusy] = useState(false);
- if (reservationId === undefined || !canAddToWallet()) return null;
+ const wallet = bookingWallet();
+ if (reservationId === undefined || !wallet) return null;
const id = reservationId;
const add = async () => {
if (busy) return;
setBusy(true);
try {
- const outcome = await addReservationToWallet(tripId, id, language);
+ const outcome =
+ wallet === 'google'
+ ? await addReservationToGoogleWallet(tripId, id, language)
+ : await addReservationToWallet(tripId, id, language);
if (outcome === 'undated') onError(t('reservations.wallet.undated'));
else if (outcome === 'failed') onError(t('reservations.wallet.failed'));
} finally {
@@ -45,10 +50,10 @@ export default function MWalletButton({ tripId, reservationId, onError, classNam
onClick={() => void add()}
disabled={busy}
aria-busy={busy}
- className="flex items-center gap-[6px] rounded-full bg-black px-3 py-[7px] text-[length:calc(12px*var(--fs-scale-body,1))] font-semibold text-white transition-transform active:scale-[.97] disabled:opacity-70" // theme-lint-disable: Apple Wallet's badge is black in either theme
+ className="flex items-center gap-[6px] rounded-full bg-black px-3 py-[7px] text-[length:calc(12px*var(--fs-scale-body,1))] font-semibold text-white transition-transform active:scale-[.97] disabled:opacity-70" // theme-lint-disable: the wallets' badges are black in either theme
>
{busy ? : }
- {t('reservations.wallet.add')}
+ {t(wallet === 'google' ? 'reservations.wallet.addGoogle' : 'reservations.wallet.add')}
);
return className ?
{button}
: button;
diff --git a/client/src/native/geolocation.test.ts b/client/src/native/geolocation.test.ts
index 5d6796159..f608c82ff 100644
--- a/client/src/native/geolocation.test.ts
+++ b/client/src/native/geolocation.test.ts
@@ -1,10 +1,10 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { hasNativeFeature } from './capabilities';
import { _resetNativeGeolocation, installNativeGeolocation } from './geolocation';
-import { isNativeIos } from './platform';
+import { isNativeApp } from './platform';
import { TrekShell, type NativeLocationPayload } from './trekShell';
-vi.mock('./platform', () => ({ isNativeIos: vi.fn() }));
+vi.mock('./platform', () => ({ isNativeApp: vi.fn() }));
vi.mock('./capabilities', () => ({ hasNativeFeature: vi.fn() }));
vi.mock('./trekShell', () => ({
TrekShell: { startLocation: vi.fn(), stopLocation: vi.fn(), addListener: vi.fn() },
@@ -16,7 +16,7 @@ const original = navigator.geolocation;
beforeEach(() => {
_resetNativeGeolocation();
Object.defineProperty(navigator, 'geolocation', { configurable: true, value: original });
- vi.mocked(isNativeIos).mockReturnValue(true);
+ vi.mocked(isNativeApp).mockReturnValue(true);
vi.mocked(hasNativeFeature).mockReturnValue(true);
vi.mocked(TrekShell.startLocation).mockReset().mockResolvedValue();
vi.mocked(TrekShell.stopLocation).mockReset().mockResolvedValue();
@@ -71,9 +71,13 @@ describe('native geolocation', () => {
expect(failed.mock.calls[0][0]).toMatchObject({ code: 1, PERMISSION_DENIED: 1 });
});
- it('leaves the browser API alone outside an iOS binary with the feature', () => {
+ it('leaves the browser API alone outside an app binary with the feature', () => {
vi.mocked(hasNativeFeature).mockReturnValue(false);
expect(installNativeGeolocation()).toBe(false);
expect(navigator.geolocation).toBe(original);
+ vi.mocked(hasNativeFeature).mockReturnValue(true);
+ vi.mocked(isNativeApp).mockReturnValue(false);
+ expect(installNativeGeolocation()).toBe(false);
+ expect(navigator.geolocation).toBe(original);
});
});
diff --git a/client/src/native/geolocation.ts b/client/src/native/geolocation.ts
index 04ee13e85..243c59451 100644
--- a/client/src/native/geolocation.ts
+++ b/client/src/native/geolocation.ts
@@ -1,11 +1,12 @@
import { hasNativeFeature } from './capabilities';
-import { isNativeIos } from './platform';
+import { isNativeApp } from './platform';
import { reportNativeFailure } from './reportFailure';
import { TrekShell, type NativeLocationPayload } from './trekShell';
/**
- * navigator.geolocation, answered by the iOS app's CoreLocation where the binary
- * has the geolocation feature.
+ * navigator.geolocation, answered by the app's own location stream where the
+ * binary has the geolocation feature: CoreLocation on iOS, the system's fused
+ * provider on Android.
*
* WKWebView asks for the location per server origin, under the server's name,
* and asks again across launches. The app asks once, as the app. Installing the
@@ -85,7 +86,7 @@ function add(success: Success, failure: Failure, options: PositionOptions | unde
/** Puts the app's location under navigator.geolocation. Once, inside a binary that has it. */
export function installNativeGeolocation(): boolean {
- if (!isNativeIos() || !hasNativeFeature('geolocation') || typeof navigator === 'undefined') return false;
+ if (!isNativeApp() || !hasNativeFeature('geolocation') || typeof navigator === 'undefined') return false;
const shim: Geolocation = {
getCurrentPosition: (success, failure, options) => {
add(success, failure, options, true);
diff --git a/client/src/native/iap.test.ts b/client/src/native/iap.test.ts
index e9dba3f7a..ea350afe6 100644
--- a/client/src/native/iap.test.ts
+++ b/client/src/native/iap.test.ts
@@ -1,6 +1,6 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
-const platform = vi.hoisted(() => ({ ios: true }));
+const platform = vi.hoisted(() => ({ ios: true, android: false }));
const shell = vi.hoisted(() => ({
getCapabilities: vi.fn(),
storeProducts: vi.fn(),
@@ -9,7 +9,7 @@ const shell = vi.hoisted(() => ({
storeRestore: vi.fn(),
}));
-vi.mock('./platform', () => ({ isNativeIos: () => platform.ios }));
+vi.mock('./platform', () => ({ isNativeIos: () => platform.ios, isNativeAndroid: () => platform.android }));
vi.mock('./trekShell', () => ({ TrekShell: shell }));
import { fakeIapClient, nativeIapClient, productIdFor } from './iap';
@@ -22,6 +22,7 @@ function jwsFor(productId: string): string {
beforeEach(() => {
platform.ios = true;
+ platform.android = false;
for (const fn of Object.values(shell)) fn.mockReset();
});
@@ -123,3 +124,55 @@ describe('native client', () => {
expect(await nativeIapClient.restore()).toBeNull();
});
});
+
+describe('native client on Android (Google Play Billing)', () => {
+ beforeEach(() => {
+ platform.ios = false;
+ platform.android = true;
+ });
+
+ it('is available with the playBilling feature, not with storeKit', async () => {
+ shell.getCapabilities.mockResolvedValue({ features: ['playBilling'] });
+ expect(await nativeIapClient.isAvailable()).toBe(true);
+ shell.getCapabilities.mockResolvedValue({ features: ['storeKit'] });
+ expect(await nativeIapClient.isAvailable()).toBe(false);
+ });
+
+ it('a bought subscription yields the purchase token as a Google receipt', async () => {
+ shell.storePurchase.mockResolvedValue({
+ kind: 'bought',
+ purchaseToken: 'token-1',
+ transactionId: 'token-1',
+ productId: 'cloud.plus.yearly',
+ });
+ const outcome = await nativeIapClient.purchase('cloud.plus.yearly');
+ expect(outcome).toEqual({
+ kind: 'bought',
+ purchase: { platform: 'google', productId: 'cloud.plus.yearly', receipt: 'token-1', transactionId: 'token-1' },
+ });
+ shell.storePurchase.mockResolvedValue({ kind: 'pending' });
+ expect(await nativeIapClient.purchase('cloud.plus.yearly')).toEqual({ kind: 'pending' });
+ shell.storePurchase.mockResolvedValue({ kind: 'bought' });
+ expect(await nativeIapClient.purchase('cloud.plus.yearly')).toEqual({ kind: 'failed' });
+ });
+
+ it('a restore finds the subscription on the Google account, and acknowledges through finish', async () => {
+ shell.storeRestore.mockResolvedValue({
+ purchaseToken: 'token-2',
+ transactionId: 'token-2',
+ productId: 'cloud.start.monthly',
+ });
+ const purchase = await nativeIapClient.restore();
+ expect(purchase).toEqual({
+ platform: 'google',
+ productId: 'cloud.start.monthly',
+ receipt: 'token-2',
+ transactionId: 'token-2',
+ });
+ shell.storeRestore.mockResolvedValue({});
+ expect(await nativeIapClient.restore()).toBeNull();
+ shell.storeFinish.mockResolvedValue(undefined);
+ await nativeIapClient.finish(purchase!);
+ expect(shell.storeFinish).toHaveBeenCalledWith({ transactionId: 'token-2' });
+ });
+});
diff --git a/client/src/native/iap.ts b/client/src/native/iap.ts
index 050e67525..b1091fb94 100644
--- a/client/src/native/iap.ts
+++ b/client/src/native/iap.ts
@@ -1,4 +1,4 @@
-import { isNativeIos } from './platform';
+import { isNativeAndroid, isNativeIos } from './platform';
import { TrekShell } from './trekShell';
/**
@@ -6,10 +6,11 @@ import { TrekShell } from './trekShell';
* screens drive a plan to a receipt through this, and never touch StoreKit
* directly. Two implementations stand behind it: a fake one for development and
* preview, so the whole subscription flow can be walked without a store, and the
- * native one that runs StoreKit 2 through TrekShell (feature storeKit). Where
- * neither can take a payment (Android until Play Billing is wired, a binary from
- * before storeKit) the client reports itself unavailable and the shell offers no
- * purchase at all: the store rules leave no room for sending buyers to the web.
+ * native one that runs StoreKit 2 on iOS (feature storeKit) and Google Play
+ * Billing on Android (feature playBilling) through TrekShell. Where neither can
+ * take a payment (a binary from before them, the web) the client reports itself
+ * unavailable and the shell offers no purchase at all: the store rules leave no
+ * room for sending buyers to the web.
*/
type IapPlatform = 'apple' | 'google';
@@ -18,7 +19,7 @@ type IapPlatform = 'apple' | 'google';
export interface Purchase {
platform: IapPlatform;
productId: string;
- /** Apple: the signed transaction (JWS) the control plane verifies. */
+ /** Apple: the signed transaction (JWS); Google: the purchase token. The control plane verifies either with its store. */
receipt: string;
/** The store's id for this transaction, handed back to {@link IapClient.finish}. */
transactionId: string;
@@ -92,17 +93,26 @@ export const fakeIapClient: IapClient = {
},
};
+/** The store this app buys through: the App Store on iOS, Google Play on Android. */
+function nativeStore(): { platform: IapPlatform; feature: string } | null {
+ if (isNativeIos()) return { platform: 'apple', feature: 'storeKit' };
+ if (isNativeAndroid()) return { platform: 'google', feature: 'playBilling' };
+ return null;
+}
+
/**
- * StoreKit 2 through TrekShell. Available on iOS when the binary has the
- * storeKit feature; everywhere else (Android, the web, an older binary) it
- * reports itself unavailable and every call comes to nothing.
+ * StoreKit 2 (iOS) or Google Play Billing (Android) through TrekShell, the same
+ * methods on both. Available when the binary has the platform's feature;
+ * everywhere else (the web, an older binary) it reports itself unavailable and
+ * every call comes to nothing.
*/
export const nativeIapClient: IapClient = {
async isAvailable() {
- if (!isNativeIos()) return false;
+ const store = nativeStore();
+ if (!store) return false;
try {
const caps = await TrekShell.getCapabilities();
- return caps.features.includes('storeKit');
+ return caps.features.includes(store.feature);
} catch {
return false;
}
@@ -125,10 +135,16 @@ export const nativeIapClient: IapClient = {
async purchase(productId) {
try {
const result = await TrekShell.storePurchase({ productId });
- if (result.kind === 'bought' && result.jws && result.transactionId) {
+ const receipt = result.jws ?? result.purchaseToken;
+ if (result.kind === 'bought' && receipt && result.transactionId) {
return {
kind: 'bought',
- purchase: { platform: 'apple', productId, receipt: result.jws, transactionId: result.transactionId },
+ purchase: {
+ platform: nativeStore()?.platform ?? 'apple',
+ productId: result.productId ?? productId,
+ receipt,
+ transactionId: result.transactionId,
+ },
};
}
if (result.kind === 'cancelled' || result.kind === 'pending') return { kind: result.kind };
@@ -146,7 +162,10 @@ export const nativeIapClient: IapClient = {
},
async restore() {
try {
- const { jws, transactionId } = await TrekShell.storeRestore({ prefix: PRODUCT_PREFIX });
+ const { jws, purchaseToken, productId, transactionId } = await TrekShell.storeRestore({ prefix: PRODUCT_PREFIX });
+ if (purchaseToken && transactionId) {
+ return { platform: 'google', productId: productId ?? '', receipt: purchaseToken, transactionId };
+ }
if (!jws || !transactionId) return null;
return { platform: 'apple', productId: productIdOf(jws), receipt: jws, transactionId };
} catch {
diff --git a/client/src/native/platform.ts b/client/src/native/platform.ts
index df1e5c5fd..12d0ee973 100644
--- a/client/src/native/platform.ts
+++ b/client/src/native/platform.ts
@@ -9,6 +9,10 @@ export function isNativeIos(): boolean {
return isNativeApp() && Capacitor.getPlatform() === 'ios';
}
+export function isNativeAndroid(): boolean {
+ return isNativeApp() && Capacitor.getPlatform() === 'android';
+}
+
/** The server the app is connected to: the WebView sits on its origin. */
export function nativeServerHost(): string | null {
return isNativeApp() ? window.location.host : null;
diff --git a/client/src/native/tileCache.test.ts b/client/src/native/tileCache.test.ts
index ba310056f..ce55157d1 100644
--- a/client/src/native/tileCache.test.ts
+++ b/client/src/native/tileCache.test.ts
@@ -1,26 +1,39 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { hasNativeFeature } from './capabilities';
-import { isNativeIos } from './platform';
+import { isNativeApp, isNativeIos } from './platform';
import { mapboxTileCacheRequest, nativeRasterTemplate, tileCacheActive, toTileCacheUrl } from './tileCache';
-vi.mock('./platform', () => ({ isNativeIos: vi.fn() }));
+vi.mock('./platform', () => ({ isNativeIos: vi.fn(), isNativeApp: vi.fn() }));
vi.mock('./capabilities', () => ({ hasNativeFeature: vi.fn() }));
beforeEach(() => {
vi.mocked(isNativeIos).mockReturnValue(true);
+ vi.mocked(isNativeApp).mockReturnValue(true);
vi.mocked(hasNativeFeature).mockReturnValue(true);
});
describe('tileCache', () => {
- it('is on only in an iOS binary that has the store', () => {
+ it('is on only in an app binary that has the store', () => {
expect(tileCacheActive()).toBe(true);
vi.mocked(hasNativeFeature).mockReturnValue(false);
expect(tileCacheActive()).toBe(false);
vi.mocked(hasNativeFeature).mockReturnValue(true);
vi.mocked(isNativeIos).mockReturnValue(false);
+ vi.mocked(isNativeApp).mockReturnValue(false);
expect(tileCacheActive()).toBe(false);
});
+ it('on Android keeps the store but leaves every URL as it is: the WebView client takes the requests', () => {
+ vi.mocked(isNativeIos).mockReturnValue(false);
+ expect(tileCacheActive()).toBe(true);
+ expect(nativeRasterTemplate('https://{s}.tiles.example.com/{z}/{x}/{y}.png')).toBe(
+ 'https://{s}.tiles.example.com/{z}/{x}/{y}.png'
+ );
+ expect(mapboxTileCacheRequest('https://a.tiles.mapbox.com/v4/x/1/2/3.vector.pbf', 'Tile').url).toBe(
+ 'https://a.tiles.mapbox.com/v4/x/1/2/3.vector.pbf'
+ );
+ });
+
it('swaps only the scheme, so the store knows where the tile lives', () => {
expect(toTileCacheUrl('https://a.tile.example.com/1/2/3.png?k=v')).toBe(
'trek-tile://a.tile.example.com/1/2/3.png?k=v'
diff --git a/client/src/native/tileCache.ts b/client/src/native/tileCache.ts
index 6ef36c65a..f08624d5a 100644
--- a/client/src/native/tileCache.ts
+++ b/client/src/native/tileCache.ts
@@ -1,5 +1,5 @@
import { hasNativeFeature } from './capabilities';
-import { isNativeIos } from './platform';
+import { isNativeApp, isNativeIos } from './platform';
/**
* The iOS app's own tile store (TrekTileSchemeHandler.swift), reached through
@@ -18,7 +18,17 @@ import { isNativeIos } from './platform';
*/
const TILE_CACHE_SCHEME = 'trek-tile';
+/**
+ * Whether the app keeps the Mapbox map's resources itself, so a Mapbox map works
+ * offline where it was viewed. On Android the app's WebView client takes those
+ * requests as they are (tiles/TrekTileStore.kt), so only iOS rewrites URLs.
+ */
export function tileCacheActive(): boolean {
+ return isNativeApp() && hasNativeFeature('tileCache');
+}
+
+/** Whether URLs go through the trek-tile:// scheme: the iOS store only. */
+function tileSchemeActive(): boolean {
return isNativeIos() && hasNativeFeature('tileCache');
}
@@ -29,7 +39,7 @@ export function toTileCacheUrl(url: string): string {
/** A raster tile template for Leaflet, through the store where the app has one. */
export function nativeRasterTemplate(template: string): string {
- return tileCacheActive() ? toTileCacheUrl(template) : template;
+ return tileSchemeActive() ? toTileCacheUrl(template) : template;
}
const MAPBOX_HOST = /^https:\/\/(?:api\.mapbox\.com|[a-z0-9-]+\.tiles\.mapbox\.com)\//i;
@@ -51,7 +61,7 @@ const CACHED_RESOURCES = new Set([
* Mapbox's servers go through the store, events and sessions never do.
*/
export function mapboxTileCacheRequest(url: string, resourceType?: string): { url: string } {
- if (!MAPBOX_HOST.test(url)) return { url };
+ if (!tileSchemeActive() || !MAPBOX_HOST.test(url)) return { url };
if (resourceType && !CACHED_RESOURCES.has(resourceType)) return { url };
return { url: toTileCacheUrl(url) };
}
diff --git a/client/src/native/trekShell.ts b/client/src/native/trekShell.ts
index 11ebef3fd..57c2609f6 100644
--- a/client/src/native/trekShell.ts
+++ b/client/src/native/trekShell.ts
@@ -32,9 +32,9 @@ export interface TrekShellPlugin {
openOfflineCopy(): Promise<{ opened: boolean }>;
/** What this binary offers the UI (native/capabilities.ts). Missing before shell API 2. */
getCapabilities(): Promise;
- /** iOS, feature tileCache: what the map tile store takes on disk, and its limit. */
+ /** Feature tileCache: what the map tile store takes on disk, and its limit (iOS: every map; Android: Mapbox's). */
getTileCacheUsage(): Promise<{ bytes: number; limit: number }>;
- /** iOS, feature tileCache: empties the map tile store. */
+ /** Feature tileCache: empties the map tile store. */
clearTileCache(): Promise;
/** Feature biometricLock: which biometry the device offers for the app lock. */
biometryInfo(): Promise<{ available: boolean; type: string }>;
@@ -42,7 +42,7 @@ export interface TrekShellPlugin {
authenticateBiometric(options: { reason: string }): Promise<{ ok: true }>;
/** Feature biometricLock: a blurred cover in the app switcher while the lock is on. */
setPrivacyCover(options: { enabled: boolean }): Promise;
- /** iOS, feature geolocation: starts the native location stream (the "location" event). */
+ /** Feature geolocation: starts the native location stream (the "location" event). */
startLocation(options: { highAccuracy: boolean }): Promise;
stopLocation(): Promise;
addListener(
@@ -71,22 +71,43 @@ export interface TrekShellPlugin {
nextTime?: string;
done: number;
total: number;
+ /** Android: minutes after midnight of the next stop, for the countdown in the Live Update. */
+ nextMinutes?: number;
+ /** Android: each stop's colour (#rrggbb) for the Live Update's segments. */
+ colors?: (string | null)[];
}): Promise<{ running: boolean }>;
endTripDay(): Promise;
- /** iOS, feature storeKit: the App Store's price strings for the products it knows. */
+ /** Feature storeKit (iOS) or playBilling (Android): the store's price strings for the products it knows. */
storeProducts(options: {
ids: string[];
}): Promise<{ products: { id: string; displayPrice: string }[]; sandbox?: boolean }>;
- /** iOS, feature storeKit: the purchase sheet; `jws` is the signed transaction, set when bought. */
- storePurchase(options: {
- productId: string;
- }): Promise<{ kind: 'bought' | 'cancelled' | 'pending' | 'failed'; jws?: string; transactionId?: string }>;
- /** iOS, feature storeKit: marks a purchase delivered once its instance exists. */
+ /**
+ * The purchase sheet. Set when bought: on iOS `jws`, the signed transaction; on
+ * Android `purchaseToken`, which the control plane verifies with Google Play.
+ */
+ storePurchase(options: { productId: string }): Promise<{
+ kind: 'bought' | 'cancelled' | 'pending' | 'failed';
+ jws?: string;
+ purchaseToken?: string;
+ productId?: string;
+ transactionId?: string;
+ }>;
+ /** Marks a purchase delivered once its instance exists (Android: acknowledges it with Google Play). */
storeFinish(options: { transactionId: string }): Promise;
/** iOS, feature wallet: adds a .pkpass (base64) to Apple Wallet, or opens it there when it is already in. */
addToWallet(options: { data: string }): Promise<{ result: 'added' | 'opened' | 'cancelled' }>;
- /** iOS, feature storeKit: the newest active subscription under `prefix` on this Apple ID, if any. */
- storeRestore(options: { prefix: string }): Promise<{ jws?: string; transactionId?: string }>;
+ /** The newest active subscription under `prefix` on this Apple ID or Google account, if any. */
+ storeRestore(options: {
+ prefix: string;
+ }): Promise<{ jws?: string; purchaseToken?: string; productId?: string; transactionId?: string }>;
+ /** Android, feature googleWallet: opens a Google Wallet save link (https://pay.google.com/gp/v/save/...). */
+ addToGoogleWallet(options: { url: string }): Promise<{ result: 'opened' }>;
+ /** Android, feature windowLayout: the window's size classes and a foldable's posture and hinge. */
+ getWindowLayout(): Promise;
+ addListener(
+ event: 'windowLayout',
+ listener: (payload: NativeWindowLayout) => void
+ ): Promise<{ remove: () => Promise }>;
addListener(
event: 'pushOpened',
listener: (payload: { url: string }) => void
@@ -103,6 +124,23 @@ export interface SharedFilePayload {
tripId?: number;
}
+/**
+ * The window as the Android app sees it (feature windowLayout): its size in CSS
+ * pixels, Android's size classes, and a foldable's posture with the hinge's
+ * place in the window. `posture` is none on a device without a fold.
+ */
+interface NativeWindowLayout {
+ width: number;
+ height: number;
+ widthClass: 'compact' | 'medium' | 'expanded';
+ heightClass: 'compact' | 'medium' | 'expanded';
+ posture: 'none' | 'flat' | 'halfOpened';
+ orientation?: 'vertical' | 'horizontal';
+ separating?: boolean;
+ occluding?: boolean;
+ hinge?: { left: number; top: number; right: number; bottom: number };
+}
+
/** A position, or an error shaped like GeolocationPositionError (1 denied, 2 unavailable). */
export type NativeLocationPayload =
| {
diff --git a/client/src/native/wallet.test.ts b/client/src/native/wallet.test.ts
index 11dfb3e79..7a859bc6c 100644
--- a/client/src/native/wallet.test.ts
+++ b/client/src/native/wallet.test.ts
@@ -1,22 +1,36 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
-const env = vi.hoisted(() => ({ ios: true, wallet: true }));
-const shell = vi.hoisted(() => ({ addToWallet: vi.fn() }));
+const env = vi.hoisted(() => ({ ios: true, android: false, wallet: true, googleWallet: false }));
+const shell = vi.hoisted(() => ({ addToWallet: vi.fn(), addToGoogleWallet: vi.fn() }));
const report = vi.hoisted(() => vi.fn());
-vi.mock('./platform', () => ({ isNativeIos: () => env.ios }));
-vi.mock('./capabilities', () => ({ hasNativeFeature: (name: string) => name === 'wallet' && env.wallet }));
+vi.mock('./platform', () => ({ isNativeIos: () => env.ios, isNativeAndroid: () => env.android }));
+vi.mock('./capabilities', () => ({
+ hasNativeFeature: (name: string) =>
+ (name === 'wallet' && env.wallet) || (name === 'googleWallet' && env.googleWallet),
+}));
vi.mock('./trekShell', () => ({ TrekShell: shell }));
vi.mock('./reportFailure', () => ({ reportNativeFailure: report }));
-import { addReservationToWallet, addToWallet, canAddToWallet, isWalletPassName } from './wallet';
+import {
+ addReservationToGoogleWallet,
+ addReservationToWallet,
+ addToWallet,
+ bookingWallet,
+ canAddToGoogleWallet,
+ canAddToWallet,
+ isWalletPassName,
+} from './wallet';
const pass = new Blob(['PK\u0003\u0004pass'], { type: 'application/vnd.apple.pkpass' });
beforeEach(() => {
env.ios = true;
+ env.android = false;
env.wallet = true;
+ env.googleWallet = false;
shell.addToWallet.mockReset();
+ shell.addToGoogleWallet.mockReset();
report.mockReset();
});
@@ -96,3 +110,65 @@ describe('a booking into Wallet', () => {
fetchSpy.mockRestore();
});
});
+
+describe('Google Wallet', () => {
+ beforeEach(() => {
+ env.ios = false;
+ env.android = true;
+ env.wallet = false;
+ env.googleWallet = true;
+ });
+
+ it('is offered only on Android with the googleWallet feature, and names its wallet', () => {
+ expect(canAddToGoogleWallet()).toBe(true);
+ expect(bookingWallet()).toBe('google');
+ env.googleWallet = false;
+ expect(canAddToGoogleWallet()).toBe(false);
+ expect(bookingWallet()).toBeNull();
+ env.ios = true;
+ env.android = false;
+ env.wallet = true;
+ expect(bookingWallet()).toBe('apple');
+ });
+
+ it('asks this server for the save link in the user language and opens it in the app', async () => {
+ const saveUrl = 'https://pay.google.com/gp/v/save/jwt';
+ const fetchMock = vi.fn(async () => new Response(JSON.stringify({ saveUrl }), { status: 200 }));
+ vi.stubGlobal('fetch', fetchMock);
+ shell.addToGoogleWallet.mockResolvedValue({ result: 'opened' });
+ expect(await addReservationToGoogleWallet(42, 7, 'de')).toBe('added');
+ expect(fetchMock).toHaveBeenCalledWith('/api/trips/42/reservations/7/wallet-pass/google?lang=de', {
+ credentials: 'include',
+ });
+ expect(shell.addToGoogleWallet).toHaveBeenCalledWith({ url: saveUrl });
+ vi.unstubAllGlobals();
+ });
+
+ it('an undated booking, a refusal or a link the app will not open is a clear outcome', async () => {
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async () => new Response('', { status: 422 }))
+ );
+ expect(await addReservationToGoogleWallet(42, 7, 'en')).toBe('undated');
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async () => new Response('', { status: 404 }))
+ );
+ expect(await addReservationToGoogleWallet(42, 7, 'en')).toBe('failed');
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async () => new Response(JSON.stringify({ saveUrl: 'x' }), { status: 200 }))
+ );
+ shell.addToGoogleWallet.mockRejectedValue({ code: 'INVALID' });
+ expect(await addReservationToGoogleWallet(42, 7, 'en')).toBe('failed');
+ expect(report).not.toHaveBeenCalled();
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async () => {
+ throw new Error('offline');
+ })
+ );
+ expect(await addReservationToGoogleWallet(42, 7, 'en')).toBe('failed');
+ vi.unstubAllGlobals();
+ });
+});
diff --git a/client/src/native/wallet.ts b/client/src/native/wallet.ts
index ea0af9531..5b5bedc7d 100644
--- a/client/src/native/wallet.ts
+++ b/client/src/native/wallet.ts
@@ -1,6 +1,6 @@
import { toBase64 } from './blobBase64';
import { hasNativeFeature } from './capabilities';
-import { isNativeIos } from './platform';
+import { isNativeAndroid, isNativeIos } from './platform';
import { reportNativeFailure } from './reportFailure';
import { TrekShell } from './trekShell';
@@ -59,3 +59,50 @@ export async function addReservationToWallet(
if (!response.ok) return 'failed';
return (await addToWallet(await response.blob())) ? 'added' : 'failed';
}
+
+/** Whether this app can hand a booking to Google Wallet (Android, feature googleWallet). */
+export function canAddToGoogleWallet(): boolean {
+ return isNativeAndroid() && hasNativeFeature('googleWallet');
+}
+
+/** The wallet a booking's button adds to here, if any: Apple Wallet on iOS, Google Wallet on Android. */
+export function bookingWallet(): 'apple' | 'google' | null {
+ if (canAddToWallet()) return 'apple';
+ if (canAddToGoogleWallet()) return 'google';
+ return null;
+}
+
+/**
+ * A booking as a Google Wallet pass: this server asks the TREK services for a
+ * save link (GET .../reservations/:id/wallet-pass/google), and the app opens it,
+ * where Google Wallet shows the pass with its own Save button. `undated`: the
+ * booking has no date yet.
+ */
+export async function addReservationToGoogleWallet(
+ tripId: number,
+ reservationId: number,
+ language: string
+): Promise {
+ if (!canAddToGoogleWallet()) return 'failed';
+ let response: Response;
+ try {
+ response = await fetch(
+ `/api/trips/${tripId}/reservations/${reservationId}/wallet-pass/google?lang=${encodeURIComponent(language)}`,
+ { credentials: 'include' }
+ );
+ } catch {
+ return 'failed';
+ }
+ if (response.status === 422) return 'undated';
+ if (!response.ok) return 'failed';
+ try {
+ const { saveUrl } = (await response.json()) as { saveUrl?: unknown };
+ if (typeof saveUrl !== 'string') return 'failed';
+ await TrekShell.addToGoogleWallet({ url: saveUrl });
+ return 'added';
+ } catch (err) {
+ const code = (err as { code?: unknown })?.code;
+ if (code !== 'INVALID' && code !== 'UNAVAILABLE') reportNativeFailure(err);
+ return 'failed';
+ }
+}
diff --git a/client/src/native/widgets.test.ts b/client/src/native/widgets.test.ts
index 284e7d4b2..d2b29d1dc 100644
--- a/client/src/native/widgets.test.ts
+++ b/client/src/native/widgets.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, it, vi } from 'vitest';
import type { Day, Trip } from '../types';
-vi.mock('./platform', () => ({ isNativeIos: vi.fn(() => true) }));
+vi.mock('./platform', () => ({ isNativeIos: vi.fn(() => true), isNativeApp: vi.fn(() => true) }));
vi.mock('./capabilities', () => ({ hasNativeFeature: vi.fn(() => true) }));
vi.mock('./reportFailure', () => ({ reportNativeFailure: vi.fn() }));
vi.mock('./trekShell', () => ({
@@ -122,6 +122,33 @@ describe('todayOf and tripDayState', () => {
expect(tripDayState(today, 12 * 60, 'done')).toMatchObject({ nextName: 'Dinner', nextTime: '19:30', done: 1 });
expect(tripDayState(today, 22 * 60, 'done')).toMatchObject({ nextName: 'done', done: 2, nextTime: undefined });
});
+
+ it('gives the Android Live Update the next stop in minutes and one colour per timed stop', () => {
+ const state = tripDayState(
+ {
+ tripTitle: 'T',
+ path: '/trips/1',
+ dayLabel: 'D',
+ stops: [
+ { name: 'Museum', time: '10:00', minutes: 600, color: '#D6273B' },
+ { name: 'Walk', time: null, minutes: null },
+ { name: 'Dinner', time: '19:30', minutes: 1170, color: null },
+ ],
+ },
+ 12 * 60,
+ 'done'
+ );
+ expect(state).toMatchObject({
+ nextName: 'Dinner',
+ nextMinutes: 1170,
+ colors: ['#D6273B', null],
+ done: 1,
+ total: 2,
+ });
+ expect(
+ tripDayState({ tripTitle: 'T', path: '/', dayLabel: 'D', stops: [] }, 0, 'done').nextMinutes
+ ).toBeUndefined();
+ });
});
describe('publishWidgets', () => {
diff --git a/client/src/native/widgets.ts b/client/src/native/widgets.ts
index e5f417d33..bdb8f250c 100644
--- a/client/src/native/widgets.ts
+++ b/client/src/native/widgets.ts
@@ -2,7 +2,7 @@ import type { Day, Reservation, Trip } from '../types';
import { splitReservationDateTime } from '../utils/formatters';
import { heroTrip, sortTripsByRelevance } from '../utils/heroTrip';
import { hasNativeFeature } from './capabilities';
-import { isNativeIos } from './platform';
+import { isNativeApp } from './platform';
import { reportNativeFailure } from './reportFailure';
import { TrekShell } from './trekShell';
import { stopLook, type WidgetBooking, type WidgetPacking, type WidgetTodos } from './widgetExtras';
@@ -125,8 +125,9 @@ export interface TripDay {
total?: number;
}
+/** iOS (WidgetKit) and Android (Glance) read the same snapshot. */
export function widgetsActive(): boolean {
- return isNativeIos() && hasNativeFeature('widgets');
+ return isNativeApp() && hasNativeFeature('widgets');
}
function minutesOf(time: string | null | undefined): number | null {
@@ -287,8 +288,23 @@ export function buildSnapshot(
return snapshot;
}
+/** What the Live Activity (iOS) and the Live Update (Android) show of the travel day. */
+interface TripDayState {
+ tripTitle: string;
+ path: string;
+ dayLabel: string;
+ nextName: string;
+ nextTime?: string;
+ /** Android: minutes after midnight of the next stop, for the countdown. */
+ nextMinutes?: number;
+ /** Android: the colour of each timed stop, for the progress segments. */
+ colors?: (string | null)[];
+ done: number;
+ total: number;
+}
+
/** The Live Activity's state: the first stop whose time is still ahead, else the last. */
-export function tripDayState(day: TripDay, nowMinutes: number, allDone: string) {
+export function tripDayState(day: TripDay, nowMinutes: number, allDone: string): TripDayState {
const timed = day.stops.filter((s) => s.minutes != null);
const nextIndex = day.stops.findIndex((s) => s.minutes != null && s.minutes >= nowMinutes);
const done = nextIndex < 0 ? timed.length : day.stops.slice(0, nextIndex).filter((s) => s.minutes != null).length;
@@ -299,6 +315,9 @@ export function tripDayState(day: TripDay, nowMinutes: number, allDone: string)
dayLabel: day.dayLabel,
nextName: next?.name ?? allDone,
nextTime: next?.time ?? undefined,
+ // Android's Live Update counts down to the next stop and colours a segment per stop.
+ nextMinutes: next?.minutes ?? undefined,
+ colors: day.stops.filter((s) => s.minutes != null).map((s) => s.color ?? null),
done,
total: timed.length,
};
@@ -315,7 +334,7 @@ export interface TripWidgetSnapshot {
export async function publishWidgets(
snapshot: WidgetSnapshot,
- liveDay: ReturnType | null,
+ liveDay: TripDayState | null,
trips: TripWidgetSnapshot[] = []
): Promise {
if (!widgetsActive()) return;
diff --git a/shared/src/i18n/ar/reservations.ts b/shared/src/i18n/ar/reservations.ts
index d1b79080f..3ab6a9797 100644
--- a/shared/src/i18n/ar/reservations.ts
+++ b/shared/src/i18n/ar/reservations.ts
@@ -300,6 +300,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'يتطلب هذا اتصالاً. حاول مرة أخرى عندما يعود TREK للاتصال.',
'reservations.exportCsvFiltered': 'تصدير الصفوف المعروضة ({shown} من {total}) (CSV)',
'reservations.wallet.add': 'إضافة إلى Apple Wallet',
+ 'reservations.wallet.addGoogle': 'إضافة إلى Google Wallet',
'reservations.wallet.failed': 'تعذّر إنشاء بطاقة Wallet. حاول مرة أخرى.',
'reservations.wallet.undated': 'حدّد تاريخًا للحجز أولًا: يعرض Wallet البطاقة قرب موعده.',
};
diff --git a/shared/src/i18n/az/reservations.ts b/shared/src/i18n/az/reservations.ts
index 55cd0dd8a..6c41e9407 100644
--- a/shared/src/i18n/az/reservations.ts
+++ b/shared/src/i18n/az/reservations.ts
@@ -308,6 +308,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Bunun üçün bağlantı lazımdır. TREK yenidən onlayn olduqda bir daha cəhd edin.',
'reservations.exportCsvFiltered': 'Göstərilən {shown}/{total} sətri ixrac et (CSV)',
'reservations.wallet.add': 'Apple Wallet-ə əlavə et',
+ 'reservations.wallet.addGoogle': 'Google Wallet-ə əlavə et',
'reservations.wallet.failed': 'Wallet kartını yaratmaq alınmadı. Yenidən cəhd edin.',
'reservations.wallet.undated': 'Əvvəlcə rezervasiyaya tarix verin: Wallet kartı həmin vaxta yaxın göstərir.',
};
diff --git a/shared/src/i18n/br/reservations.ts b/shared/src/i18n/br/reservations.ts
index 79054c42d..1e9d66ad1 100644
--- a/shared/src/i18n/br/reservations.ts
+++ b/shared/src/i18n/br/reservations.ts
@@ -274,6 +274,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Isso precisa de conexão. Tente de novo quando o TREK voltar a ficar online.',
'reservations.exportCsvFiltered': 'Ezporzhiañ ar {shown} diwar {total} renk skwer (CSV)',
'reservations.wallet.add': 'Adicionar à Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Adicionar à Google Wallet',
'reservations.wallet.failed': 'Não foi possível criar o passe da Wallet. Tente novamente.',
'reservations.wallet.undated': 'Primeiro dê uma data à reserva: a Wallet mostra o passe perto desse horário.',
};
diff --git a/shared/src/i18n/ca/reservations.ts b/shared/src/i18n/ca/reservations.ts
index 117845d3c..cf96f1d86 100644
--- a/shared/src/i18n/ca/reservations.ts
+++ b/shared/src/i18n/ca/reservations.ts
@@ -277,6 +277,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Això necessita connexió. Torna-ho a provar quan TREK torni a estar en línia.',
'reservations.exportCsvFiltered': 'Exporta les {shown} de {total} files mostrades (CSV)',
'reservations.wallet.add': 'Afegeix a Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Afegeix a Google Wallet',
'reservations.wallet.failed': 'No s’ha pogut crear el passi de Wallet. Torna-ho a provar.',
'reservations.wallet.undated':
'Primer posa una data a la reserva: Wallet mostra el passi al voltant d’aquell moment.',
diff --git a/shared/src/i18n/cs/reservations.ts b/shared/src/i18n/cs/reservations.ts
index 63e07d15a..738aac192 100644
--- a/shared/src/i18n/cs/reservations.ts
+++ b/shared/src/i18n/cs/reservations.ts
@@ -281,6 +281,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Na tohle je potřeba připojení. Zkus to znovu, až bude TREK zase online.',
'reservations.exportCsvFiltered': 'Exportovat zobrazené řádky, {shown} z {total} (CSV)',
'reservations.wallet.add': 'Přidat do Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Přidat do Google Wallet',
'reservations.wallet.failed': 'Kartu do Wallet se nepodařilo vytvořit. Zkuste to znovu.',
'reservations.wallet.undated': 'Nejdřív rezervaci zadejte datum: Wallet kartu zobrazí kolem toho času.',
};
diff --git a/shared/src/i18n/de/reservations.ts b/shared/src/i18n/de/reservations.ts
index 87101f370..d11a83084 100644
--- a/shared/src/i18n/de/reservations.ts
+++ b/shared/src/i18n/de/reservations.ts
@@ -279,6 +279,7 @@ const reservations: TranslationStrings = {
'Dafür braucht es eine Verbindung. Versuch es noch einmal, sobald TREK wieder online ist.',
'reservations.exportCsvFiltered': 'Die {shown} von {total} angezeigten Zeilen exportieren (CSV)',
'reservations.wallet.add': 'Zu Apple Wallet hinzufügen',
+ 'reservations.wallet.addGoogle': 'Zu Google Wallet hinzufügen',
'reservations.wallet.failed': 'Der Wallet-Pass konnte nicht erstellt werden. Bitte versuch es erneut.',
'reservations.wallet.undated': 'Gib der Buchung zuerst ein Datum: Wallet zeigt den Pass rund um diesen Zeitpunkt an.',
};
diff --git a/shared/src/i18n/en/reservations.ts b/shared/src/i18n/en/reservations.ts
index e99d39333..67a4fff77 100644
--- a/shared/src/i18n/en/reservations.ts
+++ b/shared/src/i18n/en/reservations.ts
@@ -276,6 +276,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'This needs a connection. Try again once TREK is back online.',
'reservations.exportCsvFiltered': 'Export the {shown} of {total} shown rows (CSV)',
'reservations.wallet.add': 'Add to Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Add to Google Wallet',
'reservations.wallet.failed': 'The Wallet pass could not be made. Please try again.',
'reservations.wallet.undated': 'Give the booking a date first: Wallet brings the pass up around its time.',
};
diff --git a/shared/src/i18n/es/reservations.ts b/shared/src/i18n/es/reservations.ts
index 2fce413e0..e580308eb 100644
--- a/shared/src/i18n/es/reservations.ts
+++ b/shared/src/i18n/es/reservations.ts
@@ -277,6 +277,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Esto necesita conexión. Vuelve a intentarlo cuando TREK esté de nuevo en línea.',
'reservations.exportCsvFiltered': 'Exportar las {shown} de {total} filas mostradas (CSV)',
'reservations.wallet.add': 'Añadir a Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Añadir a Google Wallet',
'reservations.wallet.failed': 'No se pudo crear el pase de Wallet. Inténtalo de nuevo.',
'reservations.wallet.undated': 'Primero ponle una fecha a la reserva: Wallet muestra el pase en torno a ese momento.',
};
diff --git a/shared/src/i18n/et/reservations.ts b/shared/src/i18n/et/reservations.ts
index a726105b7..2f0f2e1fc 100644
--- a/shared/src/i18n/et/reservations.ts
+++ b/shared/src/i18n/et/reservations.ts
@@ -276,6 +276,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Selleks on vaja ühendust. Proovi uuesti, kui TREK on taas võrgus.',
'reservations.exportCsvFiltered': 'Ekspordi näidatud read, {shown} / {total} (CSV)',
'reservations.wallet.add': 'Lisa Apple Walletisse',
+ 'reservations.wallet.addGoogle': 'Lisa Google Walletisse',
'reservations.wallet.failed': 'Walleti passi ei õnnestunud luua. Proovi uuesti.',
'reservations.wallet.undated': 'Anna broneeringule kõigepealt kuupäev: Wallet näitab passi selle aja paiku.',
};
diff --git a/shared/src/i18n/fr/reservations.ts b/shared/src/i18n/fr/reservations.ts
index 390f4f8dd..d55200e38 100644
--- a/shared/src/i18n/fr/reservations.ts
+++ b/shared/src/i18n/fr/reservations.ts
@@ -280,6 +280,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Cela nécessite une connexion. Réessaie dès que TREK sera de nouveau en ligne.',
'reservations.exportCsvFiltered': 'Exporter les {shown} lignes affichées sur {total} (CSV)',
'reservations.wallet.add': 'Ajouter à Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Ajouter à Google Wallet',
'reservations.wallet.failed': 'Impossible de créer la carte Wallet. Réessayez.',
'reservations.wallet.undated':
'Donnez d’abord une date à la réservation : Wallet affiche la carte autour de ce moment.',
diff --git a/shared/src/i18n/gr/reservations.ts b/shared/src/i18n/gr/reservations.ts
index 420fe26b9..2c19db879 100644
--- a/shared/src/i18n/gr/reservations.ts
+++ b/shared/src/i18n/gr/reservations.ts
@@ -279,6 +279,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Αυτό χρειάζεται σύνδεση. Δοκίμασε ξανά μόλις το TREK συνδεθεί ξανά.',
'reservations.exportCsvFiltered': 'Εξαγωγή των {shown} από {total} εμφανιζόμενων γραμμών (CSV)',
'reservations.wallet.add': 'Προσθήκη στο Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Προσθήκη στο Google Wallet',
'reservations.wallet.failed': 'Δεν ήταν δυνατή η δημιουργία της κάρτας Wallet. Δοκιμάστε ξανά.',
'reservations.wallet.undated':
'Δώστε πρώτα ημερομηνία στην κράτηση: το Wallet εμφανίζει την κάρτα γύρω από εκείνη την ώρα.',
diff --git a/shared/src/i18n/he/reservations.ts b/shared/src/i18n/he/reservations.ts
index d64a669fa..ec109ab27 100644
--- a/shared/src/i18n/he/reservations.ts
+++ b/shared/src/i18n/he/reservations.ts
@@ -278,6 +278,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'הפעולה הזו דורשת חיבור. נסו שוב כש-TREK יחזור לרשת.',
'reservations.exportCsvFiltered': 'ייצוא {shown} מתוך {total} השורות המוצגות (CSV)',
'reservations.wallet.add': 'הוספה ל-Apple Wallet',
+ 'reservations.wallet.addGoogle': 'הוספה ל-Google Wallet',
'reservations.wallet.failed': 'לא ניתן היה ליצור את כרטיס ה-Wallet. אנא נסו שוב.',
'reservations.wallet.undated': 'קודם תנו להזמנה תאריך: Wallet מציג את הכרטיס סביב המועד שלה.',
};
diff --git a/shared/src/i18n/hu/reservations.ts b/shared/src/i18n/hu/reservations.ts
index 90b84b229..932ae82bb 100644
--- a/shared/src/i18n/hu/reservations.ts
+++ b/shared/src/i18n/hu/reservations.ts
@@ -278,6 +278,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Ehhez kapcsolat kell. Próbáld újra, amint a TREK újra online lesz.',
'reservations.exportCsvFiltered': 'A megjelenített {shown} sor exportálása a(z) {total} közül (CSV)',
'reservations.wallet.add': 'Hozzáadás az Apple Wallethez',
+ 'reservations.wallet.addGoogle': 'Hozzáadás az Google Wallethez',
'reservations.wallet.failed': 'Nem sikerült létrehozni a Wallet-kártyát. Próbáld újra.',
'reservations.wallet.undated': 'Előbb adj dátumot a foglalásnak: a Wallet az időpont körül jeleníti meg a kártyát.',
};
diff --git a/shared/src/i18n/id/reservations.ts b/shared/src/i18n/id/reservations.ts
index 42f98dd00..fd05790f9 100644
--- a/shared/src/i18n/id/reservations.ts
+++ b/shared/src/i18n/id/reservations.ts
@@ -267,6 +267,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Ini memerlukan koneksi. Coba lagi begitu TREK kembali online.',
'reservations.exportCsvFiltered': 'Ekspor {shown} dari {total} baris yang ditampilkan (CSV)',
'reservations.wallet.add': 'Tambahkan ke Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Tambahkan ke Google Wallet',
'reservations.wallet.failed': 'Pass Wallet tidak dapat dibuat. Silakan coba lagi.',
'reservations.wallet.undated': 'Beri tanggal pada pemesanan dulu: Wallet menampilkan pass di sekitar waktunya.',
};
diff --git a/shared/src/i18n/it/reservations.ts b/shared/src/i18n/it/reservations.ts
index 6c9add7a4..98ce77b97 100644
--- a/shared/src/i18n/it/reservations.ts
+++ b/shared/src/i18n/it/reservations.ts
@@ -275,6 +275,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Serve una connessione. Riprova quando TREK tornerà online.',
'reservations.exportCsvFiltered': 'Esporta le {shown} righe mostrate su {total} (CSV)',
'reservations.wallet.add': 'Aggiungi ad Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Aggiungi ad Google Wallet',
'reservations.wallet.failed': 'Impossibile creare il pass di Wallet. Riprova.',
'reservations.wallet.undated': 'Prima dai una data alla prenotazione: Wallet mostra il pass intorno a quel momento.',
};
diff --git a/shared/src/i18n/ja/reservations.ts b/shared/src/i18n/ja/reservations.ts
index 6f7a68f74..584181929 100644
--- a/shared/src/i18n/ja/reservations.ts
+++ b/shared/src/i18n/ja/reservations.ts
@@ -267,6 +267,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'この操作には接続が必要です。TREK がオンラインに戻ってから、もう一度お試しください。',
'reservations.exportCsvFiltered': '表示中の {shown}/{total} 行をエクスポート (CSV)',
'reservations.wallet.add': 'Apple Walletに追加',
+ 'reservations.wallet.addGoogle': 'Google Walletに追加',
'reservations.wallet.failed': 'Walletパスを作成できませんでした。もう一度お試しください。',
'reservations.wallet.undated': '先に予約に日付を入れてください。Walletはその時刻の前後にパスを表示します。',
};
diff --git a/shared/src/i18n/ko/reservations.ts b/shared/src/i18n/ko/reservations.ts
index e4c81d50b..f31d83bda 100644
--- a/shared/src/i18n/ko/reservations.ts
+++ b/shared/src/i18n/ko/reservations.ts
@@ -267,6 +267,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': '연결이 필요한 작업입니다. TREK가 다시 온라인이 되면 다시 시도하세요.',
'reservations.exportCsvFiltered': '표시된 {total}행 중 {shown}행 내보내기 (CSV)',
'reservations.wallet.add': 'Apple Wallet에 추가',
+ 'reservations.wallet.addGoogle': 'Google Wallet에 추가',
'reservations.wallet.failed': 'Wallet 패스를 만들지 못했습니다. 다시 시도하세요.',
'reservations.wallet.undated': '먼저 예약에 날짜를 지정하세요. Wallet은 그 시간 즈음에 패스를 보여 줍니다.',
};
diff --git a/shared/src/i18n/nl/reservations.ts b/shared/src/i18n/nl/reservations.ts
index 7a32b2dd9..fbcf2323e 100644
--- a/shared/src/i18n/nl/reservations.ts
+++ b/shared/src/i18n/nl/reservations.ts
@@ -276,6 +276,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Hiervoor is een verbinding nodig. Probeer het opnieuw zodra TREK weer online is.',
'reservations.exportCsvFiltered': 'De {shown} van {total} getoonde rijen exporteren (CSV)',
'reservations.wallet.add': 'Voeg toe aan Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Voeg toe aan Google Wallet',
'reservations.wallet.failed': 'De Wallet-pas kon niet worden gemaakt. Probeer het opnieuw.',
'reservations.wallet.undated': 'Geef de boeking eerst een datum: Wallet toont de pas rond dat moment.',
};
diff --git a/shared/src/i18n/pl/reservations.ts b/shared/src/i18n/pl/reservations.ts
index 5c4ee7e0e..9006acb38 100644
--- a/shared/src/i18n/pl/reservations.ts
+++ b/shared/src/i18n/pl/reservations.ts
@@ -290,6 +290,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'To wymaga połączenia. Spróbuj ponownie, gdy TREK znów będzie online.',
'reservations.exportCsvFiltered': 'Eksportuj wyświetlone wiersze: {shown} z {total} (CSV)',
'reservations.wallet.add': 'Dodaj do Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Dodaj do Google Wallet',
'reservations.wallet.failed': 'Nie udało się utworzyć karty Wallet. Spróbuj ponownie.',
'reservations.wallet.undated': 'Najpierw nadaj rezerwacji datę: Wallet pokazuje kartę w okolicach tego terminu.',
};
diff --git a/shared/src/i18n/ru/reservations.ts b/shared/src/i18n/ru/reservations.ts
index 1740d3db9..67c4f1289 100644
--- a/shared/src/i18n/ru/reservations.ts
+++ b/shared/src/i18n/ru/reservations.ts
@@ -288,6 +288,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Для этого нужно подключение. Попробуйте ещё раз, когда TREK снова будет онлайн.',
'reservations.exportCsvFiltered': 'Экспортировать показанные строки: {shown} из {total} (CSV)',
'reservations.wallet.add': 'Добавить в Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Добавить в Google Wallet',
'reservations.wallet.failed': 'Не удалось создать карту Wallet. Повторите попытку.',
'reservations.wallet.undated': 'Сначала укажите дату брони: Wallet показывает карту ближе к этому времени.',
};
diff --git a/shared/src/i18n/sk/reservations.ts b/shared/src/i18n/sk/reservations.ts
index 250e1a23d..2119a7005 100644
--- a/shared/src/i18n/sk/reservations.ts
+++ b/shared/src/i18n/sk/reservations.ts
@@ -284,6 +284,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Na toto je potrebné pripojenie. Skús to znova, keď bude TREK opäť online.',
'reservations.exportCsvFiltered': 'Exportovať zobrazené riadky, {shown} z {total} (CSV)',
'reservations.wallet.add': 'Pridať do Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Pridať do Google Wallet',
'reservations.wallet.failed': 'Kartu do Wallet sa nepodarilo vytvoriť. Skúste to znova.',
'reservations.wallet.undated': 'Najprv rezervácii zadajte dátum: Wallet kartu zobrazí okolo toho času.',
};
diff --git a/shared/src/i18n/sv/reservations.ts b/shared/src/i18n/sv/reservations.ts
index 3c19e51d2..f3a1ec81f 100644
--- a/shared/src/i18n/sv/reservations.ts
+++ b/shared/src/i18n/sv/reservations.ts
@@ -275,6 +275,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Det här kräver en anslutning. Försök igen när TREK är online igen.',
'reservations.exportCsvFiltered': 'Exportera de {shown} av {total} visade raderna (CSV)',
'reservations.wallet.add': 'Lägg till i Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Lägg till i Google Wallet',
'reservations.wallet.failed': 'Wallet-kortet kunde inte skapas. Försök igen.',
'reservations.wallet.undated': 'Ge bokningen ett datum först: Wallet visar kortet runt den tiden.',
};
diff --git a/shared/src/i18n/th/reservations.ts b/shared/src/i18n/th/reservations.ts
index c55f25eaa..a6a8d393a 100644
--- a/shared/src/i18n/th/reservations.ts
+++ b/shared/src/i18n/th/reservations.ts
@@ -269,6 +269,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'การทำงานนี้ต้องใช้การเชื่อมต่อ ลองอีกครั้งเมื่อ TREK กลับมาออนไลน์',
'reservations.exportCsvFiltered': 'ส่งออก {shown} จาก {total} แถวที่แสดง (CSV)',
'reservations.wallet.add': 'เพิ่มลงใน Apple Wallet',
+ 'reservations.wallet.addGoogle': 'เพิ่มลงใน Google Wallet',
'reservations.wallet.failed': 'สร้างบัตร Wallet ไม่สำเร็จ โปรดลองอีกครั้ง',
'reservations.wallet.undated': 'กำหนดวันที่ให้การจองก่อน Wallet จะแสดงบัตรในช่วงเวลานั้น',
};
diff --git a/shared/src/i18n/tr/reservations.ts b/shared/src/i18n/tr/reservations.ts
index fe9c0f92f..06f83634d 100644
--- a/shared/src/i18n/tr/reservations.ts
+++ b/shared/src/i18n/tr/reservations.ts
@@ -276,6 +276,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Bunun için bağlantı gerekiyor. TREK yeniden çevrimiçi olduğunda tekrar dene.',
'reservations.exportCsvFiltered': 'Gösterilen {total} satırdan {shown} tanesini dışa aktar (CSV)',
'reservations.wallet.add': 'Apple Cüzdan’a Ekle',
+ 'reservations.wallet.addGoogle': 'Google Cüzdan’a Ekle',
'reservations.wallet.failed': 'Cüzdan kartı oluşturulamadı. Lütfen tekrar deneyin.',
'reservations.wallet.undated': 'Önce rezervasyona bir tarih verin: Cüzdan kartı o zamana yakın gösterir.',
};
diff --git a/shared/src/i18n/uk/reservations.ts b/shared/src/i18n/uk/reservations.ts
index 88e8d0b5a..67e938192 100644
--- a/shared/src/i18n/uk/reservations.ts
+++ b/shared/src/i18n/uk/reservations.ts
@@ -288,6 +288,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': "Для цього потрібне з'єднання. Спробуйте ще раз, коли TREK знову буде онлайн.",
'reservations.exportCsvFiltered': 'Експортувати показані рядки: {shown} із {total} (CSV)',
'reservations.wallet.add': 'Додати до Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Додати до Google Wallet',
'reservations.wallet.failed': 'Не вдалося створити картку Wallet. Повторіть спробу.',
'reservations.wallet.undated': 'Спершу вкажіть дату бронювання: Wallet показує картку ближче до цього часу.',
};
diff --git a/shared/src/i18n/vi/reservations.ts b/shared/src/i18n/vi/reservations.ts
index 8d5b6d96f..16397d8b7 100644
--- a/shared/src/i18n/vi/reservations.ts
+++ b/shared/src/i18n/vi/reservations.ts
@@ -270,6 +270,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': 'Thao tác này cần kết nối. Hãy thử lại khi TREK trực tuyến trở lại.',
'reservations.exportCsvFiltered': 'Xuất {shown} trong {total} dòng đang hiển thị (CSV)',
'reservations.wallet.add': 'Thêm vào Apple Wallet',
+ 'reservations.wallet.addGoogle': 'Thêm vào Google Wallet',
'reservations.wallet.failed': 'Không thể tạo thẻ Wallet. Vui lòng thử lại.',
'reservations.wallet.undated': 'Hãy đặt ngày cho đặt chỗ trước: Wallet sẽ hiện thẻ vào khoảng thời gian đó.',
};
diff --git a/shared/src/i18n/zh-TW/reservations.ts b/shared/src/i18n/zh-TW/reservations.ts
index 5c10be167..c56a32cd2 100644
--- a/shared/src/i18n/zh-TW/reservations.ts
+++ b/shared/src/i18n/zh-TW/reservations.ts
@@ -262,6 +262,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': '此操作需要網路連線。請在 TREK 恢復連線後再試一次。',
'reservations.exportCsvFiltered': '匯出顯示的 {shown}/{total} 列 (CSV)',
'reservations.wallet.add': '加入 Apple 錢包',
+ 'reservations.wallet.addGoogle': '加入 Google 錢包',
'reservations.wallet.failed': '無法產生錢包票卡。請重試。',
'reservations.wallet.undated': '請先為訂位設定日期:錢包會在那個時間前後顯示票卡。',
};
diff --git a/shared/src/i18n/zh/reservations.ts b/shared/src/i18n/zh/reservations.ts
index a8c53a514..32784eda8 100644
--- a/shared/src/i18n/zh/reservations.ts
+++ b/shared/src/i18n/zh/reservations.ts
@@ -262,6 +262,7 @@ const reservations: TranslationStrings = {
'reservations.needsConnection': '此操作需要网络连接。请在 TREK 恢复联网后重试。',
'reservations.exportCsvFiltered': '导出显示的 {shown}/{total} 行 (CSV)',
'reservations.wallet.add': '添加到 Apple 钱包',
+ 'reservations.wallet.addGoogle': '添加到 Google 钱包',
'reservations.wallet.failed': '无法生成钱包卡券。请重试。',
'reservations.wallet.undated': '请先为预订设置日期:钱包会在那个时间前后显示卡券。',
};