everything done

noobcoder17 · noobcoder17 · commit 0322cb03a81b · 2019-12-21T13:19:15.000+05:30
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
@@ -135,13 +135,13 @@ class HomeProvider extends ChangeNotifier {
   }
 
 
-  Future<bool> createNewUserData() async {
+  Future<bool> createNewUserData(String userName) async {
     Map<String,dynamic> newUserData = {
-      "userName" : "Akash Debnath",
+      "userName" : userName,
       "types" : ["common"],
       "tasks" : {
         "common" : {
-          DateTime.now().toString() : Task(id: DateTime.now().toString(),type: "common",name: "Common 1",isDone: false)
+          DateTime.now().toString() : Task(id: DateTime.now().toString(),type: "common",name: "Common Task 1",isDone: false)
         }
       }
     };
diff --git a/lib/providers/tasks.dart b/lib/providers/tasks.dart
@@ -67,6 +67,33 @@ class TasksProvider extends ChangeNotifier {
     return false;
   }
 
+  Future<bool> addIndividualTask(String taskName) async {
+    Task newTask = new Task(
+      id: DateTime.now().toString(),
+      name: taskName,
+      type: _type,
+      isDone: false
+    );
+    
+    Map<String,dynamic> newJsonData = {
+      newTask.id : newTask.toJson()
+    };
+    try {
+      File success = await storage.addTask(_type,newJsonData);
+      if(success!=null){
+        _tasks.add(newTask);
+        print("Task added in provider");
+        notifyListeners();
+        return true;
+      }
+    }catch(e){
+      print("Task adding failed");
+      print(e);
+      return false;
+    }
+    return false;
+  }
+
   Future<void> removeTask(String id) async {
     try{
       await storage.deleteTask(_type,id);
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import '../values/gradients.dart';
 
 import '../widgets/types_card.dart';
 
@@ -23,7 +22,7 @@ class _HomeScreenState extends State<HomeScreen> {
         width: width,
         decoration: BoxDecoration(
           gradient: LinearGradient(
-            colors: gradiants[0],
+            //colors: gradiants[0],
             begin: Alignment.topRight,
             end: Alignment.bottomLeft
           )
diff --git a/lib/screens/new_user_screen.dart b/lib/screens/new_user_screen.dart
@@ -1,26 +1,37 @@
 import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:provider/provider.dart';
+import 'package:flutter/services.dart';
 
 //providers
 import 'package:my_todo/providers/home.dart';
 
 //screen
 
 class NewUserScreen extends StatefulWidget {
+  
   @override
   _NewUserScreenState createState() => _NewUserScreenState();
 }
 
 class _NewUserScreenState extends State<NewUserScreen> {
+  final _form = GlobalKey<FormState>();
   bool _isLoading = false;
+  String _userName;
 
   void _createUser() async {
+    final isValid = _form.currentState.validate();
+    if (!isValid) {
+      return;
+    }
+    _form.currentState.save();
     setState(() {
       _isLoading = true;
     });
     try {
-      bool isCreated = await Provider.of<HomeProvider>(context).createNewUserData();
+      bool isCreated = await Provider.of<HomeProvider>(context).createNewUserData(_userName);
       if(isCreated){
+        print("New User Created");
         //Navigator.of(context).pushReplacementNamed(ToDo.routeName);
       }else{
         showDialog(
@@ -40,18 +51,69 @@ class _NewUserScreenState extends State<NewUserScreen> {
 
   @override
   Widget build(BuildContext context) {
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      statusBarIconBrightness: Brightness.dark,
+    ));
     return Scaffold(
-      appBar: AppBar(
-        title: Text("New User Screen"),
-      ),
       body: Center(
-        child: _isLoading ? CircularProgressIndicator() : RaisedButton(
-          child: Text("Create New User"),
-          onPressed: () {
-            _createUser();
-          },
+        child: Padding(
+          padding: const EdgeInsets.only(top: 100,left: 40,right: 40,bottom: 50),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              RichText(
+                text: TextSpan(
+                  children: [
+                    TextSpan(text: "Hello,\n",style: GoogleFonts.poppins(textStyle: TextStyle(color:Colors.blue,fontSize: 25,fontWeight: FontWeight.w600))),
+                    TextSpan(text: "Les't get some work done,\n",style: GoogleFonts.poppins(textStyle: TextStyle(color:Colors.blue))),
+                  ]
+                ),
+              ),
+              Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                children: <Widget>[
+                  Form(
+                    key: _form,
+                    child: TextFormField(
+                      decoration: InputDecoration(
+                        border: OutlineInputBorder(),
+                        hintText: "Enter your name"
+                      ),
+                      autocorrect: true,
+                      keyboardType: TextInputType.text,
+                      textCapitalization: TextCapitalization.sentences,
+                      validator: (value){
+                        if (value.isEmpty) {
+                          return 'Please provide a value.';
+                        }
+                        return null;
+                      },
+                      onChanged: (value){
+                        setState(() {
+                          _userName = value;
+                        });
+                      },
+                    ),
+                  ),
+                  SizedBox(height: 20,),
+                  RaisedButton(
+                    color: Colors.blue,
+                    child: _isLoading ? CircularProgressIndicator() : 
+                      Text("Create Account",style: GoogleFonts.poppins(textStyle: TextStyle(color: Colors.white),)),
+                    onPressed: () {
+                     _createUser();
+                    },
+                  ),
+                ],
+              ),
+            ],
+          ),
         ),
-      ),
+      )
     );
   }
 }
diff --git a/lib/screens/todo_app.dart b/lib/screens/todo_app.dart
@@ -3,6 +3,7 @@ import 'package:my_todo/widgets/types_card.dart';
 import 'package:provider/provider.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+
 //screens
 import './loading_screen.dart';
 
@@ -14,6 +15,15 @@ import '../providers/tasks.dart';
 import '../widgets/new_type_dialog.dart';
 import '../widgets/new_all_task_dialog.dart';
 
+//values
+import '../values/values.dart' as values;
+
+
+int date = DateTime.now().day;
+int m = DateTime.now().month;
+String month = values.months[m];
+int year = DateTime.now().year;
+
 class ToDo extends StatefulWidget {
   static const routeName = '/todo-screen';
   @override
@@ -23,6 +33,7 @@ class ToDo extends StatefulWidget {
 class _ToDoState extends State<ToDo> {
   bool _isLoading = false;
   bool _isListLoading = false;
+  
   @override
   void initState(){
     super.initState();
@@ -61,19 +72,18 @@ class _ToDoState extends State<ToDo> {
   Widget build(BuildContext context) {
     final height = MediaQuery.of(context).size.height;
     final width = MediaQuery.of(context).size.width;
-
     final homeProvider = Provider.of<HomeProvider>(context);
     List<TasksProvider> taskProviders = homeProvider.getTaskProviders;
     return _isLoading ? LoadingScreen() : Scaffold(
       backgroundColor: Colors.blue,
       appBar: AppBar(
         elevation: 0,
         centerTitle: true,
-        title: Text("My Task",style: GoogleFonts.poppins(textStyle: TextStyle(fontSize: 17,fontWeight: FontWeight.w600))),
-        bottom: CustomAppBar(homeProvider.getUserName,homeProvider.getTypes.length),
+        title: Text("My ToDo",style: GoogleFonts.poppins(textStyle: TextStyle(fontSize: 17,fontWeight: FontWeight.w600))),
+        bottom: CustomAppBar(homeProvider.getUserName.split(" ")[0],homeProvider.getTypes.length),
       ),
       body: homeProvider.getTypes.length == 0 ? 
-      Center(child: Text("No tasks",style: GoogleFonts.poppins(textStyle: TextStyle(color: Colors.white,fontSize: 20),)))
+      Center(child: Text("No ToDo",style: GoogleFonts.poppins(textStyle: TextStyle(color: Colors.white,fontSize: 20),)))
       : _isListLoading ? Center(child: CircularProgressIndicator(backgroundColor: Colors.white,),) :  
       ListView.builder(
         padding: EdgeInsets.only(left: 20),
@@ -110,12 +120,9 @@ class _ToDoState extends State<ToDo> {
 
 
 class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
-  String _userName;
-  int _typeCount;
-  CustomAppBar(String userName,int x){
-    _userName = userName.split(" ")[0];
-    _typeCount = x;
-  }
+  final String _userName;
+  final int _typeCount;
+  CustomAppBar(this._userName,this._typeCount);
   final size = AppBar().preferredSize*2.5;
   @override
   Widget build(BuildContext context) {
@@ -137,7 +144,7 @@ class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: <Widget>[
-                  Text("Today : september 12, 2019".toUpperCase(),style: GoogleFonts.poppins(textStyle:TextStyle(color: Colors.white60,fontSize: 13)),textAlign: TextAlign.left,),
+                  Text("Today : $month $date, $year".toUpperCase(),style: GoogleFonts.poppins(textStyle:TextStyle(color: Colors.white60,fontSize: 13)),textAlign: TextAlign.left,),
                   Wrap(
                     children: <Widget>[
                       IconButton(
diff --git a/lib/screens/todos_screen.dart b/lib/screens/todos_screen.dart
@@ -5,6 +5,9 @@ import 'package:provider/provider.dart';
 //providers
 import '../providers/tasks.dart';
 
+//widgets
+import '../widgets/new_task_dialog.dart';
+
 
 class ToDosScreen extends StatefulWidget {
   static const routeName = '/todos-screen';
@@ -28,6 +31,19 @@ class _ToDosScreenState extends State<ToDosScreen> {
                 done: tasks.getTotalDone,
                 total: tasks.getTotalTask,
               ),
+              actions: <Widget>[
+                 IconButton(
+                  icon: Icon(Icons.add_circle_outline,color: Colors.white,),
+                  onPressed: (){
+                    showDialog(
+                      context: context,
+                      builder: (context){
+                        return NewTaskDialog(tasksProvider: tasksProvider,);
+                      }
+                    );
+                  },
+                ),
+              ],
             ),
             body: ListView.builder(
               itemCount: tasks.getTotalTask,
@@ -39,9 +55,9 @@ class _ToDosScreenState extends State<ToDosScreen> {
                       tasksProvider.toggleDone(tasks.getTasks[i].id);
                     },
                   ),
-                  title: Text(tasks.getTasks[i].name,style: TextStyle(decoration: tasks.getTasks[i].isDone ? TextDecoration.lineThrough : null),),
+                  title: Text(tasks.getTasks[i].name,style: GoogleFonts.poppins(textStyle: TextStyle(decoration: tasks.getTasks[i].isDone ? TextDecoration.lineThrough : null, color: tasks.getTasks[i].isDone ?Colors.grey :Colors.black )),),
                   trailing: tasks.getTasks[i].isDone ? IconButton(
-                    icon: Icon(Icons.delete),
+                    icon: Icon(Icons.delete,size: 22,color: Colors.redAccent,),
                     onPressed: (){
                       tasksProvider.removeTask(tasks.getTasks[i].id);
                     },
diff --git a/lib/values/gradients.dart b/lib/values/gradients.dart
diff --git a/lib/values/values.dart b/lib/values/values.dart
@@ -0,0 +1,15 @@
+List<String> months = [
+  'fuck you',
+  'january',
+  'february',
+  'march',
+  'april',
+  'may',
+  'june',
+  'july',
+  'august',
+  'september',
+  'october',
+  'november',
+  'december'
+];
diff --git a/lib/widgets/new_all_task_dialog.dart b/lib/widgets/new_all_task_dialog.dart
@@ -59,8 +59,8 @@ class _NewAllTaskDialogState extends State<NewAllTaskDialog> {
       _items.add(item);
     });
     return AlertDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(3)),
-      title: Text("Add new task",style:GoogleFonts.poppins(textStyle: TextStyle(fontWeight: FontWeight.w600,fontSize: 20))),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+      title: Text("Add new task",style:GoogleFonts.poppins(textStyle: TextStyle(fontWeight: FontWeight.w500,fontSize: 20))),
       content: Column(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -75,6 +75,8 @@ class _NewAllTaskDialogState extends State<NewAllTaskDialog> {
                     border: OutlineInputBorder()
                   ),
                   autocorrect: true,
+                  keyboardType: TextInputType.text,
+                  textCapitalization: TextCapitalization.sentences,
                   validator: (value){
                     if (value.isEmpty) {
                       return 'Please provide a value.';
diff --git a/lib/widgets/new_task_dialog.dart b/lib/widgets/new_task_dialog.dart
diff --git a/lib/widgets/new_type_dialog.dart b/lib/widgets/new_type_dialog.dart
diff --git a/lib/widgets/types_card.dart b/lib/widgets/types_card.dart

Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,13 @@ class HomeProvider extends ChangeNotifier {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`
`138`		`- Future<bool> createNewUserData() async {`
	`138`	`+ Future<bool> createNewUserData(String userName) async {`
`139`	`139`	`Map<String,dynamic> newUserData = {`
`140`		`- "userName" : "Akash Debnath",`
	`140`	`+ "userName" : userName,`
`141`	`141`	`"types" : ["common"],`
`142`	`142`	`"tasks" : {`
`143`	`143`	`"common" : {`
`144`		`- DateTime.now().toString() : Task(id: DateTime.now().toString(),type: "common",name: "Common 1",isDone: false)`
	`144`	`+ DateTime.now().toString() : Task(id: DateTime.now().toString(),type: "common",name: "Common Task 1",isDone: false)`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`};`