home - task and type added

noobcoder17 · noobcoder17 · commit f782ee9c7d3c · 2019-12-20T12:04:13.000+05:30
now can add task and type from home
diff --git a/lib/data/storage.dart b/lib/data/storage.dart
@@ -39,15 +39,16 @@ class StoreData {
     String prevJsonData = await getData();
     Map<String,dynamic> data = jsonDecode(prevJsonData);
     data["types"].add(newType.toLowerCase());
+    data["tasks"].addAll({newType.toLowerCase():{}});
     return dataFile.writeAsString(jsonEncode(data));
   }
 
-  Future<File> addTask(Map<String,dynamic> newJsonData) async {
+  Future<File> addTask(String type,Map<String,dynamic> newJsonData) async {
     File dataFile = await getFile();
     print("Storing in existing file");
     String prevJsonData = await getData();
     Map<String,dynamic> data = jsonDecode(prevJsonData);
-    data["tasks"].addAll(newJsonData);
+    data["tasks"][type].addAll(newJsonData);
     return dataFile.writeAsString(jsonEncode(data));
   }
   
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
@@ -15,7 +15,7 @@ class HomeProvider extends ChangeNotifier {
   bool _isNewUser;
   String _userName;
   List<String> _types = [];
-  List<TasksProvider> _taskProviders = [];
+  Map<String,TasksProvider> _taskProviders = {};
 
   bool get isNewUser {
     return _isNewUser!=null;
@@ -30,11 +30,53 @@ class HomeProvider extends ChangeNotifier {
   }
 
   List<TasksProvider> get getTaskProviders {
-    return [..._taskProviders];
+    List<TasksProvider> tempList = [];
+    _taskProviders.forEach((type,taskProvider){
+      tempList.add(taskProvider);
+    });
+    return tempList;
   }
 
-  Future<bool> addTask() async {
+  Future<bool> addTaskFromHome(String type,String taskName) async {
+    Task newTask = new Task(
+      id: DateTime.now().toString(),
+      name: taskName,
+      type: type,
+      isDone: false
+    );
+    TasksProvider tasksProvider = _taskProviders[type];
+    try {
+      bool success = await tasksProvider.addTask(newTask);
+      if(success){
+        print("Task added from home");
+        return true;
+      }else{
+        return false;
+      }
+    }catch(e){
+      print("Task adding failed");
+      print(e);
+      return false;
+    }
+  }
 
+  Future<bool> addType(String type) async{
+    try {
+      File newFile = await storage.addType(type.toLowerCase());
+      if(newFile!=null){
+        print("$type Type added");
+        _types.add(type.toLowerCase());
+        TasksProvider _newTasksProvider = TasksProvider(type,{});
+        _taskProviders.addAll({type:_newTasksProvider});
+        notifyListeners();
+        return true;
+      }
+    }catch(e){
+      print("Type adding failed");
+      print(e);
+      return false;
+    }
+    return false;
   }
 
 
@@ -52,12 +94,12 @@ class HomeProvider extends ChangeNotifier {
           tempTypes.add(type.toString());
         });
         _types = tempTypes;
-        List<TasksProvider> tempList = [];
+        Map<String,TasksProvider> tempList = {};
         _types.forEach((type){
           print("type:$type");
           Map<String,dynamic> _eachType = data['tasks'][type];
           TasksProvider _newTasksProvider = TasksProvider(type,_eachType);
-          tempList.add(_newTasksProvider);
+          tempList.addAll({type:_newTasksProvider});
         });
         _taskProviders = tempList;
       }
@@ -69,22 +111,6 @@ class HomeProvider extends ChangeNotifier {
     }
   }
 
-  Future<bool> addType(String type) async{
-    try {
-      File success = await storage.addType(type.toLowerCase());
-      if(success!=null){
-        print("$type Type added");
-        _types.add(type.toLowerCase());
-        notifyListeners();
-        return true;
-      }
-    }catch(e){
-      print("Type adding failed");
-      print(e);
-      return false;
-    }
-    return false;
-  }
 
   Future<bool> createNewUserData() async {
     Map<String,dynamic> newUserData = {
diff --git a/lib/providers/tasks.dart b/lib/providers/tasks.dart
@@ -47,20 +47,24 @@ class TasksProvider extends ChangeNotifier {
     return [..._tasks];
   }
 
-  Future<void> addTask(Task newTask) async {
+  Future<bool> addTask(Task newTask) async {
     Map<String,dynamic> newJsonData = {
       newTask.id : newTask.toJson()
     };
     try {
-      File success = await storage.addTask(newJsonData);
+      File success = await storage.addTask(_type,newJsonData);
       if(success!=null){
-        print("Task added");
         _tasks.add(newTask);
+        print("Task added in individual provider");
+        notifyListeners();
+        return true;
       }
     }catch(e){
       print("Task adding failed");
       print(e);
+      return false;
     }
+    return false;
   }
 
   Future<void> removeTask(String key) async {
diff --git a/lib/screens/todo_app.dart b/lib/screens/todo_app.dart
@@ -14,6 +14,7 @@ import '../providers/tasks.dart';
 
 //widgets
 import '../widgets/new_type_dialog.dart';
+import '../widgets/new_all_task_dialog.dart';
 
 class ToDo extends StatefulWidget {
   static const routeName = '/todo-screen';
@@ -58,19 +59,27 @@ class _ToDoState extends State<ToDo> {
         bottom: CustomAppBar(homeProvider.getUserName),
       ),
       body: ListView.builder(
+        padding: EdgeInsets.only(left: 20),
+        scrollDirection: Axis.horizontal,
         itemCount: taskProviders.length,
         itemBuilder: (cyx,i){
-          return ChangeNotifierProvider.value(
-            value: taskProviders[i],
-            child: Consumer<TasksProvider>(
-              builder: (ctx,task,widget){
-                return Column(
-                  children: <Widget>[
-                    TypesCard(height: height,width: width,),
-                  ],
-                );
-              },
-            ),
+          return Column(
+            children: <Widget>[
+              ChangeNotifierProvider.value(
+                value: taskProviders[i],
+                child: Consumer<TasksProvider>(
+                  builder: (ctx,task,widget){
+                    return TypesCard(
+                      height: height,
+                      width: width,
+                      type: task.getType,
+                      done: task.getTotalDone,
+                      total: task.getTotalTask,
+                    );
+                  },
+                ),
+              )
+            ],
           );
         },
       )
@@ -122,7 +131,12 @@ class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
                       IconButton(
                         icon: Icon(Icons.add_circle_outline,color: Colors.white,),
                         onPressed: (){
-                          Navigator.of(context).pushNamed(AddTaskScreen.routeName);
+                          showDialog(
+                            context: context,
+                            builder: (context){
+                              return NewAllTaskDialog();
+                            }
+                          );
                         },
                       ),
                     ],
diff --git a/lib/widgets/new_all_task_dialog.dart b/lib/widgets/new_all_task_dialog.dart
@@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+//providers
+import '../providers/home.dart';
+
+
+class NewAllTaskDialog extends StatefulWidget {
+  @override
+  _NewAllTaskDialogState createState() => _NewAllTaskDialogState();
+}
+
+class _NewAllTaskDialogState extends State<NewAllTaskDialog> {
+  final _form = GlobalKey<FormState>();
+  String _type = 'common';
+  String _taskName;
+  bool _isLoading = false;
+
+  Future<void> _onSubmit() async{
+    final isValid = _form.currentState.validate();
+    if (!isValid) {
+      return;
+    }
+    _form.currentState.save();
+    setState(() {
+      _isLoading = true;
+    });
+    try{
+      bool success = await Provider.of<HomeProvider>(context).addTaskFromHome(_type, _taskName);
+      if(success){
+        print("Add all task Dialog success, popping off");
+      }
+    }catch(e){
+      print(e);
+    }
+    setState(() {
+      _isLoading = false;
+    });
+    Navigator.of(context).pop();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    List<String> _types = Provider.of<HomeProvider>(context).getTypes;
+    List<DropdownMenuItem<String>> _items = []; 
+    _types.forEach((type){
+      DropdownMenuItem<String> item = new DropdownMenuItem(
+        value: type.toString(),
+        child: Text("$type"),
+      );
+      _items.add(item);
+    });
+    return AlertDialog(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(3)),
+      title: Text("Add new task"),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          Form(
+            key: _form,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                TextFormField(
+                  decoration: InputDecoration(
+                    border: OutlineInputBorder()
+                  ),
+                  autocorrect: true,
+                  validator: (value){
+                    if (value.isEmpty) {
+                      return 'Please provide a value.';
+                    }
+                    return null;
+                  },
+                  onFieldSubmitted: (value){
+                    setState(() {
+                      _taskName= value;
+                    });
+                  },
+                ),
+                SizedBox(height: 20,),
+                DropdownButtonFormField<String>(
+                  decoration: InputDecoration(
+                    border: OutlineInputBorder()
+                  ),
+                  value: _type,
+                  items: _items,
+                  onChanged: (val){
+                    setState(() {
+                      _type = val;
+                    });
+                  }, 
+                ),
+              ],
+            ),
+          )
+        ],
+      ),
+      actions: <Widget>[
+        FlatButton(
+          child: Text("Cancel"),
+          onPressed: (){
+            Navigator.of(context).pop();
+          },
+        ),
+        RaisedButton(
+          child: _isLoading ? CircularProgressIndicator() : Text("Add"),
+          onPressed: (){
+            _onSubmit();
+          },
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/types_card.dart b/lib/widgets/types_card.dart
@@ -1,12 +1,22 @@
 import 'package:flutter/material.dart';
+
+
 class TypesCard extends StatefulWidget {
   final double height;
   final double width;
+  final String type;
+  final int done;
+  final int total;
 
-  TypesCard({
+  const TypesCard({
+    Key key, 
     this.height, 
-    this.width
-  });
+    this.width, 
+    this.type, 
+    this.done, 
+    this.total
+  }) : super(key: key);
+
   
   @override
   _TypesCardState createState() => _TypesCardState();
@@ -15,7 +25,9 @@ class TypesCard extends StatefulWidget {
 class _TypesCardState extends State<TypesCard> {
   @override
   Widget build(BuildContext context) {
+    //final taskProvider = Provider.of<TasksProvider>(context);
     return Container(
+      padding: EdgeInsets.fromLTRB(20, 20, 20, 40),
       margin: const EdgeInsets.symmetric(horizontal: 10,vertical: 15),
       height: widget.width*0.75*1.2,
       width: widget.width*0.75,
@@ -31,6 +43,32 @@ class _TypesCardState extends State<TypesCard> {
           )
         ]
       ),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: <Widget>[
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              Text("${widget.type}".toUpperCase(),style: TextStyle(fontSize: 25,color: Colors.black),),
+              IconButton(
+                icon: Icon(Icons.delete),
+                onPressed: (){},
+              )
+            ],
+          ),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text("You have ${widget.total - widget.done} tasks.",style: TextStyle(fontSize: 17),),
+              SizedBox(height: 20,),
+              LinearProgressIndicator(
+                value: 0.3,
+              )
+            ],
+          )
+          //Text("${widget.total}"),
+        ],
+      ),
     );
   }
 }
