Cleanup some of the models

2026-02-18 00:17:48 +01:00 · 2025-11-08 23:07:40 +01:00
parent 4a2047ec8b
commit 49873d20bd
28 changed files with 793 additions and 1299 deletions
--- a/integration_test/1_dashboard.dart
+++ b/integration_test/1_dashboard.dart
@@ -26,7 +26,9 @@ import '../test_data/routines.dart';

 Widget createDashboardScreen({String locale = 'en'}) {
  final mockWorkoutProvider = MockRoutinesProvider();
-  when(mockWorkoutProvider.items).thenReturn([getTestRoutine(exercises: getScreenshotExercises())]);
+  when(
+    mockWorkoutProvider.routines,
+  ).thenReturn([getTestRoutine(exercises: getScreenshotExercises())]);
  when(
    mockWorkoutProvider.currentRoutine,
  ).thenReturn(getTestRoutine(exercises: getScreenshotExercises()));
--- a/lib/models/workouts/log.dart
+++ b/lib/models/workouts/log.dart
@@ -17,76 +17,37 @@
 */

 import 'package:drift/drift.dart' as drift;
-import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/database/powersync/database.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/helpers/json.dart';
 import 'package:wger/helpers/misc.dart';
 import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/models/workouts/repetition_unit.dart';
 import 'package:wger/models/workouts/set_config_data.dart';
 import 'package:wger/models/workouts/weight_unit.dart';

-part 'log.g.dart';
-
-/// Temporary fix for id conversion: the "id" field used in the drift database
-/// is a UUID string, but the JSON data is the database ID.
-String? idFromJson(Object? value) => value?.toString();
-
-@JsonSerializable()
 class Log {
-  @JsonKey(required: true, fromJson: idFromJson)
  String? id;

-  @JsonKey(required: true, name: 'exercise')
  late int exerciseId;
+  late Exercise exerciseObj;

-  @JsonKey(includeFromJson: false, includeToJson: false)
-  late Exercise exercise;
-
-  @JsonKey(required: true, name: 'routine')
  late int routineId;
-
-  @JsonKey(required: true, name: 'session')
  late int? sessionId;
-
-  @JsonKey(required: true)
  int? iteration;
-
-  @JsonKey(required: true, name: 'slot_entry')
  int? slotEntryId;
-
-  @JsonKey(required: false, fromJson: stringToNum)
  num? rir;
-
-  @JsonKey(required: false, fromJson: stringToNum, name: 'rir_target')
  num? rirTarget;

-  @JsonKey(required: true, fromJson: stringToNum, name: 'repetitions')
  num? repetitions;
-
-  @JsonKey(required: true, fromJson: stringToNum, name: 'repetitions_target')
  num? repetitionsTarget;
-
-  @JsonKey(required: true, name: 'repetitions_unit')
  late int? repetitionsUnitId;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
  late RepetitionUnit? repetitionsUnitObj;

-  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
  late num? weight;
-
-  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString, name: 'weight_target')
  num? weightTarget;
-
-  @JsonKey(required: true, name: 'weight_unit')
  late int? weightUnitId;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
  late WeightUnit? weightUnitObj;

-  @JsonKey(required: true, toJson: dateToUtcIso8601)
  late DateTime date;

  Log({
@@ -106,13 +67,11 @@ class Log {
    required this.date,
  });

-  Log.empty();
-
  Log.fromSetConfigData(SetConfigData data, {int? routineId, this.iteration}) {
    date = DateTime.now();
    sessionId = null;
    slotEntryId = data.slotEntryId;
-    exerciseBase = data.exercise;
+    exercise = data.exercise;

    weight = data.weight;
    weightTarget = data.weight;
@@ -160,14 +119,9 @@ class Log {
    );
  }

-  // Boilerplate
-  factory Log.fromJson(Map<String, dynamic> json) => _$LogFromJson(json);
-
-  Map<String, dynamic> toJson() => _$LogToJson(this);
-
-  set exerciseBase(Exercise base) {
-    exercise = base;
-    exerciseId = base.id!;
+  set exercise(Exercise exercise) {
+    exerciseObj = exercise;
+    exerciseId = exercise.id;
  }

  set weightUnit(WeightUnit? weightUnit) {
--- a/lib/models/workouts/log.g.dart
+++ b/lib/models/workouts/log.g.dart
@@ -1,62 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'log.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Log _$LogFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const [
-      'id',
-      'exercise',
-      'routine',
-      'session',
-      'iteration',
-      'slot_entry',
-      'repetitions',
-      'repetitions_target',
-      'repetitions_unit',
-      'weight',
-      'weight_target',
-      'weight_unit',
-      'date',
-    ],
-  );
-  return Log(
-    id: idFromJson(json['id']),
-    exerciseId: (json['exercise'] as num).toInt(),
-    iteration: (json['iteration'] as num?)?.toInt(),
-    slotEntryId: (json['slot_entry'] as num?)?.toInt(),
-    routineId: (json['routine'] as num).toInt(),
-    repetitions: stringToNum(json['repetitions'] as String?),
-    repetitionsTarget: stringToNum(json['repetitions_target'] as String?),
-    repetitionsUnitId: (json['repetitions_unit'] as num?)?.toInt() ?? REP_UNIT_REPETITIONS_ID,
-    rir: stringToNum(json['rir'] as String?),
-    rirTarget: stringToNum(json['rir_target'] as String?),
-    weight: stringToNum(json['weight'] as String?),
-    weightTarget: stringToNum(json['weight_target'] as String?),
-    weightUnitId: (json['weight_unit'] as num?)?.toInt() ?? WEIGHT_UNIT_KG,
-    date: DateTime.parse(json['date'] as String),
-  )..sessionId = (json['session'] as num?)?.toInt();
-}
-
-Map<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
-  'id': instance.id,
-  'exercise': instance.exerciseId,
-  'routine': instance.routineId,
-  'session': instance.sessionId,
-  'iteration': instance.iteration,
-  'slot_entry': instance.slotEntryId,
-  'rir': instance.rir,
-  'rir_target': instance.rirTarget,
-  'repetitions': instance.repetitions,
-  'repetitions_target': instance.repetitionsTarget,
-  'repetitions_unit': instance.repetitionsUnitId,
-  'weight': numToString(instance.weight),
-  'weight_target': numToString(instance.weightTarget),
-  'weight_unit': instance.weightUnitId,
-  'date': dateToUtcIso8601(instance.date),
-};
--- a/lib/models/workouts/repetition_unit.dart
+++ b/lib/models/workouts/repetition_unit.dart
@@ -16,16 +16,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import 'package:json_annotation/json_annotation.dart';
-
-part 'repetition_unit.g.dart';
-
-@JsonSerializable()
 class RepetitionUnit {
-  @JsonKey(required: true)
  final int id;
-
-  @JsonKey(required: true)
  final String name;

  const RepetitionUnit({required this.id, required this.name});
@@ -34,9 +26,4 @@ class RepetitionUnit {
  String toString() {
    return 'RepetitionUnit{id: $id, name: $name}';
  }
-
-  // Boilerplate
-  factory RepetitionUnit.fromJson(Map<String, dynamic> json) => _$RepetitionUnitFromJson(json);
-
-  Map<String, dynamic> toJson() => _$RepetitionUnitToJson(this);
 }
--- a/lib/models/workouts/repetition_unit.g.dart
+++ b/lib/models/workouts/repetition_unit.g.dart
@@ -1,20 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'repetition_unit.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-RepetitionUnit _$RepetitionUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const ['id', 'name']);
-  return RepetitionUnit(
-    id: (json['id'] as num).toInt(),
-    name: json['name'] as String,
-  );
-}
-
-Map<String, dynamic> _$RepetitionUnitToJson(RepetitionUnit instance) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-};
--- a/lib/models/workouts/routine.dart
+++ b/lib/models/workouts/routine.dart
@@ -69,7 +69,7 @@ class Routine {
  @JsonKey(includeFromJson: false, includeToJson: false)
  List<DayData> dayDataGym = [];

-  @JsonKey(required: false, includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, includeToJson: false, includeFromJson: false)
  List<WorkoutSession> sessions = [];

  Routine({
--- a/lib/models/workouts/routine.g.dart
+++ b/lib/models/workouts/routine.g.dart
@@ -32,11 +32,6 @@ Routine _$RoutineFromJson(Map<String, dynamic> json) {
            ?.map((e) => Day.fromJson(e as Map<String, dynamic>))
            .toList() ??
        const [],
-    sessions:
-        (json['sessions'] as List<dynamic>?)
-            ?.map((e) => WorkoutSession.fromJson(e as Map<String, dynamic>))
-            .toList() ??
-        [],
  );
 }

--- a/lib/models/workouts/session.dart
+++ b/lib/models/workouts/session.dart
@@ -18,43 +18,22 @@

 import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
-import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/database/powersync/database.dart';
-import 'package:wger/helpers/json.dart';
 import 'package:wger/models/exercises/exercise.dart';
 import 'package:wger/models/workouts/log.dart';

-part 'session.g.dart';
-
 const IMPRESSION_MAP = {1: 'bad', 2: 'neutral', 3: 'good'};

-@JsonSerializable()
 class WorkoutSession {
-  @JsonKey(required: true, name: 'uuid')
  String? id;
-
-  @JsonKey(required: true, name: 'routine')
  late int? routineId;
-
-  @JsonKey(required: true, name: 'day')
  int? dayId;
-
-  @JsonKey(required: true, toJson: dateToYYYYMMDD)
  late DateTime date;
-
-  @JsonKey(required: true, fromJson: int.parse, toJson: numToString)
  late int impression;
-
-  @JsonKey(required: false, defaultValue: '')
  late String? notes;
-
-  @JsonKey(required: true, name: 'time_start', toJson: timeToString, fromJson: stringToTimeNull)
  late TimeOfDay? timeStart;
-
-  @JsonKey(required: true, name: 'time_end', toJson: timeToString, fromJson: stringToTimeNull)
  late TimeOfDay? timeEnd;

-  @JsonKey(required: false, includeToJson: false, defaultValue: [])
  List<Log> logs = [];

  WorkoutSession({
@@ -65,7 +44,7 @@ class WorkoutSession {
    this.notes = '',
    this.timeStart,
    this.timeEnd,
-    this.logs = const <Log>[],
+    this.logs = const [],
    DateTime? date,
  }) {
    this.date = date ?? DateTime.now();
@@ -87,16 +66,11 @@ class WorkoutSession {
  List<Exercise> get exercises {
    final Set<Exercise> exerciseSet = {};
    for (final log in logs) {
-      exerciseSet.add(log.exercise);
+      exerciseSet.add(log.exerciseObj);
    }
    return exerciseSet.toList();
  }

-  // Boilerplate
-  factory WorkoutSession.fromJson(Map<String, dynamic> json) => _$WorkoutSessionFromJson(json);
-
-  Map<String, dynamic> toJson() => _$WorkoutSessionToJson(this);
-
  String get impressionAsString {
    return IMPRESSION_MAP[impression]!;
  }
--- a/lib/models/workouts/session.g.dart
+++ b/lib/models/workouts/session.g.dart
@@ -1,48 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'session.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const [
-      'uuid',
-      'routine',
-      'day',
-      'date',
-      'impression',
-      'time_start',
-      'time_end',
-    ],
-  );
-  return WorkoutSession(
-    id: json['uuid'] as String?,
-    dayId: (json['day'] as num?)?.toInt(),
-    routineId: (json['routine'] as num?)?.toInt(),
-    impression: json['impression'] == null ? 2 : int.parse(json['impression'] as String),
-    notes: json['notes'] as String? ?? '',
-    timeStart: stringToTimeNull(json['time_start'] as String?),
-    timeEnd: stringToTimeNull(json['time_end'] as String?),
-    logs:
-        (json['logs'] as List<dynamic>?)
-            ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
-            .toList() ??
-        [],
-    date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
-  );
-}
-
-Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) => <String, dynamic>{
-  'uuid': instance.id,
-  'routine': instance.routineId,
-  'day': instance.dayId,
-  'date': dateToYYYYMMDD(instance.date),
-  'impression': numToString(instance.impression),
-  'notes': instance.notes,
-  'time_start': timeToString(instance.timeStart),
-  'time_end': timeToString(instance.timeEnd),
-};
--- a/lib/models/workouts/slot_entry.dart
+++ b/lib/models/workouts/slot_entry.dart
@@ -104,10 +104,10 @@ class SlotEntry {
  @JsonKey(required: true, name: 'repetition_rounding', fromJson: stringToNumNull)
  late num? repetitionRounding;

-  @JsonKey(required: false, name: 'repetitions_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'repetitions_configs', includeToJson: false)
  late List<BaseConfig> repetitionsConfigs = [];

-  @JsonKey(required: false, name: 'max_repetitions_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'max_repetitions_configs', includeToJson: false)
  late List<BaseConfig> maxRepetitionsConfigs = [];

  @JsonKey(required: true, name: 'weight_unit')
@@ -119,28 +119,28 @@ class SlotEntry {
  @JsonKey(required: true, name: 'weight_rounding', fromJson: stringToNumNull)
  late num? weightRounding;

-  @JsonKey(required: false, name: 'weight_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'weight_configs', includeToJson: false)
  late List<BaseConfig> weightConfigs = [];

-  @JsonKey(required: false, name: 'max_weight_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'max_weight_configs', includeToJson: false)
  late List<BaseConfig> maxWeightConfigs = [];

-  @JsonKey(required: false, name: 'set_nr_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'set_nr_configs', includeToJson: false)
  late List<BaseConfig> nrOfSetsConfigs = [];

-  @JsonKey(required: false, name: 'max_set_nr_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'max_set_nr_configs', includeToJson: false)
  late List<BaseConfig> maxNrOfSetsConfigs = [];

-  @JsonKey(required: false, name: 'rir_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'rir_configs', includeToJson: false)
  late List<BaseConfig> rirConfigs = [];

-  @JsonKey(required: false, name: 'max_rir_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'max_rir_configs', includeToJson: false)
  late List<BaseConfig> maxRirConfigs = [];

-  @JsonKey(required: false, name: 'rest_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'rest_configs', includeToJson: false)
  late List<BaseConfig> restTimeConfigs = [];

-  @JsonKey(required: false, name: 'max_rest_configs', includeToJson: false, defaultValue: [])
+  @JsonKey(required: false, name: 'max_rest_configs', includeToJson: false)
  late List<BaseConfig> maxRestTimeConfigs = [];

  @JsonKey(required: true)
--- a/lib/models/workouts/slot_entry.g.dart
+++ b/lib/models/workouts/slot_entry.g.dart
@@ -38,52 +38,52 @@ SlotEntry _$SlotEntryFromJson(Map<String, dynamic> json) {
        (json['weight_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    maxWeightConfigs:
        (json['max_weight_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    nrOfSetsConfigs:
        (json['set_nr_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    maxNrOfSetsConfigs:
        (json['max_set_nr_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    rirConfigs:
        (json['rir_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    maxRirConfigs:
        (json['max_rir_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    restTimeConfigs:
        (json['rest_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    maxRestTimeConfigs:
        (json['max_rest_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    repetitionsConfigs:
        (json['repetitions_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
    maxRepetitionsConfigs:
        (json['max_repetitions_configs'] as List<dynamic>?)
            ?.map((e) => BaseConfig.fromJson(e as Map<String, dynamic>))
            .toList() ??
-        [],
+        const [],
  )..config = json['config'];
 }

--- a/lib/models/workouts/weight_unit.dart
+++ b/lib/models/workouts/weight_unit.dart
@@ -16,21 +16,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-import 'package:json_annotation/json_annotation.dart';
-
-part 'weight_unit.g.dart';
-
-@JsonSerializable()
 class WeightUnit {
-  @JsonKey(required: true)
  final int id;
-
-  @JsonKey(required: true)
  final String name;

  const WeightUnit({required this.id, required this.name});
-
-  // Boilerplate
-  factory WeightUnit.fromJson(Map<String, dynamic> json) => _$WeightUnitFromJson(json);
-  Map<String, dynamic> toJson() => _$WeightUnitToJson(this);
 }
--- a/lib/models/workouts/weight_unit.g.dart
+++ b/lib/models/workouts/weight_unit.g.dart
@@ -1,20 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'weight_unit.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-WeightUnit _$WeightUnitFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const ['id', 'name']);
-  return WeightUnit(
-    id: (json['id'] as num).toInt(),
-    name: json['name'] as String,
-  );
-}
-
-Map<String, dynamic> _$WeightUnitToJson(WeightUnit instance) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-};
--- a/lib/providers/routines.dart
+++ b/lib/providers/routines.dart
@@ -89,7 +89,7 @@ RoutinesProvider routinesChangeNotifier(Ref ref) {

  ref.listen(workoutSessionProvider, (_, next) {
    final data = next.asData?.value;
-    if (data != null) {
+    if (data != null && ref.mounted) {
      logger.finer('Setting ${data.length} sessions');
      provider.sessions = data;
    }
@@ -97,7 +97,7 @@ RoutinesProvider routinesChangeNotifier(Ref ref) {

  ref.listen(workoutLogProvider, (_, next) {
    final data = next.asData?.value;
-    if (data != null) {
+    if (data != null && ref.mounted) {
      logger.finer('Setting ${data.length} logs');

      // Merge logs into sessions, matching by date (no time component)
@@ -115,14 +115,11 @@ class RoutinesProvider with ChangeNotifier {

  static const _routinesUrlPath = 'routine';
  static const _routinesStructureSubpath = 'structure';
-  static const _routinesLogsSubpath = 'logs';
  static const _routinesDateSequenceDisplaySubpath = 'date-sequence-display';
  static const _routinesDateSequenceGymSubpath = 'date-sequence-gym';
  static const _daysUrlPath = 'day';
  static const _slotsUrlPath = 'slot';
  static const _slotEntriesUrlPath = 'slot-entry';
-  static const _logsUrlPath = 'workoutlog';
-  static const _sessionUrlPath = 'workoutsession';
  static const _routineConfigSets = 'sets-config';
  static const _routineConfigMaxSets = 'max-sets-config';
  static const _routineConfigWeights = 'weight-config';
@@ -192,6 +189,9 @@ class RoutinesProvider with ChangeNotifier {
  set sessions(List<WorkoutSession> sessions) {
    _logger.finer('Setting ${sessions.length} sessions');
    _sessions = sessions;
+    for (final routine in _routines) {
+      routine.sessions = getSessionsForRoutine(routine.id!);
+    }
  }

  List<WorkoutSession> get sessions {
@@ -210,7 +210,7 @@ class RoutinesProvider with ChangeNotifier {
    return null;
  }

-  List<Routine> get items {
+  List<Routine> get routines {
    return [..._routines];
  }

@@ -219,22 +219,14 @@ class RoutinesProvider with ChangeNotifier {
    _routines = [];
    _weightUnits = [];
    _repetitionUnits = [];
-  }
-
-  /// Return the default weight unit (kg)
-  WeightUnit get defaultWeightUnit {
-    return _weightUnits.firstWhere((element) => element.id == WEIGHT_UNIT_KG);
+    _sessions = [];
+    _exercises = [];
  }

  List<RepetitionUnit> get repetitionUnits {
    return [..._repetitionUnits];
  }

-  /// Return the default weight unit (reps)
-  RepetitionUnit get defaultRepetitionUnit {
-    return _repetitionUnits.firstWhere((element) => element.id == REP_UNIT_REPETITIONS_ID);
-  }
-
  List<Routine> getPlans() {
    return _routines;
  }
--- a/lib/providers/routines.g.dart
+++ b/lib/providers/routines.g.dart
@@ -126,4 +126,4 @@ final class RoutinesChangeNotifierProvider
  }
 }

-String _$routinesChangeNotifierHash() => r'18a1217d2e77ffc1c557d33aeb8ed6fe1fe75095';
+String _$routinesChangeNotifierHash() => r'fcdf8c1101761d0cfd26fce6b169e348dcbd55cb';
--- a/lib/providers/workout_log_repository.dart
+++ b/lib/providers/workout_log_repository.dart
@@ -82,7 +82,7 @@ class WorkoutLogRepository {
        }

        try {
-          log.exerciseBase = exercisesProvider.getById(log.exerciseId);
+          log.exercise = exercisesProvider.getById(log.exerciseId);
        } catch (e) {
          _logger.warning(
            'Could not find exercise for log entry ${log.id} with exercise ID ${log.exerciseId}',
--- a/lib/widgets/routines/gym_mode/log_page.dart
+++ b/lib/widgets/routines/gym_mode/log_page.dart
@@ -120,7 +120,7 @@ class _LogPageState extends ConsumerState<LogPage> {
            ),
          ),
        ),
-        if (widget._log.exercise.showPlateCalculator) const LogsPlatesWidget(),
+        if (widget._log.exerciseObj.showPlateCalculator) const LogsPlatesWidget(),
        if (widget._slotData.comment.isNotEmpty)
          Text(widget._slotData.comment, textAlign: TextAlign.center),
        const SizedBox(height: 10),
--- a/lib/widgets/routines/routines_list.dart
+++ b/lib/widgets/routines/routines_list.dart
@@ -43,13 +43,13 @@ class _RoutinesListState extends ConsumerState<RoutinesList> {

    return RefreshIndicator(
      onRefresh: isOnline ? () => routineProvider.fetchAndSetAllRoutinesSparse() : () async {},
-      child: routineProvider.items.isEmpty
+      child: routineProvider.routines.isEmpty
          ? const TextPrompt()
          : ListView.builder(
              padding: const EdgeInsets.all(10.0),
-              itemCount: routineProvider.items.length,
+              itemCount: routineProvider.routines.length,
              itemBuilder: (context, index) {
-                final currentRoutine = routineProvider.items[index];
+                final currentRoutine = routineProvider.routines[index];

                return Card(
                  child: ListTile(
--- a/test/routine/day_form_test.mocks.dart
+++ b/test/routine/day_form_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/gym_mode_screen_test.mocks.dart
+++ b/test/routine/gym_mode_screen_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/routine_edit_screen_test.mocks.dart
+++ b/test/routine/routine_edit_screen_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/routine_edit_test.mocks.dart
+++ b/test/routine/routine_edit_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/routine_form_test.mocks.dart
+++ b/test/routine/routine_form_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/routine_logs_screen_test.mocks.dart
+++ b/test/routine/routine_logs_screen_test.mocks.dart
@@ -9,18 +9,18 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
 import 'package:wger/models/workouts/log.dart' as _i18;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;
 import 'package:wger/providers/workout_log_repository.dart' as _i17;

 // ignore_for_file: type=lint
@@ -42,39 +42,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -91,61 +82,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -157,19 +126,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -179,12 +148,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -193,23 +162,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -247,43 +216,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -301,17 +270,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -320,7 +289,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -338,14 +307,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -357,7 +326,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -366,7 +335,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -375,20 +344,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -400,7 +369,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -409,7 +378,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -420,39 +389,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -462,9 +431,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/routines_screen_test.dart
+++ b/test/routine/routines_screen_test.dart
@@ -63,7 +63,7 @@ void main() {
    when(mockRoutinesProvider.fetchAndSetRoutineFull(any)).thenAnswer(
      (_) async => routine1,
    );
-    when(mockRoutinesProvider.items).thenReturn([
+    when(mockRoutinesProvider.routines).thenReturn([
      routine1,
      routine2,
    ]);
--- a/test/routine/routines_screen_test.mocks.dart
+++ b/test/routine/routines_screen_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test/routine/slot_entry_form_test.mocks.dart
+++ b/test/routine/slot_entry_form_test.mocks.dart
@@ -9,17 +9,17 @@ import 'dart:ui' as _i16;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:mockito/src/dummies.dart' as _i15;
 import 'package:wger/models/exercises/exercise.dart' as _i12;
-import 'package:wger/models/workouts/base_config.dart' as _i9;
-import 'package:wger/models/workouts/day.dart' as _i6;
+import 'package:wger/models/workouts/base_config.dart' as _i7;
+import 'package:wger/models/workouts/day.dart' as _i4;
 import 'package:wger/models/workouts/day_data.dart' as _i14;
-import 'package:wger/models/workouts/repetition_unit.dart' as _i4;
-import 'package:wger/models/workouts/routine.dart' as _i5;
-import 'package:wger/models/workouts/session.dart' as _i11;
-import 'package:wger/models/workouts/slot.dart' as _i7;
-import 'package:wger/models/workouts/slot_entry.dart' as _i8;
-import 'package:wger/models/workouts/weight_unit.dart' as _i3;
+import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
+import 'package:wger/models/workouts/routine.dart' as _i3;
+import 'package:wger/models/workouts/session.dart' as _i10;
+import 'package:wger/models/workouts/slot.dart' as _i5;
+import 'package:wger/models/workouts/slot_entry.dart' as _i6;
+import 'package:wger/models/workouts/weight_unit.dart' as _i9;
 import 'package:wger/providers/base_provider.dart' as _i2;
-import 'package:wger/providers/routines.dart' as _i10;
+import 'package:wger/providers/routines.dart' as _i8;

 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -40,39 +40,30 @@ class _FakeWgerBaseProvider_0 extends _i1.SmartFake implements _i2.WgerBaseProvi
    : super(parent, parentInvocation);
 }

-class _FakeWeightUnit_1 extends _i1.SmartFake implements _i3.WeightUnit {
-  _FakeWeightUnit_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeRoutine_1 extends _i1.SmartFake implements _i3.Routine {
+  _FakeRoutine_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRepetitionUnit_2 extends _i1.SmartFake implements _i4.RepetitionUnit {
-  _FakeRepetitionUnit_2(Object parent, Invocation parentInvocation)
-    : super(parent, parentInvocation);
+class _FakeDay_2 extends _i1.SmartFake implements _i4.Day {
+  _FakeDay_2(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeRoutine_3 extends _i1.SmartFake implements _i5.Routine {
-  _FakeRoutine_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlot_3 extends _i1.SmartFake implements _i5.Slot {
+  _FakeSlot_3(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeDay_4 extends _i1.SmartFake implements _i6.Day {
-  _FakeDay_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeSlotEntry_4 extends _i1.SmartFake implements _i6.SlotEntry {
+  _FakeSlotEntry_4(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

-class _FakeSlot_5 extends _i1.SmartFake implements _i7.Slot {
-  _FakeSlot_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeSlotEntry_6 extends _i1.SmartFake implements _i8.SlotEntry {
-  _FakeSlotEntry_6(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-}
-
-class _FakeBaseConfig_7 extends _i1.SmartFake implements _i9.BaseConfig {
-  _FakeBaseConfig_7(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+class _FakeBaseConfig_5 extends _i1.SmartFake implements _i7.BaseConfig {
+  _FakeBaseConfig_5(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
 }

 /// A class which mocks [RoutinesProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
+class MockRoutinesProvider extends _i1.Mock implements _i8.RoutinesProvider {
  MockRoutinesProvider() {
    _i1.throwOnMissingStub(this);
  }
@@ -89,61 +80,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i2.WgerBaseProvider);

  @override
-  List<_i3.WeightUnit> get weightUnits =>
+  List<_i9.WeightUnit> get weightUnits =>
      (super.noSuchMethod(
            Invocation.getter(#weightUnits),
-            returnValue: <_i3.WeightUnit>[],
+            returnValue: <_i9.WeightUnit>[],
          )
-          as List<_i3.WeightUnit>);
+          as List<_i9.WeightUnit>);

  @override
-  List<_i11.WorkoutSession> get sessions =>
+  List<_i10.WorkoutSession> get sessions =>
      (super.noSuchMethod(
            Invocation.getter(#sessions),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
-  List<_i5.Routine> get items =>
+  List<_i3.Routine> get routines =>
      (super.noSuchMethod(
-            Invocation.getter(#items),
-            returnValue: <_i5.Routine>[],
+            Invocation.getter(#routines),
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i3.WeightUnit get defaultWeightUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultWeightUnit),
-            returnValue: _FakeWeightUnit_1(
-              this,
-              Invocation.getter(#defaultWeightUnit),
-            ),
-          )
-          as _i3.WeightUnit);
-
-  @override
-  List<_i4.RepetitionUnit> get repetitionUnits =>
+  List<_i11.RepetitionUnit> get repetitionUnits =>
      (super.noSuchMethod(
            Invocation.getter(#repetitionUnits),
-            returnValue: <_i4.RepetitionUnit>[],
+            returnValue: <_i11.RepetitionUnit>[],
          )
-          as List<_i4.RepetitionUnit>);
+          as List<_i11.RepetitionUnit>);

  @override
-  _i4.RepetitionUnit get defaultRepetitionUnit =>
-      (super.noSuchMethod(
-            Invocation.getter(#defaultRepetitionUnit),
-            returnValue: _FakeRepetitionUnit_2(
-              this,
-              Invocation.getter(#defaultRepetitionUnit),
-            ),
-          )
-          as _i4.RepetitionUnit);
-
-  @override
-  set activeRoutine(_i5.Routine? _activeRoutine) => super.noSuchMethod(
+  set activeRoutine(_i3.Routine? _activeRoutine) => super.noSuchMethod(
    Invocation.setter(#activeRoutine, _activeRoutine),
    returnValueForMissingStub: null,
  );
@@ -155,19 +124,19 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  set repetitionUnits(List<_i4.RepetitionUnit>? units) => super.noSuchMethod(
+  set repetitionUnits(List<_i11.RepetitionUnit>? units) => super.noSuchMethod(
    Invocation.setter(#repetitionUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set weightUnits(List<_i3.WeightUnit>? units) => super.noSuchMethod(
+  set weightUnits(List<_i9.WeightUnit>? units) => super.noSuchMethod(
    Invocation.setter(#weightUnits, units),
    returnValueForMissingStub: null,
  );

  @override
-  set sessions(List<_i11.WorkoutSession>? sessions) => super.noSuchMethod(
+  set sessions(List<_i10.WorkoutSession>? sessions) => super.noSuchMethod(
    Invocation.setter(#sessions, sessions),
    returnValueForMissingStub: null,
  );
@@ -177,12 +146,12 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);

  @override
-  List<_i11.WorkoutSession> getSessionsForRoutine(int? id) =>
+  List<_i10.WorkoutSession> getSessionsForRoutine(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#getSessionsForRoutine, [id]),
-            returnValue: <_i11.WorkoutSession>[],
+            returnValue: <_i10.WorkoutSession>[],
          )
-          as List<_i11.WorkoutSession>);
+          as List<_i10.WorkoutSession>);

  @override
  void clear() => super.noSuchMethod(
@@ -191,23 +160,23 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
  );

  @override
-  List<_i5.Routine> getPlans() =>
+  List<_i3.Routine> getPlans() =>
      (super.noSuchMethod(
            Invocation.method(#getPlans, []),
-            returnValue: <_i5.Routine>[],
+            returnValue: <_i3.Routine>[],
          )
-          as List<_i5.Routine>);
+          as List<_i3.Routine>);

  @override
-  _i5.Routine findById(int? id) =>
+  _i3.Routine findById(int? id) =>
      (super.noSuchMethod(
            Invocation.method(#findById, [id]),
-            returnValue: _FakeRoutine_3(
+            returnValue: _FakeRoutine_1(
              this,
              Invocation.method(#findById, [id]),
            ),
          )
-          as _i5.Routine);
+          as _i3.Routine);

  @override
  int findIndexById(int? id) =>
@@ -245,43 +214,43 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineSparse(int? planId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineSparse, [planId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineSparse, [planId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> fetchAndSetRoutineFull(int? routineId) =>
+  _i13.Future<_i3.Routine> fetchAndSetRoutineFull(int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#fetchAndSetRoutineFull, [routineId]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(
                this,
                Invocation.method(#fetchAndSetRoutineFull, [routineId]),
              ),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<_i5.Routine> addRoutine(_i5.Routine? routine) =>
+  _i13.Future<_i3.Routine> addRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#addRoutine, [routine]),
-            returnValue: _i13.Future<_i5.Routine>.value(
-              _FakeRoutine_3(this, Invocation.method(#addRoutine, [routine])),
+            returnValue: _i13.Future<_i3.Routine>.value(
+              _FakeRoutine_1(this, Invocation.method(#addRoutine, [routine])),
            ),
          )
-          as _i13.Future<_i5.Routine>);
+          as _i13.Future<_i3.Routine>);

  @override
-  _i13.Future<void> editRoutine(_i5.Routine? routine) =>
+  _i13.Future<void> editRoutine(_i3.Routine? routine) =>
      (super.noSuchMethod(
            Invocation.method(#editRoutine, [routine]),
            returnValue: _i13.Future<void>.value(),
@@ -299,17 +268,17 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i6.Day> addDay(_i6.Day? day) =>
+  _i13.Future<_i4.Day> addDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#addDay, [day]),
-            returnValue: _i13.Future<_i6.Day>.value(
-              _FakeDay_4(this, Invocation.method(#addDay, [day])),
+            returnValue: _i13.Future<_i4.Day>.value(
+              _FakeDay_2(this, Invocation.method(#addDay, [day])),
            ),
          )
-          as _i13.Future<_i6.Day>);
+          as _i13.Future<_i4.Day>);

  @override
-  _i13.Future<void> editDay(_i6.Day? day) =>
+  _i13.Future<void> editDay(_i4.Day? day) =>
      (super.noSuchMethod(
            Invocation.method(#editDay, [day]),
            returnValue: _i13.Future<void>.value(),
@@ -318,7 +287,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editDays(List<_i6.Day>? days) =>
+  _i13.Future<void> editDays(List<_i4.Day>? days) =>
      (super.noSuchMethod(
            Invocation.method(#editDays, [days]),
            returnValue: _i13.Future<void>.value(),
@@ -336,14 +305,14 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i7.Slot> addSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<_i5.Slot> addSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#addSlot, [slot, routineId]),
-            returnValue: _i13.Future<_i7.Slot>.value(
-              _FakeSlot_5(this, Invocation.method(#addSlot, [slot, routineId])),
+            returnValue: _i13.Future<_i5.Slot>.value(
+              _FakeSlot_3(this, Invocation.method(#addSlot, [slot, routineId])),
            ),
          )
-          as _i13.Future<_i7.Slot>);
+          as _i13.Future<_i5.Slot>);

  @override
  _i13.Future<void> deleteSlot(int? slotId, int? routineId) =>
@@ -355,7 +324,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlot(_i7.Slot? slot, int? routineId) =>
+  _i13.Future<void> editSlot(_i5.Slot? slot, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlot, [slot, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -364,7 +333,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlots(List<_i7.Slot>? slots, int? routineId) =>
+  _i13.Future<void> editSlots(List<_i5.Slot>? slots, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlots, [slots, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -373,20 +342,20 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<_i8.SlotEntry> addSlotEntry(
-    _i8.SlotEntry? entry,
+  _i13.Future<_i6.SlotEntry> addSlotEntry(
+    _i6.SlotEntry? entry,
    int? routineId,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addSlotEntry, [entry, routineId]),
-            returnValue: _i13.Future<_i8.SlotEntry>.value(
-              _FakeSlotEntry_6(
+            returnValue: _i13.Future<_i6.SlotEntry>.value(
+              _FakeSlotEntry_4(
                this,
                Invocation.method(#addSlotEntry, [entry, routineId]),
              ),
            ),
          )
-          as _i13.Future<_i8.SlotEntry>);
+          as _i13.Future<_i6.SlotEntry>);

  @override
  _i13.Future<void> deleteSlotEntry(int? id, int? routineId) =>
@@ -398,7 +367,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  _i13.Future<void> editSlotEntry(_i8.SlotEntry? entry, int? routineId) =>
+  _i13.Future<void> editSlotEntry(_i6.SlotEntry? entry, int? routineId) =>
      (super.noSuchMethod(
            Invocation.method(#editSlotEntry, [entry, routineId]),
            returnValue: _i13.Future<void>.value(),
@@ -407,7 +376,7 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as _i13.Future<void>);

  @override
-  String getConfigUrl(_i8.ConfigType? type) =>
+  String getConfigUrl(_i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#getConfigUrl, [type]),
            returnValue: _i15.dummyValue<String>(
@@ -418,39 +387,39 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {
          as String);

  @override
-  _i13.Future<_i9.BaseConfig> editConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> editConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#editConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#editConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<_i9.BaseConfig> addConfig(
-    _i9.BaseConfig? config,
-    _i8.ConfigType? type,
+  _i13.Future<_i7.BaseConfig> addConfig(
+    _i7.BaseConfig? config,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#addConfig, [config, type]),
-            returnValue: _i13.Future<_i9.BaseConfig>.value(
-              _FakeBaseConfig_7(
+            returnValue: _i13.Future<_i7.BaseConfig>.value(
+              _FakeBaseConfig_5(
                this,
                Invocation.method(#addConfig, [config, type]),
              ),
            ),
          )
-          as _i13.Future<_i9.BaseConfig>);
+          as _i13.Future<_i7.BaseConfig>);

  @override
-  _i13.Future<void> deleteConfig(int? id, _i8.ConfigType? type) =>
+  _i13.Future<void> deleteConfig(int? id, _i6.ConfigType? type) =>
      (super.noSuchMethod(
            Invocation.method(#deleteConfig, [id, type]),
            returnValue: _i13.Future<void>.value(),
@@ -460,9 +429,9 @@ class MockRoutinesProvider extends _i1.Mock implements _i10.RoutinesProvider {

  @override
  _i13.Future<void> handleConfig(
-    _i8.SlotEntry? entry,
+    _i6.SlotEntry? entry,
    num? value,
-    _i8.ConfigType? type,
+    _i6.ConfigType? type,
  ) =>
      (super.noSuchMethod(
            Invocation.method(#handleConfig, [entry, value, type]),
--- a/test_data/routines.dart
+++ b/test_data/routines.dart
@@ -55,7 +55,7 @@ Routine getTestRoutine({List<Exercise>? exercises}) {
    repetitions: 10,
    routineId: 1,
  );
-  log1.exerciseBase = testExercises[0];
+  log1.exercise = testExercises[0];
  log1.weightUnit = testWeightUnit1;
  log1.repetitionUnit = testRepetitionUnit1;

@@ -70,7 +70,7 @@ Routine getTestRoutine({List<Exercise>? exercises}) {
    repetitions: 12,
    routineId: 1,
  );
-  log2.exerciseBase = testExercises[0];
+  log2.exercise = testExercises[0];
  log2.weightUnit = testWeightUnit1;
  log2.repetitionUnit = testRepetitionUnit1;

@@ -85,7 +85,7 @@ Routine getTestRoutine({List<Exercise>? exercises}) {
    repetitions: 8,
    routineId: 1,
  );
-  log3.exerciseBase = testExercises[1];
+  log3.exercise = testExercises[1];
  log3.weightUnit = testWeightUnit1;
  log3.repetitionUnit = testRepetitionUnit1;