done

widget-404 · Apr 24, 2022 · eb4beb1 · eb4beb1
1 parent 4844cc4
commit eb4beb1
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 42 deletions.
diff --git a/lib/screens/change_password/change_password.dart b/lib/screens/change_password/change_password.dart
@@ -194,7 +194,9 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
                         child: TextButton(
                             onPressed: () async {
                               if (oldPasswordController.text.isNotEmpty &&
-                                  newPasswordController.text.isNotEmpty) {
+                                  newPasswordController.text.isNotEmpty &&
+                                  oldPasswordController.text !=
+                                      newPasswordController.text) {
                                 setState(() {
                                   isLoading = true;
                                 });
@@ -208,11 +210,6 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
                                   widget.userData.userId,
                                 );
                                 if (res != null) {
-                                  oldPasswordController.clear();
-                                  newPasswordController.clear();
-                                  setState(() {
-                                    isLoading = false;
-                                  });
                                   ScaffoldMessenger.of(context)
                                       .showSnackBar(SnackBar(
                                     content: Text(
@@ -229,6 +226,7 @@ class _ChangePasswordPageState extends State<ChangePasswordPage> {
                                     backgroundColor:
                                         CustomizedTheme.voucherPaid,
                                   ));
+                                  isLoading = false;
                                   Navigator.pop(context);
                                 } else {
                                   setState(() {

diff --git a/lib/screens/download_pdf/download_pdf.dart b/lib/screens/download_pdf/download_pdf.dart
@@ -44,8 +44,8 @@ class PdfApi {
       ),
     );
 
-    selectedLang == 0
-        ? pdf.addPage(
+    // selectedLang == 0 ?
+    pdf.addPage(
             MultiPage(
               theme: myTheme,
               build: (context) => [
@@ -64,27 +64,27 @@ class PdfApi {
                 ),
               ],
             ),
-          )
-        : pdf.addPage(
-            MultiPage(
-              theme: myTheme,
-              build: (context) => [
-                buildArabicHeader(
-                  data: vouchers,
-                  font: myFont,
-                ),
-                spacing(),
-                buildArabicBody(
-                  data: vouchers,
-                  font: myFont,
-                ),
-                spacing(),
-                buildQrImage(
-                  image: image,
-                ),
-              ],
-            ),
           );
+        // : pdf.addPage(
+        //     MultiPage(
+        //       theme: myTheme,
+        //       build: (context) => [
+        //         buildArabicHeader(
+        //           data: vouchers,
+        //           font: myFont,
+        //         ),
+        //         spacing(),
+        //         buildArabicBody(
+        //           data: vouchers,
+        //           font: myFont,
+        //         ),
+        //         spacing(),
+        //         buildQrImage(
+        //           image: image,
+        //         ),
+        //       ],
+        //     ),
+        //   );
 
     return PDFDocument.saveDocument(name: 'L${vouchers.id}', pdf: pdf);
   }

diff --git a/lib/screens/forget_password/mobile_number.dart b/lib/screens/forget_password/mobile_number.dart
@@ -208,7 +208,9 @@ class _PhoneNumberPageState extends State<PhoneNumberPage> {
       });
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(
-          "OTP sent!",
+          AppLocalizations.of(context)!.translate(
+            TranslationKeys.otpSent,
+          ),
           textAlign: TextAlign.center,
         ),
         behavior: SnackBarBehavior.floating,
@@ -227,8 +229,10 @@ class _PhoneNumberPageState extends State<PhoneNumberPage> {
         isLoading = false;
       });
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-        content: const Text(
-          "Invalid Phone Number!",
+        content: Text(
+          AppLocalizations.of(context)!.translate(
+            TranslationKeys.invalidMobileNumber,
+          ),
           textAlign: TextAlign.center,
         ),
         behavior: SnackBarBehavior.floating,

diff --git a/lib/screens/intl_phone_number_dropdown/custom_country_picker_dialog.dart b/lib/screens/intl_phone_number_dropdown/custom_country_picker_dialog.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:translator/translator.dart';
 
 import 'country.dart';
 import 'custom_halper.dart';
@@ -155,13 +154,4 @@ class _CustomCountryPickerDialogState extends State<CustomCountryPickerDialog> {
     );
   }
 
-  String _getText({required String input }){
-    String output = '';
-    final translator = GoogleTranslator();
-    translator.translate(input, from: 'en',to: 'ar').then((Translation translation){
-      output = translation.text;
-    });
-
-    return output;
-  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -55,7 +55,6 @@ dependencies:
   image_gallery_saver: '^1.7.1'
   permission_handler: ^9.0.2
   flutter_toggle_tab: ^1.1.7
-  restart_app: ^1.1.0
 
 dev_dependencies:
   flutter_test: