converted to activity from activity model finally

This commit is contained in:
Joshua Burman
2024-12-24 16:58:50 -05:00
parent c6030f8ac5
commit 604b099010
7 changed files with 30 additions and 198 deletions

View File

@ -1,13 +1,12 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:sendtrain/database/database.dart';
import 'package:sendtrain/models/activity_model.dart';
class ActivityTimerModel with ChangeNotifier {
int _actionCounter = 0;
ActivityModel? _activityModel;
Activity? _activity;
List _sets = [];
List _actions = [];
@ -23,7 +22,6 @@ class ActivityTimerModel with ChangeNotifier {
dynamic get currentAction => currentSet[_currentActionNum];
int get currentSetNum => _currentSetNum;
dynamic get currentSet => _sets[_currentSetNum];
ActivityModel? get activityModel => _activityModel;
Activity? get activity => _activity;
List get sets => _sets;
Timer? get periodicTimer => _periodicTimer;
@ -31,14 +29,14 @@ class ActivityTimerModel with ChangeNotifier {
double get progress => _progress;
int get totalTime => _totalTime;
void setup(ActivityModel activityModel, Activity activity, List actions) {
if (_activityModel == null || activityModel.id != _activityModel?.id) {
void setup(Activity activity, List actions) {
if (_activity == null || activity.id != _activity?.id) {
_periodicTimer?.cancel();
_progress = 0;
_isc = null;
_activityModel = activityModel;
_activity = activity;
_sets = activityModel.actions[0].items();
// only one action for now
_sets = json.decode(actions[0].set);
_actions = actions;
_currentActionNum = 0;
_currentSetNum = 0;