Merge branch 'master' of https://git.mokkon.com/tzw/fcs

assets/local/localization_en.json

@@ -170,6 +170,7 @@
     "profile.edit.currency.title":"Preferred Currency",
     "profile.name": "Name",
     "profile.phone": "Phone",
+    "profile.delete": "Delete Account",
     "profile.language": "Languages",
     "profile.logout": "logout",
     "profile.currency":"Preferred currency",

assets/local/localization_mu.json

@@ -171,6 +171,7 @@
     "profile.edit.currency.title":"နှစ်သက်သော ငွေအမျိုးအစား",
     "profile.name":"နာမည်",
     "profile.phone": "ဖုန်းနံပါတ်",
+    "profile.delete": "အကောင့်ကို ဖျက်မည်",
     "profile.language": "ဘာသာစကားများ",
     "profile.logout": "အကောင့်ထွက်ရန်",
     "profile.currency":"နှစ်သက်သော ငွေအမျိုးအစား",

lib/pages/carton_search/carton_search.dart

@@ -81,6 +81,7 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
                   child: Text(
                     "No result found",
                     textAlign: TextAlign.center,
+                    style: TextStyle(color: Colors.black),
                   ),
                 ),
               );

lib/pages/package_search/package_search.dart

@@ -80,6 +80,7 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
                   child: Text(
                     "No result found",
                     textAlign: TextAlign.center,
+                    style: TextStyle(color: Colors.black),
                   ),
                 ),
               );

lib/pages/pickup_search/pickup_search.dart

@@ -81,6 +81,7 @@ class PackageSearchDelegate extends SearchDelegate<Pickup> {
                   child: Text(
                     "No result found",
                     textAlign: TextAlign.center,
+                    style: TextStyle(color: Colors.black),
                   ),
                 ),
               );

lib/pages/profile/profile_page.dart

@@ -82,6 +82,10 @@ class _ProfileState extends State<Profile> {
       labelTextKey: "profile.currency",
       iconData: FontAwesome5Regular.money_bill_alt,
     );
+    final deleteacbox = DisplayText(
+      labelTextKey: "profile.delete",
+      iconData: MaterialCommunityIcons.delete,
+    );
 
     final phonenumberbox = DisplayText(
       text: mainModel.user!.phone,
@@ -181,6 +185,18 @@ class _ProfileState extends State<Profile> {
                 iconData: Icons.language,
                 isEng: languageModel.isEng,
               ),
+              Row(
+                children: <Widget>[
+                  Expanded(child: deleteacbox,),
+                  Padding(
+                    padding: const EdgeInsets.only(right: 0),
+                    child: IconButton(
+                        icon: Icon(Icons.edit, color: Colors.grey),
+                        onPressed: _editDelete),
+                  )
+                ],
+              ),
+              
               getPrivilegeBox(context),
               SizedBox(height: 15),
               logoutbutton,
@@ -343,7 +359,10 @@ class _ProfileState extends State<Profile> {
       ),
     );
   }
-
+_editDelete() {
+    Navigator.of(context)
+        .push<void>(CupertinoPageRoute(builder: (context) => ProfileEdit()));
+  }
   _editName() {
     Navigator.of(context)
         .push<void>(CupertinoPageRoute(builder: (context) => ProfileEdit()));

lib/pages/user_search/user_search.dart

@@ -79,6 +79,7 @@ class UserSearchDelegate extends SearchDelegate<User> {
                   child: Text(
                     "No result found",
                     textAlign: TextAlign.center,
+                    style: TextStyle(color:Colors.black),
                   ),
                 ),
               );