incyclist-services 1.7.99 → 1.7.101

package/lib/cjs/activities/page/service.js

@@ -40,6 +40,7 @@ const decorators_1 = require("../../base/decorators");
 const pages_1 = require("../../base/pages");
 const list_1 = require("../list");
 const sleep_1 = require("../../utils/sleep");
+const workouts_1 = require("../../workouts");
 let ActivitiesPageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -48,12 +49,15 @@ let ActivitiesPageService = (() => {
     let _classSuper = pages_1.IncyclistPageService;
     let _instanceExtraInitializers = [];
     let _getActivityList_decorators;
+    let _getWorkoutList_decorators;
     var ActivitiesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getActivityList_decorators = [decorators_1.Injectable];
+            _getWorkoutList_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getActivityList_decorators, { kind: "method", name: "getActivityList", static: false, private: false, access: { has: obj => "getActivityList" in obj, get: obj => obj.getActivityList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivitiesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -146,6 +150,27 @@ let ActivitiesPageService = (() => {
                 this.logError(err, 'onCloseActivity');
             }
         }
+        getActivityDetailsProps(activityId) {
+            const comboEnabled = this.isWorkoutComboEnabled();
+            try {
+                const workout = this.getWorkoutList().getSelected();
+                const attachedWorkout = workout ? { id: workout.id, title: workout.name } : null;
+                return { activityId, attachedWorkout, comboEnabled };
+            }
+            catch (err) {
+                this.logError(err, 'getActivityDetailsProps');
+                return { activityId, attachedWorkout: null, comboEnabled };
+            }
+        }
+        onClearWorkoutSelection() {
+            try {
+                this.getWorkoutList().unselect();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onClearWorkoutSelection');
+            }
+        }
         updatePageDisplay() {
             this.getPageObserver()?.emit('page-update');
         }
@@ -169,6 +194,9 @@ let ActivitiesPageService = (() => {
         getActivityList() {
             return (0, list_1.useActivityList)();
         }
+        getWorkoutList() {
+            return (0, workouts_1.useWorkoutList)();
+        }
     };
     return ActivitiesPageService = _classThis;
 })();

package/lib/cjs/base/pages/service.js

@@ -122,6 +122,17 @@ let IncyclistPageService = (() => {
         getAppState() {
             return (0, appstate_1.useAppState)();
         }
+        isWorkoutComboEnabled() {
+            try {
+                const appState = this.getAppState();
+                return appState.hasFeature('MOBILE_WORKOUTS')
+                    && appState.hasFeature('MOBILE_WORKOUT_ROUTE_COMBO');
+            }
+            catch (err) {
+                this.logError(err, 'isWorkoutComboEnabled');
+                return false;
+            }
+        }
     };
 })();
 exports.IncyclistPageService = IncyclistPageService;

package/lib/cjs/ride/page/service.js

@@ -50,6 +50,7 @@ const UPCOMING_STEPS_COUNT = 3;
 const DEFAULT_LOAD_INCREMENT = 1;
 const HINTS_WORKOUT_GESTURES_KEY = 'hints.workoutRideGestures';
 const LOAD_INCREMENT_SETTING_KEY = 'preferences.workouts.loadIncrement';
+const CORNER_WIDGET_SETTING_KEY = 'preferences.workouts.rideCornerWidget';
 let RidePageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -84,16 +85,19 @@ let RidePageService = (() => {
         eventHandler = (__runInitializers(this, _instanceExtraInitializers), {});
         workoutEventHandler = {};
         workoutObserverSubscribed = false;
+        workoutObserver;
         backgroundTimer;
         backgroundPausedByService = false;
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
         gestureHintDismissed = false;
+        viewTransition = false;
         constructor() {
             super('RidePage');
             this.eventHandler['state-update'] = this.onDisplayStateUpdate.bind(this);
             this.eventHandler['route-update'] = this.onRouteUpdate.bind(this);
+            this.eventHandler['view-changed'] = this.onViewChanged.bind(this);
             this.workoutEventHandler['step-changed'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
@@ -113,6 +117,14 @@ let RidePageService = (() => {
             }
         }
         openPage(simulate) {
+            if (this.viewTransition) {
+                this.viewTransition = false;
+                this.logEvent({ message: 'page shown', page: this.getPageLogName(), viewTransition: true });
+                gd_eventlog_1.EventLogger.setGlobalConfig('page', this.getPageLogName());
+                this.subscribeToWorkoutObserver();
+                this.updatePageDisplay();
+                return this.getPageObserver();
+            }
             try {
                 const pageLogName = this.getPageLogName();
                 this.logEvent({ message: 'page shown', page: pageLogName });
@@ -124,6 +136,12 @@ let RidePageService = (() => {
                     const registerAndStart = () => {
                         this.registerHandlers(this.rideObserver, this.eventHandler);
                         this.subscribeToWorkoutObserver();
+                        const state = service.getState();
+                        if (state === 'Started' || state === 'Active' || state === 'Paused') {
+                            this.logError(new Error(`start() requested while ride is ${state}`), 'openPage');
+                            this.updatePageDisplay();
+                            return;
+                        }
                         service.start(simulate);
                         if (this.isRideType('Video', 'GPX')) {
                             (0, sleep_1.sleep)(5).then(() => {
@@ -154,6 +172,8 @@ let RidePageService = (() => {
             return this.getPageObserver();
         }
         closePage() {
+            if (this.viewTransition)
+                return;
             try {
                 gd_eventlog_1.EventLogger.setGlobalConfig('page', null);
                 this.logEvent({ message: 'page closed', page: this.getPageLogName() });
@@ -251,7 +271,7 @@ let RidePageService = (() => {
         onMenuOpen() {
             try {
                 const state = this.getRideDisplay().getState();
-                this.menuProps = this.isRideType('Workout')
+                this.menuProps = this.isWorkoutAttached()
                     ? { showResume: state === 'Paused', ...this.getStepFlags() }
                     : { showResume: state === 'Paused' };
                 this.updatePageDisplay();
@@ -321,8 +341,10 @@ let RidePageService = (() => {
         }
         getVideoRideDisplayProps() {
             const props = this.rideDisplayProps;
+            const base = this.buildBaseDisplayProps();
             const displayProps = {
-                ...this.buildBaseDisplayProps(),
+                ...base,
+                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -331,14 +353,61 @@ let RidePageService = (() => {
         }
         getGPXRideDisplayProps() {
             const props = this.rideDisplayProps;
+            const base = this.buildBaseDisplayProps();
             const displayProps = {
-                ...this.buildBaseDisplayProps(),
+                ...base,
+                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver
             };
             return displayProps;
         }
+        buildWorkoutOverlayProps(props, startOverlayCleared) {
+            const cornerWidget = this.getCornerWidget();
+            if (!this.isWorkoutAttached() || !props?.showWorkout)
+                return { workoutAttached: false, cornerWidget };
+            try {
+                const wo = this.getWorkoutRide().getDashboardDisplayProperties();
+                return {
+                    workoutAttached: true,
+                    cornerWidget,
+                    title: wo.title ?? '',
+                    graph: this.buildGraphPlan(props.workout, wo.ftp),
+                    steps: this.buildUpcomingSteps(props.workout, wo.ftp),
+                    dashboard: this.buildDashboardLine(wo),
+                    gestureHint: this.buildGestureHint(startOverlayCleared),
+                    loadIncrement: this.getLoadIncrement(),
+                    loadButtonMode: wo.loadButtonMode ?? 'power'
+                };
+            }
+            catch (err) {
+                this.logError(err, 'buildWorkoutOverlayProps');
+                return { workoutAttached: false, cornerWidget };
+            }
+        }
+        getCornerWidget() {
+            try {
+                if (!this.isWorkoutAttached() || !this.isWorkoutComboEnabled())
+                    return undefined;
+                return this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+            }
+            catch (err) {
+                this.logError(err, 'getCornerWidget');
+                return undefined;
+            }
+        }
+        onToggleCornerWidget() {
+            try {
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const next = current === 'elevation' ? 'workout' : 'elevation';
+                this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onToggleCornerWidget');
+            }
+        }
         async checkSecretValidity() {
             if (this.getBindings().appInfo?.getChannel() === 'mobile') {
                 const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
@@ -362,6 +431,18 @@ let RidePageService = (() => {
         onRouteUpdate() {
             this.updatePageDisplay();
         }
+        onViewChanged() {
+            try {
+                const rideType = this.getRideDisplay().getRideType();
+                this.logEvent({ message: 'ride type changed', rideType });
+                this.viewTransition = true;
+                this.getPageObserver()?.emit('ride-type-update', rideType);
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onViewChanged');
+            }
+        }
         get rideDisplayProps() {
             return this.getRideDisplay().getDisplayProperties();
         }
@@ -370,6 +451,8 @@ let RidePageService = (() => {
         }
         getGraphActuals() {
             try {
+                if (!this.isWorkoutAttached())
+                    return { power: [], heartrate: [], position: 0 };
                 const state = this.getRideDisplay().getState();
                 if (state === 'Idle' || state === 'Starting' || state === 'Started') {
                     return { power: [], heartrate: [], position: 0 };
@@ -398,8 +481,21 @@ let RidePageService = (() => {
                 this.logError(err, 'onStop');
             }
         }
+        onStopWorkout() {
+            try {
+                if (!this.isWorkoutAttached())
+                    return;
+                this.getRideDisplay().stopWorkout();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onStopWorkout');
+            }
+        }
         onStepBack() {
             try {
+                if (!this.isWorkoutAttached())
+                    return;
                 this.getRideDisplay().backward();
             }
             catch (err) {
@@ -408,6 +504,8 @@ let RidePageService = (() => {
         }
         onStepForward() {
             try {
+                if (!this.isWorkoutAttached())
+                    return;
                 this.getRideDisplay().forward();
             }
             catch (err) {
@@ -475,6 +573,7 @@ let RidePageService = (() => {
                 return {
                     ...base,
                     menuProps: base.menuProps,
+                    workoutAttached: true,
                     title: wo.title ?? '',
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
@@ -494,7 +593,8 @@ let RidePageService = (() => {
         }
         onWorkoutFinished() {
             try {
-                this.menuProps = this.buildFinishedMenuProps();
+                if (this.isRideType('Workout'))
+                    this.menuProps = this.buildFinishedMenuProps();
                 this.updatePageDisplay();
             }
             catch (err) {
@@ -503,21 +603,24 @@ let RidePageService = (() => {
         }
         finishRide() {
             this.getRideDisplay().stop(true);
-            this.onWorkoutFinished();
+            this.menuProps = this.buildFinishedMenuProps();
+            this.updatePageDisplay();
         }
         subscribeToWorkoutObserver() {
-            if (!this.isRideType('Workout') || this.workoutObserverSubscribed)
+            if (this.workoutObserverSubscribed || !this.isWorkoutAttached())
                 return;
             const observer = this.getWorkoutRide().getObserver();
             if (!observer)
                 return;
             this.registerHandlers(observer, this.workoutEventHandler);
+            this.workoutObserver = observer;
             this.workoutObserverSubscribed = true;
         }
         unsubscribeFromWorkoutObserver() {
             if (!this.workoutObserverSubscribed)
                 return;
-            this.unregisterHandlers(this.getWorkoutRide().getObserver(), this.workoutEventHandler);
+            this.unregisterHandlers(this.workoutObserver, this.workoutEventHandler);
+            this.workoutObserver = undefined;
             this.workoutObserverSubscribed = false;
         }
         buildGestureHint(startOverlayCleared) {
@@ -655,13 +758,28 @@ let RidePageService = (() => {
                 return false;
             }
         }
+        isWorkoutAttached() {
+            try {
+                if (this.isRideType('Workout'))
+                    return true;
+                if (!this.isRideType('Video', 'GPX'))
+                    return false;
+                if (!this.isWorkoutComboEnabled())
+                    return false;
+                return this.getWorkoutRide().inUse();
+            }
+            catch (err) {
+                this.logError(err, 'isWorkoutAttached');
+                return false;
+            }
+        }
         buildPausedMenuProps() {
-            return this.isRideType('Workout')
+            return this.isWorkoutAttached()
                 ? { showResume: true, ...this.getStepFlags() }
                 : { showResume: true };
         }
         buildFinishedMenuProps() {
-            return this.isRideType('Workout')
+            return this.isWorkoutAttached()
                 ? { showResume: false, finished: true, canStepBack: false, canStepForward: false }
                 : { showResume: false, finished: true };
         }

package/lib/cjs/routes/page/service.js

@@ -45,6 +45,7 @@ const sleep_1 = require("../../utils/sleep");
 const devices_1 = require("../../devices");
 const service_1 = require("../download/service");
 const service_2 = require("../library/service");
+const workouts_1 = require("../../workouts");
 let RoutesPageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -57,6 +58,7 @@ let RoutesPageService = (() => {
     let _getUserSettings_decorators;
     let _getRouteDownload_decorators;
     let _getRouteLibraryScanner_decorators;
+    let _getWorkoutList_decorators;
     var RoutesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -66,11 +68,13 @@ let RoutesPageService = (() => {
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getRouteDownload_decorators = [decorators_1.Injectable];
             _getRouteLibraryScanner_decorators = [decorators_1.Injectable];
+            _getWorkoutList_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getRouteDownload_decorators, { kind: "method", name: "getRouteDownload", static: false, private: false, access: { has: obj => "getRouteDownload" in obj, get: obj => obj.getRouteDownload }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getRouteLibraryScanner_decorators, { kind: "method", name: "getRouteLibraryScanner", static: false, private: false, access: { has: obj => "getRouteLibraryScanner" in obj, get: obj => obj.getRouteLibraryScanner }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RoutesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -316,6 +320,31 @@ let RoutesPageService = (() => {
                 this.logError(err, 'start');
             }
         }
+        getRouteDetailsProps(routeId) {
+            const comboEnabled = this.isWorkoutComboEnabled();
+            try {
+                return { routeId, attachedWorkout: this.getAttachedWorkoutProps(), comboEnabled };
+            }
+            catch (err) {
+                this.logError(err, 'getRouteDetailsProps');
+                return { routeId, attachedWorkout: null, comboEnabled };
+            }
+        }
+        getAttachedWorkoutProps() {
+            const workout = this.getWorkoutList().getSelected();
+            if (!workout)
+                return null;
+            return { id: workout.id, title: workout.name };
+        }
+        onClearWorkoutSelection() {
+            try {
+                this.getWorkoutList().unselect();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onClearWorkoutSelection');
+            }
+        }
         getDownloadDisplayProps() {
             return Array.from(this.downloadCache.values());
         }
@@ -453,6 +482,9 @@ let RoutesPageService = (() => {
         getRouteLibraryScanner() {
             return (0, service_2.useRouteLibraryScanner)();
         }
+        getWorkoutList() {
+            return (0, workouts_1.useWorkoutList)();
+        }
     };
     return RoutesPageService = _classThis;
 })();

package/lib/cjs/workouts/page/service.js

@@ -44,6 +44,7 @@ const settings_1 = require("../../settings");
 const calendar_1 = require("../calendar");
 const service_1 = require("../list/service");
 const devices_1 = require("../../devices");
+const routes_1 = require("../../routes");
 const DEFAULT_IMPORT_GROUP = 'My Workouts';
 const UPCOMING_COLLAPSED_COUNT = 3;
 let WorkoutListPageService = (() => {
@@ -55,6 +56,7 @@ let WorkoutListPageService = (() => {
     let _instanceExtraInitializers = [];
     let _getDevicePairing_decorators;
     let _getWorkoutList_decorators;
+    let _getRouteList_decorators;
     let _getWorkoutCalendar_decorators;
     let _getUserSettings_decorators;
     let _getAppState_decorators;
@@ -64,11 +66,13 @@ let WorkoutListPageService = (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getDevicePairing_decorators = [decorators_1.Injectable];
             _getWorkoutList_decorators = [decorators_1.Injectable];
+            _getRouteList_decorators = [decorators_1.Injectable];
             _getWorkoutCalendar_decorators = [decorators_1.Injectable];
             _getUserSettings_decorators = [decorators_1.Injectable];
             _getAppState_decorators = [decorators_1.Injectable];
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutCalendar_decorators, { kind: "method", name: "getWorkoutCalendar", static: false, private: false, access: { has: obj => "getWorkoutCalendar" in obj, get: obj => obj.getWorkoutCalendar }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -171,7 +175,9 @@ let WorkoutListPageService = (() => {
                     group: settingsProps.category,
                     canDelete: card.canDelete(),
                     isScheduled,
-                    date: isScheduled ? settingsProps.date : undefined
+                    date: isScheduled ? settingsProps.date : undefined,
+                    attachedRoute: this.getAttachedRouteProps(),
+                    comboEnabled: this.isWorkoutComboEnabled()
                 };
             }
             catch (err) {
@@ -179,6 +185,18 @@ let WorkoutListPageService = (() => {
                 return null;
             }
         }
+        getAttachedRouteProps() {
+            try {
+                const route = this.getRouteList().getSelected();
+                if (!route)
+                    return null;
+                return { id: route.description?.id, title: route.title };
+            }
+            catch (err) {
+                this.logError(err, 'getAttachedRouteProps');
+                return null;
+            }
+        }
         getImportDisplayProps() {
             try {
                 const phase = this.importPhase ?? 'landing';
@@ -309,6 +327,15 @@ let WorkoutListPageService = (() => {
                 this.logError(err, 'onClearSelection');
             }
         }
+        onClearRouteSelection() {
+            try {
+                this.getRouteList().unselect();
+                this.emitPageUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onClearRouteSelection');
+            }
+        }
         onImportOpen() {
             try {
                 this.importPhase = 'landing';
@@ -489,6 +516,9 @@ let WorkoutListPageService = (() => {
         getWorkoutList() {
             return (0, service_1.useWorkoutList)();
         }
+        getRouteList() {
+            return (0, routes_1.useRouteList)();
+        }
         getWorkoutCalendar() {
             return (0, calendar_1.useWorkoutCalendar)();
         }

package/lib/esm/activities/page/service.js

@@ -37,6 +37,7 @@ import { Injectable, Singleton } from "../../base/decorators";
 import { IncyclistPageService } from "../../base/pages";
 import { useActivityList } from "../list";
 import { sleep } from "../../utils/sleep";
+import { useWorkoutList } from "../../workouts";
 let ActivitiesPageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -45,12 +46,15 @@ let ActivitiesPageService = (() => {
     let _classSuper = IncyclistPageService;
     let _instanceExtraInitializers = [];
     let _getActivityList_decorators;
+    let _getWorkoutList_decorators;
     var ActivitiesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getActivityList_decorators = [Injectable];
+            _getWorkoutList_decorators = [Injectable];
             __esDecorate(this, null, _getActivityList_decorators, { kind: "method", name: "getActivityList", static: false, private: false, access: { has: obj => "getActivityList" in obj, get: obj => obj.getActivityList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             ActivitiesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -143,6 +147,27 @@ let ActivitiesPageService = (() => {
                 this.logError(err, 'onCloseActivity');
             }
         }
+        getActivityDetailsProps(activityId) {
+            const comboEnabled = this.isWorkoutComboEnabled();
+            try {
+                const workout = this.getWorkoutList().getSelected();
+                const attachedWorkout = workout ? { id: workout.id, title: workout.name } : null;
+                return { activityId, attachedWorkout, comboEnabled };
+            }
+            catch (err) {
+                this.logError(err, 'getActivityDetailsProps');
+                return { activityId, attachedWorkout: null, comboEnabled };
+            }
+        }
+        onClearWorkoutSelection() {
+            try {
+                this.getWorkoutList().unselect();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onClearWorkoutSelection');
+            }
+        }
         updatePageDisplay() {
             this.getPageObserver()?.emit('page-update');
         }
@@ -166,6 +191,9 @@ let ActivitiesPageService = (() => {
         getActivityList() {
             return useActivityList();
         }
+        getWorkoutList() {
+            return useWorkoutList();
+        }
     };
     return ActivitiesPageService = _classThis;
 })();

package/lib/esm/base/pages/service.js

@@ -119,6 +119,17 @@ let IncyclistPageService = (() => {
         getAppState() {
             return useAppState();
         }
+        isWorkoutComboEnabled() {
+            try {
+                const appState = this.getAppState();
+                return appState.hasFeature('MOBILE_WORKOUTS')
+                    && appState.hasFeature('MOBILE_WORKOUT_ROUTE_COMBO');
+            }
+            catch (err) {
+                this.logError(err, 'isWorkoutComboEnabled');
+                return false;
+            }
+        }
     };
 })();
 export { IncyclistPageService };

package/lib/esm/ride/page/service.js

@@ -47,6 +47,7 @@ const UPCOMING_STEPS_COUNT = 3;
 const DEFAULT_LOAD_INCREMENT = 1;
 const HINTS_WORKOUT_GESTURES_KEY = 'hints.workoutRideGestures';
 const LOAD_INCREMENT_SETTING_KEY = 'preferences.workouts.loadIncrement';
+const CORNER_WIDGET_SETTING_KEY = 'preferences.workouts.rideCornerWidget';
 let RidePageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -81,16 +82,19 @@ let RidePageService = (() => {
         eventHandler = (__runInitializers(this, _instanceExtraInitializers), {});
         workoutEventHandler = {};
         workoutObserverSubscribed = false;
+        workoutObserver;
         backgroundTimer;
         backgroundPausedByService = false;
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
         gestureHintDismissed = false;
+        viewTransition = false;
         constructor() {
             super('RidePage');
             this.eventHandler['state-update'] = this.onDisplayStateUpdate.bind(this);
             this.eventHandler['route-update'] = this.onRouteUpdate.bind(this);
+            this.eventHandler['view-changed'] = this.onViewChanged.bind(this);
             this.workoutEventHandler['step-changed'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['update'] = this.onWorkoutUpdate.bind(this);
             this.workoutEventHandler['forward'] = this.onWorkoutUpdate.bind(this);
@@ -110,6 +114,14 @@ let RidePageService = (() => {
             }
         }
         openPage(simulate) {
+            if (this.viewTransition) {
+                this.viewTransition = false;
+                this.logEvent({ message: 'page shown', page: this.getPageLogName(), viewTransition: true });
+                EventLogger.setGlobalConfig('page', this.getPageLogName());
+                this.subscribeToWorkoutObserver();
+                this.updatePageDisplay();
+                return this.getPageObserver();
+            }
             try {
                 const pageLogName = this.getPageLogName();
                 this.logEvent({ message: 'page shown', page: pageLogName });
@@ -121,6 +133,12 @@ let RidePageService = (() => {
                     const registerAndStart = () => {
                         this.registerHandlers(this.rideObserver, this.eventHandler);
                         this.subscribeToWorkoutObserver();
+                        const state = service.getState();
+                        if (state === 'Started' || state === 'Active' || state === 'Paused') {
+                            this.logError(new Error(`start() requested while ride is ${state}`), 'openPage');
+                            this.updatePageDisplay();
+                            return;
+                        }
                         service.start(simulate);
                         if (this.isRideType('Video', 'GPX')) {
                             sleep(5).then(() => {
@@ -151,6 +169,8 @@ let RidePageService = (() => {
             return this.getPageObserver();
         }
         closePage() {
+            if (this.viewTransition)
+                return;
             try {
                 EventLogger.setGlobalConfig('page', null);
                 this.logEvent({ message: 'page closed', page: this.getPageLogName() });
@@ -248,7 +268,7 @@ let RidePageService = (() => {
         onMenuOpen() {
             try {
                 const state = this.getRideDisplay().getState();
-                this.menuProps = this.isRideType('Workout')
+                this.menuProps = this.isWorkoutAttached()
                     ? { showResume: state === 'Paused', ...this.getStepFlags() }
                     : { showResume: state === 'Paused' };
                 this.updatePageDisplay();
@@ -318,8 +338,10 @@ let RidePageService = (() => {
         }
         getVideoRideDisplayProps() {
             const props = this.rideDisplayProps;
+            const base = this.buildBaseDisplayProps();
             const displayProps = {
-                ...this.buildBaseDisplayProps(),
+                ...base,
+                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -328,14 +350,61 @@ let RidePageService = (() => {
         }
         getGPXRideDisplayProps() {
             const props = this.rideDisplayProps;
+            const base = this.buildBaseDisplayProps();
             const displayProps = {
-                ...this.buildBaseDisplayProps(),
+                ...base,
+                ...this.buildWorkoutOverlayProps(props, base.startOverlayProps === null),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver
             };
             return displayProps;
         }
+        buildWorkoutOverlayProps(props, startOverlayCleared) {
+            const cornerWidget = this.getCornerWidget();
+            if (!this.isWorkoutAttached() || !props?.showWorkout)
+                return { workoutAttached: false, cornerWidget };
+            try {
+                const wo = this.getWorkoutRide().getDashboardDisplayProperties();
+                return {
+                    workoutAttached: true,
+                    cornerWidget,
+                    title: wo.title ?? '',
+                    graph: this.buildGraphPlan(props.workout, wo.ftp),
+                    steps: this.buildUpcomingSteps(props.workout, wo.ftp),
+                    dashboard: this.buildDashboardLine(wo),
+                    gestureHint: this.buildGestureHint(startOverlayCleared),
+                    loadIncrement: this.getLoadIncrement(),
+                    loadButtonMode: wo.loadButtonMode ?? 'power'
+                };
+            }
+            catch (err) {
+                this.logError(err, 'buildWorkoutOverlayProps');
+                return { workoutAttached: false, cornerWidget };
+            }
+        }
+        getCornerWidget() {
+            try {
+                if (!this.isWorkoutAttached() || !this.isWorkoutComboEnabled())
+                    return undefined;
+                return this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+            }
+            catch (err) {
+                this.logError(err, 'getCornerWidget');
+                return undefined;
+            }
+        }
+        onToggleCornerWidget() {
+            try {
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const next = current === 'elevation' ? 'workout' : 'elevation';
+                this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onToggleCornerWidget');
+            }
+        }
         async checkSecretValidity() {
             if (this.getBindings().appInfo?.getChannel() === 'mobile') {
                 const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
@@ -359,6 +428,18 @@ let RidePageService = (() => {
         onRouteUpdate() {
             this.updatePageDisplay();
         }
+        onViewChanged() {
+            try {
+                const rideType = this.getRideDisplay().getRideType();
+                this.logEvent({ message: 'ride type changed', rideType });
+                this.viewTransition = true;
+                this.getPageObserver()?.emit('ride-type-update', rideType);
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onViewChanged');
+            }
+        }
         get rideDisplayProps() {
             return this.getRideDisplay().getDisplayProperties();
         }
@@ -367,6 +448,8 @@ let RidePageService = (() => {
         }
         getGraphActuals() {
             try {
+                if (!this.isWorkoutAttached())
+                    return { power: [], heartrate: [], position: 0 };
                 const state = this.getRideDisplay().getState();
                 if (state === 'Idle' || state === 'Starting' || state === 'Started') {
                     return { power: [], heartrate: [], position: 0 };
@@ -395,8 +478,21 @@ let RidePageService = (() => {
                 this.logError(err, 'onStop');
             }
         }
+        onStopWorkout() {
+            try {
+                if (!this.isWorkoutAttached())
+                    return;
+                this.getRideDisplay().stopWorkout();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onStopWorkout');
+            }
+        }
         onStepBack() {
             try {
+                if (!this.isWorkoutAttached())
+                    return;
                 this.getRideDisplay().backward();
             }
             catch (err) {
@@ -405,6 +501,8 @@ let RidePageService = (() => {
         }
         onStepForward() {
             try {
+                if (!this.isWorkoutAttached())
+                    return;
                 this.getRideDisplay().forward();
             }
             catch (err) {
@@ -472,6 +570,7 @@ let RidePageService = (() => {
                 return {
                     ...base,
                     menuProps: base.menuProps,
+                    workoutAttached: true,
                     title: wo.title ?? '',
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
@@ -491,7 +590,8 @@ let RidePageService = (() => {
         }
         onWorkoutFinished() {
             try {
-                this.menuProps = this.buildFinishedMenuProps();
+                if (this.isRideType('Workout'))
+                    this.menuProps = this.buildFinishedMenuProps();
                 this.updatePageDisplay();
             }
             catch (err) {
@@ -500,21 +600,24 @@ let RidePageService = (() => {
         }
         finishRide() {
             this.getRideDisplay().stop(true);
-            this.onWorkoutFinished();
+            this.menuProps = this.buildFinishedMenuProps();
+            this.updatePageDisplay();
         }
         subscribeToWorkoutObserver() {
-            if (!this.isRideType('Workout') || this.workoutObserverSubscribed)
+            if (this.workoutObserverSubscribed || !this.isWorkoutAttached())
                 return;
             const observer = this.getWorkoutRide().getObserver();
             if (!observer)
                 return;
             this.registerHandlers(observer, this.workoutEventHandler);
+            this.workoutObserver = observer;
             this.workoutObserverSubscribed = true;
         }
         unsubscribeFromWorkoutObserver() {
             if (!this.workoutObserverSubscribed)
                 return;
-            this.unregisterHandlers(this.getWorkoutRide().getObserver(), this.workoutEventHandler);
+            this.unregisterHandlers(this.workoutObserver, this.workoutEventHandler);
+            this.workoutObserver = undefined;
             this.workoutObserverSubscribed = false;
         }
         buildGestureHint(startOverlayCleared) {
@@ -652,13 +755,28 @@ let RidePageService = (() => {
                 return false;
             }
         }
+        isWorkoutAttached() {
+            try {
+                if (this.isRideType('Workout'))
+                    return true;
+                if (!this.isRideType('Video', 'GPX'))
+                    return false;
+                if (!this.isWorkoutComboEnabled())
+                    return false;
+                return this.getWorkoutRide().inUse();
+            }
+            catch (err) {
+                this.logError(err, 'isWorkoutAttached');
+                return false;
+            }
+        }
         buildPausedMenuProps() {
-            return this.isRideType('Workout')
+            return this.isWorkoutAttached()
                 ? { showResume: true, ...this.getStepFlags() }
                 : { showResume: true };
         }
         buildFinishedMenuProps() {
-            return this.isRideType('Workout')
+            return this.isWorkoutAttached()
                 ? { showResume: false, finished: true, canStepBack: false, canStepForward: false }
                 : { showResume: false, finished: true };
         }

package/lib/esm/routes/page/service.js

@@ -42,6 +42,7 @@ import { sleep } from "../../utils/sleep";
 import { useDevicePairing } from "../../devices";
 import { useRouteDownload } from "../download/service";
 import { useRouteLibraryScanner } from "../library/service";
+import { useWorkoutList } from "../../workouts";
 let RoutesPageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -54,6 +55,7 @@ let RoutesPageService = (() => {
     let _getUserSettings_decorators;
     let _getRouteDownload_decorators;
     let _getRouteLibraryScanner_decorators;
+    let _getWorkoutList_decorators;
     var RoutesPageService = class extends _classSuper {
         static { _classThis = this; }
         static {
@@ -63,11 +65,13 @@ let RoutesPageService = (() => {
             _getUserSettings_decorators = [Injectable];
             _getRouteDownload_decorators = [Injectable];
             _getRouteLibraryScanner_decorators = [Injectable];
+            _getWorkoutList_decorators = [Injectable];
             __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getRouteDownload_decorators, { kind: "method", name: "getRouteDownload", static: false, private: false, access: { has: obj => "getRouteDownload" in obj, get: obj => obj.getRouteDownload }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getRouteLibraryScanner_decorators, { kind: "method", name: "getRouteLibraryScanner", static: false, private: false, access: { has: obj => "getRouteLibraryScanner" in obj, get: obj => obj.getRouteLibraryScanner }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             RoutesPageService = _classThis = _classDescriptor.value;
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -313,6 +317,31 @@ let RoutesPageService = (() => {
                 this.logError(err, 'start');
             }
         }
+        getRouteDetailsProps(routeId) {
+            const comboEnabled = this.isWorkoutComboEnabled();
+            try {
+                return { routeId, attachedWorkout: this.getAttachedWorkoutProps(), comboEnabled };
+            }
+            catch (err) {
+                this.logError(err, 'getRouteDetailsProps');
+                return { routeId, attachedWorkout: null, comboEnabled };
+            }
+        }
+        getAttachedWorkoutProps() {
+            const workout = this.getWorkoutList().getSelected();
+            if (!workout)
+                return null;
+            return { id: workout.id, title: workout.name };
+        }
+        onClearWorkoutSelection() {
+            try {
+                this.getWorkoutList().unselect();
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'onClearWorkoutSelection');
+            }
+        }
         getDownloadDisplayProps() {
             return Array.from(this.downloadCache.values());
         }
@@ -450,6 +479,9 @@ let RoutesPageService = (() => {
         getRouteLibraryScanner() {
             return useRouteLibraryScanner();
         }
+        getWorkoutList() {
+            return useWorkoutList();
+        }
     };
     return RoutesPageService = _classThis;
 })();

package/lib/esm/workouts/page/service.js

@@ -41,6 +41,7 @@ import { useUserSettings } from "../../settings";
 import { useWorkoutCalendar } from "../calendar";
 import { useWorkoutList } from "../list/service";
 import { useDevicePairing } from "../../devices";
+import { useRouteList } from "../../routes";
 const DEFAULT_IMPORT_GROUP = 'My Workouts';
 const UPCOMING_COLLAPSED_COUNT = 3;
 let WorkoutListPageService = (() => {
@@ -52,6 +53,7 @@ let WorkoutListPageService = (() => {
     let _instanceExtraInitializers = [];
     let _getDevicePairing_decorators;
     let _getWorkoutList_decorators;
+    let _getRouteList_decorators;
     let _getWorkoutCalendar_decorators;
     let _getUserSettings_decorators;
     let _getAppState_decorators;
@@ -61,11 +63,13 @@ let WorkoutListPageService = (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _getDevicePairing_decorators = [Injectable];
             _getWorkoutList_decorators = [Injectable];
+            _getRouteList_decorators = [Injectable];
             _getWorkoutCalendar_decorators = [Injectable];
             _getUserSettings_decorators = [Injectable];
             _getAppState_decorators = [Injectable];
             __esDecorate(this, null, _getDevicePairing_decorators, { kind: "method", name: "getDevicePairing", static: false, private: false, access: { has: obj => "getDevicePairing" in obj, get: obj => obj.getDevicePairing }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutList_decorators, { kind: "method", name: "getWorkoutList", static: false, private: false, access: { has: obj => "getWorkoutList" in obj, get: obj => obj.getWorkoutList }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _getRouteList_decorators, { kind: "method", name: "getRouteList", static: false, private: false, access: { has: obj => "getRouteList" in obj, get: obj => obj.getRouteList }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getWorkoutCalendar_decorators, { kind: "method", name: "getWorkoutCalendar", static: false, private: false, access: { has: obj => "getWorkoutCalendar" in obj, get: obj => obj.getWorkoutCalendar }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getUserSettings_decorators, { kind: "method", name: "getUserSettings", static: false, private: false, access: { has: obj => "getUserSettings" in obj, get: obj => obj.getUserSettings }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _getAppState_decorators, { kind: "method", name: "getAppState", static: false, private: false, access: { has: obj => "getAppState" in obj, get: obj => obj.getAppState }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -168,7 +172,9 @@ let WorkoutListPageService = (() => {
                     group: settingsProps.category,
                     canDelete: card.canDelete(),
                     isScheduled,
-                    date: isScheduled ? settingsProps.date : undefined
+                    date: isScheduled ? settingsProps.date : undefined,
+                    attachedRoute: this.getAttachedRouteProps(),
+                    comboEnabled: this.isWorkoutComboEnabled()
                 };
             }
             catch (err) {
@@ -176,6 +182,18 @@ let WorkoutListPageService = (() => {
                 return null;
             }
         }
+        getAttachedRouteProps() {
+            try {
+                const route = this.getRouteList().getSelected();
+                if (!route)
+                    return null;
+                return { id: route.description?.id, title: route.title };
+            }
+            catch (err) {
+                this.logError(err, 'getAttachedRouteProps');
+                return null;
+            }
+        }
         getImportDisplayProps() {
             try {
                 const phase = this.importPhase ?? 'landing';
@@ -306,6 +324,15 @@ let WorkoutListPageService = (() => {
                 this.logError(err, 'onClearSelection');
             }
         }
+        onClearRouteSelection() {
+            try {
+                this.getRouteList().unselect();
+                this.emitPageUpdate();
+            }
+            catch (err) {
+                this.logError(err, 'onClearRouteSelection');
+            }
+        }
         onImportOpen() {
             try {
                 this.importPhase = 'landing';
@@ -486,6 +513,9 @@ let WorkoutListPageService = (() => {
         getWorkoutList() {
             return useWorkoutList();
         }
+        getRouteList() {
+            return useRouteList();
+        }
         getWorkoutCalendar() {
             return useWorkoutCalendar();
         }

package/lib/types/activities/page/service.d.ts

@@ -1,5 +1,5 @@
 import { IncyclistPageService } from "../../base/pages";
-import { ActivitiesPageDisplayProps, IActivitiesPageService } from "./types";
+import { ActivitiesPageDisplayProps, ActivityDetailsProps, IActivitiesPageService } from "./types";
 import { IObserver } from "../../types";
 import { ActivityListDisplayProperties } from "../list";
 export declare class ActivitiesPageService extends IncyclistPageService implements IActivitiesPageService {
@@ -15,10 +15,13 @@ export declare class ActivitiesPageService extends IncyclistPageService implemen
     getPageDisplayProps(): ActivitiesPageDisplayProps;
     onOpenActivity(id: string | null): void;
     onCloseActivity(): void;
+    getActivityDetailsProps(activityId: string): ActivityDetailsProps;
+    onClearWorkoutSelection(): void;
     protected updatePageDisplay(): void;
     protected onStateUpdate(): void;
     protected startEventListener(): void;
     protected stopEventListener(final?: boolean): void;
     getActivityList(): import("../list").ActivityListService;
+    protected getWorkoutList(): import("../../workouts").WorkoutListService;
 }
 export declare const getActivitiesPageService: () => ActivitiesPageService;

package/lib/types/activities/page/types.d.ts

@@ -1,10 +1,19 @@
 import { IPageService } from "../../base/pages";
 import { ActivityInfoUI } from "../base";
+import { AttachedWorkoutProps } from "../../routes/page/types";
 export interface ActivitiesPageDisplayProps {
     loading: boolean;
     activities?: Array<ActivityInfoUI>;
     detailActivityId?: string;
 }
+export type { AttachedWorkoutProps };
+export interface ActivityDetailsProps {
+    activityId: string;
+    attachedWorkout: AttachedWorkoutProps | null;
+    comboEnabled: boolean;
+}
 export interface IActivitiesPageService extends IPageService {
     getPageDisplayProps(): ActivitiesPageDisplayProps;
+    getActivityDetailsProps(activityId: string): ActivityDetailsProps;
+    onClearWorkoutSelection(): void;
 }

package/lib/types/base/pages/service.d.ts

@@ -20,4 +20,5 @@ export declare class IncyclistPageService extends IncyclistService implements IP
     protected getUIBinding(): import("../../api").INativeUI;
     protected getBindings(): import("../../api").IncyclistBindings;
     protected getAppState(): import("../../appstate").AppStateService;
+    protected isWorkoutComboEnabled(): boolean;
 }

package/lib/types/ride/page/service.d.ts

@@ -1,6 +1,6 @@
 import { IncyclistPageService } from "../../base/pages";
 import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "../../types";
-import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, RideMenuProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
+import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
 import { ISecretBinding } from "../../api/secret";
 import type { LoadButtonMode, PowerAdjustmentResult, WorkoutDisplayProperties } from "../../workouts/ride/types";
 import type { Workout } from "../../workouts/base/model";
@@ -9,12 +9,14 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected eventHandler: Record<string, any>;
     protected workoutEventHandler: Record<string, any>;
     protected workoutObserverSubscribed: boolean;
+    protected workoutObserver: IObserver | undefined;
     protected backgroundTimer: NodeJS.Timeout | undefined;
     protected backgroundPausedByService: boolean;
     protected menuProps: RideMenuProps | null;
     protected isInitialized: boolean;
     protected startGateProps: StartGateProps | null;
     protected gestureHintDismissed: boolean;
+    protected viewTransition: boolean;
     constructor();
     initPage(): Promise<RideType | undefined>;
     openPage(simulate?: boolean): IObserver;
@@ -36,14 +38,21 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     onEndRide(): void;
     protected getVideoRideDisplayProps(): VideoRidePageDisplayProps;
     protected getGPXRideDisplayProps(): GPXRidePageDisplayProps;
+    protected buildWorkoutOverlayProps(props: CurrentRideDisplayProps & {
+        showWorkout?: boolean;
+    }, startOverlayCleared: boolean): Partial<RidePageDisplayProps>;
+    protected getCornerWidget(): 'elevation' | 'workout' | undefined;
+    onToggleCornerWidget(): void;
     protected checkSecretValidity(): Promise<void>;
     protected showStartGate(): void;
     protected hideStartgate(): void;
     protected onRouteUpdate(): void;
+    protected onViewChanged(): void;
     protected get rideDisplayProps(): CurrentRideDisplayProps;
     protected getSecretBinding(): ISecretBinding | undefined;
     getGraphActuals(): WorkoutGraphActuals;
     onStop(): void;
+    onStopWorkout(): void;
     onStepBack(): void;
     onStepForward(): void;
     onIncreaseLoad(): void;
@@ -78,6 +87,7 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected requiresOwnInit(): boolean;
     protected getBackgroundPauseRequester(): 'user' | 'device';
     protected isRideType(...types: RideType[]): boolean;
+    protected isWorkoutAttached(): boolean;
     protected buildPausedMenuProps(): RideMenuProps | WorkoutRideMenuProps;
     protected buildFinishedMenuProps(): RideMenuProps | WorkoutRideMenuProps;
     protected buildBaseDisplayProps(): {

package/lib/types/ride/page/types.d.ts

@@ -27,6 +27,9 @@ export interface RidePageDisplayProps {
     title?: string;
     gestureHint?: WorkoutGestureHint | null;
     loadIncrement?: number;
+    workoutAttached?: boolean;
+    loadButtonMode?: LoadButtonMode;
+    cornerWidget?: 'elevation' | 'workout';
 }
 export interface VideoRidePageDisplayProps extends RidePageDisplayProps {
     video?: VideoDisplayProps;
@@ -49,6 +52,7 @@ interface RidePageCallbacks {
     onRefreshSecrets(): void;
     onContinueAnyway(): void;
     onStop(): void;
+    onStopWorkout(): void;
     onStepBack(): void;
     onStepForward(): void;
     onIncreaseLoad(): void;
@@ -57,6 +61,7 @@ interface RidePageCallbacks {
     onGestureHintDismissed(props: {
         dontShowAgain: boolean;
     }): void;
+    onToggleCornerWidget(): void;
 }
 export interface IRidePageService extends RidePageCallbacks, IPageService {
     initPage(): Promise<RideType | undefined>;

package/lib/types/routes/page/service.d.ts

@@ -1,7 +1,7 @@
 import { IncyclistPageService } from "../../base/pages";
 import { FileInfo, FolderInfo, ImportDisplayProps, IObserver, ParsedRoute, ScannedRoute } from "../../types";
 import { SearchFilter, SearchState } from "../list/types";
-import { DownloadRowDisplayProps, IRoutePageService, RouteItemProps, RoutePageDisplayProps } from "./types";
+import { AttachedWorkoutProps, DownloadRowDisplayProps, IRoutePageService, RouteDetailsProps, RouteItemProps, RoutePageDisplayProps } from "./types";
 import { Observer } from "../../base/types";
 import { Route } from "../base/model/route";
 import { DownloadObserver } from "../download/types";
@@ -42,6 +42,9 @@ export declare class RoutesPageService extends IncyclistPageService implements I
     onSelect(id: string): void;
     onDelete(id: string): void;
     start(): void;
+    getRouteDetailsProps(routeId: string): RouteDetailsProps;
+    protected getAttachedWorkoutProps(): AttachedWorkoutProps | null;
+    onClearWorkoutSelection(): void;
     protected getDownloadDisplayProps(): DownloadRowDisplayProps[];
     protected updatePageDisplay(): void;
     protected getRoutesDisplayProps(): Array<RouteItemProps>;
@@ -62,5 +65,6 @@ export declare class RoutesPageService extends IncyclistPageService implements I
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getRouteDownload(): import("../download/service").RouteDownloadService;
     protected getRouteLibraryScanner(): import("../library/service").RouteLibraryScannerService;
+    protected getWorkoutList(): import("../../workouts").WorkoutListService;
 }
 export declare const getRoutesPageService: () => RoutesPageService;

package/lib/types/routes/page/types.d.ts

@@ -31,6 +31,17 @@ export interface IRoutePageService extends IPageService, IPageCallBacks {
     getPageDisplayProps(): RoutePageDisplayProps;
     onImportClosed(): void;
     getImportDisplayProps(): ImportDisplayProps;
+    getRouteDetailsProps(routeId: string): RouteDetailsProps;
+    onClearWorkoutSelection(): void;
+}
+export interface AttachedWorkoutProps {
+    id: string;
+    title: string;
+}
+export interface RouteDetailsProps {
+    routeId: string;
+    attachedWorkout: AttachedWorkoutProps | null;
+    comboEnabled: boolean;
 }
 export type DownloadStatus = 'downloading' | 'done' | 'failed' | 'required';
 export interface DownloadRowDisplayProps {

package/lib/types/workouts/page/service.d.ts

@@ -3,7 +3,7 @@ import { IObserver } from "../../types";
 import { FileInfo } from "../../api";
 import { WorkoutCard } from "../list/cards/WorkoutCard";
 import { WorkoutListService } from "../list/service";
-import { GroupFilterProps, IWorkoutListPageService, UpcomingTrainingProps, WorkoutDetailsProps, WorkoutImportDisplayProps, WorkoutListItemProps, WorkoutListPageDisplayProps } from "./types";
+import { AttachedRouteProps, GroupFilterProps, IWorkoutListPageService, UpcomingTrainingProps, WorkoutDetailsProps, WorkoutImportDisplayProps, WorkoutListItemProps, WorkoutListPageDisplayProps } from "./types";
 export declare class WorkoutListPageService extends IncyclistPageService implements IWorkoutListPageService {
     protected groupFilter: string | null;
     protected detailWorkoutId: string | null;
@@ -24,6 +24,7 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     closePage(): void;
     getPageDisplayProps(): WorkoutListPageDisplayProps;
     getWorkoutDetailsProps(id: string): WorkoutDetailsProps | null;
+    protected getAttachedRouteProps(): AttachedRouteProps | null;
     getImportDisplayProps(): WorkoutImportDisplayProps;
     onSelectGroup(group: string | null): void;
     onOpenDetails(id: string): void;
@@ -37,6 +38,7 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     }): void;
     onMarkForRoute(id: string): void;
     onClearSelection(): void;
+    onClearRouteSelection(): void;
     onImportOpen(): void;
     onImportFile(file: FileInfo): IObserver;
     onImportSetGroup(id: string, group: string): void;
@@ -55,6 +57,7 @@ export declare class WorkoutListPageService extends IncyclistPageService impleme
     protected emitImportUpdate(): void;
     protected getDevicePairing(): import("../../devices").DevicePairingService;
     protected getWorkoutList(): WorkoutListService;
+    protected getRouteList(): import("../../routes").RouteListService;
     protected getWorkoutCalendar(): import("../calendar").WorkoutCalendarService;
     protected getUserSettings(): import("../../settings").UserSettingsService;
     protected getAppState(): import("../../appstate").AppStateService;

package/lib/types/workouts/page/types.d.ts

@@ -41,6 +41,10 @@ export interface WorkoutListItemProps {
     canDelete: boolean;
     workout: Workout;
 }
+export interface AttachedRouteProps {
+    id: string;
+    title: string;
+}
 export interface WorkoutDetailsProps {
     id: string;
     title: string;
@@ -57,6 +61,8 @@ export interface WorkoutDetailsProps {
     canDelete: boolean;
     isScheduled: boolean;
     date?: Date;
+    attachedRoute: AttachedRouteProps | null;
+    comboEnabled: boolean;
 }
 export interface WorkoutImportDisplayProps {
     phase: 'landing' | 'importing' | 'result' | 'error';
@@ -84,6 +90,7 @@ export interface WorkoutListPageCallbacks {
     }) => void;
     onMarkForRoute?: (id: string) => void;
     onClearSelection: () => void;
+    onClearRouteSelection: () => void;
     onImportOpen: () => void;
     onImportFile: (file: FileInfo) => IObserver;
     onImportSetGroup: (id: string, group: string) => void;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.99",
+  "version": "1.7.101",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.31",
+    "incyclist-devices": "^3.0.32",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",