some small changes

wersharks · Sep 10, 2022 · df7d974 · df7d974
1 parent c4a6515
commit df7d974
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/lib/screens/documentCheckPage.dart b/lib/screens/documentCheckPage.dart
@@ -196,7 +196,9 @@ class _DocumentCheckPageState extends State<DocumentCheckPage> {
                     'https://uidai.gov.in/images/commdoc/List_of_Acceptable_documents_July2022.pdf');
               },
               child: Text(
-                translatedStrings["clickHereForMoreInformationAboutTheDocumentNeeded."].toString(),
+                translatedStrings[
+                        "clickHereForMoreInformationAboutTheDocumentNeeded"]
+                    .toString(),
                 style: GoogleFonts.nunito(
                   textStyle: TextStyle(fontSize: 20, color: Colors.white),
                 ),
@@ -224,7 +226,9 @@ class _DocumentCheckPageState extends State<DocumentCheckPage> {
 
               else
                 showSnackBar(
-                    translatedStrings["pleaseCheckAllTheDocumentsToContinue"].toString(), context);
+                    translatedStrings["pleaseCheckAllTheDocumentsToContinue"]
+                        .toString(),
+                    context);
             },
             backgroundColor: Colors.white,
             child: const Icon(

diff --git a/lib/screens/operator_booked.dart b/lib/screens/operator_booked.dart
@@ -30,13 +30,16 @@ class _OperatorBookedState extends State<OperatorBooked> {
     super.initState();
 
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-          int bookingId = Provider.of<BookingProvider>(context, listen: false).booking.bookingId!;
-          print("book id completed $bookingId");
-          var bdb = BookingDB();
-          bdb.registerForBookingCompleted(bookingId, (){
-            Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => FinishPage()));});
+      int bookingId = Provider.of<BookingProvider>(context, listen: false)
+          .booking
+          .bookingId!;
+      print("book id completed $bookingId");
+      var bdb = BookingDB();
+      bdb.registerForBookingCompleted(bookingId, () {
+        Navigator.pushReplacement(
+            context, MaterialPageRoute(builder: (context) => FinishPage()));
+      });
     });
-
   }
 
   @override
@@ -45,10 +48,10 @@ class _OperatorBookedState extends State<OperatorBooked> {
     SizeConfig().init(context);
   }
 
-    void cancelCurrentBookingAndExit() async {
-      print("cancel");
-      // TODO: Implement here
-    }
+  void cancelCurrentBookingAndExit() async {
+    print("cancel");
+    // TODO: Implement here
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -91,7 +94,7 @@ class _OperatorBookedState extends State<OperatorBooked> {
                     Padding(
                       padding: const EdgeInsets.only(bottom: 5),
                       child: Text(
-                        translatedStrings["operatorBooked"].tostring(),
+                        translatedStrings["operatorBooked"].toString(),
                         style: textStyle.copyWith(fontWeight: FontWeight.bold),
                       ),
                     ),
@@ -116,19 +119,21 @@ class _OperatorBookedState extends State<OperatorBooked> {
             child: Align(
               alignment: Alignment.topLeft,
               child: Text(
-                translatedStrings["yourOperator"].tostring(),
+                translatedStrings["yourOperator"].toString(),
                 style: oTextStyle,
               ),
             ),
           ),
           Consumer<BookingProvider>(
             builder: (context, provider, child) {
               return OperatorBookedCard(
-              name: provider.focusOperator.name!,
-              phoneNo: provider.focusOperator.phoneNo!,
-              rating: provider.focusOperator.ratings!,
-              task: provider.booking.bookingType! == 0 ? 'Aadhar Updation' : 'Aadhar Enrollment',
-              time: provider.booking.slotTime!);
+                  name: provider.focusOperator.name!,
+                  phoneNo: provider.focusOperator.phoneNo!,
+                  rating: provider.focusOperator.ratings!,
+                  task: provider.booking.bookingType! == 0
+                      ? 'Aadhar Updation'
+                      : 'Aadhar Enrollment',
+                  time: provider.booking.slotTime!);
             },
           ),
           SizedBox(
@@ -146,8 +151,6 @@ class _OperatorBookedState extends State<OperatorBooked> {
               );
             },
           ),
-
-
           SizedBox(
             height: 55,
           ),
@@ -162,9 +165,7 @@ class _OperatorBookedState extends State<OperatorBooked> {
                   child: Text(
                     translatedStrings["cancel"].toString(),
                     style: buttonTextStyle,
-                  )
-                )
-            ),
+                  ))),
         ],
       )),
     );

diff --git a/lib/screens/serviceSelectionPage.dart b/lib/screens/serviceSelectionPage.dart
@@ -1,6 +1,7 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:flutter/material.dart';
+import 'package:mera_aadhar/language_handler.dart';
 import 'package:mera_aadhar/provider/booking.dart';
 import 'package:mera_aadhar/screens/documentCheckPage.dart';
 import 'package:mera_aadhar/services/auth/otp_signin.dart';
@@ -35,7 +36,7 @@ class _ServiceSelectionPageState extends State<ServiceSelectionPage> {
                     colors: [Color(0xffF8774A), Color(0xffF8774A)],
                     begin: Alignment.topRight,
                     end: Alignment.bottomLeft))),
-        onPressed: () {
+        onPressed: ()async {
           (bookingType == 'update')
               ? Provider.of<BookingProvider>(context, listen: false)
                   .booking
@@ -64,7 +65,7 @@ class _ServiceSelectionPageState extends State<ServiceSelectionPage> {
                 .booking
                 .userdata!
                 .type = 1;
-
+   await superTranslate(context);
           Provider.of<BookingProvider>(context, listen: false)
               .booking
               .userdata!