From 9a76a368839ba57794f79512b9cbe068981dda1a Mon Sep 17 00:00:00 2001 From: sainw Date: Fri, 4 Sep 2020 15:30:10 +0630 Subject: [PATCH] add contact --- lib/app.dart | 7 +- lib/charts/bar_chart.dart | 2 +- lib/charts/delivery_do_line.dart | 2 +- lib/charts/delivery_do_line_detail.dart | 2 +- lib/charts/delivery_do_summary.dart | 2 +- lib/charts/delivery_do_summary_details.dart | 2 +- lib/charts/delivery_line.dart | 2 +- lib/charts/delivery_line_data.dart | 2 +- lib/charts/delivery_line_detail.dart | 2 +- lib/charts/delivery_summary.dart | 2 +- lib/charts/delivery_summary_detail.dart | 2 +- lib/charts/do_line.dart | 2 +- lib/charts/do_line_detail.dart | 2 +- lib/charts/po_balance_chart.dart | 2 +- lib/charts/po_balance_table.dart | 2 +- lib/charts/po_balanceby_buyer.dart | 2 +- lib/charts/po_line.dart | 2 +- lib/charts/po_line_detail.dart | 2 +- lib/charts/qtyby_customer_table.dart | 2 +- lib/charts/revenue_line.dart | 2 +- lib/charts/revenue_line_data.dart | 2 +- lib/charts/revenue_line_detail.dart | 2 +- lib/fcs/common/data/providers/auth_fb.dart | 2 +- lib/fcs/common/domain/entities/setting.dart | 29 ++- lib/fcs/common/{ => helpers}/api_helper.dart | 2 +- .../{ => helpers}/network_connectivity.dart | 2 +- lib/fcs/common/helpers/shared_pref.dart | 72 ++++++ lib/fcs/common/{ => helpers}/theme.dart | 2 +- .../common/localization/app_translations.dart | 42 ++++ .../app_translations_delegate.dart | 25 ++ lib/fcs/common/localization/transalation.dart | 27 ++ lib/fcs/common/pages/contact.dart | 150 ++++++++++++ lib/fcs/common/pages/home_page.dart | 230 +++--------------- lib/fcs/common/pages/model/base_model.dart | 35 +++ .../common/pages/model/language_model.dart | 46 ++++ lib/fcs/common/pages/model/main_model.dart | 2 +- lib/fcs/common/pages/profile_page.dart | 12 +- lib/fcs/common/pages/signin/code_page.dart | 4 +- lib/fcs/common/pages/signin/signin_page.dart | 4 +- lib/fcs/common/pages/signin/signup_page.dart | 2 +- lib/fcs/common/pages/splash_page.dart | 2 +- lib/fcs/common/pages/term.dart | 173 +++++++++++++ lib/fcs/common/pages/term_edit.dart | 125 ++++++++++ lib/{ => fcs/common}/pages/util.dart | 18 +- lib/fcs/common/pages/welcome_page.dart | 190 ++++----------- .../common/pages/widgets/action_button.dart | 69 ++++++ .../common/pages/widgets/bottom_widgets.dart | 49 ++++ lib/fcs/common/pages/widgets/local_text.dart | 30 +++ lib/fcs/common/pages/widgets/progress.dart | 45 ++++ lib/main-local.dart | 5 +- lib/model/base_model.dart | 2 +- lib/model/buyer_model.dart | 2 +- lib/model/do_model.dart | 2 +- lib/model/main_model.dart | 2 +- lib/model/report_model.dart | 2 +- lib/pages/add_pin_editor.dart | 4 +- lib/pages/announcement.dart | 4 +- lib/pages/announcement_editor.dart | 4 +- lib/pages/announcement_list.dart | 2 +- lib/pages/banks/bank_edit.dart | 4 +- lib/pages/banks/banks.dart | 2 +- lib/pages/barcode_screen_page.dart | 2 +- lib/pages/block_list.dart | 4 +- lib/pages/buyer_info.dart | 4 +- lib/pages/buyer_list.dart | 2 +- lib/pages/buyer_list_row.dart | 4 +- lib/pages/buying_online.dart | 4 +- lib/pages/calculate_shipment_cost_editor.dart | 2 +- lib/pages/chage_phone_number.dart | 4 +- lib/pages/change_password.dart | 4 +- lib/pages/confirm_email.dart | 4 +- lib/pages/contact.dart | 4 +- lib/pages/contact_editor.dart | 4 +- lib/pages/custom_editor.dart | 4 +- lib/pages/customer_editor.dart | 4 +- lib/pages/customer_list.dart | 6 +- lib/pages/delivery/delivery_item.dart | 4 +- lib/pages/delivery/delivery_list.dart | 4 +- lib/pages/device_list.dart | 4 +- lib/pages/discount_by_weight_editor.dart | 4 +- lib/pages/discount_editor.dart | 4 +- lib/pages/discount_list.dart | 4 +- lib/pages/do/do_approve.dart | 4 +- lib/pages/do/do_creation_form.dart | 4 +- lib/pages/do/do_creation_todelete.dart | 4 +- lib/pages/do/do_list.dart | 4 +- lib/pages/do/do_product_item.dart | 4 +- lib/pages/do/do_storage_item.dart | 2 +- lib/pages/do/photo_page.dart | 4 +- lib/pages/do/po_selection.dart | 2 +- lib/pages/document_log_page.dart | 2 +- lib/pages/email_page.dart | 4 +- lib/pages/fcs_profile_page.dart | 4 +- lib/pages/forget_password.dart | 4 +- lib/pages/instruction.dart | 4 +- lib/pages/invitation_page.dart | 4 +- lib/pages/invoice/box_addition.dart | 2 +- lib/pages/invoice/invoce_list.dart | 2 +- lib/pages/invoice/invoice_editor.dart | 4 +- lib/pages/invoice/invoice_list_row.dart | 4 +- lib/pages/invoice/package_addition.dart | 2 +- lib/pages/invoice/package_info.dart | 2 +- lib/pages/invoice/payment_page.dart | 4 +- lib/pages/invoice/payment_pdf_screen.dart | 2 +- lib/pages/log_list.dart | 2 +- lib/pages/login_page.dart | 4 +- lib/pages/manual/instruction_data_page.dart | 2 +- lib/pages/manual/manual_page.dart | 4 +- lib/pages/message_detail.dart | 2 +- lib/pages/my_registeration.dart | 4 +- lib/pages/my_registeration_info.dart | 2 +- lib/pages/my_registeration_item.dart | 2 +- lib/pages/notification_list.dart | 2 +- lib/pages/payment_editor.dart | 4 +- lib/pages/payment_method_page.dart | 2 +- lib/pages/pd/pd_form.dart | 4 +- lib/pages/pd/pd_item.dart | 2 +- lib/pages/pd/pd_list.dart | 2 +- lib/pages/phone_input.dart | 4 +- lib/pages/pickup_box_editor.dart | 4 +- lib/pages/pickup_editor.dart | 4 +- lib/pages/pickup_list.dart | 2 +- lib/pages/pickup_list_row.dart | 4 +- lib/pages/pin_login_dialog.dart | 4 +- lib/pages/po/po_item.dart | 4 +- lib/pages/po/po_submission_form.dart | 4 +- lib/pages/product_edit_item.dart | 4 +- lib/pages/products_list.dart | 2 +- lib/pages/products_list_edit.dart | 4 +- lib/pages/profile_edit.dart | 4 +- lib/pages/profile_setting.dart | 2 +- lib/pages/quota_form.dart | 2 +- lib/pages/quota_page.dart | 4 +- lib/pages/report_user_editor.dart | 4 +- lib/pages/report_user_list.dart | 4 +- lib/pages/reset_password.dart | 4 +- lib/pages/search_page.dart | 2 +- lib/pages/setting_editor.dart | 4 +- lib/pages/setting_editor_byOwner.dart | 4 +- lib/pages/shipment_editor.dart | 4 +- lib/pages/shipment_list.dart | 2 +- lib/pages/shipment_list_row.dart | 4 +- lib/pages/shipment_rates.dart | 4 +- lib/pages/shipment_rates_calculate.dart | 2 +- lib/pages/shipment_rates_edit.dart | 4 +- lib/pages/shipping_address_editor.dart | 4 +- lib/pages/sms_page.dart | 4 +- lib/pages/staff_editor.dart | 4 +- lib/pages/staff_list.dart | 6 +- lib/pages/storage/inventory_item.dart | 2 +- lib/pages/storage/inventory_take.dart | 4 +- lib/pages/storage/inventory_taking_list.dart | 2 +- lib/pages/storage/storage_addition.dart | 4 +- lib/pages/storage/storage_list.dart | 2 +- lib/pages/term.dart | 4 +- lib/pages/term_edit.dart | 4 +- lib/pages/test_list.dart | 2 +- lib/pages/user_editor.dart | 4 +- lib/pages/user_list.dart | 4 +- lib/pages/user_search_page.dart | 2 +- lib/pages_fcs/box_editor.dart | 4 +- lib/pages_fcs/box_list.dart | 2 +- lib/pages_fcs/box_list_row.dart | 2 +- lib/pages_fcs/cargo_editor.dart | 4 +- lib/pages_fcs/delivery_list.dart | 2 +- lib/pages_fcs/delivery_list_row.dart | 2 +- lib/pages_fcs/package_editor.dart | 4 +- lib/pages_fcs/package_list.dart | 2 +- lib/pages_fcs/package_list_row.dart | 2 +- lib/pages_fcs/pickup_editor.dart | 4 +- lib/pages_fcs/shipping_address_list.dart | 2 +- lib/pages_fcs/shipping_address_row.dart | 2 +- lib/reports/report_field_list_page.dart | 2 +- lib/reports/report_filter_list_page.dart | 2 +- lib/reports/report_list.dart | 2 +- lib/reports/reports_data_table.dart | 4 +- lib/widget/NetworkConnectivity.dart | 2 +- lib/widget/fcs_text_field.dart | 2 +- lib/widget/fcs_text_field_readonly.dart | 2 +- lib/widget/label_widgets.dart | 2 +- lib/widget/local_text.dart | 2 +- lib/widget/local_text_field.dart | 2 +- lib/widget/number_cell.dart | 2 +- lib/widget/products.dart | 2 +- lib/widget/products_price_table.dart | 2 +- lib/widget/progress.dart | 2 +- lib/widget/show_img.dart | 2 +- 187 files changed, 1257 insertions(+), 616 deletions(-) rename lib/fcs/common/{ => helpers}/api_helper.dart (99%) rename lib/fcs/common/{ => helpers}/network_connectivity.dart (96%) create mode 100644 lib/fcs/common/helpers/shared_pref.dart rename lib/fcs/common/{ => helpers}/theme.dart (98%) create mode 100644 lib/fcs/common/localization/app_translations.dart create mode 100644 lib/fcs/common/localization/app_translations_delegate.dart create mode 100644 lib/fcs/common/localization/transalation.dart create mode 100644 lib/fcs/common/pages/contact.dart create mode 100644 lib/fcs/common/pages/model/base_model.dart create mode 100644 lib/fcs/common/pages/model/language_model.dart create mode 100644 lib/fcs/common/pages/term.dart create mode 100644 lib/fcs/common/pages/term_edit.dart rename lib/{ => fcs/common}/pages/util.dart (97%) create mode 100644 lib/fcs/common/pages/widgets/action_button.dart create mode 100644 lib/fcs/common/pages/widgets/bottom_widgets.dart create mode 100644 lib/fcs/common/pages/widgets/local_text.dart create mode 100644 lib/fcs/common/pages/widgets/progress.dart diff --git a/lib/app.dart b/lib/app.dart index df6f0c7..d769bd3 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -1,3 +1,6 @@ +import 'package:fcs/fcs/common/localization/app_translations_delegate.dart'; +import 'package:fcs/fcs/common/localization/transalation.dart'; +import 'package:fcs/fcs/common/pages/model/language_model.dart'; import 'package:fcs/model/buyer_model.dart'; import 'package:fcs/model/delivery_model.dart'; import 'package:fcs/model/discount_model.dart'; @@ -25,7 +28,6 @@ import 'model/device_model.dart'; import 'model/do_model.dart'; import 'model/employee_model.dart'; import 'model/invoice_model.dart'; -import 'model/language_model.dart'; import 'model/log_model.dart'; import 'model/main_model.dart'; import 'model/pickup_model.dart'; @@ -39,8 +41,6 @@ import 'fcs/common/pages/home_page.dart'; import 'fcs/common/pages/welcome_page.dart'; import 'fcs/common/pages/splash_page.dart'; import 'pages/term.dart'; -import 'widget/localization/app_translations_delegate.dart'; -import 'widget/localization/transalation.dart'; class App extends StatefulWidget { @override @@ -92,7 +92,6 @@ class _AppState extends State { mainModel ..addModel(userModel) ..addModel(employeeModel) - ..addModel(lanuguageModel) ..addModel(storageModel) ..addModel(regModel) ..addModel(poSubmissionModel) diff --git a/lib/charts/bar_chart.dart b/lib/charts/bar_chart.dart index bd3cee6..19de245 100644 --- a/lib/charts/bar_chart.dart +++ b/lib/charts/bar_chart.dart @@ -6,7 +6,7 @@ import 'package:provider/provider.dart'; import 'package:fcs/charts/qtyby_customer_table.dart'; import 'package:fcs/model/chart_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/widget/local_text.dart'; diff --git a/lib/charts/delivery_do_line.dart b/lib/charts/delivery_do_line.dart index 2ae625f..5e6bd38 100644 --- a/lib/charts/delivery_do_line.dart +++ b/lib/charts/delivery_do_line.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/charts/delivery_do_line_detail.dart b/lib/charts/delivery_do_line_detail.dart index 353ee93..5ef17d8 100644 --- a/lib/charts/delivery_do_line_detail.dart +++ b/lib/charts/delivery_do_line_detail.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/delivery_do_summary.dart b/lib/charts/delivery_do_summary.dart index 7fece95..251bf6d 100644 --- a/lib/charts/delivery_do_summary.dart +++ b/lib/charts/delivery_do_summary.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/charts/delivery_do_summary_details.dart b/lib/charts/delivery_do_summary_details.dart index 486b53e..5fa669a 100644 --- a/lib/charts/delivery_do_summary_details.dart +++ b/lib/charts/delivery_do_summary_details.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/delivery_line.dart b/lib/charts/delivery_line.dart index ba930f8..6d8f83d 100644 --- a/lib/charts/delivery_line.dart +++ b/lib/charts/delivery_line.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/charts/delivery_line_data.dart b/lib/charts/delivery_line_data.dart index e813768..634a6a3 100644 --- a/lib/charts/delivery_line_data.dart +++ b/lib/charts/delivery_line_data.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_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/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/delivery_line_detail.dart b/lib/charts/delivery_line_detail.dart index 445d376..211470b 100644 --- a/lib/charts/delivery_line_detail.dart +++ b/lib/charts/delivery_line_detail.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/do_model.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/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/delivery_summary.dart b/lib/charts/delivery_summary.dart index 2d7eb26..133563b 100644 --- a/lib/charts/delivery_summary.dart +++ b/lib/charts/delivery_summary.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'delivery_summary_detail.dart'; diff --git a/lib/charts/delivery_summary_detail.dart b/lib/charts/delivery_summary_detail.dart index 4065acf..78ccad8 100644 --- a/lib/charts/delivery_summary_detail.dart +++ b/lib/charts/delivery_summary_detail.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/do_line.dart b/lib/charts/do_line.dart index fe1c8ca..544ac65 100644 --- a/lib/charts/do_line.dart +++ b/lib/charts/do_line.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/po_do_count.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/charts/do_line_detail.dart b/lib/charts/do_line_detail.dart index add1cce..e0c8192 100644 --- a/lib/charts/do_line_detail.dart +++ b/lib/charts/do_line_detail.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/po_do_count.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/po_balance_chart.dart b/lib/charts/po_balance_chart.dart index 6d2450a..2791633 100644 --- a/lib/charts/po_balance_chart.dart +++ b/lib/charts/po_balance_chart.dart @@ -6,7 +6,7 @@ import 'package:provider/provider.dart'; import 'package:fcs/charts/po_balance_table.dart'; import 'package:fcs/model/chart_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/widget/local_text.dart'; diff --git a/lib/charts/po_balance_table.dart b/lib/charts/po_balance_table.dart index 66f3f2f..d91280e 100644 --- a/lib/charts/po_balance_table.dart +++ b/lib/charts/po_balance_table.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.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/po.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; diff --git a/lib/charts/po_balanceby_buyer.dart b/lib/charts/po_balanceby_buyer.dart index 77b7708..035b092 100644 --- a/lib/charts/po_balanceby_buyer.dart +++ b/lib/charts/po_balanceby_buyer.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_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/widget/local_text.dart'; diff --git a/lib/charts/po_line.dart b/lib/charts/po_line.dart index ac6da23..a29736b 100644 --- a/lib/charts/po_line.dart +++ b/lib/charts/po_line.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/charts/po_line_detail.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/po_do_count.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/charts/po_line_detail.dart b/lib/charts/po_line_detail.dart index f0f570e..198be9d 100644 --- a/lib/charts/po_line_detail.dart +++ b/lib/charts/po_line_detail.dart @@ -4,7 +4,7 @@ import 'package:http/http.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/po_do_count.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/qtyby_customer_table.dart b/lib/charts/qtyby_customer_table.dart index f35d178..b5257c8 100644 --- a/lib/charts/qtyby_customer_table.dart +++ b/lib/charts/qtyby_customer_table.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_model.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/po.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; diff --git a/lib/charts/revenue_line.dart b/lib/charts/revenue_line.dart index 385e7ca..dbfbdac 100644 --- a/lib/charts/revenue_line.dart +++ b/lib/charts/revenue_line.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_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/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/charts/revenue_line_data.dart b/lib/charts/revenue_line_data.dart index 99b8986..146e6dc 100644 --- a/lib/charts/revenue_line_data.dart +++ b/lib/charts/revenue_line_data.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/chart_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/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/charts/revenue_line_detail.dart b/lib/charts/revenue_line_detail.dart index 7b976cb..2f879e6 100644 --- a/lib/charts/revenue_line_detail.dart +++ b/lib/charts/revenue_line_detail.dart @@ -4,7 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/main_model.dart'; import 'package:fcs/model/po_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/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; diff --git a/lib/fcs/common/data/providers/auth_fb.dart b/lib/fcs/common/data/providers/auth_fb.dart index 1c076aa..2129b10 100644 --- a/lib/fcs/common/data/providers/auth_fb.dart +++ b/lib/fcs/common/data/providers/auth_fb.dart @@ -9,7 +9,7 @@ import 'package:fcs/fcs/common/domain/entities/user.dart'; import 'package:fcs/fcs/common/domain/exceiptions/signin_exception.dart'; import 'package:firebase_auth/firebase_auth.dart'; -import '../../api_helper.dart'; +import '../../helpers/api_helper.dart'; class AuthFb { static final AuthFb instance = AuthFb._(); diff --git a/lib/fcs/common/domain/entities/setting.dart b/lib/fcs/common/domain/entities/setting.dart index b5f9db1..22a0e02 100644 --- a/lib/fcs/common/domain/entities/setting.dart +++ b/lib/fcs/common/domain/entities/setting.dart @@ -14,6 +14,15 @@ List dayLists = [ class Setting { final int supportBuildNum; + + // contact page + String usaAddress; + String mmAddress; + String usaContactNumber; + String mmContactNumber; + String emailAddress; + String facebookLink; + final String okEnergyId; final String about; final String terms; @@ -35,9 +44,7 @@ class Setting { List phones; String deliveryPhone; String address; - String email; String website; - String facebook; DateTime priceLastUpdate; String bankAccountInfo; List bankAccounts; @@ -71,6 +78,12 @@ class Setting { Setting( {this.supportBuildNum, + this.usaAddress, + this.mmAddress, + this.usaContactNumber, + this.mmContactNumber, + this.emailAddress, + this.facebookLink, this.about, this.okEnergyId, this.terms, @@ -89,9 +102,7 @@ class Setting { this.helpVersion, this.helpURL, this.phones, - this.email, this.website, - this.facebook, this.priceLastUpdate, this.bankAccountInfo, this.bankAccounts, @@ -110,10 +121,16 @@ class Setting { } return Setting( - priceLastUpdate: ts?.toDate(), supportBuildNum: map['support_build_number'], + usaAddress: map['usa_address'], + mmAddress: map['mm_address'], + usaContactNumber: map['usa_contact_number'], + mmContactNumber: map['mm_contact_number'], + emailAddress: map['email_address'], + facebookLink: map['facebook_link'], about: map['about'], terms: map['terms'], + priceLastUpdate: ts?.toDate(), okEnergyId: map['ok_energy_id'], poExpireInHours: map['po_expire_hours'], doExpireInHours: map['do_expire_hours'], @@ -128,11 +145,9 @@ class Setting { reportURL: map['report_url'], helpVersion: map['help_version'], helpURL: map['help_url'], - email: map['email'], deliveryPhone: map['delivery_phone'], address: map['address'], website: map['website'], - facebook: map['facebook'], bankAccountInfo: map['bank_account_info'], bankAccounts: bankAccounts); } diff --git a/lib/fcs/common/api_helper.dart b/lib/fcs/common/helpers/api_helper.dart similarity index 99% rename from lib/fcs/common/api_helper.dart rename to lib/fcs/common/helpers/api_helper.dart index b5e958f..3e166ef 100644 --- a/lib/fcs/common/api_helper.dart +++ b/lib/fcs/common/helpers/api_helper.dart @@ -6,7 +6,7 @@ import 'package:dio/dio.dart'; import 'package:logging/logging.dart'; import 'package:fcs/vo/status.dart'; -import '../../config.dart'; +import '../../../config.dart'; final log = Logger('requestAPI'); diff --git a/lib/fcs/common/network_connectivity.dart b/lib/fcs/common/helpers/network_connectivity.dart similarity index 96% rename from lib/fcs/common/network_connectivity.dart rename to lib/fcs/common/helpers/network_connectivity.dart index be680b4..d34f593 100644 --- a/lib/fcs/common/network_connectivity.dart +++ b/lib/fcs/common/helpers/network_connectivity.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:connectivity/connectivity.dart'; import 'package:fcs/config.dart'; -import 'package:fcs/fcs/common/api_helper.dart'; +import 'package:fcs/fcs/common/helpers/api_helper.dart'; import 'package:logging/logging.dart'; class NetworkConnectivity { diff --git a/lib/fcs/common/helpers/shared_pref.dart b/lib/fcs/common/helpers/shared_pref.dart new file mode 100644 index 0000000..52821bd --- /dev/null +++ b/lib/fcs/common/helpers/shared_pref.dart @@ -0,0 +1,72 @@ +import 'dart:convert'; + +import 'package:fcs/fcs/common/domain/entities/user.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + + +class SharedPref { + static final SharedPref instance = SharedPref._(); + SharedPref._(); + + static Future getLang() async { + SharedPreferences prefs = await SharedPreferences.getInstance(); + return prefs.getString('language'); + } + + static Future saveLang(String lang) async { + SharedPreferences prefs = await SharedPreferences.getInstance(); + prefs.setString('language', lang); + } + + static Future saveUser(User user) async { + await _save("user", user.toJson()); + } + + static Future getUser() async { + try { + return User.fromJson(await _read("user")); + } catch (e) { + return null; + } + } + + static Future removeUser() async { + return await _remove("user"); + } + + static Future saveSkippedRecoverEmail(bool skipped) async { + await _save("skipped_recovery_email", skipped); + } + + static Future getSkippedRecoverEmail() async { + try { + bool _skipped = await _read("skipped_recovery_email"); + return _skipped; + } catch (e) { + return null; + } + } + + static _read(String key) async { + try { + final prefs = await SharedPreferences.getInstance(); + return json.decode(prefs.getString(key)); + } catch (e) { + print("Error:$e"); + } + } + + static _save(String key, value) async { + try { + final prefs = await SharedPreferences.getInstance(); + prefs.setString(key, json.encode(value)); + } catch (e) { + print("Error:$e"); + } + } + + static _remove(String key) async { + final prefs = await SharedPreferences.getInstance(); + prefs.remove(key); + } +} diff --git a/lib/fcs/common/theme.dart b/lib/fcs/common/helpers/theme.dart similarity index 98% rename from lib/fcs/common/theme.dart rename to lib/fcs/common/helpers/theme.dart index a8b4a9f..1c84937 100644 --- a/lib/fcs/common/theme.dart +++ b/lib/fcs/common/helpers/theme.dart @@ -18,7 +18,7 @@ const TextStyle welcomeLabelStyle = const TextStyle welcomeSubLabelStyle = TextStyle(fontSize: 18, color: primaryColor, fontWeight: FontWeight.w500); const TextStyle subMenuStyle = - TextStyle(fontSize: 11, color: Colors.white, fontWeight: FontWeight.w500); + TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500); const TextStyle siginButtonStyle = TextStyle(fontSize: 16, color: Colors.white, fontWeight: FontWeight.w500); diff --git a/lib/fcs/common/localization/app_translations.dart b/lib/fcs/common/localization/app_translations.dart new file mode 100644 index 0000000..0c8cc59 --- /dev/null +++ b/lib/fcs/common/localization/app_translations.dart @@ -0,0 +1,42 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:ui'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart' show rootBundle; + +class AppTranslations { + Locale locale; + static Map _localisedValues; + + AppTranslations(Locale locale) { + this.locale = locale; + } + + static AppTranslations of(BuildContext context) { + return Localizations.of(context, AppTranslations); + } + + static Future load(Locale locale) async { + AppTranslations appTranslations = AppTranslations(locale); + String jsonContent = await rootBundle + .loadString("assets/local/localization_${locale.languageCode}.json"); + _localisedValues = json.decode(jsonContent); + return appTranslations; + } + + get currentLanguage => locale.languageCode; + + String text(String key, {List translationVariables}) { + String value = _localisedValues[key]; + if (value == null) { + return "$key not found"; + } + if (translationVariables != null) { + translationVariables.asMap().forEach((i, s) { + value = value.replaceAll("{$i}", s); + }); + } + return value; + } +} diff --git a/lib/fcs/common/localization/app_translations_delegate.dart b/lib/fcs/common/localization/app_translations_delegate.dart new file mode 100644 index 0000000..f2b3aa1 --- /dev/null +++ b/lib/fcs/common/localization/app_translations_delegate.dart @@ -0,0 +1,25 @@ +import 'dart:async'; +import 'package:flutter/material.dart'; +import 'app_translations.dart'; +import 'transalation.dart'; + +class AppTranslationsDelegate extends LocalizationsDelegate { + final Locale newLocale; + + const AppTranslationsDelegate({this.newLocale}); + + @override + bool isSupported(Locale locale) { + return Translation().supportedLanguagesCodes.contains(locale.languageCode); + } + + @override + Future load(Locale locale) { + return AppTranslations.load(newLocale ?? locale); + } + + @override + bool shouldReload(LocalizationsDelegate old) { + return true; + } +} \ No newline at end of file diff --git a/lib/fcs/common/localization/transalation.dart b/lib/fcs/common/localization/transalation.dart new file mode 100644 index 0000000..3ab2f99 --- /dev/null +++ b/lib/fcs/common/localization/transalation.dart @@ -0,0 +1,27 @@ +import 'dart:ui'; + +typedef void LocaleChangeCallback(Locale locale); + +class Translation { + static final Translation _translation = Translation._internal(); + + factory Translation() { + return _translation; + } + + Translation._internal(); + + final List supportedLanguages = [ + "English", + "မြန်မာ ", + ]; + + final List supportedLanguagesCodes = ["en", "mu"]; + + //returns the list of supported Locales + Iterable supportedLocales() => + supportedLanguagesCodes.map((language) => Locale(language, "")); + + //function to be invoked when changing the language + LocaleChangeCallback onLocaleChanged; +} diff --git a/lib/fcs/common/pages/contact.dart b/lib/fcs/common/pages/contact.dart new file mode 100644 index 0000000..0a8e28c --- /dev/null +++ b/lib/fcs/common/pages/contact.dart @@ -0,0 +1,150 @@ +import 'package:fcs/fcs/common/domain/entities/setting.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; +import 'package:fcs/fcs/common/pages/model/main_model.dart'; +import 'package:fcs/fcs/common/pages/widgets/local_text.dart'; +import 'package:fcs/fcs/common/pages/widgets/progress.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:package_info/package_info.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class Contact extends StatefulWidget { + @override + _ContactState createState() => _ContactState(); +} + +class _ContactState extends State { + bool _isLoading = false; + + @override + Widget build(BuildContext context) { + Setting setting = Provider.of(context).setting; + + return LocalProgress( + inAsyncCall: _isLoading, + child: Scaffold( + appBar: AppBar( + backgroundColor: primaryColor, + elevation: 0, + centerTitle: true, + leading: new IconButton( + icon: new Icon(Icons.close), + onPressed: () => Navigator.of(context).pop(), + ), + title: LocalText( + context, + "contact", + fontSize: 25, + color: Colors.white, + ), + ), + body: ListView( + children: [ + link(setting.usaContactNumber, Icons.phone_forwarded, + onTap: () => _call(setting.usaContactNumber), + label: LocalText( + context, + "contact.usa.phone", + color: primaryColor, + )), + link(setting.mmContactNumber, Icons.phone_forwarded, + onTap: () => _call( + setting.mmContactNumber, + ), + label: LocalText( + context, + "contact.mm.phone", + color: primaryColor, + )), + link( + setting.usaAddress, + Icons.location_on, + ), + link(setting.mmAddress, Icons.location_on), + link(setting.emailAddress, Icons.email, + onTap: () => _email(setting.emailAddress)), + link(setting.facebookLink, FontAwesomeIcons.facebook, + onTap: () => _openLink(setting.facebookLink)), + ], + ), + ), + ); + } + + Widget link(String text, IconData iconData, + {Function() onTap, Widget label}) { + return Padding( + padding: const EdgeInsets.only(left: 18.0, bottom: 5), + child: InkWell( + onTap: () => onTap != null ? onTap() : null, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Row( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Icon( + iconData, + ), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + label == null + ? Container() + : Padding( + padding: EdgeInsets.fromLTRB(10, 10, 10, 0), + child: label, + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + text == null ? "" : text, + overflow: TextOverflow.ellipsis, + maxLines: 5, + style: TextStyle(fontSize: 14.0), + ), + ), + ], + ), + SizedBox( + width: 5, + ), + onTap == null + ? Container() + : Icon( + Icons.open_in_new, + color: Colors.grey, + size: 15, + ) + ], + ), + )), + ); + } + + Future getVersionNumber() async { + PackageInfo packageInfo = await PackageInfo.fromPlatform(); + String version = packageInfo.version + "+" + packageInfo.buildNumber; + return version; + } + + _call(String phone) { + showConfirmDialog( + context, "contact.phone.confim", () => launch("tel:$phone"), + translationVariables: ["$phone"]); + } + + _email(String email) { + showConfirmDialog( + context, "contact.email.configm", () => launch("mailto:$email"), + translationVariables: ["$email"]); + } + + _openLink(String link) { + showConfirmDialog(context, "contact.open.confrim", () => launch("$link"), + translationVariables: ["$link"]); + } +} diff --git a/lib/fcs/common/pages/home_page.dart b/lib/fcs/common/pages/home_page.dart index 5832364..27aca90 100644 --- a/lib/fcs/common/pages/home_page.dart +++ b/lib/fcs/common/pages/home_page.dart @@ -1,6 +1,8 @@ +import 'package:fcs/fcs/common/localization/transalation.dart'; +import 'package:fcs/fcs/common/pages/model/language_model.dart'; import 'package:fcs/fcs/common/pages/model/main_model.dart'; -import 'package:fcs/model/language_model.dart'; -import 'package:fcs/pages/contact.dart'; +import 'package:fcs/fcs/common/pages/widgets/action_button.dart'; +import 'package:fcs/fcs/common/pages/widgets/bottom_widgets.dart'; import 'package:fcs/pages/discount_list.dart'; import 'package:fcs/pages/notification_list.dart'; import 'package:fcs/pages/payment_method_page.dart'; @@ -11,8 +13,6 @@ import 'package:fcs/pages_fcs/delivery_list.dart'; import 'package:fcs/pages_fcs/package_list.dart'; import 'package:fcs/widget/banner.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; -import 'package:fcs/widget/localization/app_translations.dart'; -import 'package:fcs/widget/localization/transalation.dart'; import 'package:fcs/widget/offline_redirect.dart'; import 'package:fcs/widget/right_left_page_route%20copy.dart'; import 'package:flutter/cupertino.dart'; @@ -30,7 +30,7 @@ import '../../../pages/invoice/invoce_list.dart'; import '../../../pages/pickup_list.dart'; import '../../../pages/shipment_rates.dart'; import '../../../pages/staff_list.dart'; -import '../theme.dart'; +import '../helpers/theme.dart'; import 'profile_page.dart'; import 'signin/signin_page.dart'; @@ -41,12 +41,11 @@ class HomePage extends StatefulWidget { _HomePageState createState() => _HomePageState(); } -typedef BtnCallback(); - class _HomePageState extends State { final log = Logger('_HomePageState'); bool login = false; bool customer = true; + List isSelected = [true, false]; @override void initState() { @@ -67,41 +66,41 @@ class _HomePageState extends State { final numberFormatter = new NumberFormat("#,###"); String pin; - List isSelected = [true, false]; @override Widget build(BuildContext context) { login = Provider.of(context).isLogin(); var owner = Provider.of(context).isOwner(); var customer = Provider.of(context).isCustomer(); + LanguageModel languageModel = Provider.of(context); - final packagesBtn = _buildBtn2("package.name", + final packagesBtn = _buildBtn("package.name", icon: Octicons.package, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(PackageList()))); - final boxesBtn = _buildBtn2("boxes.name", + final boxesBtn = _buildBtn("boxes.name", icon: MaterialCommunityIcons.package, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(BoxList()))); - final pickUpBtn = _buildBtn2("pickup", + final pickUpBtn = _buildBtn("pickup", icon: SimpleLineIcons.direction, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(PickUpList()))); - final shipmentCostBtn = _buildBtn2("rate", + final shipmentCostBtn = _buildBtn("rate", icon: FontAwesomeIcons.calculator, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(ShipmentRates()))); - final fcsProfileBtn = _buildBtn2("fcs.btn", + final fcsProfileBtn = _buildBtn("fcs.btn", // imgIcon: Image.asset("assets/logo_btn.png", height: 25,color:Colors.white), icon: MaterialCommunityIcons.home_city, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(FCSProfilePage()))); - final shipmentBtn = _buildBtn2("shipment.title", + final shipmentBtn = _buildBtn("shipment.title", icon: Ionicons.ios_airplane, imgIcon: Image.asset( "assets/truck.png", @@ -112,7 +111,7 @@ class _HomePageState extends State { btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(ShipmentList()))); - final buyingBtn = _buildBtn2("buy_online", + final buyingBtn = _buildBtn("buy_online", icon: MaterialCommunityIcons.cart_outline, btnCallback: () { Navigator.push(context, BottomUpPageRoute(BuyingOnlinePage()) // MaterialPageRoute(builder: (context) => BuyingOnlinePage()), @@ -120,43 +119,43 @@ class _HomePageState extends State { }); final notiBtn = - _buildBtn2("message.btn", icon: Icons.message, btnCallback: () { + _buildBtn("message.btn", icon: Icons.message, btnCallback: () { Navigator.push( context, BottomUpPageRoute(NotificationList()), ); }); - final staffBtn = _buildBtn2("staff.title", + final staffBtn = _buildBtn("staff.title", icon: MaterialCommunityIcons.worker, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(StaffList()))); - final customersBtn = _buildBtn2("customers.btn", + final customersBtn = _buildBtn("customers.btn", icon: Feather.users, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(CustomerList()))); - final invoicesBtn = _buildBtn2("invoices.btn", + final invoicesBtn = _buildBtn("invoices.btn", icon: FontAwesomeIcons.fileInvoice, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(InvoiceList()))); - final paymentMethodBtn = _buildBtn2("payment.method.btn", + final paymentMethodBtn = _buildBtn("payment.method.btn", icon: FontAwesomeIcons.creditCard, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(PaymentMethodPage()))); - final discountBtn = _buildBtn2("discount.btn", + final discountBtn = _buildBtn("discount.btn", icon: Entypo.price_ribbon, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(DiscountList()))); - final termBtn = _buildBtn2("term.btn", + final termBtn = _buildBtn("term.btn", icon: FontAwesomeIcons.info, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(Term()))); - final deliveryBtn = _buildBtn2("delivery.title", + final deliveryBtn = _buildBtn("delivery.title", icon: MaterialCommunityIcons.truck_fast, btnCallback: () => Navigator.of(context).push(BottomUpPageRoute(DeliverList()))); @@ -206,7 +205,7 @@ class _HomePageState extends State { ) ], onPressed: _langChange, - isSelected: isSelected, + isSelected: languageModel.currentState, ), IconButton( onPressed: () { @@ -234,7 +233,7 @@ class _HomePageState extends State { ) ], onPressed: _langChange, - isSelected: isSelected, + isSelected: languageModel.currentState, ), FlatButton( onPressed: () { @@ -288,42 +287,14 @@ class _HomePageState extends State { child: Column( children: [ Expanded( - child: Padding( - padding: const EdgeInsets.only(top: 8.0), - child: ListView(children: [ - Wrap( - alignment: WrapAlignment.center, - children: widgets, - ), - ]), - ), + child: ListView(children: [ + Wrap( + alignment: WrapAlignment.center, + children: widgets, + ), + ]), ), - Container( - height: 80, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - // _buildSmallButton( - // "Policies", FontAwesomeIcons.fileContract), - InkWell( - onTap: () { - Navigator.of(context) - .push(BottomUpPageRoute(Contact())); - }, - child: _buildSmallButton( - "Contact Us", SimpleLineIcons.support), - ), - InkWell( - onTap: () { - Navigator.of(context) - .push(BottomUpPageRoute(Term())); - }, - child: _buildSmallButton( - "Terms of service", Icons.info_outline), - ), - ], - ), - ) + BottomWidgets(), ], ))), ), @@ -331,7 +302,7 @@ class _HomePageState extends State { } _langChange(index) { - var languageModel = Provider.of(context); + var languageModel = Provider.of(context,listen: false); languageModel.saveLanguage(Translation().supportedLanguages[index]); setState(() { isSelected.asMap().forEach((i, e) { @@ -341,143 +312,8 @@ class _HomePageState extends State { }); } - Widget _buildTile(Widget child, {Function() onTap}) { - return Material( - elevation: 0, - borderRadius: BorderRadius.circular(12.0), - // shadowColor: Colors.transparent, - color: Colors.transparent, - child: InkWell( - onTap: onTap != null - ? () => onTap() - : () { - log.info('Not set yet'); - }, - child: child)); - } - Widget _buildBtn(String title, {Image imgIcon, IconData icon, BtnCallback btnCallback}) { - var languageModel = Provider.of(context); - return _buildTile( - Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - icon != null - ? Material( - child: Padding( - padding: EdgeInsets.only(top: 10), - child: Icon(icon, color: primaryColor, size: 35.0))) - : Container( - padding: EdgeInsets.only(top: 3), - child: imgIcon, - ), - Padding(padding: EdgeInsets.only(bottom: 10.0)), - Text(AppTranslations.of(context).text(title), - style: languageModel.isEng - ? TextStyle( - color: Colors.black, - fontWeight: FontWeight.w700, - fontSize: 12.0) - : TextStyle( - color: Colors.black, - fontWeight: FontWeight.w700, - fontSize: 12.0, - fontFamily: "MyanmarUnicode")), - ]), - ), - onTap: btnCallback, - ); - } - - Widget _buildBtn2(String title, - {Image imgIcon, IconData icon, BtnCallback btnCallback}) { - var languageModel = Provider.of(context); - return Container( - width: 100, - height: 100, - decoration: new BoxDecoration( - color: Colors.transparent, //new Color.fromRGBO(255, 0, 0, 0.0), - borderRadius: new BorderRadius.only( - topLeft: const Radius.circular(40.0), - topRight: const Radius.circular(40.0))), - // color: Colors.transparent, - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - // Padding( - // padding: EdgeInsets.only(top: 10), - // child: Icon(icon, color: Colors.white, size: 35.0)), - // Padding(padding: EdgeInsets.only(bottom: 10.0)), - ClipOval( - child: Material( - color: Colors.black54, // button color - child: InkWell( - splashColor: primaryColor, // inkwell color - child: SizedBox( - width: 60, - height: 60, - child: icon == null - ? Container(width: 10, height: 10, child: imgIcon) - : Icon(icon, color: Colors.white, size: 30)), - onTap: btnCallback, - ), - ), - ), - - Container( - height: 30, - child: FittedBox( - fit: BoxFit.fitWidth, - child: Text(AppTranslations.of(context).text(title), - style: languageModel.isEng - ? TextStyle( - color: Colors.white, - fontWeight: FontWeight.w500, - fontSize: 14.0, - fontFamily: "Roboto") - : TextStyle( - color: Colors.white, - fontWeight: FontWeight.w700, - fontSize: 12.0, - fontFamily: "MyanmarUnicode")), - ), - ), - ]), - ), - ); - } - - Widget _buildSmallButton(String text, IconData iconData) { - return Padding( - padding: const EdgeInsets.all(18.0), - child: Row( - children: [ - IconButton( - icon: Icon(iconData, color: Colors.white70), - color: Colors.white70, - onPressed: null), - // RaisedButton(onPressed: ()=>{},child: Row( - // children: [ - // IconButton( - // icon: Icon(iconData, ), - // onPressed: null), - // Text(text), - // ], - // ),color: Colors.transparent, - // focusColor: Colors.transparent,), - Text( - text, - style: subMenuStyle, - ) - ], - ), - ); + return ActionButton(title: title,imgIcon: imgIcon,icon:icon,btnCallback: btnCallback); } } diff --git a/lib/fcs/common/pages/model/base_model.dart b/lib/fcs/common/pages/model/base_model.dart new file mode 100644 index 0000000..916cd00 --- /dev/null +++ b/lib/fcs/common/pages/model/base_model.dart @@ -0,0 +1,35 @@ +import 'package:fcs/fcs/common/domain/entities/setting.dart'; +import 'package:fcs/fcs/common/domain/entities/user.dart'; +import 'package:flutter/foundation.dart'; +import 'package:fcs/fcs/common/helpers/api_helper.dart'; + +import 'main_model.dart'; + +abstract class BaseModel extends ChangeNotifier { + User user; + Setting setting; + MainModel mainModel; + + void initUser(User user) async { + this.user = user; + } + + void initSetting(Setting setting) async { + this.setting = setting; + } + + void logout(); + +// request makes http request +// if token is null + dynamic request( + String path, + method, { + dynamic payload, + String token, + String url, + }) async { + return await requestAPI(path, method, + payload: payload, token: token, url: url); + } +} diff --git a/lib/fcs/common/pages/model/language_model.dart b/lib/fcs/common/pages/model/language_model.dart new file mode 100644 index 0000000..b37910e --- /dev/null +++ b/lib/fcs/common/pages/model/language_model.dart @@ -0,0 +1,46 @@ +import 'package:fcs/fcs/common/localization/transalation.dart'; +import 'package:fcs/fcs/common/helpers/shared_pref.dart'; +import 'package:flutter/painting.dart'; + +import 'base_model.dart'; + +class LanguageModel extends BaseModel { + String language; + bool get isEng => this.language == "English"; + List get currentState => isEng ? [true, false] : [false, true]; + + static final List languageCodesList = + Translation().supportedLanguagesCodes; + static final List languagesList = Translation().supportedLanguages; + + final Map languagesMap = { + languagesList[0]: languageCodesList[0], + languagesList[1]: languageCodesList[1], + }; + LanguageModel() { + load(); + } + @override + logout() async {} + + Future load() async { + var data = await SharedPref.getLang(); + String result = languagesList[1]; // defalut to english + if (data != null) { + result = data; + } + this.language = result; + Translation().onLocaleChanged(Locale(languagesMap[this.language])); + print("lang=====$result"); + notifyListeners(); + return result; + } + + void saveLanguage(String language) async { + Translation().onLocaleChanged(Locale(languagesMap[language])); + + SharedPref.saveLang(language); + this.language = language; + notifyListeners(); + } +} diff --git a/lib/fcs/common/pages/model/main_model.dart b/lib/fcs/common/pages/model/main_model.dart index 2462c94..7fa9523 100644 --- a/lib/fcs/common/pages/model/main_model.dart +++ b/lib/fcs/common/pages/model/main_model.dart @@ -8,7 +8,7 @@ import 'package:fcs/fcs/common/domain/entities/auth_result.dart'; import 'package:fcs/fcs/common/domain/entities/auth_status.dart'; import 'package:fcs/fcs/common/domain/entities/setting.dart'; import 'package:fcs/fcs/common/domain/entities/user.dart'; -import 'package:fcs/fcs/common/network_connectivity.dart'; +import 'package:fcs/fcs/common/helpers/network_connectivity.dart'; import 'package:fcs/fcs/common/services/services.dart'; import 'package:flutter/foundation.dart'; import 'package:logging/logging.dart'; diff --git a/lib/fcs/common/pages/profile_page.dart b/lib/fcs/common/pages/profile_page.dart index cb8f876..e981e73 100644 --- a/lib/fcs/common/pages/profile_page.dart +++ b/lib/fcs/common/pages/profile_page.dart @@ -1,20 +1,20 @@ +import 'package:fcs/fcs/common/localization/app_translations.dart'; +import 'package:fcs/fcs/common/localization/transalation.dart'; +import 'package:fcs/fcs/common/pages/model/language_model.dart'; import 'package:fcs/fcs/common/pages/model/main_model.dart'; -import 'package:fcs/model/language_model.dart'; +import 'package:fcs/fcs/common/pages/widgets/progress.dart'; import 'package:fcs/model/shipment_model.dart'; import 'package:fcs/model/user_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/role.dart'; import 'package:fcs/vo/shipping_address.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; -import 'package:fcs/widget/localization/app_translations.dart'; -import 'package:fcs/widget/localization/transalation.dart'; -import 'package:fcs/widget/progress.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../pages/shipping_address_editor.dart'; -import '../theme.dart'; +import '../helpers/theme.dart'; typedef void ProfileCallback(); diff --git a/lib/fcs/common/pages/signin/code_page.dart b/lib/fcs/common/pages/signin/code_page.dart index 068df13..e681af0 100644 --- a/lib/fcs/common/pages/signin/code_page.dart +++ b/lib/fcs/common/pages/signin/code_page.dart @@ -4,14 +4,14 @@ import 'package:fcs/fcs/common/domain/entities/auth_result.dart'; import 'package:fcs/fcs/common/domain/entities/auth_status.dart'; import 'package:fcs/fcs/common/domain/entities/user.dart'; import 'package:fcs/fcs/common/pages/model/main_model.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:pin_input_text_field/pin_input_text_field.dart'; import 'package:provider/provider.dart'; import 'signup_page.dart'; -import '../../theme.dart'; +import '../../helpers/theme.dart'; import '../../../../widget/local_text.dart'; import '../../../../widget/progress.dart'; diff --git a/lib/fcs/common/pages/signin/signin_page.dart b/lib/fcs/common/pages/signin/signin_page.dart index ef19eac..a869786 100644 --- a/lib/fcs/common/pages/signin/signin_page.dart +++ b/lib/fcs/common/pages/signin/signin_page.dart @@ -8,11 +8,11 @@ import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; -import '../../theme.dart'; +import '../../helpers/theme.dart'; import '../../../../widget/local_text.dart'; import '../../../../widget/progress.dart'; import 'code_page.dart'; -import '../../../../pages/util.dart'; +import '../util.dart'; class SigninPage extends StatefulWidget { @override diff --git a/lib/fcs/common/pages/signin/signup_page.dart b/lib/fcs/common/pages/signin/signup_page.dart index b4b766b..4f5b611 100644 --- a/lib/fcs/common/pages/signin/signup_page.dart +++ b/lib/fcs/common/pages/signin/signup_page.dart @@ -6,7 +6,7 @@ import 'package:provider/provider.dart'; import '../../../../widget/local_text.dart'; import '../../../../widget/progress.dart'; -import '../../theme.dart'; +import '../../helpers/theme.dart'; class SignupPage extends StatefulWidget { @override diff --git a/lib/fcs/common/pages/splash_page.dart b/lib/fcs/common/pages/splash_page.dart index e4269d6..656fe32 100644 --- a/lib/fcs/common/pages/splash_page.dart +++ b/lib/fcs/common/pages/splash_page.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:fcs/fcs/common/pages/model/main_model.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:flutter/material.dart'; import 'package:logging/logging.dart'; diff --git a/lib/fcs/common/pages/term.dart b/lib/fcs/common/pages/term.dart new file mode 100644 index 0000000..34ee27a --- /dev/null +++ b/lib/fcs/common/pages/term.dart @@ -0,0 +1,173 @@ +import 'dart:convert'; + +import 'package:fcs/fcs/common/pages/model/main_model.dart'; +import 'package:fcs/fcs/common/pages/term_edit.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; +import 'package:fcs/fcs/common/pages/widgets/local_text.dart'; +import 'package:fcs/fcs/common/pages/widgets/progress.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; +import 'package:zefyr/zefyr.dart'; + + +typedef void ProfileCallback(); + +class Term extends StatefulWidget { + final bool agreePage; + + const Term({Key key, this.agreePage = false}) : super(key: key); + @override + _TermState createState() => _TermState(); +} + +class _TermState extends State { + ZefyrController _controller; + FocusNode _focusNode; + NotusDocument document = new NotusDocument(); + bool isLoading = false; + + @override + void initState() { + super.initState(); + _controller = ZefyrController(_loadDocument()); + print("controller terms => ${_controller.document}"); + _focusNode = FocusNode(); + } + + NotusDocument _loadDocument() { + MainModel mainModel = Provider.of(context, listen: false); + String term = mainModel.setting.terms; + print("terms => $term"); + NotusDocument doc; + try { + doc = NotusDocument.fromJson(jsonDecode(term)); + print('doc=> $doc'); + } catch (e) {} + if (doc == null) { + doc = NotusDocument(); + } + return doc; + } + + @override + Widget build(BuildContext context) { + MainModel mainModel = Provider.of(context); + + bool isOwnerAndAbove = + mainModel.user != null && mainModel.user.isOwnerAndAbove(); + bool hasAdmin = mainModel.user != null && mainModel.user.hasAdmin(); + + // bool aggreed = mainModel.user.agreeTerms; + bool aggreed = true; + + final agreeBtn = Padding( + padding: EdgeInsets.symmetric(vertical: 10.0), + child: Card( + elevation: 10, + child: Container( + height: 45.0, + child: ButtonTheme( + minWidth: 900.0, + height: 100.0, + child: FlatButton.icon( + onPressed: () { + showConfirmDialog(context, "term.iagree", () async { + _agree(); + }); + }, + label: LocalText(context, "term.agree_btn"), + icon: Icon( + Icons.check, + ), + ), + ), + ), + )); + + return LocalProgress( + inAsyncCall: isLoading, + child: Scaffold( + appBar: AppBar( + centerTitle: true, + leading: new IconButton( + icon: new Icon(Icons.close), + onPressed: () => Navigator.of(context).pop(), + ), + // automaticallyImplyLeading: !widget.agreePage, + title: LocalText(context, 'term', color: Colors.white, fontSize: 20), + backgroundColor: primaryColor, + actions: [ + // isOwnerAndAbove || hasAdmin + // ? + IconButton( + icon: Icon(Icons.edit), + onPressed: () async { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => TermEdit((data) { + setState(() { + _controller = ZefyrController(data); + }); + })), + ); + // print('doc=> $doc'); + + // setState(() { + // document = doc; + // }); + // var document = await + // Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => TermEdit()), + // ); + }, + ) + // : Container() + ], + ), + body: Column( + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Card( + child: ZefyrTheme( + data: ZefyrThemeData().copyWith(), + child: ZefyrScaffold( + child: ZefyrEditor( + mode: ZefyrMode.view, + padding: EdgeInsets.all(16), + controller: _controller, + focusNode: _focusNode, + ), + ))), + )), + !aggreed ? agreeBtn : Container(), + ], + ), + ), + ); + } + + _agree() async { + setState(() { + isLoading = true; + }); + try { + // MainModel mainModel = Provider.of(context); + // await mainModel.agreeTerms(); + // if (widget.agreePage) { + // Future.delayed(const Duration(milliseconds: 3000), () { + // Navigator.pop(context); + // }); + // } + } catch (e) { + showMsgDialog(context, "Error", e.toString()); + setState(() { + isLoading = false; + }); + } + } +} diff --git a/lib/fcs/common/pages/term_edit.dart b/lib/fcs/common/pages/term_edit.dart new file mode 100644 index 0000000..b00c5be --- /dev/null +++ b/lib/fcs/common/pages/term_edit.dart @@ -0,0 +1,125 @@ +import 'dart:convert'; + +import 'package:fcs/fcs/common/helpers/theme.dart'; +import 'package:fcs/model/main_model.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; +import 'package:fcs/widget/progress.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:provider/provider.dart'; +import 'package:zefyr/zefyr.dart'; + + +typedef void ProfileCallback(); + +class TermEdit extends StatefulWidget { + final ValueChanged onChangedData; + TermEdit(this.onChangedData); + @override + _TermEditState createState() => _TermEditState(); +} + +class _TermEditState extends State { + /// Allows to control the editor and the document. + ZefyrController _controller; + + /// Zefyr editor like any other input field requires a focus node. + FocusNode _focusNode; + bool _isLoading; + + @override + void initState() { + super.initState(); + _isLoading = false; + + // Here we must load the document and pass it to Zefyr controller. + final document = _loadDocument(); + _controller = ZefyrController(document); + _focusNode = FocusNode(); + } + + /// Loads the document to be edited in Zefyr. + NotusDocument _loadDocument() { + MainModel mainModel = Provider.of(context, listen: false); + String term = mainModel.setting.terms; + + NotusDocument doc; + try { + doc = NotusDocument.fromJson(jsonDecode(term)); + } catch (e) {} + if (doc == null) { + doc = NotusDocument(); + } + return doc; + } + + @override + Widget build(BuildContext context) { + MainModel mainModel = Provider.of(context); + + var singleChildScrollView = SingleChildScrollView( + padding: EdgeInsets.only( + left: 25.0, + right: 25.0, + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 300, + height: 300, + child: Card(child: Markdown(data: mainModel.setting.terms))), + ], + ), + ); + + return LocalProgress( + inAsyncCall: _isLoading, + child: Scaffold( + appBar: AppBar( + title: Text( + "Terms", + ), + backgroundColor: primaryColor, + actions: [ + IconButton( + icon: Icon(Icons.save), + onPressed: () { + _save(); + }, + ) + ], + ), + body: ZefyrScaffold( + child: ZefyrTheme( + data: ZefyrThemeData().copyWith(), + child: ZefyrEditor( + padding: EdgeInsets.all(16), + controller: _controller, + focusNode: _focusNode, + ), + ), + ), + ), + ); + } + + _save() { + setState(() { + _isLoading = true; + }); + try { + final contents = jsonEncode(_controller.document); + print('contents => $contents'); + widget.onChangedData(_controller.document); + // MainModel mainModel = Provider.of(context, listen: false); + // mainModel.updateTerms(contents); + } catch (e) { + showMsgDialog(context, "Error", e.toString()); + } finally { + _isLoading = false; + Navigator.pop(context); + } + } +} diff --git a/lib/pages/util.dart b/lib/fcs/common/pages/util.dart similarity index 97% rename from lib/pages/util.dart rename to lib/fcs/common/pages/util.dart index 25f48c7..e64ea2b 100644 --- a/lib/pages/util.dart +++ b/lib/fcs/common/pages/util.dart @@ -11,20 +11,20 @@ import 'package:fcs/model/language_model.dart'; import 'package:fcs/model/notification_model.dart'; import 'package:fcs/model/po_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/buyer.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/vo/notification.dart' as Noti; -import 'announcement.dart'; -import 'buyer_info.dart'; -import 'do/do_approve.dart'; -import 'log_list.dart'; -import 'my_registeration_info.dart'; -import 'po/po_submission_form.dart'; -import 'products_list.dart'; -import 'user_editor.dart'; +import '../../../pages/announcement.dart'; +import '../../../pages/buyer_info.dart'; +import '../../../pages/do/do_approve.dart'; +import '../../../pages/log_list.dart'; +import '../../../pages/my_registeration_info.dart'; +import '../../../pages/po/po_submission_form.dart'; +import '../../../pages/products_list.dart'; +import '../../../pages/user_editor.dart'; final log = Logger('Util'); diff --git a/lib/fcs/common/pages/welcome_page.dart b/lib/fcs/common/pages/welcome_page.dart index d6ab02e..d7a9077 100644 --- a/lib/fcs/common/pages/welcome_page.dart +++ b/lib/fcs/common/pages/welcome_page.dart @@ -1,18 +1,17 @@ import 'package:fcs/fcs/common/pages/model/main_model.dart'; +import 'package:fcs/fcs/common/pages/widgets/bottom_widgets.dart'; import 'package:fcs/model/language_model.dart'; -import 'package:fcs/pages/contact.dart'; import 'package:fcs/widget/banner.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; import 'package:fcs/widget/localization/transalation.dart'; import 'package:fcs/widget/offline_redirect.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; import 'package:intl/intl.dart' as intl; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; -import '../theme.dart'; +import '../helpers/theme.dart'; import 'profile_page.dart'; import 'signin/signin_page.dart'; import '../../../pages/term.dart'; @@ -136,132 +135,58 @@ class _WelcomePageState extends State { Color(0xfa272262), ], // whitish to gray )), - child: ListView( + child: Column( children: [ - Column( - children: [ - Padding( - padding: const EdgeInsets.all(80.0), - child: Text( - "Welcome!", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 28, - fontFamily: "Roboto"), - ), - ), - Padding( - padding: const EdgeInsets.only(top: 0.0), - child: Text( - "Cargo Services", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 28, - fontFamily: "Roboto"), - ), - ), - Padding( - padding: const EdgeInsets.all(10.0), - child: Text( - "by FCS Trading", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 18, - fontFamily: "Roboto"), - ), - ), - Container( - padding: EdgeInsets.only(top: 10, bottom: 10), - child: CircleAvatar( - radius: (50), - backgroundColor: Colors.white, - child: ClipRRect( - borderRadius: BorderRadius.circular(50), - child: Image.asset("assets/logo.jpg"), - )), - ), - ], - ), - // Row( - // children: [ - // Expanded( - // child: Container( - // height: 200, - // // child: DimensionBox( - // // dimension: Dimension(length, width, height), - // // color: secondaryColor, - // // ), - // ), - // ), - // RotatedBox( - // quarterTurns: -1, - // child: Slider( - // min: 6, - // max: 100, - // value: height, - // onChanged: (value) { - // setState(() { - // height = value; - // }); - // }, - // ), - // ), - // ], - // ), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceEvenly, - // children: [ - // Slider( - // label: "Length", - // min: 6, - // max: 100, - // value: length, - // onChanged: (value) { - // setState(() { - // length = value; - // }); - // }, - // ), - // Slider( - // label: "Width", - // min: 6, - // max: 100, - // value: width, - // onChanged: (value) { - // setState(() { - // width = value; - // }); - // }, - // ), - // ], - // ), - Padding( - padding: const EdgeInsets.only(top: 28.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + Expanded( + child: ListView( children: [ - InkWell( - onTap: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (_) => Contact())); - }, - child: _buildSmallButton( - "Contact Us", SimpleLineIcons.support), + Padding( + padding: const EdgeInsets.all(80.0), + child: Text( + "Welcome!", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 28, + fontFamily: "Roboto"), + ), ), - InkWell( - onTap: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (_) => Term())); - }, - child: _buildSmallButton( - "Terms of service", Icons.info_outline), + Padding( + padding: const EdgeInsets.only(top: 0.0), + child: Text( + "Cargo Services", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 28, + fontFamily: "Roboto"), + ), + ), + Padding( + padding: const EdgeInsets.all(10.0), + child: Text( + "by FCS Trading", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 18, + fontFamily: "Roboto"), + ), + ), + Container( + padding: EdgeInsets.only(top: 10, bottom: 30), + child: CircleAvatar( + radius: (50), + backgroundColor: Colors.white, + child: ClipRRect( + borderRadius: BorderRadius.circular(50), + child: Image.asset("assets/logo.jpg"), + )), ), ], ), - ) + ), + BottomWidgets(), ], ))), ), @@ -278,23 +203,4 @@ class _WelcomePageState extends State { isSelected[index] = !isSelected[index]; }); } - - Widget _buildSmallButton(String text, IconData iconData) { - return Padding( - padding: const EdgeInsets.all(18.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Padding( - padding: const EdgeInsets.only(right: 5), - child: Icon(iconData, color: Colors.white70, size: 18), - ), - Text( - text, - style: subMenuStyle, - ) - ], - ), - ); - } } diff --git a/lib/fcs/common/pages/widgets/action_button.dart b/lib/fcs/common/pages/widgets/action_button.dart new file mode 100644 index 0000000..66fcc0d --- /dev/null +++ b/lib/fcs/common/pages/widgets/action_button.dart @@ -0,0 +1,69 @@ +import 'package:fcs/fcs/common/localization/app_translations.dart'; +import 'package:fcs/fcs/common/pages/model/language_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; +import 'package:provider/provider.dart'; + +typedef BtnCallback(); + +class ActionButton extends StatelessWidget { + final String title; + final Image imgIcon; + final IconData icon; + final BtnCallback btnCallback; + + const ActionButton( + {Key key, this.title, this.imgIcon, this.icon, this.btnCallback}) + : super(key: key); + + @override + Widget build(BuildContext context) { + var languageModel = Provider.of(context); + return InkWell( + onTap: btnCallback != null ? btnCallback : () => {}, + child: Container( + width: 120, + height: 150, + padding: EdgeInsets.only(top:15.0), + decoration: new BoxDecoration( + color: Colors.transparent, + borderRadius: new BorderRadius.only( + topLeft: const Radius.circular(40.0), + topRight: const Radius.circular(40.0))), + child: Padding( + padding: const EdgeInsets.all(5.0), + child: Column(children: [ + ClipOval( + child: Material( + color: Colors.black54, // button color + child: SizedBox( + width: 60, + height: 60, + child: icon == null + ? Container(width: 10, height: 10, child: imgIcon) + : Icon(icon, color: Colors.white, size: 30)), + ), + ), + Container( + height: 50, + alignment: Alignment.topCenter, + child: Text(AppTranslations.of(context).text(title), + textAlign: TextAlign.center, + style: languageModel.isEng + ? TextStyle( + color: Colors.white, + fontWeight: FontWeight.w500, + fontSize: 15.0, + fontFamily: "Roboto") + : TextStyle( + color: Colors.white, + fontWeight: FontWeight.w500, + fontSize: 14.0, + fontFamily: "MyanmarUnicode")), + ), + ]), + ), + ), + ); + } +} diff --git a/lib/fcs/common/pages/widgets/bottom_widgets.dart b/lib/fcs/common/pages/widgets/bottom_widgets.dart new file mode 100644 index 0000000..81b91b0 --- /dev/null +++ b/lib/fcs/common/pages/widgets/bottom_widgets.dart @@ -0,0 +1,49 @@ +import 'package:fcs/fcs/common/pages/contact.dart'; +import 'package:fcs/fcs/common/pages/term.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; +import 'package:fcs/widget/bottom_up_page_route.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_icons/flutter_icons.dart'; + +class BottomWidgets extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + InkWell( + onTap: () { + Navigator.of(context).push(BottomUpPageRoute(Contact())); + }, + child: _buildSmallButton("Contact Us", SimpleLineIcons.support), + ), + InkWell( + onTap: () { + Navigator.of(context).push(BottomUpPageRoute(Term())); + }, + child: _buildSmallButton("Terms of service", Icons.info_outline), + ), + ], + ); + } + + Widget _buildSmallButton(String text, IconData iconData) { + return Padding( + padding: const EdgeInsets.all(18.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.only(right: 5), + child: Icon(iconData, color: Colors.white70, size: 20), + ), + Text( + text, + style: subMenuStyle, + ) + ], + ), + ); + } +} diff --git a/lib/fcs/common/pages/widgets/local_text.dart b/lib/fcs/common/pages/widgets/local_text.dart new file mode 100644 index 0000000..c26c488 --- /dev/null +++ b/lib/fcs/common/pages/widgets/local_text.dart @@ -0,0 +1,30 @@ +import 'package:fcs/fcs/common/localization/app_translations.dart'; +import 'package:fcs/fcs/common/pages/model/language_model.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; + + +class LocalText extends Text { + final BuildContext context; + LocalText(this.context, String translationKey, + {Color color, + double fontSize, + FontWeight fontWeight, + List translationVariables, + bool underline = false}) + : super( + AppTranslations.of(context).text(translationKey, + translationVariables: translationVariables), + style: Provider.of(context).isEng + ? newLabelStyle( + color: color, + fontSize: fontSize, + fontWeight: fontWeight, + underline: underline) + : newLabelStyleMM( + color: color, + fontSize: fontSize, + fontWeight: fontWeight, + underline: underline)); +} diff --git a/lib/fcs/common/pages/widgets/progress.dart b/lib/fcs/common/pages/widgets/progress.dart new file mode 100644 index 0000000..8135fbe --- /dev/null +++ b/lib/fcs/common/pages/widgets/progress.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; +import 'package:progress/progress.dart'; +import 'package:provider/provider.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; + +class LocalProgress extends Progress { + LocalProgress({bool inAsyncCall, Widget child}) + : super( + inAsyncCall: inAsyncCall, + child: child, + opacity: 0.6, + progressIndicator: Center( + child: Container( + height: 100, + width: 300, + child: Card( + color: Colors.white, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + CircularProgressIndicator( + valueColor: + new AlwaysStoppedAnimation(primaryColor), + ), + SizedBox( + height: 10, + ), + Text("Loading...") + ], + ), + ), + ), + )); + + Widget build(BuildContext context) { + // hide keyboard + if (inAsyncCall) { + FocusScopeNode currentFocus = FocusScope.of(context); + if (!currentFocus.hasPrimaryFocus) { + currentFocus.unfocus(); + } + } + return super.build(context); + } +} diff --git a/lib/main-local.dart b/lib/main-local.dart index 6d48ad8..eb80cc2 100644 --- a/lib/main-local.dart +++ b/lib/main-local.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:fcs/config.dart'; -import 'package:shared_preferences/shared_preferences.dart'; import 'app.dart'; @@ -9,9 +8,7 @@ void main() { Config( flavor: Flavor.DEV, color: Colors.blue, - apiURL: "https://localhost:7777", - reportURL: "http://petrok-dev.mokkon.com:8080", - reportProjectID: "dev", + apiURL: "http://192.168.1.155:7777", level: Level.ALL); runApp(App()); } diff --git a/lib/model/base_model.dart b/lib/model/base_model.dart index 6b220fb..2a39149 100644 --- a/lib/model/base_model.dart +++ b/lib/model/base_model.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:fcs/fcs/common/api_helper.dart'; +import 'package:fcs/fcs/common/helpers/api_helper.dart'; import '../vo/setting.dart'; import '../vo/user.dart'; diff --git a/lib/model/buyer_model.dart b/lib/model/buyer_model.dart index f5326e4..43fbb3d 100644 --- a/lib/model/buyer_model.dart +++ b/lib/model/buyer_model.dart @@ -4,7 +4,7 @@ import 'dart:convert' show HtmlEscape, base64, utf8; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:logging/logging.dart'; import 'package:fcs/config.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/popup_menu.dart'; diff --git a/lib/model/do_model.dart b/lib/model/do_model.dart index 3816e6b..4b8e0f1 100644 --- a/lib/model/do_model.dart +++ b/lib/model/do_model.dart @@ -4,7 +4,7 @@ import 'dart:typed_data'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:path/path.dart' as Path; -import 'package:fcs/fcs/common/api_helper.dart'; +import 'package:fcs/fcs/common/helpers/api_helper.dart'; import 'package:fcs/model/constants.dart'; import 'package:fcs/pages/do/do_files.dart'; import 'package:fcs/vo/do.dart'; diff --git a/lib/model/main_model.dart b/lib/model/main_model.dart index 62ed57d..75f4ae2 100644 --- a/lib/model/main_model.dart +++ b/lib/model/main_model.dart @@ -23,7 +23,7 @@ import 'package:fcs/widget/NetworkConnectivity.dart'; import '../config.dart'; import '../vo/status.dart'; import '../vo/user.dart'; -import '../fcs/common/api_helper.dart'; +import '../fcs/common/helpers/api_helper.dart'; import 'base_model.dart'; import 'constants.dart'; import 'firebase_helper.dart'; diff --git a/lib/model/report_model.dart b/lib/model/report_model.dart index e958caa..f683f0c 100644 --- a/lib/model/report_model.dart +++ b/lib/model/report_model.dart @@ -6,7 +6,7 @@ import 'package:fcs/vo/report.dart'; import 'package:fcs/vo/report_user.dart'; import 'package:open_file/open_file.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:fcs/fcs/common/api_helper.dart' as api; +import 'package:fcs/fcs/common/helpers/api_helper.dart' as api; import 'package:fcs/vo/report.dart'; import '../config.dart'; diff --git a/lib/pages/add_pin_editor.dart b/lib/pages/add_pin_editor.dart index 1591a81..8259afa 100644 --- a/lib/pages/add_pin_editor.dart +++ b/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; diff --git a/lib/pages/announcement.dart b/lib/pages/announcement.dart index e81a807..af88b1a 100644 --- a/lib/pages/announcement.dart +++ b/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 { diff --git a/lib/pages/announcement_editor.dart b/lib/pages/announcement_editor.dart index e2ff07a..b37a332 100644 --- a/lib/pages/announcement_editor.dart +++ b/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'; diff --git a/lib/pages/announcement_list.dart b/lib/pages/announcement_list.dart index 4119f47..0c57365 100644 --- a/lib/pages/announcement_list.dart +++ b/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'; diff --git a/lib/pages/banks/bank_edit.dart b/lib/pages/banks/bank_edit.dart index 2b5252a..e99f1c0 100644 --- a/lib/pages/banks/bank_edit.dart +++ b/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'; diff --git a/lib/pages/banks/banks.dart b/lib/pages/banks/banks.dart index aa1bdb7..e1000ec 100644 --- a/lib/pages/banks/banks.dart +++ b/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'; diff --git a/lib/pages/barcode_screen_page.dart b/lib/pages/barcode_screen_page.dart index 4e5d72f..7c58af0 100644 --- a/lib/pages/barcode_screen_page.dart +++ b/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'; diff --git a/lib/pages/block_list.dart b/lib/pages/block_list.dart index a341f10..68314c9 100644 --- a/lib/pages/block_list.dart +++ b/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'; diff --git a/lib/pages/buyer_info.dart b/lib/pages/buyer_info.dart index e81b45f..33654b7 100644 --- a/lib/pages/buyer_info.dart +++ b/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 { diff --git a/lib/pages/buyer_list.dart b/lib/pages/buyer_list.dart index c4edf25..9e85e5c 100644 --- a/lib/pages/buyer_list.dart +++ b/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 { diff --git a/lib/pages/buyer_list_row.dart b/lib/pages/buyer_list_row.dart index c29d03f..a8cbbf3 100644 --- a/lib/pages/buyer_list_row.dart +++ b/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'; diff --git a/lib/pages/buying_online.dart b/lib/pages/buying_online.dart index 7c8cc70..b02f050 100644 --- a/lib/pages/buying_online.dart +++ b/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'; diff --git a/lib/pages/calculate_shipment_cost_editor.dart b/lib/pages/calculate_shipment_cost_editor.dart index bc84b34..a78d088 100644 --- a/lib/pages/calculate_shipment_cost_editor.dart +++ b/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; diff --git a/lib/pages/chage_phone_number.dart b/lib/pages/chage_phone_number.dart index 77b46bb..8910567 100644 --- a/lib/pages/chage_phone_number.dart +++ b/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; diff --git a/lib/pages/change_password.dart b/lib/pages/change_password.dart index 9a158d8..7cac95b 100644 --- a/lib/pages/change_password.dart +++ b/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; diff --git a/lib/pages/confirm_email.dart b/lib/pages/confirm_email.dart index 5e509d2..ed82bba 100644 --- a/lib/pages/confirm_email.dart +++ b/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; diff --git a/lib/pages/contact.dart b/lib/pages/contact.dart index 7dc16f9..abbdefd 100644 --- a/lib/pages/contact.dart +++ b/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'; diff --git a/lib/pages/contact_editor.dart b/lib/pages/contact_editor.dart index 2020895..22db660 100644 --- a/lib/pages/contact_editor.dart +++ b/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'; diff --git a/lib/pages/custom_editor.dart b/lib/pages/custom_editor.dart index bbacc51..69b5bad 100644 --- a/lib/pages/custom_editor.dart +++ b/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; diff --git a/lib/pages/customer_editor.dart b/lib/pages/customer_editor.dart index d436d3f..004dbdd 100644 --- a/lib/pages/customer_editor.dart +++ b/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(); diff --git a/lib/pages/customer_list.dart b/lib/pages/customer_list.dart index 8023dd8..d61f64c 100644 --- a/lib/pages/customer_list.dart +++ b/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 diff --git a/lib/pages/delivery/delivery_item.dart b/lib/pages/delivery/delivery_item.dart index 3611100..c02418f 100644 --- a/lib/pages/delivery/delivery_item.dart +++ b/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; diff --git a/lib/pages/delivery/delivery_list.dart b/lib/pages/delivery/delivery_list.dart index 7e30966..52163de 100644 --- a/lib/pages/delivery/delivery_list.dart +++ b/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'; diff --git a/lib/pages/device_list.dart b/lib/pages/device_list.dart index 9d38ef9..c51ddf3 100644 --- a/lib/pages/device_list.dart +++ b/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 diff --git a/lib/pages/discount_by_weight_editor.dart b/lib/pages/discount_by_weight_editor.dart index e9af24f..f8d0605 100644 --- a/lib/pages/discount_by_weight_editor.dart +++ b/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; diff --git a/lib/pages/discount_editor.dart b/lib/pages/discount_editor.dart index 1b6c49a..a3c3b59 100644 --- a/lib/pages/discount_editor.dart +++ b/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; diff --git a/lib/pages/discount_list.dart b/lib/pages/discount_list.dart index 7cb569c..b22a149 100644 --- a/lib/pages/discount_list.dart +++ b/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 diff --git a/lib/pages/do/do_approve.dart b/lib/pages/do/do_approve.dart index ad62733..863830c 100644 --- a/lib/pages/do/do_approve.dart +++ b/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'; diff --git a/lib/pages/do/do_creation_form.dart b/lib/pages/do/do_creation_form.dart index 3c11275..843bba4 100644 --- a/lib/pages/do/do_creation_form.dart +++ b/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'; diff --git a/lib/pages/do/do_creation_todelete.dart b/lib/pages/do/do_creation_todelete.dart index 0dddc74..6215b66 100644 --- a/lib/pages/do/do_creation_todelete.dart +++ b/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'; diff --git a/lib/pages/do/do_list.dart b/lib/pages/do/do_list.dart index 45c0f94..b435c55 100644 --- a/lib/pages/do/do_list.dart +++ b/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'; diff --git a/lib/pages/do/do_product_item.dart b/lib/pages/do/do_product_item.dart index b7bf75e..186da53 100644 --- a/lib/pages/do/do_product_item.dart +++ b/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'; diff --git a/lib/pages/do/do_storage_item.dart b/lib/pages/do/do_storage_item.dart index ec8a381..1e3447e 100644 --- a/lib/pages/do/do_storage_item.dart +++ b/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'; diff --git a/lib/pages/do/photo_page.dart b/lib/pages/do/photo_page.dart index f6189a2..6c0e710 100644 --- a/lib/pages/do/photo_page.dart +++ b/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); diff --git a/lib/pages/do/po_selection.dart b/lib/pages/do/po_selection.dart index d9e45c8..80b8601 100644 --- a/lib/pages/do/po_selection.dart +++ b/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'; diff --git a/lib/pages/document_log_page.dart b/lib/pages/document_log_page.dart index 766b797..2518eb9 100644 --- a/lib/pages/document_log_page.dart +++ b/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'; diff --git a/lib/pages/email_page.dart b/lib/pages/email_page.dart index 0c097ef..7165247 100644 --- a/lib/pages/email_page.dart +++ b/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; diff --git a/lib/pages/fcs_profile_page.dart b/lib/pages/fcs_profile_page.dart index 8cd1695..807b106 100644 --- a/lib/pages/fcs_profile_page.dart +++ b/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; diff --git a/lib/pages/forget_password.dart b/lib/pages/forget_password.dart index 6208dae..8b14953 100644 --- a/lib/pages/forget_password.dart +++ b/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; diff --git a/lib/pages/instruction.dart b/lib/pages/instruction.dart index 94de671..d1129f1 100644 --- a/lib/pages/instruction.dart +++ b/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'; diff --git a/lib/pages/invitation_page.dart b/lib/pages/invitation_page.dart index d5374ab..b3173f9 100644 --- a/lib/pages/invitation_page.dart +++ b/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 diff --git a/lib/pages/invoice/box_addition.dart b/lib/pages/invoice/box_addition.dart index 663f79d..4fea0f2 100644 --- a/lib/pages/invoice/box_addition.dart +++ b/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'; diff --git a/lib/pages/invoice/invoce_list.dart b/lib/pages/invoice/invoce_list.dart index f6e52eb..5374e9a 100644 --- a/lib/pages/invoice/invoce_list.dart +++ b/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'; diff --git a/lib/pages/invoice/invoice_editor.dart b/lib/pages/invoice/invoice_editor.dart index abdc266..66f5810 100644 --- a/lib/pages/invoice/invoice_editor.dart +++ b/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 { diff --git a/lib/pages/invoice/invoice_list_row.dart b/lib/pages/invoice/invoice_list_row.dart index bfdf174..fffaf2c 100644 --- a/lib/pages/invoice/invoice_list_row.dart +++ b/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'; diff --git a/lib/pages/invoice/package_addition.dart b/lib/pages/invoice/package_addition.dart index 5b8d7b0..72055d4 100644 --- a/lib/pages/invoice/package_addition.dart +++ b/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'; diff --git a/lib/pages/invoice/package_info.dart b/lib/pages/invoice/package_info.dart index 024b83f..239af8f 100644 --- a/lib/pages/invoice/package_info.dart +++ b/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'; diff --git a/lib/pages/invoice/payment_page.dart b/lib/pages/invoice/payment_page.dart index 397c42c..f95e7dc 100644 --- a/lib/pages/invoice/payment_page.dart +++ b/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'; diff --git a/lib/pages/invoice/payment_pdf_screen.dart b/lib/pages/invoice/payment_pdf_screen.dart index ea01da4..f3dbc4b 100644 --- a/lib/pages/invoice/payment_pdf_screen.dart +++ b/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'; diff --git a/lib/pages/log_list.dart b/lib/pages/log_list.dart index cae3afd..3f1847a 100644 --- a/lib/pages/log_list.dart +++ b/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 diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 8f06498..260f11f 100644 --- a/lib/pages/login_page.dart +++ b/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); diff --git a/lib/pages/manual/instruction_data_page.dart b/lib/pages/manual/instruction_data_page.dart index de59b6b..669b9a4 100644 --- a/lib/pages/manual/instruction_data_page.dart +++ b/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'; diff --git a/lib/pages/manual/manual_page.dart b/lib/pages/manual/manual_page.dart index 6ec770b..3a63621 100644 --- a/lib/pages/manual/manual_page.dart +++ b/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 { diff --git a/lib/pages/message_detail.dart b/lib/pages/message_detail.dart index c76d0b4..5598fb0 100644 --- a/lib/pages/message_detail.dart +++ b/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'; diff --git a/lib/pages/my_registeration.dart b/lib/pages/my_registeration.dart index 76d7f91..da886aa 100644 --- a/lib/pages/my_registeration.dart +++ b/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'; diff --git a/lib/pages/my_registeration_info.dart b/lib/pages/my_registeration_info.dart index d25a403..9152366 100644 --- a/lib/pages/my_registeration_info.dart +++ b/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'; diff --git a/lib/pages/my_registeration_item.dart b/lib/pages/my_registeration_item.dart index a0d7d76..c7f76fd 100644 --- a/lib/pages/my_registeration_item.dart +++ b/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'; diff --git a/lib/pages/notification_list.dart b/lib/pages/notification_list.dart index 8c498f6..fe4c8b9 100644 --- a/lib/pages/notification_list.dart +++ b/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 { diff --git a/lib/pages/payment_editor.dart b/lib/pages/payment_editor.dart index c81ae09..275764c 100644 --- a/lib/pages/payment_editor.dart +++ b/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; diff --git a/lib/pages/payment_method_page.dart b/lib/pages/payment_method_page.dart index 0e18b06..86597ca 100644 --- a/lib/pages/payment_method_page.dart +++ b/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 diff --git a/lib/pages/pd/pd_form.dart b/lib/pages/pd/pd_form.dart index 5d520a0..7b6a794 100644 --- a/lib/pages/pd/pd_form.dart +++ b/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 { diff --git a/lib/pages/pd/pd_item.dart b/lib/pages/pd/pd_item.dart index d39acbc..6c39801 100644 --- a/lib/pages/pd/pd_item.dart +++ b/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'; diff --git a/lib/pages/pd/pd_list.dart b/lib/pages/pd/pd_list.dart index 41565ff..c32b736 100644 --- a/lib/pages/pd/pd_list.dart +++ b/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'; diff --git a/lib/pages/phone_input.dart b/lib/pages/phone_input.dart index 60a18e7..d6e6e44 100644 --- a/lib/pages/phone_input.dart +++ b/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'; diff --git a/lib/pages/pickup_box_editor.dart b/lib/pages/pickup_box_editor.dart index 9116bcc..5660500 100644 --- a/lib/pages/pickup_box_editor.dart +++ b/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 { diff --git a/lib/pages/pickup_editor.dart b/lib/pages/pickup_editor.dart index f927d36..3e3d574 100644 --- a/lib/pages/pickup_editor.dart +++ b/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 { diff --git a/lib/pages/pickup_list.dart b/lib/pages/pickup_list.dart index 0968627..4018abe 100644 --- a/lib/pages/pickup_list.dart +++ b/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 { diff --git a/lib/pages/pickup_list_row.dart b/lib/pages/pickup_list_row.dart index e817c0a..7ee9b8d 100644 --- a/lib/pages/pickup_list_row.dart +++ b/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'; diff --git a/lib/pages/pin_login_dialog.dart b/lib/pages/pin_login_dialog.dart index 2b48f84..c62bcc0 100644 --- a/lib/pages/pin_login_dialog.dart +++ b/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 { diff --git a/lib/pages/po/po_item.dart b/lib/pages/po/po_item.dart index 1eb2b1e..6f11ba9 100644 --- a/lib/pages/po/po_item.dart +++ b/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; diff --git a/lib/pages/po/po_submission_form.dart b/lib/pages/po/po_submission_form.dart index 9699a41..daa47d2 100644 --- a/lib/pages/po/po_submission_form.dart +++ b/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 { diff --git a/lib/pages/product_edit_item.dart b/lib/pages/product_edit_item.dart index 1060c2e..df6596e 100644 --- a/lib/pages/product_edit_item.dart +++ b/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; diff --git a/lib/pages/products_list.dart b/lib/pages/products_list.dart index ef04b08..a11d783 100644 --- a/lib/pages/products_list.dart +++ b/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'; diff --git a/lib/pages/products_list_edit.dart b/lib/pages/products_list_edit.dart index 25645da..ef45f73 100644 --- a/lib/pages/products_list_edit.dart +++ b/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 { diff --git a/lib/pages/profile_edit.dart b/lib/pages/profile_edit.dart index 1190621..60bfde1 100644 --- a/lib/pages/profile_edit.dart +++ b/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(); diff --git a/lib/pages/profile_setting.dart b/lib/pages/profile_setting.dart index 0f457bf..c705422 100644 --- a/lib/pages/profile_setting.dart +++ b/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'; diff --git a/lib/pages/quota_form.dart b/lib/pages/quota_form.dart index 73ff056..c5735d4 100644 --- a/lib/pages/quota_form.dart +++ b/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'; diff --git a/lib/pages/quota_page.dart b/lib/pages/quota_page.dart index 948e17e..6790715 100644 --- a/lib/pages/quota_page.dart +++ b/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; diff --git a/lib/pages/report_user_editor.dart b/lib/pages/report_user_editor.dart index 0ebab33..d3999d0 100644 --- a/lib/pages/report_user_editor.dart +++ b/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(); diff --git a/lib/pages/report_user_list.dart b/lib/pages/report_user_list.dart index 01bc46f..2b08a3a 100644 --- a/lib/pages/report_user_list.dart +++ b/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; diff --git a/lib/pages/reset_password.dart b/lib/pages/reset_password.dart index 4e94c9a..a1eed65 100644 --- a/lib/pages/reset_password.dart +++ b/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; diff --git a/lib/pages/search_page.dart b/lib/pages/search_page.dart index bd46881..459c9f0 100644 --- a/lib/pages/search_page.dart +++ b/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'; diff --git a/lib/pages/setting_editor.dart b/lib/pages/setting_editor.dart index cbecf85..ba184c6 100644 --- a/lib/pages/setting_editor.dart +++ b/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'; diff --git a/lib/pages/setting_editor_byOwner.dart b/lib/pages/setting_editor_byOwner.dart index 0c6401f..54af0e8 100644 --- a/lib/pages/setting_editor_byOwner.dart +++ b/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'; diff --git a/lib/pages/shipment_editor.dart b/lib/pages/shipment_editor.dart index bef76b6..8a12eb1 100644 --- a/lib/pages/shipment_editor.dart +++ b/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; diff --git a/lib/pages/shipment_list.dart b/lib/pages/shipment_list.dart index 778dbf7..405c5d2 100644 --- a/lib/pages/shipment_list.dart +++ b/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'; diff --git a/lib/pages/shipment_list_row.dart b/lib/pages/shipment_list_row.dart index f2a4c0f..88d1a7d 100644 --- a/lib/pages/shipment_list_row.dart +++ b/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; diff --git a/lib/pages/shipment_rates.dart b/lib/pages/shipment_rates.dart index eff95fe..f46bbbf 100644 --- a/lib/pages/shipment_rates.dart +++ b/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; diff --git a/lib/pages/shipment_rates_calculate.dart b/lib/pages/shipment_rates_calculate.dart index 07f5716..2c6da22 100644 --- a/lib/pages/shipment_rates_calculate.dart +++ b/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; diff --git a/lib/pages/shipment_rates_edit.dart b/lib/pages/shipment_rates_edit.dart index da5769f..594dae4 100644 --- a/lib/pages/shipment_rates_edit.dart +++ b/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; diff --git a/lib/pages/shipping_address_editor.dart b/lib/pages/shipping_address_editor.dart index 8c62c20..6e43ccc 100644 --- a/lib/pages/shipping_address_editor.dart +++ b/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; diff --git a/lib/pages/sms_page.dart b/lib/pages/sms_page.dart index b186c3b..a6f39c2 100644 --- a/lib/pages/sms_page.dart +++ b/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; diff --git a/lib/pages/staff_editor.dart b/lib/pages/staff_editor.dart index c8d4772..24d4b7b 100644 --- a/lib/pages/staff_editor.dart +++ b/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(); diff --git a/lib/pages/staff_list.dart b/lib/pages/staff_list.dart index 1e696b4..c965990 100644 --- a/lib/pages/staff_list.dart +++ b/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 diff --git a/lib/pages/storage/inventory_item.dart b/lib/pages/storage/inventory_item.dart index ed8fefe..27e91e8 100644 --- a/lib/pages/storage/inventory_item.dart +++ b/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'; diff --git a/lib/pages/storage/inventory_take.dart b/lib/pages/storage/inventory_take.dart index 86bd1ec..fe586c6 100644 --- a/lib/pages/storage/inventory_take.dart +++ b/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'; diff --git a/lib/pages/storage/inventory_taking_list.dart b/lib/pages/storage/inventory_taking_list.dart index 193f2f7..39d243d 100644 --- a/lib/pages/storage/inventory_taking_list.dart +++ b/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'; diff --git a/lib/pages/storage/storage_addition.dart b/lib/pages/storage/storage_addition.dart index 9a8cf4d..72d206f 100644 --- a/lib/pages/storage/storage_addition.dart +++ b/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'; diff --git a/lib/pages/storage/storage_list.dart b/lib/pages/storage/storage_list.dart index 945bc42..697effe 100644 --- a/lib/pages/storage/storage_list.dart +++ b/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'; diff --git a/lib/pages/term.dart b/lib/pages/term.dart index cd70908..aaeb684 100644 --- a/lib/pages/term.dart +++ b/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(); diff --git a/lib/pages/term_edit.dart b/lib/pages/term_edit.dart index bd88c3a..8a38e4d 100644 --- a/lib/pages/term_edit.dart +++ b/lib/pages/term_edit.dart @@ -5,11 +5,11 @@ import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:provider/provider.dart'; import 'package:quill_delta/quill_delta.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/progress.dart'; import 'package:zefyr/zefyr.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; typedef void ProfileCallback(); diff --git a/lib/pages/test_list.dart b/lib/pages/test_list.dart index 77d0e52..0fea30a 100644 --- a/lib/pages/test_list.dart +++ b/lib/pages/test_list.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/test_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/popup_menu.dart'; class TestList extends StatefulWidget { diff --git a/lib/pages/user_editor.dart b/lib/pages/user_editor.dart index f33275c..a97450e 100644 --- a/lib/pages/user_editor.dart +++ b/lib/pages/user_editor.dart @@ -4,8 +4,8 @@ import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:fcs/model/main_model.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/role.dart'; import 'package:fcs/vo/user.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/pages/user_list.dart b/lib/pages/user_list.dart index 7f87d5e..1286f32 100644 --- a/lib/pages/user_list.dart +++ b/lib/pages/user_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'; diff --git a/lib/pages/user_search_page.dart b/lib/pages/user_search_page.dart index a3e9cd3..396281c 100644 --- a/lib/pages/user_search_page.dart +++ b/lib/pages/user_search_page.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.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/vo/user.dart'; import 'user_editor.dart'; diff --git a/lib/pages_fcs/box_editor.dart b/lib/pages_fcs/box_editor.dart index 9816302..38b6d5b 100644 --- a/lib/pages_fcs/box_editor.dart +++ b/lib/pages_fcs/box_editor.dart @@ -3,7 +3,7 @@ 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/shipping_address_editor.dart'; -import 'package:fcs/pages/util.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; import 'package:fcs/vo/box.dart'; import 'package:fcs/vo/cargo.dart'; import 'package:fcs/vo/package.dart'; @@ -21,7 +21,7 @@ import 'package:provider/provider.dart'; import 'package:timeline_list/timeline.dart'; import 'package:timeline_list/timeline_model.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; import 'shipping_address_row.dart'; class BoxEditor extends StatefulWidget { diff --git a/lib/pages_fcs/box_list.dart b/lib/pages_fcs/box_list.dart index 9ef6b13..6ee408c 100644 --- a/lib/pages_fcs/box_list.dart +++ b/lib/pages_fcs/box_list.dart @@ -14,7 +14,7 @@ import 'package:fcs/widget/progress.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; import 'pickup_editor.dart'; class BoxList extends StatefulWidget { diff --git a/lib/pages_fcs/box_list_row.dart b/lib/pages_fcs/box_list_row.dart index ed67f36..af14bb6 100644 --- a/lib/pages_fcs/box_list_row.dart +++ b/lib/pages_fcs/box_list_row.dart @@ -1,5 +1,5 @@ import 'package:fcs/pages/invoice/package_info.dart'; -import 'package:fcs/pages/util.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; import 'package:fcs/pages_fcs/box_editor.dart'; import 'package:fcs/pages_fcs/package_editor.dart'; import 'package:fcs/vo/box.dart'; diff --git a/lib/pages_fcs/cargo_editor.dart b/lib/pages_fcs/cargo_editor.dart index 2d61cf2..cc6717b 100644 --- a/lib/pages_fcs/cargo_editor.dart +++ b/lib/pages_fcs/cargo_editor.dart @@ -1,9 +1,9 @@ -import 'package:fcs/pages/util.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; import 'package:fcs/vo/rate.dart'; 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 CargoEditor extends StatefulWidget { final Rate rate; diff --git a/lib/pages_fcs/delivery_list.dart b/lib/pages_fcs/delivery_list.dart index dc60fc3..b3c4bac 100644 --- a/lib/pages_fcs/delivery_list.dart +++ b/lib/pages_fcs/delivery_list.dart @@ -8,7 +8,7 @@ import 'package:fcs/widget/progress.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; import 'delivery_list_row.dart'; class DeliverList extends StatefulWidget { diff --git a/lib/pages_fcs/delivery_list_row.dart b/lib/pages_fcs/delivery_list_row.dart index ba265a1..f08a564 100644 --- a/lib/pages_fcs/delivery_list_row.dart +++ b/lib/pages_fcs/delivery_list_row.dart @@ -1,4 +1,4 @@ -import 'package:fcs/pages/util.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; import 'package:fcs/pages_fcs/box_editor.dart'; import 'package:fcs/vo/box.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; diff --git a/lib/pages_fcs/package_editor.dart b/lib/pages_fcs/package_editor.dart index bf62d4e..dd9d24a 100644 --- a/lib/pages_fcs/package_editor.dart +++ b/lib/pages_fcs/package_editor.dart @@ -2,7 +2,7 @@ import 'package:fcs/model/main_model.dart'; import 'package:fcs/model/shipment_model.dart'; import 'package:fcs/pages/barcode_screen_page.dart'; import 'package:fcs/pages/shipping_address_editor.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/package.dart'; import 'package:fcs/vo/shipping_address.dart'; @@ -18,7 +18,7 @@ import 'package:provider/provider.dart'; import 'package:timeline_list/timeline.dart'; import 'package:timeline_list/timeline_model.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; import 'shipping_address_list.dart'; class PackageEditor extends StatefulWidget { diff --git a/lib/pages_fcs/package_list.dart b/lib/pages_fcs/package_list.dart index 1d995dd..5ad04d9 100644 --- a/lib/pages_fcs/package_list.dart +++ b/lib/pages_fcs/package_list.dart @@ -14,7 +14,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_icons/flutter_icons.dart'; import 'package:provider/provider.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; class PackageList extends StatefulWidget { @override diff --git a/lib/pages_fcs/package_list_row.dart b/lib/pages_fcs/package_list_row.dart index c125e9e..59e767f 100644 --- a/lib/pages_fcs/package_list_row.dart +++ b/lib/pages_fcs/package_list_row.dart @@ -1,5 +1,5 @@ import 'package:fcs/pages/invoice/package_info.dart'; -import 'package:fcs/pages/util.dart'; +import 'package:fcs/fcs/common/pages/util.dart'; import 'package:fcs/pages_fcs/package_editor.dart'; import 'package:fcs/vo/package.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; diff --git a/lib/pages_fcs/pickup_editor.dart b/lib/pages_fcs/pickup_editor.dart index b162ffb..e9ecf49 100644 --- a/lib/pages_fcs/pickup_editor.dart +++ b/lib/pages_fcs/pickup_editor.dart @@ -1,6 +1,6 @@ import 'package:fcs/model/main_model.dart'; 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:flutter_icons/flutter_icons.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; @@ -10,7 +10,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 PickUpEditor extends StatefulWidget { final PickUp pickUp; diff --git a/lib/pages_fcs/shipping_address_list.dart b/lib/pages_fcs/shipping_address_list.dart index f0e7e1c..c6ec8ce 100644 --- a/lib/pages_fcs/shipping_address_list.dart +++ b/lib/pages_fcs/shipping_address_list.dart @@ -9,7 +9,7 @@ import 'package:fcs/widget/progress.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; class ShippingAddressList extends StatefulWidget { @override diff --git a/lib/pages_fcs/shipping_address_row.dart b/lib/pages_fcs/shipping_address_row.dart index 0d4e8cf..57d5adf 100644 --- a/lib/pages_fcs/shipping_address_row.dart +++ b/lib/pages_fcs/shipping_address_row.dart @@ -1,5 +1,5 @@ import 'package:fcs/model/shipment_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/shipping_address.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/reports/report_field_list_page.dart b/lib/reports/report_field_list_page.dart index 9121572..6c3e7e5 100644 --- a/lib/reports/report_field_list_page.dart +++ b/lib/reports/report_field_list_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/report_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/report.dart'; class ReportFieldListPage extends StatefulWidget { diff --git a/lib/reports/report_filter_list_page.dart b/lib/reports/report_filter_list_page.dart index 56e5da9..a3c3726 100644 --- a/lib/reports/report_filter_list_page.dart +++ b/lib/reports/report_filter_list_page.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'; class ReportFilterListPage extends StatefulWidget { final Report report; diff --git a/lib/reports/report_list.dart b/lib/reports/report_list.dart index cd0baad..b20e2e5 100644 --- a/lib/reports/report_list.dart +++ b/lib/reports/report_list.dart @@ -11,7 +11,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 'reports_data_table.dart'; class ReportList extends StatefulWidget { diff --git a/lib/reports/reports_data_table.dart b/lib/reports/reports_data_table.dart index cf13625..4612e9e 100644 --- a/lib/reports/reports_data_table.dart +++ b/lib/reports/reports_data_table.dart @@ -12,8 +12,8 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/language_model.dart'; import 'package:fcs/model/report_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/report.dart'; import 'package:fcs/widget/my_data_table.dart'; import 'package:fcs/widget/progress.dart'; diff --git a/lib/widget/NetworkConnectivity.dart b/lib/widget/NetworkConnectivity.dart index 4888bc0..2e87def 100644 --- a/lib/widget/NetworkConnectivity.dart +++ b/lib/widget/NetworkConnectivity.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:connectivity/connectivity.dart'; import 'package:logging/logging.dart'; import 'package:fcs/config.dart'; -import 'package:fcs/fcs/common/api_helper.dart'; +import 'package:fcs/fcs/common/helpers/api_helper.dart'; class NetworkConnectivity { final log = Logger('NetworkConnectivity'); diff --git a/lib/widget/fcs_text_field.dart b/lib/widget/fcs_text_field.dart index cecfd2b..ec6dedd 100644 --- a/lib/widget/fcs_text_field.dart +++ b/lib/widget/fcs_text_field.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; class FCSTextField extends StatelessWidget { final TextEditingController controller; diff --git a/lib/widget/fcs_text_field_readonly.dart b/lib/widget/fcs_text_field_readonly.dart index 9ae2b83..fc03344 100644 --- a/lib/widget/fcs_text_field_readonly.dart +++ b/lib/widget/fcs_text_field_readonly.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../fcs/common/theme.dart'; +import '../fcs/common/helpers/theme.dart'; class FCSTextFieldReadOnly extends StatelessWidget { final TextEditingController controller; diff --git a/lib/widget/label_widgets.dart b/lib/widget/label_widgets.dart index 9fa4eb2..7365b9f 100644 --- a/lib/widget/label_widgets.dart +++ b/lib/widget/label_widgets.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/widget/img_url.dart'; import 'package:fcs/widget/local_text.dart'; diff --git a/lib/widget/local_text.dart b/lib/widget/local_text.dart index 4875ac5..d82d907 100644 --- a/lib/widget/local_text.dart +++ b/lib/widget/local_text.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.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 'localization/app_translations.dart'; diff --git a/lib/widget/local_text_field.dart b/lib/widget/local_text_field.dart index 596b0cc..10306c9 100644 --- a/lib/widget/local_text_field.dart +++ b/lib/widget/local_text_field.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.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 'localization/app_translations.dart'; diff --git a/lib/widget/number_cell.dart b/lib/widget/number_cell.dart index 54d43e5..dde4f01 100644 --- a/lib/widget/number_cell.dart +++ b/lib/widget/number_cell.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:intl/intl.dart'; -import 'package:fcs/fcs/common/theme.dart' as theme; +import 'package:fcs/fcs/common/helpers/theme.dart' as theme; class NumberCell extends StatelessWidget { final int number; diff --git a/lib/widget/products.dart b/lib/widget/products.dart index f6740dd..88c7d1d 100644 --- a/lib/widget/products.dart +++ b/lib/widget/products.dart @@ -7,7 +7,7 @@ import 'package:provider/provider.dart'; import 'package:fcs/charts/lines.dart'; import 'package:fcs/model/main_model.dart'; import 'package:fcs/pages/po/po_submission_form.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; import 'package:fcs/vo/product.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; diff --git a/lib/widget/products_price_table.dart b/lib/widget/products_price_table.dart index 59a75dc..a2fa915 100644 --- a/lib/widget/products_price_table.dart +++ b/lib/widget/products_price_table.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.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/product.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; diff --git a/lib/widget/progress.dart b/lib/widget/progress.dart index 3f35d0a..8f4a9bd 100644 --- a/lib/widget/progress.dart +++ b/lib/widget/progress.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:progress/progress.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/main_model.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; class LocalProgress extends Progress { LocalProgress({bool inAsyncCall, Widget child}) diff --git a/lib/widget/show_img.dart b/lib/widget/show_img.dart index a0a8717..4f8bb1b 100644 --- a/lib/widget/show_img.dart +++ b/lib/widget/show_img.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:photo_view/photo_view.dart'; -import 'package:fcs/fcs/common/theme.dart'; +import 'package:fcs/fcs/common/helpers/theme.dart'; class ShowImage extends StatefulWidget { final String url;