Remove unused code and pointless wrappers.

markstory · Jul 24, 2023 · d92e576 · d92e576
1 parent c54e9b6
commit d92e576
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/flutterapp/lib/screens/today.dart b/flutterapp/lib/screens/today.dart
@@ -32,10 +32,6 @@ class _TodayScreenState extends State<TodayScreen> {
     viewmodel.loadData();
   }
 
-  Future<void> _refresh(TodayViewModel view) async {
-    return view.refresh();
-  }
-
   @override
   Widget build(BuildContext context) {
     // Update the the theme based on device settings.
@@ -75,7 +71,7 @@ class _TodayScreenState extends State<TodayScreen> {
       body = const LoadingIndicator();
     } else {
       body = RefreshIndicator(
-          onRefresh: () => _refresh(viewmodel),
+          onRefresh: () => viewmodel.refresh(),
           child: TaskSorter(
                 taskLists: viewmodel.taskLists,
                 overdue: viewmodel.overdue,

diff --git a/flutterapp/lib/screens/upcoming.dart b/flutterapp/lib/screens/upcoming.dart
@@ -28,10 +28,6 @@ class _UpcomingScreenState extends State<UpcomingScreen> {
     viewmodel.loadData();
   }
 
-  Future<void> _refresh(UpcomingViewModel view) async {
-    return view.refresh();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Consumer<UpcomingViewModel>(
@@ -46,7 +42,7 @@ class _UpcomingScreenState extends State<UpcomingScreen> {
       body = const LoadingIndicator();
     } else {
       body = RefreshIndicator(
-        onRefresh: () => _refresh(viewmodel),
+        onRefresh: () => viewmodel.refresh(),
         child: TaskSorter(
             taskLists: viewmodel.taskLists,
             buildItem: (Task task) {

diff --git a/flutterapp/lib/viewmodels/today.dart b/flutterapp/lib/viewmodels/today.dart
@@ -24,13 +24,10 @@ class TodayViewModel extends ChangeNotifier {
   /// Any overdue tasks
   TaskSortMetadata? _overdue;
 
-  late Task _newTask;
-
   TodayViewModel(LocalDatabase database) {
     _taskLists = [];
     _database = database;
     _database.dailyTasks.addListener(listener);
-    _newTask = Task.blank(dueOn: DateUtils.dateOnly(DateTime.now()));
   }
 
   @override
@@ -46,7 +43,6 @@ class TodayViewModel extends ChangeNotifier {
   bool get loading => _loading && !_silentLoading;
   bool get loadError => _loadError;
   DateTime get today => DateUtils.dateOnly(DateTime.now());
-  Task? get newTask => _newTask;
 
   TaskSortMetadata? get overdue => _overdue;
   List<TaskSortMetadata> get taskLists => _taskLists;
@@ -58,18 +54,15 @@ class TodayViewModel extends ChangeNotifier {
   /// Load data. Should be called during initState()
   /// or when database events are received.
   Future<void> loadData() async {
-    _newTask = Task.blank(dueOn: DateUtils.dateOnly(DateTime.now()));
     // Update to us the upcoming repo.
     var rangeView = await _database.dailyTasks.getDate(today, overdue: true);
     if (rangeView.isNotEmpty) {
       _buildTaskLists(rangeView);
     }
     if (!_loading && rangeView.isEmpty) {
-      _newTask = Task.blank(dueOn: DateUtils.dateOnly(DateTime.now()));
       return refresh();
     }
     if (!_loading && rangeView.needsRefresh) {
-      _newTask = Task.blank(dueOn: DateUtils.dateOnly(DateTime.now()));
       return refreshTasks();
     }
   }