Merge pull request #26 from dwyl/completed-tasks-#25

Completed tasks

.gitignore

@@ -24,4 +24,4 @@ coverage/
 lib/generated_plugin_registrant.dart
 # test file for coverage
 test/coverage_helper_test.dart
-.flutter_plugins
+.flutter-plugins

README.md

@@ -99,4 +99,4 @@ Note that the `Column` and `Exapanded` widgets are "space" widgets.
 Flutter provide a widget inspector where you can see the full tree
 of the application:
 
-![widget tree](https://user-images.githubusercontent.com/6057298/93480078-f6876b00-f8f4-11ea-95df-3c81321e8284.png)
+![widget tree](https://user-images.githubusercontent.com/6057298/93480078-f6876b00-f8f4-11ea-95df-3c81321e8284.png)

lib/main.dart

@@ -2,7 +2,5 @@ import 'package:flutter/material.dart';
 import 'package:todolist/screens/tasks/tasks.dart';
 
 void main() {
-  return runApp(
-    MaterialApp(title: 'TodoList', home: Tasks())
-  );
-}
+  return runApp(MaterialApp(title: 'TodoList', home: Tasks()));
+}

lib/models/todoList.dart

@@ -25,4 +25,8 @@ class TodoListModel extends ChangeNotifier {
     final json = jsonEncode(tasks);
     prefs.setString('tasks', json);
   }
+
+  List<TaskModel> getCompletedTasks() {
+    return tasks.where((t) => t.completed == true).toList();
+  }
 }

lib/screens/completed_tasks/completed_tasks.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:todolist/models/todoList.dart';
+
+class CompletedTasks extends StatelessWidget {
+  final TodoListModel todoList;
+
+  CompletedTasks({this.todoList});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(
+          title: Text('Completed Items'),
+        ),
+        body: ListView(
+            children: todoList.getCompletedTasks().map((t) {
+          return Container(
+            height: 50,
+            child: Center(child: Text(t.text, style: TextStyle(fontSize: 20))));
+        }).toList()));
+  }
+}

lib/screens/tasks/tasks.dart

@@ -1,20 +1,39 @@
 import 'package:provider/provider.dart';
 import 'package:todolist/models/todoList.dart';
+import 'package:todolist/screens/completed_tasks/completed_tasks.dart';
 import 'package:todolist/screens/tasks/todolist.dart';
 import 'package:flutter/material.dart';
 
 class Tasks extends StatelessWidget {
+  // display completed tasks screen
+  void _goToCompletedTasks(context, todoList) {
+    Navigator.push(
+        context,
+        MaterialPageRoute(
+            builder: (context) => CompletedTasks(todoList: todoList)));
+  }
+
   @override
   Widget build(BuildContext context) {
+    // get tasks from shared preferences
     final TodoListModel todoList = TodoListModel();
+    // getTasksFromSharedPrefs call notifyListeners
     todoList.getTasksFromSharedPrefs();
+
     return Scaffold(
         appBar: AppBar(
           title: Text('TodoList'),
+          actions: [
+            Padding(
+                padding: EdgeInsets.only(right: 20.0),
+                child: IconButton(
+                    icon: Icon(Icons.check),
+                    onPressed: () => _goToCompletedTasks(context, todoList)))
+          ],
         ),
         body: ChangeNotifierProvider.value(
           value: todoList,
-          child: TodoListWidget() ,)
-    );
+          child: TodoListWidget(),
+        ));
   }
-}
+}

lib/screens/tasks/todolist.dart

@@ -19,15 +19,17 @@ class TodoListWidget extends StatelessWidget {
         );
       })),
       Consumer<TodoListModel>(
-        builder: (contexst, tasks, child) {
+        builder: (context, tasks, child) {
           return TextField(
             controller: _controller,
             decoration: InputDecoration(
                 border: OutlineInputBorder(
                     borderSide: BorderSide(color: Colors.teal)),
                 labelText: 'new task'),
             onSubmitted: (newTask) {
-              tasks.addTaks(TaskModel(text: newTask)); // create new instance of task changeNotifier model
+              tasks.addTaks(TaskModel(
+                  text:
+                      newTask)); // create new instance of task changeNotifier model
               _controller.clear(); // clear the text input after adding taks
               tasks.saveTasksToSharedPrefs();
             },

test/completed_tasks_test.dart

@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:todolist/models/task.dart';
+import 'package:todolist/models/todoList.dart';
+import 'package:todolist/screens/completed_tasks/completed_tasks.dart';
+
+void main() {
+  testWidgets('Test Todolist widget', (WidgetTester tester) async {
+    final todoList = TodoListModel();
+    final task = TaskModel(text: "task 1");
+    final task2 = TaskModel(text: "task 2");
+    final task3 = TaskModel(text: "task 3", completed: true);
+    todoList.addTaks(task);
+    todoList.addTaks(task2);
+    todoList.addTaks(task3);
+    await tester.pumpWidget(
+      MaterialApp(
+          home: CompletedTasks(todoList: todoList )
+          ),
+    );
+
+    final textTask1 = find.text('task 1');
+    final textTask2 = find.text('task 2');
+    final textTask3 = find.text('task 3');
+    expect(textTask1, findsNothing);
+    expect(textTask2, findsNothing);
+    expect(textTask3, findsOneWidget);
+  });
+}

test/tasks_widget_test.dart

@@ -17,5 +17,14 @@ void main() {
     // check input field to create new task exists
     final textField = find.byType(TextField);
     expect(textField, findsOneWidget);
+
+   // find completed icon
+   final completedIcon = find.byType(Icon);
+   expect(completedIcon, findsOneWidget);
+   await tester.tap(completedIcon);
+   await tester.pumpAndSettle();
+   final titleCompletedScreen = find.text('Completed Items');
+   expect(titleCompletedScreen, findsOneWidget);
+
   });
 }