add contact

lib/pages/add_pin_editor.dart

@@ -8,8 +8,8 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart' as Theme;
-import 'util.dart';
+import '../fcs/common/helpers/theme.dart' as Theme;
+import '../fcs/common/pages/util.dart';
 
 class AddPINEditor extends StatefulWidget {
   final User user;

lib/pages/announcement.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/announcement_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/announcement.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/widget/local_text.dart';
@@ -12,7 +12,7 @@ import 'package:fcs/widget/popupmenu.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:zefyr/zefyr.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'announcement_editor.dart';
 
 class AnnouncementPage extends StatefulWidget {

lib/pages/announcement_editor.dart

@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/announcement_model.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/announcement.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/announcement_list.dart

@@ -8,7 +8,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'announcement.dart';
 import 'announcement_editor.dart';
 

lib/pages/banks/bank_edit.dart

@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/bank_account.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/local_text_field.dart';

lib/pages/banks/banks.dart

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/banks/bank_edit.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/bank_account.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/barcode_screen_page.dart

@@ -5,7 +5,7 @@ import 'package:flutter_icons/flutter_icons.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/block_list.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/buyer_info.dart

@@ -5,14 +5,14 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/quota_page.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/util.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/widget/label_widgets.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'document_log_page.dart';
 
 class BuyerInfo extends StatefulWidget {

lib/pages/buyer_list.dart

@@ -9,7 +9,7 @@ import 'package:fcs/widget/popupmenu.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'buyer_list_row.dart';
 
 class BuyerList extends StatefulWidget {

lib/pages/buyer_list_row.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 
 import 'buyer_info.dart';

lib/pages/buying_online.dart

@@ -1,4 +1,4 @@
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/manual.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/material.dart';
@@ -7,7 +7,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../widget/label_widgets.dart';
 import '../widget/local_text.dart';
 import 'instruction.dart';

lib/pages/calculate_shipment_cost_editor.dart

@@ -6,7 +6,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class CalculateShipmentCostEditor extends StatefulWidget {
   final PickUp pickUp;

lib/pages/chage_phone_number.dart

@@ -9,9 +9,9 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart' as Theme;
+import '../fcs/common/helpers/theme.dart' as Theme;
 import 'confirm_email.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class ChangePhoneNumber extends StatefulWidget {
   final User user;

lib/pages/change_password.dart

@@ -9,8 +9,8 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart' as Theme;
-import 'util.dart';
+import '../fcs/common/helpers/theme.dart' as Theme;
+import '../fcs/common/pages/util.dart';
 
 class ChangePassword extends StatefulWidget {
   final User user;

lib/pages/confirm_email.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class ConfirmEmail extends StatefulWidget {
   final String id, email, phoneNumber;

lib/pages/contact.dart

@@ -6,8 +6,8 @@ import 'package:package_info/package_info.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 

lib/pages/contact_editor.dart

@@ -4,8 +4,8 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/phone_input.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/setting.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/local_text_field.dart';

lib/pages/custom_editor.dart

@@ -1,10 +1,10 @@
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/custom.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class CustomEditor extends StatefulWidget {
   final Custom custom;

lib/pages/customer_editor.dart

@@ -4,13 +4,13 @@ import 'package:fcs/model/employee_model.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/role.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 typedef void FindCallBack();
 

lib/pages/customer_list.dart

@@ -7,15 +7,15 @@ import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
 
 import 'package:provider/provider.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../vo/user.dart';
 import '../widget/local_text.dart';
 import 'customer_editor.dart';
 import 'invitation_page.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class CustomerList extends StatefulWidget {
   @override

lib/pages/delivery/delivery_item.dart

@@ -12,7 +12,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/do/photo_page.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/widget/img_file.dart';
 import 'package:fcs/widget/local_text.dart';
@@ -21,7 +21,7 @@ import 'package:fcs/widget/my_data_table.dart';
 import 'package:fcs/widget/number_cell.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 
 class DeliveryItem extends StatefulWidget {
   final DOSubmission doSubmission;

lib/pages/delivery/delivery_list.dart

@@ -6,8 +6,8 @@ import 'package:fcs/model/delivery_model.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/delivery/delivery_item.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/popupmenu.dart';

lib/pages/device_list.dart

@@ -8,8 +8,8 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/popupmenu.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
-import 'util.dart';
+import '../fcs/common/helpers/theme.dart';
+import '../fcs/common/pages/util.dart';
 
 class PhoneDeviceList extends StatefulWidget {
   @override

lib/pages/discount_by_weight_editor.dart

@@ -1,11 +1,11 @@
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/custom.dart';
 import 'package:fcs/vo/discount.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class DiscountByWeightEditor extends StatefulWidget {
   final Discount discount;

lib/pages/discount_editor.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model/discount_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/discount.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
@@ -8,7 +8,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class DiscountEditor extends StatefulWidget {
   final Discount discount;

lib/pages/discount_list.dart

@@ -1,13 +1,13 @@
 import 'package:fcs/model/discount_model.dart';
 import 'package:fcs/pages/discount_editor.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class DiscountList extends StatefulWidget {
   @override

lib/pages/do/do_approve.dart

@@ -13,7 +13,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/do/photo_page.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';
@@ -24,7 +24,7 @@ import 'package:fcs/widget/number_cell.dart';
 import 'package:fcs/widget/progress.dart';
 
 import '../document_log_page.dart';
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 import 'do_files.dart';
 import 'do_storage_item.dart';
 

lib/pages/do/do_creation_form.dart

@@ -8,8 +8,8 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/do/do_product_item.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';

lib/pages/do/do_creation_todelete.dart

@@ -2,8 +2,8 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/po_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';

lib/pages/do/do_list.dart

@@ -5,8 +5,8 @@ import 'package:fcs/model/do_model.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/do/do_creation_form.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/popupmenu.dart';

lib/pages/do/do_product_item.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/do/do_storage_item.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/util.dart';
 import 'package:fcs/vo/do.dart';
 import 'package:fcs/vo/storage.dart';

lib/pages/do/photo_page.dart

@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 
 class PhotoPage extends StatefulWidget {
   PhotoPage({Key key}) : super(key: key);

lib/pages/do/po_selection.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/local_text.dart';
 

lib/pages/document_log_page.dart

@@ -3,7 +3,7 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/log_model.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/document_log.dart';
 import 'package:fcs/vo/role.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/email_page.dart

@@ -4,14 +4,14 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/shared_pref.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
 import 'confirm_email.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class EmailPage extends StatefulWidget {
   final User user;

lib/pages/fcs_profile_page.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model/pickup_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/pickup.dart';
 import 'package:fcs/widget/fcs_text_field.dart';
 import 'package:fcs/widget/local_text.dart';
@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class FCSProfilePage extends StatefulWidget {
   final PickUp pickUp;

lib/pages/forget_password.dart

@@ -4,12 +4,12 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/user_model.dart';
 import 'package:fcs/pages/reset_password.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class ForgetPassword extends StatefulWidget {
   final phoneNumber;

lib/pages/instruction.dart

@@ -1,11 +1,11 @@
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/manual_model.dart';
 import 'package:fcs/pages/manual/manual_item_title_dialog.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/manual.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/invitation_page.dart

@@ -1,9 +1,9 @@
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class InvitationPage extends StatefulWidget {
   @override

lib/pages/invoice/box_addition.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model_fcs/box_model.dart';
 import 'package:fcs/model_fcs/package_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/box.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/invoice/invoce_list.dart

@@ -3,7 +3,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/shipment_model.dart';
 import 'package:fcs/model_fcs/package_model.dart';
 import 'package:fcs/pages_fcs/package_list_row.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:provider/provider.dart';

lib/pages/invoice/invoice_editor.dart

@@ -2,7 +2,7 @@ import 'package:fcs/model/discount_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model_fcs/box_model.dart';
 import 'package:fcs/pages/invoice/package_addition.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/box.dart';
 import 'package:fcs/vo/cargo.dart';
 import 'package:fcs/vo/invoice.dart';
@@ -20,7 +20,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 import 'box_addition.dart';
 
 class InvoiceEditor extends StatefulWidget {

lib/pages/invoice/invoice_list_row.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/invoice/payment_pdf_screen.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/invoice.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/cupertino.dart';
@@ -14,7 +14,7 @@ import 'package:intl/intl.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 import 'invoice_editor.dart';
 import 'payment_page.dart';
 

lib/pages/invoice/package_addition.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model_fcs/package_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/invoice/package_info.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/pickup_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/label_widgets.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/invoice/payment_page.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/invoice.dart';
 import 'package:fcs/vo/package.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/invoice/payment_pdf_screen.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

lib/pages/log_list.dart

@@ -6,7 +6,7 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class LogList extends StatefulWidget {
   @override

lib/pages/login_page.dart

@@ -10,10 +10,10 @@ import 'package:fcs/widget/bubble_indication_painter.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart' as Theme;
+import '../fcs/common/helpers/theme.dart' as Theme;
 import 'forget_password.dart';
 import 'sms_page.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class LoginPage extends StatefulWidget {
   LoginPage({Key key}) : super(key: key);

lib/pages/manual/instruction_data_page.dart

@@ -7,7 +7,7 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/manual_model.dart';
 import 'package:fcs/pages/manual/moveable_stack_item.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/manual.dart';
 import 'package:path/path.dart' as Path;
 import 'package:fcs/widget/progress.dart';

lib/pages/manual/manual_page.dart

@@ -4,12 +4,12 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/manual_model.dart';
 import 'package:fcs/pages/manual/manual_item_title_dialog.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/manual.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../../fcs/common/theme.dart';
+import '../../fcs/common/helpers/theme.dart';
 import 'slide_page.dart';
 
 class ManualPage extends StatefulWidget {

lib/pages/message_detail.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model_fcs/message_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/message.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';

lib/pages/my_registeration.dart

@@ -3,14 +3,14 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/reg_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/widget/img_file.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/my_data_table.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../widget/localization/app_translations.dart';
 import 'my_registeration_item.dart';
 

lib/pages/my_registeration_info.dart

@@ -6,7 +6,7 @@ import 'package:fcs/model/reg_model.dart';
 import 'package:fcs/widget/label_widgets.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../util.dart';
 import '../widget/localization/app_translations.dart';
 import 'my_registeration.dart';

lib/pages/my_registeration_item.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/notification_list.dart

@@ -9,7 +9,7 @@ import 'package:fcs/model/notification_model.dart';
 import 'package:fcs/vo/notification.dart' as Noti;
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../widget/local_text.dart';
 
 class NotificationList extends StatefulWidget {

lib/pages/payment_editor.dart

@@ -1,5 +1,5 @@
 import 'package:fcs/model/discount_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/discount.dart';
 import 'package:fcs/vo/payment_method.dart';
 import 'package:flutter/material.dart';
@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class PaymentMethodEditor extends StatefulWidget {
   final PaymentMethod paymentMethod;

lib/pages/payment_method_page.dart

@@ -6,7 +6,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class PaymentMethodPage extends StatefulWidget {
   @override

lib/pages/pd/pd_form.dart

@@ -5,13 +5,13 @@ import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/log_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/pd_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/pd.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/my_data_table.dart';
 import 'package:fcs/widget/progress.dart';
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 import 'pd_item.dart';
 
 class PDForm extends StatefulWidget {

lib/pages/pd/pd_item.dart

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/pd.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/vo/storage.dart';

lib/pages/pd/pd_list.dart

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/pd_model.dart';
 import 'package:fcs/pages/pd/pd_form.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 

lib/pages/phone_input.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 

lib/pages/pickup_box_editor.dart

@@ -2,7 +2,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/shipment_model.dart';
 import 'package:fcs/model_fcs/package_model.dart';
 import 'package:fcs/pages/invoice/package_addition.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/pages_fcs/shipping_address_row.dart';
 import 'package:fcs/vo/box.dart';
 import 'package:fcs/vo/cargo.dart';
@@ -16,7 +16,7 @@ import 'package:fcs/widget/progress.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'shipping_address_editor.dart';
 
 class PickupBoxEditor extends StatefulWidget {

lib/pages/pickup_editor.dart

@@ -2,7 +2,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/pickup_model.dart';
 import 'package:fcs/model/shipment_model.dart';
 import 'package:fcs/model_fcs/box_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/pages_fcs/shipping_address_row.dart';
 import 'package:fcs/vo/box.dart';
 import 'package:fcs/vo/cargo.dart';
@@ -23,7 +23,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'pickup_box_editor.dart';
 
 class PickUpEditor extends StatefulWidget {

lib/pages/pickup_list.dart

@@ -8,7 +8,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'pickup_editor.dart';
 
 class PickUpList extends StatefulWidget {

lib/pages/pickup_list_row.dart

@@ -6,8 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 
 import 'buyer_info.dart';

lib/pages/pin_login_dialog.dart

@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_verification_code_input/flutter_verification_code_input.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:quiver/async.dart';
 
 class PinLoginDialog extends StatefulWidget {

lib/pages/po/po_item.dart

@@ -3,14 +3,14 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 
 class POItem extends StatefulWidget {
   final POLine poLine;

lib/pages/po/po_submission_form.dart

@@ -7,7 +7,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/po_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/pages/po/po_item.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/attach.dart';
 import 'package:fcs/vo/po.dart';
 import 'package:fcs/widget/img_file.dart';
@@ -22,7 +22,7 @@ import 'package:fcs/widget/progress.dart';
 
 import '../../util.dart';
 import '../document_log_page.dart';
-import '../util.dart';
+import '../../fcs/common/pages/util.dart';
 import 'po_files.dart';
 
 class POSubmissionForm extends StatefulWidget {

lib/pages/product_edit_item.dart

@@ -3,12 +3,12 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class ProductEditItem extends StatefulWidget {
   final Product product;

lib/pages/products_list.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/products.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/products_list_edit.dart

@@ -3,12 +3,12 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/product_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'product_edit_item.dart';
 
 class ProductsListEdit extends StatefulWidget {

lib/pages/profile_edit.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 typedef void ProfileCallback();
 

lib/pages/profile_setting.dart

@@ -4,7 +4,7 @@ import 'package:fcs/model/main_model.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'add_pin_editor.dart';
 import 'block_list.dart';
 import 'chage_phone_number.dart';

lib/pages/quota_form.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/quota_page.dart

@@ -3,12 +3,12 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
 import 'package:fcs/model/language_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/buyer.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class QuotaPage extends StatefulWidget {
   final Buyer buyer;

lib/pages/report_user_editor.dart

@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/report_user_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/report.dart';
 import 'package:fcs/vo/report_user.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 typedef void FindCallBack();
 

lib/pages/report_user_list.dart

@@ -7,9 +7,9 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'report_user_editor.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class ReportUserList extends StatefulWidget {
   final Report report;

lib/pages/reset_password.dart

@@ -8,8 +8,8 @@ import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart' as Theme;
-import 'util.dart';
+import '../fcs/common/helpers/theme.dart' as Theme;
+import '../fcs/common/pages/util.dart';
 
 class ResetPasswordPage extends StatefulWidget {
   final String phoneNumber;

lib/pages/search_page.dart

@@ -5,7 +5,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/buyer_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/buyer.dart';
 
 import 'buyer_list_row.dart';

lib/pages/setting_editor.dart

@@ -3,8 +3,8 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/setting.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/setting_editor_byOwner.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/setting.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';

lib/pages/shipment_editor.dart

@@ -1,6 +1,6 @@
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/shipment_model.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/shipment.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/label_widgets.dart';
@@ -13,7 +13,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class ShipmentEditor extends StatefulWidget {
   final Shipment shipment;

lib/pages/shipment_list.dart

@@ -9,7 +9,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'shipment_editor.dart';
 import 'shipment_list_row.dart';
 

lib/pages/shipment_list_row.dart

@@ -1,4 +1,4 @@
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/shipment.dart';
 import 'package:fcs/widget/bottom_up_page_route.dart';
 import 'package:flutter/material.dart';
@@ -6,7 +6,7 @@ import 'package:flutter_icons/flutter_icons.dart';
 import 'package:intl/intl.dart';
 
 import 'shipment_editor.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class ShipmentListRow extends StatefulWidget {
   final Shipment shipment;

lib/pages/shipment_rates.dart

@@ -12,8 +12,8 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
-import 'util.dart';
+import '../fcs/common/helpers/theme.dart';
+import '../fcs/common/pages/util.dart';
 
 class ShipmentRates extends StatefulWidget {
   final PickUp pickUp;

lib/pages/shipment_rates_calculate.dart

@@ -6,7 +6,7 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class ShipmentRatesCal extends StatefulWidget {
   final PickUp pickUp;

lib/pages/shipment_rates_edit.dart

@@ -13,10 +13,10 @@ import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import 'custom_editor.dart';
 import 'discount_by_weight_editor.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class ShipmentRatesEdit extends StatefulWidget {
   final PickUp pickUp;

lib/pages/shipping_address_editor.dart

@@ -1,11 +1,11 @@
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/vo/shipping_address.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 class ShippingAddressEditor extends StatefulWidget {
   final ShippingAddress shippingAddress;

lib/pages/sms_page.dart

@@ -3,10 +3,10 @@ import 'package:progress/progress.dart';
 import 'package:provider/provider.dart';
 
 import '../model/main_model.dart';
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../widget/localization/app_translations.dart';
 import '../widget/progress.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class SmsCodePage extends StatefulWidget {
   final String id, password;

lib/pages/staff_editor.dart

@@ -4,13 +4,13 @@ import 'package:fcs/model/employee_model.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/model/user_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/role.dart';
 import 'package:fcs/vo/user.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';
 import 'package:fcs/widget/progress.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 typedef void FindCallBack();
 

lib/pages/staff_list.dart

@@ -6,14 +6,14 @@ import 'package:intl/intl.dart';
 
 import 'package:provider/provider.dart';
 import 'package:fcs/model/employee_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/widget/progress.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 import '../vo/user.dart';
 import '../widget/local_text.dart';
 import 'staff_editor.dart';
-import 'util.dart';
+import '../fcs/common/pages/util.dart';
 
 class StaffList extends StatefulWidget {
   @override

lib/pages/storage/inventory_item.dart

@@ -5,7 +5,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/product_model.dart';
 import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/inventory_line.dart';
 import 'package:fcs/vo/product.dart';
 import 'package:fcs/vo/storage.dart';

lib/pages/storage/inventory_take.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/storage_model.dart';
 import 'package:fcs/pages/storage/inventory_item.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/inventory_line.dart';
 import 'package:fcs/vo/inventory_taking.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/storage/inventory_taking_list.dart

@@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/storage_model.dart';
 import 'package:fcs/pages/storage/inventory_take.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/inventory_taking.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/storage/storage_addition.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/language_model.dart';
 import 'package:fcs/model/storage_model.dart';
-import 'package:fcs/pages/util.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/storage.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/localization/app_translations.dart';

lib/pages/storage/storage_list.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/storage_model.dart';
 import 'package:fcs/pages/storage/storage_addition.dart';
-import 'package:fcs/fcs/common/theme.dart';
+import 'package:fcs/fcs/common/helpers/theme.dart';
 import 'package:fcs/vo/popup_menu.dart';
 import 'package:fcs/vo/storage.dart';
 import 'package:fcs/widget/local_text.dart';

lib/pages/term.dart

@@ -4,12 +4,12 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:fcs/model/main_model.dart';
 import 'package:fcs/pages/term_edit.dart';
-import 'package:fcs/pages/util.dart';
+import 'package:fcs/fcs/common/pages/util.dart';
 import 'package:fcs/widget/local_text.dart';
 import 'package:fcs/widget/progress.dart';
 import 'package:zefyr/zefyr.dart';
 
-import '../fcs/common/theme.dart';
+import '../fcs/common/helpers/theme.dart';
 
 typedef void ProfileCallback();