Merge pull request #1 from MuhammedThajudeen/newbranch

MuhammedThajudeen · web-flow · commit a978fb570ef2 · 2023-12-29T11:45:50.000+05:30
note delete feature bug fixes
diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/lib/providers/delete_flag.dart b/lib/providers/delete_flag.dart
@@ -4,8 +4,8 @@ class deleteflag extends ChangeNotifier {
   int _flag=0;
   int get flag => _flag;
 
-  List <int>_flaglist =[];
-  List<int> get flaglist => _flaglist;
+  // List <int>_flaglist =[];
+  // List<int> get flaglist => _flaglist;
   
   List _notekey = [];
   List get notekey => _notekey;
@@ -14,25 +14,25 @@ class deleteflag extends ChangeNotifier {
     _flag = newflag;
   }
   
-  addflaglist (){
-    _flaglist.add(1);  
-    notifyListeners();
-  }
+  // addflaglist (){
+  //   _flaglist.add(1);  
+  //   notifyListeners();
+  // }
 
-  deleteflaglist (){
-    _flaglist.removeLast();  
-    notifyListeners();
-  }
+  // deleteflaglist (){
+  //   _flaglist.removeLast();  
+  //   notifyListeners();
+  // }
 
   notekeylist(int key) {
     _notekey.contains(key) ? _notekey.remove(key) : _notekey.add(key);
     notifyListeners();
   }
 
-  clearFlagList() {
-    _flaglist.clear();
-    notifyListeners();
-  }
+  // clearFlagList() {
+  //   _flaglist.clear();
+  //   notifyListeners();
+  // }
 
   clearNoteKeyList() {
     _notekey.clear();
diff --git a/lib/screens/homescreen.dart b/lib/screens/homescreen.dart
@@ -1,15 +1,12 @@
-// ignore_for_file: prefer_const_constructors
 import 'package:colornotes/models/note.dart';
 import 'package:colornotes/providers/delete_flag.dart';
 import 'package:colornotes/screens/noteeditscreen.dart';
-import 'package:colornotes/screens/noteviewscreen.dart';
 import 'package:colornotes/style/appstyle.dart';
 import 'package:colornotes/widgets/notecard.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 class Homescreen extends StatefulWidget {
@@ -28,41 +25,52 @@ class _HomescreenState extends State<Homescreen> {
           actions: [
             IconButton(
               onPressed: () {
+                final deleteFlagProvider =
+                    Provider.of<deleteflag>(context, listen: false);
                 showDialog(
                     context: context,
                     builder: (BuildContext context) {
                       return AlertDialog(
-                        title: Text('Delete the selected Notes?'),
+                        title: deleteFlagProvider.notekey.isEmpty
+                            ? Text(
+                                'Delete all the Notes?',
+                                style: Appstyle.deletemsgtxtstyle,
+                              )
+                            : Text('Delete the selected Notes?',
+                                style: Appstyle.deletemsgtxtstyle),
                         actions: [
                           TextButton(
                               onPressed: () {
                                 Navigator.pop(context);
                               },
-                              child: Text('NO')),
+                              child: Text('NO',
+                                  style: Appstyle.deletemsgoptionstyle)),
                           TextButton(
-                              onPressed: () {
-                                final deleteFlagProvider =
-                                    Provider.of<deleteflag>(context,
-                                        listen: false);
-
-                                // Retrieve the list of selected note keys
-                                final selectedNoteKeys =
-                                    deleteFlagProvider.getSelectedNoteKeys();
-                                print('liss ${selectedNoteKeys}');
+                              onPressed: deleteFlagProvider.notekey.isEmpty
+                                  ? () {
+                                      db.deleteAll(db.keys);
+                                      Navigator.pop(context);
+                                    }
+                                  : () {
+                                      // Retrieve the list of selected note keys
+                                      final selectedNoteKeys =
+                                          deleteFlagProvider
+                                              .getSelectedNoteKeys();
 
-                                // Delete the selected notes using their keys
-                                for (var key in selectedNoteKeys) {
-                                  db.delete(key);
-                                }
+                                      // Delete the selected notes using their keys
+                                      for (var key in selectedNoteKeys) {
+                                        db.delete(key);
+                                      }
 
-                                // Clear the flag list and note key list after deletion
-                                deleteFlagProvider.clearFlagList();
-                                deleteFlagProvider.clearNoteKeyList();
+                                      // Clear the flag list and note key list after deletion
+                                      // deleteFlagProvider.clearFlagList();
+                                      deleteFlagProvider.clearNoteKeyList();
 
-                                Navigator.pop(context);
-                                deleteFlagProvider.flaglist.clear();
-                              },
-                              child: Text('YES'))
+                                      Navigator.pop(context);
+                                      // deleteFlagProvider.flaglist.clear();
+                                    },
+                              child: Text('YES',
+                                  style: Appstyle.deletemsgoptionstyle))
                         ],
                       );
                     });
@@ -117,9 +125,9 @@ class _HomescreenState extends State<Homescreen> {
                               builder: (BuildContext context, deleteflag value,
                                   Widget? child) {
                                 return Visibility(
-                                    visible: value.flaglist.isNotEmpty,
+                                    visible: value.notekey.isNotEmpty,
                                     child: Text(
-                                      '(${value.flaglist.length})',
+                                      '(${value.notekey.length})',
                                       style: GoogleFonts.roboto(
                                           color: Colors.white,
                                           fontWeight: FontWeight.bold,
@@ -152,7 +160,7 @@ class _HomescreenState extends State<Homescreen> {
           onPressed: () {
             final deleteFlagProvider =
                 Provider.of<deleteflag>(context, listen: false);
-            deleteFlagProvider.clearFlagList();
+            // deleteFlagProvider.clearFlagList();
             deleteFlagProvider.clearNoteKeyList();
             Navigator.push(
                 context, MaterialPageRoute(builder: (context) => NoteEdit()));
diff --git a/lib/screens/noteeditscreen.dart b/lib/screens/noteeditscreen.dart
@@ -1,7 +1,4 @@
-// ignore_for_file: prefer_const_constructors, prefer_const_literals_to_create_immutables, no_logic_in_create_state
-
 import 'dart:math';
-
 import 'package:colornotes/style/appstyle.dart';
 import 'package:flutter/material.dart';
 import 'package:colornotes/models/note.dart';
@@ -40,16 +37,16 @@ class _NoteEditState extends State<NoteEdit> {
                 onPressed: () {
                   handlebackbutton();
                 },
-                icon: Icon(Icons.arrow_back)),
+                icon: const Icon(Icons.arrow_back)),
             elevation: 5,
             backgroundColor: Appstyle.cardcolor[colorindexx],
-            iconTheme: IconThemeData(color: Colors.black),
+            iconTheme: const IconThemeData(color: Colors.black),
             title: Text(
               'Add a new Note',
-              style: TextStyle(color: Colors.black),
+              style: Appstyle.notescreenheadingtextstyle,
             )),
         body: Padding(
-          padding: EdgeInsets.all(16),
+          padding: const EdgeInsets.all(16),
           child: Column(
             mainAxisSize: MainAxisSize.max,
             children: [
@@ -64,7 +61,7 @@ class _NoteEditState extends State<NoteEdit> {
                     hintStyle: Appstyle.titletext,
                     border: InputBorder.none),
               ),
-              SizedBox(
+              const SizedBox(
                 height: 6,
               ),
               Expanded(
diff --git a/lib/screens/noteviewscreen.dart b/lib/screens/noteviewscreen.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: prefer_const_constructors, no_logic_in_create_state
-
 import 'package:colornotes/style/appstyle.dart';
 import 'package:flutter/material.dart';
 import 'package:colornotes/models/note.dart';
@@ -54,41 +52,44 @@ class _NoteViewState extends State<NoteView> {
                         context: context,
                         builder: (BuildContext context) {
                           return AlertDialog(
-                            title: Text('Are you sure want to delete?'),
+                            title: Text(
+                              'Are you sure want to delete?',
+                              style: Appstyle.deletemsgtxtstyle,
+                            ),
                             actions: [
                               TextButton(
                                   onPressed: () {
                                     Navigator.pop(context);
                                   },
-                                  child: Text('NO')),
+                                  child: Text('NO',style: Appstyle.deletemsgoptionstyle)),
                               TextButton(
                                   onPressed: () {
                                     db.delete(note.key);
                                     Navigator.pop(context);
                                     Navigator.pop(context);
                                   },
-                                  child: Text('YES'))
+                                  child: Text('YES',style: Appstyle.deletemsgoptionstyle))
                             ],
                           );
                         });
                   },
-                  icon: Icon(Icons.delete))
+                  icon: const Icon(Icons.delete))
             ],
             centerTitle: true,
             leading: IconButton(
                 onPressed: () {
                   handlebackbutton();
                 },
-                icon: Icon(Icons.arrow_back)),
+                icon: const Icon(Icons.arrow_back)),
             elevation: 5,
             backgroundColor: Appstyle.cardcolor[note.colorIndex],
-            iconTheme: IconThemeData(color: Colors.black),
+            iconTheme: const IconThemeData(color: Colors.black),
             title: Text(
               'Your Note',
-              style: TextStyle(color: Colors.black),
+              style: Appstyle.notescreenheadingtextstyle,
             )),
         body: Padding(
-          padding: EdgeInsets.all(16),
+          padding: const EdgeInsets.all(16),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
@@ -102,14 +103,14 @@ class _NoteViewState extends State<NoteView> {
                 controller: _titlecontroller,
                 style: Appstyle.titletext,
               ),
-              SizedBox(
+              const SizedBox(
                 height: 2,
               ),
               Text(
                 'Edited ${DateFormat("dd MMM yyyy").format(note.datentime)}',
-                style: TextStyle(fontSize: 13),
+                style: const TextStyle(fontSize: 13),
               ),
-              SizedBox(height: 6),
+              const SizedBox(height: 6),
               Expanded(
                 child: TextField(
                   maxLines: null,
diff --git a/lib/style/appstyle.dart b/lib/style/appstyle.dart
@@ -1,5 +1,3 @@
-// ignore_for_file: prefer_const_constructors
-
 import 'dart:math';
 
 import 'package:flutter/material.dart';
@@ -14,27 +12,34 @@ class Appstyle {
   }
 
   static List cardcolor = [
-    Color(0xfff8c5d8),
-    Color(0xfff7a7aa),
-    Color(0xfffaf0bc),
-    Color(0xfff5f6cc),
-    Color(0xffd1e8cb),
-    Color(0xffeaf3de),
-    Color(0xffc5e7e9),
-    Color(0xff88d5f1),
-    Color(0xff76aedd),
-    Color(0xffd5cfe7),
-    Color(0xff9d93c7),
-    Color(0xffc6a7d0),
-    Color(0xffefdded),
-    Color(0xffd7a5cb),
-    Color(0xffe8c5dd),
-    Color(0xff81d0d4),
+    const Color(0xfff8c5d8),
+    const Color(0xfff7a7aa),
+    const Color(0xfffaf0bc),
+    const Color(0xfff5f6cc),
+    const Color(0xffd1e8cb),
+    const Color(0xffeaf3de),
+    const Color(0xffc5e7e9),
+    const Color(0xff88d5f1),
+    const Color(0xff76aedd),
+    const Color(0xffd5cfe7),
+    const Color(0xff9d93c7),
+    const Color(0xffc6a7d0),
+    const Color(0xffefdded),
+    const Color(0xffd7a5cb),
+    const Color(0xffe8c5dd),
+    const Color(0xff81d0d4),
   ];
 
   static TextStyle maintext =
       GoogleFonts.dynaPuff(fontSize: 20, color: Colors.white);
   static TextStyle titletext =
       GoogleFonts.ubuntu(fontSize: 18, fontWeight: FontWeight.w600);
-  static TextStyle contenttext = GoogleFonts.nunito(fontSize: 16);
+  static TextStyle contenttext = 
+      GoogleFonts.nunito(fontSize: 16);
+  static TextStyle notescreenheadingtextstyle = 
+      GoogleFonts.poppins(fontSize: 18,color: Colors.black,fontWeight: FontWeight.w600);
+  static TextStyle deletemsgtxtstyle = 
+      GoogleFonts.poppins(fontSize: 17,color: Colors.black,fontWeight: FontWeight.w600);
+  static TextStyle deletemsgoptionstyle = 
+      GoogleFonts.poppins(fontSize: 14,color: Colors.black,fontWeight: FontWeight.w600);
 }
diff --git a/lib/widgets/notecard.dart b/lib/widgets/notecard.dart
