From f76768e1ab69df0220de7baa96e29f156f00b799 Mon Sep 17 00:00:00 2001 From: anishsreenivas82 <77966360+anishsreenivas82@users.noreply.github.com> Date: Sat, 31 Jul 2021 02:32:30 +0530 Subject: [PATCH] Final --- assets/capture.png | Bin 0 -> 8366 bytes lib/pages/donor_dashboard.dart | 14 +++++++++++++- lib/pages/pending_orders.dart | 8 ++++++++ lib/pages/shelter_page.dart | 14 ++++++++++++-- lib/pages/volunteer_page.dart | 16 ++++++++++++++-- pubspec.yaml | 1 + 6 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 assets/capture.png diff --git a/assets/capture.png b/assets/capture.png new file mode 100644 index 0000000000000000000000000000000000000000..fbb5d41e85b53472c01a81a0545208710892720b GIT binary patch literal 8366 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 literal 0 HcmV?d00001 diff --git a/lib/pages/donor_dashboard.dart b/lib/pages/donor_dashboard.dart index e84ccce..33333d3 100644 --- a/lib/pages/donor_dashboard.dart +++ b/lib/pages/donor_dashboard.dart @@ -33,16 +33,28 @@ class _DonorState extends State { 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 index 2cd3763..580c598 100644 --- a/lib/pages/pending_orders.dart +++ b/lib/pages/pending_orders.dart @@ -46,11 +46,19 @@ class _PendingOrdersState extends State { 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 index 2f44e3b..8222d3a 100644 --- a/lib/pages/shelter_page.dart +++ b/lib/pages/shelter_page.dart @@ -25,14 +25,24 @@ class _Shelter_pageState extends State { 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 index e986d51..6d19bf1 100644 --- 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 { 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 { 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 index f094d55..ab513db 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -68,6 +68,7 @@ flutter: - assets/3.png - assets/do.png - assets/lottie/lottie.json + - assets/capture.png