finish

alireza4585 · Aug 28, 2023 · bf1f96f · bf1f96f
1 parent 5f2266b
commit bf1f96f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 42 deletions.
diff --git a/lib/data/firestor.dart b/lib/data/firestor.dart
@@ -65,11 +65,12 @@ class Firestore_Datasource {
     }
   }
 
-  Stream<QuerySnapshot> stream() {
+  Stream<QuerySnapshot> stream(bool isDone) {
     return _firestore
         .collection('users')
         .doc(_auth.currentUser!.uid)
         .collection('notes')
+        .where('isDon', isEqualTo: isDone)
         .snapshots();
   }
 

diff --git a/lib/screen/home.dart b/lib/screen/home.dart
@@ -1,11 +1,8 @@
-import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_to_do_list/const/colors.dart';
-import 'package:flutter_to_do_list/data/firestor.dart';
 import 'package:flutter_to_do_list/screen/add_note_screen.dart';
-import 'package:flutter_to_do_list/widgets/task_widgets.dart';
+import 'package:flutter_to_do_list/widgets/stream_note.dart';
 
 class Home_Screen extends StatefulWidget {
   const Home_Screen({super.key});
@@ -34,41 +31,35 @@ class _Home_ScreenState extends State<Home_Screen> {
         ),
       ),
       body: SafeArea(
-          child: NotificationListener<UserScrollNotification>(
-        onNotification: (notification) {
-          if (notification.direction == ScrollDirection.forward) {
-            setState(() {
-              show = true;
-            });
-          }
-          if (notification.direction == ScrollDirection.reverse) {
-            setState(() {
-              show = false;
-            });
-          }
-          return true;
-        },
-        child: StreamBuilder<QuerySnapshot>(
-            stream: Firestore_Datasource().stream(),
-            builder: (context, snapshot) {
-              if (!snapshot.hasData) {
-                return CircularProgressIndicator();
-              }
-              final noteslist = Firestore_Datasource().getNotes(snapshot);
-              return ListView.builder(
-                itemBuilder: (context, index) {
-                  final note = noteslist[index];
-                  return Dismissible(
-                      key: UniqueKey(),
-                      onDismissed: (direction) {
-                        Firestore_Datasource().delet_note(note.id);
-                      },
-                      child: Task_Widget(note));
-                },
-                itemCount: noteslist.length,
-              );
-            }),
-      )),
+        child: NotificationListener<UserScrollNotification>(
+          onNotification: (notification) {
+            if (notification.direction == ScrollDirection.forward) {
+              setState(() {
+                show = true;
+              });
+            }
+            if (notification.direction == ScrollDirection.reverse) {
+              setState(() {
+                show = false;
+              });
+            }
+            return true;
+          },
+          child: Column(
+            children: [
+              Stream_note(false),
+              Text(
+                'isDone',
+                style: TextStyle(
+                    fontSize: 16,
+                    color: Colors.grey.shade500,
+                    fontWeight: FontWeight.bold),
+              ),
+              Stream_note(true),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/lib/widgets/stream_note.dart b/lib/widgets/stream_note.dart
@@ -5,12 +5,13 @@ import 'package:flutter_to_do_list/widgets/task_widgets.dart';
 import '../data/firestor.dart';
 
 class Stream_note extends StatelessWidget {
-  const Stream_note({super.key});
+  bool done;
+  Stream_note(this.done, {super.key});
 
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<QuerySnapshot>(
-        stream: Firestore_Datasource().stream(),
+        stream: Firestore_Datasource().stream(done),
         builder: (context, snapshot) {
           if (!snapshot.hasData) {
             return CircularProgressIndicator();