add contact

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';