Final

anishsreenivas82 · Jul 30, 2021 · f76768e · f76768e
1 parent 24bc2db
commit f76768e
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 5 deletions.
diff --git a/assets/capture.png b/assets/capture.png
diff --git a/lib/pages/donor_dashboard.dart b/lib/pages/donor_dashboard.dart
@@ -33,16 +33,28 @@ class _DonorState extends State<Donor> {
           padding: EdgeInsets.zero,
           children: [
             DrawerHeader(
-              child: Text('Here 4 Hygiene'),
+
+              child: Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [Image.asset('assets/capture.png',) ,Text('Here 4 Hygiene',style: TextStyle(fontSize: 15, color: Colors.black),)]),
               decoration: BoxDecoration(color: Colors.blue),
+
+            ),
+            ListTile(
+              title: Text('Profile'),
+              leading: Icon(Icons.person),
             ),
             ListTile(
               title: Text('Location'),
               leading: Icon(Icons.map_outlined),
             ),
+            ListTile(
+              title: Text('Terms and Conditions'),
+              leading: Icon(Icons.checklist)
+            ),
             ListTile(
                 title: Text('Logout'),
                 leading: Icon(Icons.logout),
+
                 onTap: () {
                   FirebaseAuth.instance.signOut();
                   Navigator.push(context,

diff --git a/lib/pages/pending_orders.dart b/lib/pages/pending_orders.dart
@@ -46,11 +46,19 @@ class _PendingOrdersState extends State<PendingOrders> {
                       width * 0.01, height * 0.01, width * 0.01, height * 0.01),
                   child: Container(
                     child: new Card(
+
                       elevation: 20,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(width*0.1),
                       ),
                       child: InkWell(
+                        onTap: (){
+                          generatedID =
+                            document.id.toString() + uidDonor.toString();
+                        Navigator.push(context,
+                            MaterialPageRoute(builder: (context) => Qrcode()));
+
+                        },
                         child: Padding(
                           padding:  EdgeInsets.all(width*0.04),
                           child: Column(

diff --git a/lib/pages/shelter_page.dart b/lib/pages/shelter_page.dart
@@ -25,14 +25,24 @@ class _Shelter_pageState extends State<Shelter_page> {
           padding: EdgeInsets.zero,
           children: [
             DrawerHeader(
-              child: Text('Here 4 Hygiene'),
 
+              child: Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [Image.asset('assets/capture.png',) ,Text('Here 4 Hygiene',style: TextStyle(fontSize: 15, color: Colors.black),)]),
               decoration: BoxDecoration(color: Colors.blue),
+
+            ),
+            ListTile(
+              title: Text('Profile'),
+              leading: Icon(Icons.person),
+
             ),
             ListTile(
               title: Text('Location'),
               leading: Icon(Icons.map_outlined),
-
+            ),
+            ListTile(
+              title: Text('Terms and Conditions'),
+              leading: Icon(Icons.checklist)
             ),
             ListTile(
               title: Text('Logout'),

diff --git a/lib/pages/volunteer_page.dart b/lib/pages/volunteer_page.dart
@@ -7,6 +7,7 @@ import 'package:flutter_barcode_scanner/flutter_barcode_scanner.dart';
 
 import 'package:flutterlogindesign/pages/splash_screen.dart';
 import 'package:flutterlogindesign/pages/verification.dart';
+import 'package:lottie/lottie.dart';
 
 FirebaseAuth auth = FirebaseAuth.instance;
 var uidVolunteer = auth.currentUser.uid;
@@ -161,7 +162,7 @@ class _VolunteerState extends State<Volunteer> {
               child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
 
-          children: [
+          children: [Lottie.asset('assets/lottie/lottie.json'),
           ElevatedButton(child:Text('QR Scanner',style: TextStyle(color:Colors.white,fontSize: 20)),onPressed: () {
 
             Navigator.push(context,
@@ -274,13 +275,24 @@ class _VolunteerState extends State<Volunteer> {
           padding: EdgeInsets.zero,
           children: [
             DrawerHeader(
-              child: Text('Here 4 Hygiene'),
+
+              child: Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [Image.asset('assets/capture.png',) ,Text('Here 4 Hygiene',style: TextStyle(fontSize: 15, color: Colors.black),)]),
               decoration: BoxDecoration(color: Colors.blue),
+
+            ),
+            ListTile(
+              title: Text('Profile'),
+              leading: Icon(Icons.person)
             ),
             ListTile(
               title: Text('Location'),
               leading: Icon(Icons.map_outlined),
             ),
+            ListTile(
+              title: Text('Terms and Conditions'),
+              leading: Icon(Icons.checklist)
+            ),
             ListTile(
                 title: Text('Logout'),
                 leading: Icon(Icons.logout),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -68,6 +68,7 @@ flutter:
     - assets/3.png
     - assets/do.png
     - assets/lottie/lottie.json
+    - assets/capture.png