diff --git a/app/app.css b/app/app.css index 673fc5bb..b981046b 100644 --- a/app/app.css +++ b/app/app.css @@ -199,6 +199,29 @@ Button.pairing-link { border-width: 0; } +/* + * Permissions screen (phone-ui/permissions-page). Cards reuse the pairing-row + * / pairing-title / pairing-badge look above; these add the explanation body + * and the already-granted checkmark. + */ +.permissions-description { + font-size: 13; + color: #555555; + margin-top: 2; +} + +.permissions-check { + font-size: 24; + color: #2e7d32; + margin-left: 10; +} + +/* Continue with required permissions still missing: looks disabled but stays + * tappable (the tap raises an are-you-sure prompt instead of being ignored). */ +Button.permissions-primary-dimmed { + opacity: 0.45; +} + /* * Dark-mode pairing page. The cards keep their light-mode look above; here * they go dark-gray, and every text colour set above gets a light counterpart @@ -277,3 +300,11 @@ Button.pairing-link { .ns-dark Button.pairing-link { color: #7da7f5; } + +.ns-dark .permissions-description { + color: #b0b0b0; +} + +.ns-dark .permissions-check { + color: #7bc47f; +} diff --git a/app/g2/android-permissions.ts b/app/g2/android-permissions.ts index 648846ee..e3c4a949 100644 --- a/app/g2/android-permissions.ts +++ b/app/g2/android-permissions.ts @@ -5,6 +5,8 @@ const VOICE_PERMISSION_REQUEST_CODE = 4243; const CALENDAR_PERMISSION_REQUEST_CODE = 4244; const LOCATION_PERMISSION_REQUEST_CODE = 4245; const FINE_LOCATION_PERMISSION_REQUEST_CODE = 4246; +const BLE_ONLY_PERMISSION_REQUEST_CODE = 4247; +const POST_NOTIFICATIONS_PERMISSION_REQUEST_CODE = 4248; const POST_NOTIFICATIONS_PERMISSION = "android.permission.POST_NOTIFICATIONS"; const RECORD_AUDIO_PERMISSION = "android.permission.RECORD_AUDIO"; const READ_CALENDAR_PERMISSION = "android.permission.READ_CALENDAR"; @@ -31,23 +33,22 @@ function toJavaStringArray(values: string[]): string[] { return result; } -function getRequiredPermissions(): string[] { - const sdk = android.os.Build.VERSION.SDK_INT; - const permissions: string[] = []; - - if (sdk >= 31) { - permissions.push( +/** The runtime permissions this Android version needs for BLE scan + connect. */ +function getBlePermissions(): string[] { + if (android.os.Build.VERSION.SDK_INT >= 31) { + return [ android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.BLUETOOTH_CONNECT, - ); - } else { - permissions.push(android.Manifest.permission.ACCESS_FINE_LOCATION); + ]; } + return [android.Manifest.permission.ACCESS_FINE_LOCATION]; +} - if (sdk >= 33) { +function getRequiredPermissions(): string[] { + const permissions = getBlePermissions(); + if (android.os.Build.VERSION.SDK_INT >= 33) { permissions.push(POST_NOTIFICATIONS_PERMISSION); } - return permissions; } @@ -107,6 +108,69 @@ export async function ensureVoicePermissions(): Promise { await ensurePermissions([RECORD_AUDIO_PERMISSION], VOICE_PERMISSION_REQUEST_CODE, "Voice control"); } +/** Whether the BLE scan/connect permissions have been granted (false off-Android). */ +export function hasBlePermissions(): boolean { + if (!global.isAndroid) return false; + return getBlePermissions().every((permission) => isPermissionGranted(permission)); +} + +/** + * Prompt for just the BLE permissions (without POST_NOTIFICATIONS, which the + * Permissions screen presents as its own card). Resolves true when granted. + */ +export async function requestBlePermissions(): Promise { + if (!global.isAndroid) return false; + try { + await ensurePermissions(getBlePermissions(), BLE_ONLY_PERMISSION_REQUEST_CODE, "Bluetooth"); + return true; + } catch { + return false; + } +} + +/** + * Whether posting notifications is allowed. Before Android 13 (sdk 33) there + * is no runtime permission for this, so it reports as granted. + */ +export function hasPostNotificationsPermission(): boolean { + if (!global.isAndroid) return false; + if (android.os.Build.VERSION.SDK_INT < 33) return true; + return isPermissionGranted(POST_NOTIFICATIONS_PERMISSION); +} + +/** Prompt for POST_NOTIFICATIONS. Resolves true when the permission is held afterward. */ +export async function requestPostNotificationsPermission(): Promise { + if (!global.isAndroid) return false; + if (android.os.Build.VERSION.SDK_INT < 33) return true; + try { + await ensurePermissions( + [POST_NOTIFICATIONS_PERMISSION], + POST_NOTIFICATIONS_PERMISSION_REQUEST_CODE, + "Notification", + ); + return true; + } catch { + return false; + } +} + +/** Whether RECORD_AUDIO has been granted (false off-Android). */ +export function hasMicrophonePermission(): boolean { + if (!global.isAndroid) return false; + return isPermissionGranted(RECORD_AUDIO_PERMISSION); +} + +/** Prompt for RECORD_AUDIO. Resolves true when granted, false on denial. */ +export async function requestMicrophonePermission(): Promise { + if (!global.isAndroid) return false; + try { + await ensureVoicePermissions(); + return true; + } catch { + return false; + } +} + /** Whether READ_CALENDAR has been granted (false off-Android). */ export function hasCalendarPermission(): boolean { if (!global.isAndroid) return false; diff --git a/app/phone-ui/main-page.xml b/app/phone-ui/main-page.xml index ec7ffe68..84d508c3 100644 --- a/app/phone-ui/main-page.xml +++ b/app/phone-ui/main-page.xml @@ -3,6 +3,7 @@ + diff --git a/app/phone-ui/main-view-model.ts b/app/phone-ui/main-view-model.ts index ad331513..ab31378d 100644 --- a/app/phone-ui/main-view-model.ts +++ b/app/phone-ui/main-view-model.ts @@ -484,6 +484,13 @@ export class MainViewModel extends Observable { Frame.topmost()?.navigate("phone-ui/config-page"); } + onPermissionsTap(): void { + Frame.topmost()?.navigate({ + moduleName: "phone-ui/permissions-page", + context: { onboarding: false }, + }); + } + /** * Live scan that names each nearby pair by model, colour, and serial and * checks both arms belong together. A connected arm stops advertising, so diff --git a/app/phone-ui/onboarding-page.ts b/app/phone-ui/onboarding-page.ts index 69e00b33..ee47af0b 100644 --- a/app/phone-ui/onboarding-page.ts +++ b/app/phone-ui/onboarding-page.ts @@ -1,12 +1,16 @@ -import { EventData, Page } from "@nativescript/core"; +import { NavigatedData, Page } from "@nativescript/core"; import { OnboardingViewModel } from "./onboarding-view-model"; -export function navigatingTo(args: EventData): void { +type OnboardingContext = { step?: number } | undefined; + +export function navigatingTo(args: NavigatedData): void { const page = args.object as Page; // Preserve the step when returning from the flashing page (back navigation - // re-fires navigatingTo); only build a fresh model on first entry. + // re-fires navigatingTo); only build a fresh model on first entry. The + // permissions page navigates here with { step: 3 } to continue the flow. if (!page.bindingContext) { - page.bindingContext = new OnboardingViewModel(); + const context = args.context as OnboardingContext; + page.bindingContext = new OnboardingViewModel(context?.step); } } diff --git a/app/phone-ui/onboarding-view-model.ts b/app/phone-ui/onboarding-view-model.ts index a68cc6ff..bcd39f3a 100644 --- a/app/phone-ui/onboarding-view-model.ts +++ b/app/phone-ui/onboarding-view-model.ts @@ -50,8 +50,9 @@ const STEP_CONTENT: Record = { export class OnboardingViewModel extends Observable { private _step: OnboardingStep = 1; - constructor() { + constructor(initialStep?: number) { super(); + if (initialStep === 2 || initialStep === 3) this._step = initialStep; this.publish(); } @@ -61,7 +62,12 @@ export class OnboardingViewModel extends Observable { return; } if (this._step === 2) { - this.setStep(3); + // The Permissions screen sits between the disclaimer and the firmware + // step; it navigates forward to a fresh onboarding page at step 3. + Frame.topmost()?.navigate({ + moduleName: "phone-ui/permissions-page", + context: { onboarding: true }, + }); return; } // Step 3 primary: begin the flashing setup — scan for and pick the glasses diff --git a/app/phone-ui/permissions-page.ts b/app/phone-ui/permissions-page.ts new file mode 100644 index 00000000..977a7036 --- /dev/null +++ b/app/phone-ui/permissions-page.ts @@ -0,0 +1,25 @@ +import { EventData, NavigatedData, Page } from "@nativescript/core"; + +import { PermissionsViewModel } from "./permissions-view-model"; + +type PermissionsContext = { onboarding?: boolean } | undefined; + +export function navigatingTo(args: NavigatedData): void { + const page = args.object as Page; + // Preserve the model when returning via back navigation (from the step-3 + // onboarding page); statuses are re-checked in the loaded handler. + if (!page.bindingContext) { + const context = args.context as PermissionsContext; + page.bindingContext = new PermissionsViewModel({ onboarding: context?.onboarding ?? false }); + } +} + +export function loaded(args: EventData): void { + const page = args.object as Page; + (page.bindingContext as PermissionsViewModel | undefined)?.onPageLoaded(); +} + +export function unloaded(args: EventData): void { + const page = args.object as Page; + (page.bindingContext as PermissionsViewModel | undefined)?.onPageUnloaded(); +} diff --git a/app/phone-ui/permissions-page.xml b/app/phone-ui/permissions-page.xml new file mode 100644 index 00000000..49f519d7 --- /dev/null +++ b/app/phone-ui/permissions-page.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +