Merge pull request #10 from niloysikdar/style

Style
niloysikdar · May 2, 2021 · e690ae6 · e690ae6
2 parents 5b6e93d + 6aa12a0
commit e690ae6
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 66 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:plaso_connect/constants/colors.dart';
-import 'package:plaso_connect/screens/landingScreen.dart';
+import 'package:plaso_connect/screens/signup.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -30,7 +30,7 @@ class MyApp extends StatelessWidget {
         primaryColor: kelectronBlue,
         iconTheme: IconThemeData(color: kelectronBlue),
       ),
-      home: LandingScreen(),
+      home: SignUpPage(),
     );
   }
 }
diff --git a/lib/screens/addoxygen.dart b/lib/screens/addoxygen.dart
@@ -15,10 +15,15 @@ class _AddOxygenDetailsState extends State<AddOxygenDetails> {
   late TextEditingController descriptioncontroller;
   late TextEditingController pincontroller;
 
+  bool isUploading = false;
+
   String headerstring =
       "Please ensure all the data that you are providing are from verified sources.\nFeeding any false information or spamming will lead to permanent ban.";
 
   void postPressed() async {
+    setState(() {
+      isUploading = true;
+    });
     var oxygenPostModel = OxygenPostModel(
       title: titlecontroller.text,
       description: descriptioncontroller.text,
@@ -29,6 +34,8 @@ class _AddOxygenDetailsState extends State<AddOxygenDetails> {
     );
     await DatabaseMethod().uploadOxygen(oxygenPostModel);
     clearcontrollers();
+    isUploading = false;
+    setState(() {});
   }
 
   void clearcontrollers() {
@@ -132,6 +139,20 @@ class _AddOxygenDetailsState extends State<AddOxygenDetails> {
                 ),
               ),
             ),
+            (isUploading)
+                ? Container(
+                    height: double.infinity,
+                    width: double.infinity,
+                    color: Colors.grey.withOpacity(0.5),
+                    child: Center(
+                      child: SizedBox(
+                        height: size.width * 0.2,
+                        width: size.width * 0.2,
+                        child: CircularProgressIndicator(),
+                      ),
+                    ),
+                  )
+                : Container(height: 0, width: 0),
           ],
         ),
       ),

diff --git a/lib/screens/homescreen.dart b/lib/screens/homescreen.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:plaso_connect/constants/colors.dart';
 import 'package:plaso_connect/screens/selectoxygen.dart';
 import 'package:plaso_connect/screens/selectplasma.dart';
 import 'package:plaso_connect/screens/statdashboard.dart';
+import 'package:plaso_connect/services/transitions.dart';
 import 'package:plaso_connect/widgets/boxdecoration.dart';
 import 'package:plaso_connect/widgets/logowidget.dart';
 
@@ -33,9 +35,7 @@ class HomeScreen extends StatelessWidget {
               onTap: () {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return TotalStatsDashboard();
-                  }),
+                  SlideLeftRoute(page: TotalStatsDashboard()),
                 );
               },
             ),
@@ -44,9 +44,7 @@ class HomeScreen extends StatelessWidget {
               onTap: () {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return SelectPlasma();
-                  }),
+                  SlideLeftRoute(page: SelectPlasma()),
                 );
               },
             ),
@@ -55,15 +53,23 @@ class HomeScreen extends StatelessWidget {
               onTap: () {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return SelectOxygen();
-                  }),
+                  SlideLeftRoute(page: SelectOxygen()),
                 );
               },
             ),
             homeButton(
               text: "More",
-              onTap: () {},
+              onTap: () {
+                Fluttertoast.showToast(
+                  msg: "Coming Soon",
+                  toastLength: Toast.LENGTH_SHORT,
+                  gravity: ToastGravity.BOTTOM,
+                  timeInSecForIosWeb: 1,
+                  backgroundColor: Colors.red,
+                  textColor: Colors.white,
+                  fontSize: 18.0,
+                );
+              },
             ),
           ],
         ),

diff --git a/lib/screens/landingScreen.dart b/lib/screens/landingScreen.dart
@@ -2,6 +2,7 @@ import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:plaso_connect/constants/colors.dart';
 import 'package:plaso_connect/screens/homescreen.dart';
+import 'package:plaso_connect/services/transitions.dart';
 import 'package:plaso_connect/widgets/boxdecoration.dart';
 
 class LandingScreen extends StatelessWidget {
@@ -39,9 +40,7 @@ class LandingScreen extends StatelessWidget {
               onTap: () {
                 Navigator.pushReplacement(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return HomeScreen();
-                  }),
+                  SlideLeftRoute(page: HomeScreen()),
                 );
               },
             ),
@@ -50,9 +49,7 @@ class LandingScreen extends StatelessWidget {
               onTap: () {
                 Navigator.pushReplacement(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return HomeScreen();
-                  }),
+                  SlideLeftRoute(page: HomeScreen()),
                 );
               },
             ),

diff --git a/lib/screens/plasmaform.dart b/lib/screens/plasmaform.dart
@@ -23,6 +23,8 @@ class _PlasmaDonateState extends State<PlasmaDonate> {
   String covidquestion = "Have you ever tested covid positive ?";
   int covidStatus = 1;
 
+  bool isUploading = false;
+
   @override
   void initState() {
     super.initState();
@@ -46,6 +48,9 @@ class _PlasmaDonateState extends State<PlasmaDonate> {
   }
 
   void donePressed() async {
+    setState(() {
+      isUploading = true;
+    });
     var donorModel = DonorModel(
       name: namecontroller.text,
       phone: phonecontroller.text,
@@ -59,6 +64,8 @@ class _PlasmaDonateState extends State<PlasmaDonate> {
     );
     await DatabaseMethod().uploadDonor(donorModel);
     clearInput();
+    isUploading = false;
+    setState(() {});
   }
 
   void clearInput() {
@@ -379,6 +386,20 @@ class _PlasmaDonateState extends State<PlasmaDonate> {
                 ),
               ),
             ),
+            (isUploading)
+                ? Container(
+                    height: double.infinity,
+                    width: double.infinity,
+                    color: Colors.grey.withOpacity(0.5),
+                    child: Center(
+                      child: SizedBox(
+                        height: size.width * 0.2,
+                        width: size.width * 0.2,
+                        child: CircularProgressIndicator(),
+                      ),
+                    ),
+                  )
+                : Container(height: 0, width: 0),
           ],
         ),
       ),

diff --git a/lib/screens/selectoxygen.dart b/lib/screens/selectoxygen.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:plaso_connect/constants/colors.dart';
 import 'package:plaso_connect/screens/addoxygen.dart';
 import 'package:plaso_connect/screens/showOxygenposts.dart';
+import 'package:plaso_connect/services/transitions.dart';
 import 'package:plaso_connect/widgets/boxdecoration.dart';
 
 class SelectOxygen extends StatelessWidget {
@@ -29,9 +30,7 @@ class SelectOxygen extends StatelessWidget {
               onTap: () {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return AddOxygenDetails();
-                  }),
+                  SlideLeftRoute(page: AddOxygenDetails()),
                 );
               },
             ),
@@ -40,9 +39,7 @@ class SelectOxygen extends StatelessWidget {
               onTap: () {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return ShowOxygenPosts();
-                  }),
+                  SlideLeftRoute(page: ShowOxygenPosts()),
                 );
               },
             ),

diff --git a/lib/screens/selectplasma.dart b/lib/screens/selectplasma.dart
@@ -2,50 +2,49 @@ import 'package:flutter/material.dart';
 import 'package:plaso_connect/constants/colors.dart';
 import 'package:plaso_connect/screens/donorlist.dart';
 import 'package:plaso_connect/screens/plasmaform.dart';
+import 'package:plaso_connect/services/transitions.dart';
 import 'package:plaso_connect/widgets/boxdecoration.dart';
 
 class SelectPlasma extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(left: 30, bottom: 15),
-            child: Text(
-              "Choose an option :",
-              style: TextStyle(
-                color: kelectronBlue,
-                fontSize: 22,
-                fontWeight: FontWeight.w600,
+    return SafeArea(
+      child: Scaffold(
+        body: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(left: 30, bottom: 15),
+              child: Text(
+                "Choose an option :",
+                style: TextStyle(
+                  color: kelectronBlue,
+                  fontSize: 22,
+                  fontWeight: FontWeight.w600,
+                ),
               ),
             ),
-          ),
-          selectPlasmaButton(
-            text: "Donate Plasma/Blood",
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) {
-                  return PlasmaDonate();
-                }),
-              );
-            },
-          ),
-          selectPlasmaButton(
-            text: "Availbe Donors",
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) {
-                  return DonorList();
-                }),
-              );
-            },
-          ),
-        ],
+            selectPlasmaButton(
+              text: "Donate Plasma/Blood",
+              onTap: () {
+                Navigator.push(
+                  context,
+                  SlideLeftRoute(page: PlasmaDonate()),
+                );
+              },
+            ),
+            selectPlasmaButton(
+              text: "Availbe Donors",
+              onTap: () {
+                Navigator.push(
+                  context,
+                  SlideLeftRoute(page: DonorList()),
+                );
+              },
+            ),
+          ],
+        ),
       ),
     );
   }

diff --git a/lib/screens/signup.dart b/lib/screens/signup.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:plaso_connect/screens/plasmaform.dart';
+import 'package:plaso_connect/screens/landingScreen.dart';
+import 'package:plaso_connect/services/transitions.dart';
 import 'package:plaso_connect/widgets/inputfield.dart';
 import 'package:plaso_connect/widgets/loginbutton.dart';
 import 'package:plaso_connect/widgets/loginheader.dart';
@@ -61,11 +62,11 @@ class _SignUpPageState extends State<SignUpPage> {
                   text: "Sign In/Up",
                   onTap: () {
                     print("Done");
-                    Navigator.push(
+                    Navigator.pushReplacement(
                       context,
-                      MaterialPageRoute(builder: (context) {
-                        return PlasmaDonate();
-                      }),
+                      SlideLeftRoute(
+                        page: LandingScreen(),
+                      ),
                     );
                   },
                 ),

diff --git a/lib/services/transitions.dart b/lib/services/transitions.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+
+class SlideLeftRoute extends PageRouteBuilder {
+  final Widget page;
+  SlideLeftRoute({required this.page})
+      : super(
+          pageBuilder: (
+            BuildContext context,
+            Animation<double> animation,
+            Animation<double> secondaryAnimation,
+          ) =>
+              page,
+          transitionsBuilder: (
+            BuildContext context,
+            Animation<double> animation,
+            Animation<double> secondaryAnimation,
+            Widget child,
+          ) =>
+              SlideTransition(
+            position: Tween<Offset>(
+              begin: const Offset(1, 0),
+              end: Offset.zero,
+            ).animate(animation),
+            child: child,
+          ),
+        );
+}
diff --git a/pubspec.lock b/pubspec.lock
@@ -170,6 +170,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  fluttertoast:
+    dependency: "direct main"
+    description:
+      name: fluttertoast
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.0.6"
   google_fonts:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -31,6 +31,7 @@ dependencies:
   firebase_auth: ^1.1.2
   cloud_firestore: ^1.0.7
   carousel_slider: ^4.0.0-nullsafety.0
+  fluttertoast: ^8.0.6
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.