diff --git a/lib/app.dart b/lib/app.dart index 617ce37..ce29ae6 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -1,22 +1,22 @@ -import 'package:fcs/model/discount_model.dart'; -import 'package:fcs/model/shipment_model.dart'; -import 'package:fcs/model_fcs/message_model.dart'; -import 'package:fcs/model_fcs/package_model.dart'; -import 'package:fcs/vo/message.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:provider/provider.dart'; +import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart'; import 'package:fcs/model/buyer_model.dart'; import 'package:fcs/model/delivery_model.dart'; +import 'package:fcs/model/discount_model.dart'; import 'package:fcs/model/manual_model.dart'; import 'package:fcs/model/notification_model.dart'; import 'package:fcs/model/pd_model.dart'; import 'package:fcs/model/reg_model.dart'; import 'package:fcs/model/report_model.dart'; +import 'package:fcs/model/shipment_model.dart'; import 'package:fcs/model/storage_model.dart'; import 'package:fcs/model/test_model.dart'; +import 'package:fcs/model_fcs/message_model.dart'; +import 'package:fcs/model_fcs/package_model.dart'; import 'package:fcs/pages/email_page.dart'; import 'package:fcs/pages/login_page.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:provider/provider.dart'; import 'model/announcement_model.dart'; import 'model/chart_model.dart'; @@ -35,11 +35,10 @@ import 'model/report_user_model.dart'; import 'model/shipment_rate_model.dart'; import 'model/user_model.dart'; import 'model_fcs/box_model.dart'; -import 'pages/home_page.dart'; -import 'pages/home_page_welcome.dart'; -import 'pages/splash.dart'; +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 'pages/welcome_page.dart'; import 'widget/localization/app_translations_delegate.dart'; import 'widget/localization/transalation.dart'; @@ -131,9 +130,8 @@ class _AppState extends State { Map route(BuildContext context) { final routes = { '/': (_) => SplashScreen(), - '/home': (_) => HomePageWelcome(), - '/homeLogin': (_) => HomePage(), - '/welcome': (context) => WelcomePage(), + '/welcome': (_) => WelcomePage(), + '/home': (_) => HomePage(), '/term': (context) => Term( agreePage: true, ), @@ -147,38 +145,37 @@ class _AppState extends State { Widget build(BuildContext context) { return MultiProvider( providers: [ - ChangeNotifierProvider(builder: (context) => mainModel), - ChangeNotifierProvider(builder: (context) => userModel), - ChangeNotifierProvider(builder: (context) => productModel), - ChangeNotifierProvider(builder: (context) => employeeModel), - ChangeNotifierProvider(builder: (context) => poSubmissionModel), - ChangeNotifierProvider(builder: (context) => doModel), - ChangeNotifierProvider(builder: (context) => storageModel), - ChangeNotifierProvider(builder: (context) => pdModel), - ChangeNotifierProvider(builder: (context) => lanuguageModel), - ChangeNotifierProvider(builder: (context) => regModel), - ChangeNotifierProvider(builder: (context) => buyerModel), - ChangeNotifierProvider(builder: (context) => notificationModel), - ChangeNotifierProvider(builder: (context) => chartModel), - ChangeNotifierProvider(builder: (context) => deliveryModel), - ChangeNotifierProvider(builder: (context) => manualModel), - ChangeNotifierProvider(builder: (context) => logModel), - ChangeNotifierProvider(builder: (context) => deliveryModel), - ChangeNotifierProvider(builder: (context) => phoneDeviceModel), - ChangeNotifierProvider(builder: (context) => reportModel), - ChangeNotifierProvider(builder: (context) => announcementModel), - ChangeNotifierProvider(builder: (context) => reportUserModel), - ChangeNotifierProvider(builder: (context) => pickUpModel), - ChangeNotifierProvider(builder: (context) => shipmentRateModel), - ChangeNotifierProvider(builder: (context) => shipmentModel), - ChangeNotifierProvider(builder: (context) => packageModel), - ChangeNotifierProvider(builder: (context) => boxModel), - ChangeNotifierProvider(builder: (context) => messageModel), - ChangeNotifierProvider(builder: (context) => invoiceModel), - ChangeNotifierProvider(builder: (context) => customerModel), - ChangeNotifierProvider(builder: (context) => discountModel), + ChangeNotifierProvider.value(value: mainModel), + ChangeNotifierProvider.value(value: userModel), + ChangeNotifierProvider.value(value: productModel), + ChangeNotifierProvider.value(value: employeeModel), + ChangeNotifierProvider.value(value: poSubmissionModel), + ChangeNotifierProvider.value(value: doModel), + ChangeNotifierProvider.value(value: storageModel), + ChangeNotifierProvider.value(value: pdModel), + ChangeNotifierProvider.value(value: lanuguageModel), + ChangeNotifierProvider.value(value: regModel), + ChangeNotifierProvider.value(value: buyerModel), + ChangeNotifierProvider.value(value: notificationModel), + ChangeNotifierProvider.value(value: chartModel), + ChangeNotifierProvider.value(value: deliveryModel), + ChangeNotifierProvider.value(value: logModel), + ChangeNotifierProvider.value(value: phoneDeviceModel), + ChangeNotifierProvider.value(value: reportModel), + ChangeNotifierProvider.value(value: announcementModel), + ChangeNotifierProvider.value(value: reportUserModel), + ChangeNotifierProvider.value(value: pickUpModel), + ChangeNotifierProvider.value(value: shipmentRateModel), + ChangeNotifierProvider.value(value: shipmentModel), + ChangeNotifierProvider.value(value: packageModel), + ChangeNotifierProvider.value(value: boxModel), + ChangeNotifierProvider.value(value: messageModel), + ChangeNotifierProvider.value(value: invoiceModel), + ChangeNotifierProvider.value(value: customerModel), + ChangeNotifierProvider.value(value: discountModel), + ChangeNotifierProvider.value(value: testModel), ChangeNotifierProvider( - builder: (context) => testModel, + create: (_) => SigninModel(), ), ], child: Consumer( diff --git a/lib/charts/bar_chart.dart b/lib/charts/bar_chart.dart index 4421669..bd3cee6 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/po.dart'; import 'package:fcs/widget/local_text.dart'; @@ -41,7 +41,8 @@ class _BarChartState extends State { }); }); - this.chartSummary + this + .chartSummary .sort((s1, s2) => s1.displayOrder.compareTo(s2.displayOrder)); } List> series = [ diff --git a/lib/charts/delivery_do_line.dart b/lib/charts/delivery_do_line.dart index f9f53d9..2ae625f 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; @@ -45,7 +45,8 @@ class _DODeliveryLineChartState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - LocalText(context, "delivery.do.title", color: primaryColor, fontSize: 16), + LocalText(context, "delivery.do.title", + color: primaryColor, fontSize: 16), InkWell( child: LocalText( context, @@ -54,8 +55,8 @@ class _DODeliveryLineChartState extends State { fontSize: 14, ), onTap: () { - Navigator.of(context) - .push(MaterialPageRoute(builder: (_) => DODeliveryLineDetail())); + Navigator.of(context).push(MaterialPageRoute( + builder: (_) => DODeliveryLineDetail())); }, ), ], diff --git a/lib/charts/delivery_do_line_detail.dart b/lib/charts/delivery_do_line_detail.dart index b8ba3cb..353ee93 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 889299c..7fece95 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 e9c77e0..486b53e 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 5e74c90..ba930f8 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 8428f61..e813768 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; @@ -56,7 +56,8 @@ class _DeliveryBarDataState extends State { columnSpacing: 100, columns: [ MyDataColumn(label: LocalText(context, "delivery.date")), - MyDataColumn(label: LocalText(context, "delivery.qty"),numeric: true), + MyDataColumn( + label: LocalText(context, "delivery.qty"), numeric: true), ], rows: getProductRow(chartModel.revenue.getDelivery()), ), @@ -80,9 +81,7 @@ class _DeliveryBarDataState extends State { MyDataCell( new Text(dateFormatter.format(d.date), style: textStyle), ), - MyDataCell( - NumberCell(d.amount) - ), + MyDataCell(NumberCell(d.amount)), ], ); diff --git a/lib/charts/delivery_line_detail.dart b/lib/charts/delivery_line_detail.dart index 8319317..445d376 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/do.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; @@ -61,7 +61,8 @@ class _DeliveryBarDetailState extends State { columns: [ MyDataColumn(label: LocalText(context, "do.name")), MyDataColumn(label: LocalText(context, "do.do_num")), - MyDataColumn(label: LocalText(context, "do.quantity"),numeric: true), + MyDataColumn( + label: LocalText(context, "do.quantity"), numeric: true), ], rows: getProductRow(), ), @@ -82,9 +83,7 @@ class _DeliveryBarDetailState extends State { MyDataCell( new Text(d.doNumber, style: textStyle), ), - MyDataCell( - NumberCell(d.totalQty) - ), + MyDataCell(NumberCell(d.totalQty)), ], ); diff --git a/lib/charts/delivery_summary.dart b/lib/charts/delivery_summary.dart index 49a3e28..2d7eb26 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 0a6fcae..4065acf 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 6300b05..fe1c8ca 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 5faa01e..add1cce 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 be48f37..6d2450a 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 b28ec94..66f3f2f 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 7a11fdc..77b7708 100644 --- a/lib/charts/po_balanceby_buyer.dart +++ b/lib/charts/po_balanceby_buyer.dart @@ -3,15 +3,13 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/po.dart'; import 'package:fcs/widget/local_text.dart'; class POBalanceChart_ extends StatefulWidget { @override _POBalanceChartState createState() => _POBalanceChartState(); - - } class _POBalanceChartState extends State { diff --git a/lib/charts/po_line.dart b/lib/charts/po_line.dart index a89cf0a..ac6da23 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 002a30f..f0f570e 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 4892da7..f35d178 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 ad3f9e8..385e7ca 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 d5301d7..99b8986 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/revenue.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; @@ -56,7 +56,9 @@ class _RevenueLineDataState extends State { columnSpacing: 100, columns: [ MyDataColumn(label: LocalText(context, "revenue.date")), - MyDataColumn(label: LocalText(context, "revenue.amount"),numeric: true), + MyDataColumn( + label: LocalText(context, "revenue.amount"), + numeric: true), ], rows: getProductRow(chartModel.revenue.getData()), ), @@ -70,7 +72,7 @@ class _RevenueLineDataState extends State { List getProductRow(List revs) { return revs.map((p) { var r = MyDataRow( - onSelectChanged: (bool selected) async { + onSelectChanged: (bool selected) async { Navigator.push( context, MaterialPageRoute(builder: (context) => RevenueLineDetail(p.date)), @@ -80,9 +82,7 @@ class _RevenueLineDataState extends State { MyDataCell( new Text(dateFormatter.format(p.date), style: textStyle), ), - MyDataCell( - NumberCell(p.amount) - ), + MyDataCell(NumberCell(p.amount)), ], ); diff --git a/lib/charts/revenue_line_detail.dart b/lib/charts/revenue_line_detail.dart index 03187ad..7b976cb 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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/model/api_helper.dart b/lib/fcs/common/api_helper.dart similarity index 99% rename from lib/model/api_helper.dart rename to lib/fcs/common/api_helper.dart index cb6e5ce..b5e958f 100644 --- a/lib/model/api_helper.dart +++ b/lib/fcs/common/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/data/providers/auth_fb.dart b/lib/fcs/common/data/providers/auth_fb.dart index 9a9e19b..bbb90ba 100644 --- a/lib/fcs/common/data/providers/auth_fb.dart +++ b/lib/fcs/common/data/providers/auth_fb.dart @@ -4,21 +4,29 @@ import 'package:fcs/fcs/common/domain/entities/auth.dart'; import 'package:fcs/fcs/common/domain/entities/auth_status.dart'; import 'package:firebase_auth/firebase_auth.dart'; +import '../../api_helper.dart'; + class AuthFb { static final AuthFb instance = AuthFb._(); AuthFb._(); - final FirebaseAuth _fb = FirebaseAuth.instance; + static final FirebaseAuth _fb = FirebaseAuth.instance; + static FirebaseUser firebaseUser; static String _verificationId; Future sendSmsCodeToPhoneNumber(String phoneNumber) { Completer completer = Completer(); final PhoneVerificationCompleted verificationCompleted = - (AuthCredential user) { - completer.complete(Auth(authStatus: AuthStatus.AUTH_VERIFIED)); + (AuthCredential authCredential) async { + firebaseUser = await _signIn(authCredential); + Auth auth = Auth(authStatus: AuthStatus.AUTH_VERIFIED); + auth.uid = firebaseUser.uid; + auth.name = await _getName(firebaseUser); + auth.phoneNumber = firebaseUser.phoneNumber; + completer.complete(auth); print( - 'Inside _sendCodeToPhoneNumber: signInWithPhoneNumber auto succeeded: $user'); + 'Inside _sendCodeToPhoneNumber: signInWithPhoneNumber auto succeeded: $firebaseUser'); }; final PhoneVerificationFailed verificationFailed = @@ -28,8 +36,7 @@ class AuthFb { completer.complete(Auth( authStatus: AuthStatus.ERROR, authErrorCode: authException.code, - authErrorMsg: authException.message)); - throw authException; + authErrorMsg: "Phone number verification failed")); }; final PhoneCodeSent codeSent = @@ -63,11 +70,10 @@ class AuthFb { smsCode: smsCode, ); - var firebaseUser = await _fb.signInWithCredential(credential); - final FirebaseUser currentUser = await _fb.currentUser(); - assert(firebaseUser.user.uid == currentUser.uid); + firebaseUser = await _signIn(credential); - auth.uid = firebaseUser.user.uid; + auth.uid = firebaseUser.uid; + auth.name = await _getName(firebaseUser); auth.authStatus = AuthStatus.AUTH_VERIFIED; } on Exception catch (e) { auth.authStatus = AuthStatus.ERROR; @@ -76,7 +82,46 @@ class AuthFb { return Future.value(auth); } - Future logout() { + Future signout() { + firebaseUser = null; return _fb.signOut(); } + + Future _signIn(AuthCredential credential) async { + AuthResult _authResult = await _fb.signInWithCredential(credential); + FirebaseUser _fusr = _authResult.user; + final FirebaseUser firebaseUser = await _fb.currentUser(); + assert(_fusr.uid == firebaseUser.uid); + + var idToken = await firebaseUser.getIdToken(); + print("Claims:${idToken.claims}"); + + return firebaseUser; + } + + Future _getName(FirebaseUser firebaseUser) async { + IdTokenResult idToken = await firebaseUser.getIdToken(); + return idToken.claims["name"]; + } + + Future hasSignup() async { + IdTokenResult idToken = await firebaseUser.getIdToken(); + return idToken.claims.containsKey("signup") && idToken.claims["signup"]; + } + + Future signup(String name) async { + await requestAPI("/signup", "POST", + payload: { + 'name': name, + }, + token: await getToken()); + // refresh token once signup + await firebaseUser.getIdToken(refresh: true); + } + + static Future getToken() async { + FirebaseUser firebaseUser = await _fb.currentUser(); + IdTokenResult token = await firebaseUser.getIdToken(); + return token.token; + } } diff --git a/lib/fcs/common/domain/entities/auth.dart b/lib/fcs/common/domain/entities/auth.dart index 5d173e3..8fd50c5 100644 --- a/lib/fcs/common/domain/entities/auth.dart +++ b/lib/fcs/common/domain/entities/auth.dart @@ -6,6 +6,8 @@ class Auth { String authErrorMsg; String uid; + String name; + String phoneNumber; Auth({this.authStatus, this.authErrorCode, this.authErrorMsg}); } diff --git a/lib/fcs/common/domain/entities/auth_status.dart b/lib/fcs/common/domain/entities/auth_status.dart index 540df1e..dd68667 100644 --- a/lib/fcs/common/domain/entities/auth_status.dart +++ b/lib/fcs/common/domain/entities/auth_status.dart @@ -1 +1 @@ -enum AuthStatus { SMS_SENT, AUTH_VERIFIED, ERROR } +enum AuthStatus { SMS_SENT, AUTH_VERIFIED, ERROR, SIGN_OUT } diff --git a/lib/pages/home_page.dart b/lib/fcs/common/pages/home_page.dart similarity index 90% rename from lib/pages/home_page.dart rename to lib/fcs/common/pages/home_page.dart index 6a421d0..abc10e6 100644 --- a/lib/pages/home_page.dart +++ b/lib/fcs/common/pages/home_page.dart @@ -1,74 +1,38 @@ -import 'package:country_code_picker/country_code.dart'; +import 'package:fcs/model/language_model.dart'; import 'package:fcs/model/main_model.dart'; +import 'package:fcs/pages/contact.dart'; import 'package:fcs/pages/discount_list.dart'; +import 'package:fcs/pages/notification_list.dart'; import 'package:fcs/pages/payment_method_page.dart'; import 'package:fcs/pages/shipment_list.dart'; +import 'package:fcs/pages/term.dart'; import 'package:fcs/pages_fcs/box_list.dart'; import 'package:fcs/pages_fcs/delivery_list.dart'; import 'package:fcs/pages_fcs/package_list.dart'; -import 'package:fcs/widget/bottom_up_page_route.dart'; -import 'package:fcs/widget/localization/transalation.dart'; -import 'package:fcs/widget/right_left_page_route%20copy.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; -import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart'; -import 'package:logging/logging.dart'; -import 'package:provider/provider.dart'; -import 'dart:math' as math; -import 'package:fcs/charts/bar_chart.dart'; -import 'package:fcs/charts/delivery_do_line.dart'; -import 'package:fcs/charts/delivery_do_summary.dart'; -import 'package:fcs/charts/delivery_line.dart'; -import 'package:fcs/charts/delivery_summary.dart'; -import 'package:fcs/charts/do_line.dart'; -import 'package:fcs/charts/po_balance_chart.dart'; -import 'package:fcs/charts/po_line.dart'; -import 'package:fcs/charts/revenue_line.dart'; -import 'package:fcs/model/language_model.dart'; -import 'package:fcs/model/product_model.dart'; -import 'package:fcs/pages/banks/banks.dart'; -import 'package:fcs/pages/buyer_list.dart'; -import 'package:fcs/pages/contact.dart'; -import 'package:fcs/pages/delivery/delivery_list.dart'; -import 'package:fcs/pages/manual/manual_page.dart'; -import 'package:fcs/pages/notification_list.dart'; -import 'package:fcs/pages/term.dart'; -import 'package:fcs/reports/report_list.dart'; import 'package:fcs/widget/banner.dart'; -import 'package:fcs/widget/local_text.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'; import 'package:flutter/material.dart'; -import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart'; +import 'package:flutter_icons/flutter_icons.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; -import '../theme/theme.dart'; -import 'announcement_list.dart'; -import 'buying_online.dart'; -import 'customer_list.dart'; -import 'do/do_list.dart'; -import 'invoice/invoce_list.dart'; -import 'my_registeration.dart'; -import 'pd/pd_list.dart'; -import 'products_list.dart'; +import '../../../pages/buying_online.dart'; +import '../../../pages/customer_list.dart'; +import '../../../pages/fcs_profile_page.dart'; +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 'profile_page.dart'; -import '../fcs/common/pages/signin/signin_page.dart'; -import 'staff_list.dart'; - -import 'fcs_profile_page.dart'; -import 'pd/pd_list.dart'; -import 'pickup_list.dart'; -import 'products_list.dart'; -import 'profile_page.dart'; -import 'shipment_rates.dart'; -import 'storage/storage_list.dart'; -import 'user_list.dart'; +import 'signin/signin_page.dart'; final msgLog = Logger('backgroundMessageHandler'); diff --git a/lib/pages/profile_page.dart b/lib/fcs/common/pages/profile_page.dart similarity index 97% rename from lib/pages/profile_page.dart rename to lib/fcs/common/pages/profile_page.dart index 9345122..7393725 100644 --- a/lib/pages/profile_page.dart +++ b/lib/fcs/common/pages/profile_page.dart @@ -1,26 +1,21 @@ -import 'package:fcs/model/shipment_model.dart'; -import 'package:fcs/pages_fcs/shipping_address_row.dart'; -import 'package:fcs/vo/shipping_address.dart'; -import 'package:fcs/widget/bottom_up_page_route.dart'; -import 'package:fcs/widget/local_text.dart'; -import 'package:fcs/widget/my_data_table.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; -import 'package:package_info/package_info.dart'; -import 'package:provider/provider.dart'; +import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart'; import 'package:fcs/model/language_model.dart'; import 'package:fcs/model/main_model.dart'; +import 'package:fcs/model/shipment_model.dart'; import 'package:fcs/model/user_model.dart'; -import 'package:fcs/pages/profile_edit.dart'; import 'package:fcs/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 '../theme/theme.dart'; -import 'profile_setting.dart'; -import 'shipping_address_editor.dart'; +import '../../../pages/shipping_address_editor.dart'; +import '../theme.dart'; typedef void ProfileCallback(); @@ -235,8 +230,9 @@ class _ProfileState extends State { _isLoading = true; }); await mainModel.logout(); + await context.read().signout(); Navigator.of(context).pushNamedAndRemoveUntil( - "/home", ModalRoute.withName('/home')); + "/welcome", ModalRoute.withName('/welcome')); Future.delayed(Duration(seconds: 1), () { if (mounted) { setState(() { diff --git a/lib/fcs/common/pages/signin/code_page.dart b/lib/fcs/common/pages/signin/code_page.dart index f9f3dd2..892ebeb 100644 --- a/lib/fcs/common/pages/signin/code_page.dart +++ b/lib/fcs/common/pages/signin/code_page.dart @@ -1,17 +1,19 @@ import 'dart:async'; +import 'package:fcs/fcs/common/domain/entities/auth.dart'; +import 'package:fcs/fcs/common/domain/entities/auth_status.dart'; +import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart'; import 'package:fcs/model/main_model.dart'; -import 'package:fcs/model/shared_pref.dart'; -import 'package:fcs/vo/user.dart'; +import 'package:fcs/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 '../../../../theme/theme.dart'; +import 'signup_page.dart'; +import '../../theme.dart'; import '../../../../widget/local_text.dart'; import '../../../../widget/progress.dart'; -import '../../../../pages/user_edit.dart'; const resend_count_sec = 5; @@ -191,9 +193,21 @@ class _CodePageState extends State { _resend() async {} _verify() async { - Provider.of(context).saveUser(pin, widget.phoneNumber); - await Navigator.of(context).push(BottomUpPageRoute(UserEditPage())); - Navigator.pop(context); + try { + Auth auth = await context.read().signin(this.pin); + if (auth.authStatus == AuthStatus.AUTH_VERIFIED) { + bool hasSignup = await context.read().hasSignup(); + if (!hasSignup) { + await Navigator.of(context).push(BottomUpPageRoute(SignupPage())); + } else { + Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false); + } + Provider.of(context, listen: false) + .saveUser(pin, widget.phoneNumber); + } + } catch (e) { + showMsgDialog(context, "Error", e.toString()); + } } _completeResend() { diff --git a/lib/fcs/common/pages/signin/model/signin_model.dart b/lib/fcs/common/pages/signin/model/signin_model.dart index 15d8308..97d7998 100644 --- a/lib/fcs/common/pages/signin/model/signin_model.dart +++ b/lib/fcs/common/pages/signin/model/signin_model.dart @@ -1,8 +1,25 @@ import 'package:fcs/fcs/common/data/providers/auth_fb.dart'; +import 'package:fcs/fcs/common/domain/entities/auth.dart'; import 'package:flutter/foundation.dart'; class SigninModel extends ChangeNotifier { - setPhoneNumber(String phoneNumber) async { - await AuthFb.instance.sendSmsCodeToPhoneNumber(phoneNumber); + Future sendSms(String phoneNumber) { + return AuthFb.instance.sendSmsCodeToPhoneNumber(phoneNumber); + } + + Future signin(String smsCode) { + return AuthFb.instance.signInWithPhoneNumber(smsCode); + } + + Future signout() { + return AuthFb.instance.signout(); + } + + Future hasSignup() { + return AuthFb.instance.hasSignup(); + } + + Future signup(String name) { + return AuthFb.instance.signup(name); } } diff --git a/lib/fcs/common/pages/signin/signin_page.dart b/lib/fcs/common/pages/signin/signin_page.dart index ce8f25e..7454cee 100644 --- a/lib/fcs/common/pages/signin/signin_page.dart +++ b/lib/fcs/common/pages/signin/signin_page.dart @@ -1,10 +1,14 @@ import 'package:country_code_picker/country_code_picker.dart'; +import 'package:fcs/fcs/common/domain/entities/auth.dart'; +import 'package:fcs/fcs/common/domain/entities/auth_status.dart'; +import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; -import '../../../../theme/theme.dart'; +import '../../theme.dart'; import '../../../../widget/local_text.dart'; import '../../../../widget/progress.dart'; import 'code_page.dart'; @@ -157,19 +161,33 @@ class _SigninPageState extends State { return; } + setState(() { + _isLoading = true; + }); + try { Exception exp; phoneNumber = phoneNumber[0] == "0" ? phoneNumber.replaceFirst("0", "") : phoneNumber; phoneNumber = dialCode + phoneNumber; - await Navigator.of(context) - .push(BottomUpPageRoute(CodePage(phoneNumber: phoneNumber))); - Navigator.pop(context); + + Auth auth = await context.read().sendSms(phoneNumber); + if (auth.authStatus == AuthStatus.SMS_SENT) { + await Navigator.of(context) + .push(BottomUpPageRoute(CodePage(phoneNumber: phoneNumber))); + Navigator.pop(context); + } + if (auth.authStatus == AuthStatus.ERROR) { + showMsgDialog(context, "Error", auth.authErrorMsg); + } if (exp != null) throw exp; } catch (e) { showMsgDialog(context, "Error", e.toString()); } + setState(() { + _isLoading = false; + }); } } diff --git a/lib/pages/user_edit.dart b/lib/fcs/common/pages/signin/signup_page.dart similarity index 84% rename from lib/pages/user_edit.dart rename to lib/fcs/common/pages/signin/signup_page.dart index 10c35a8..bd550b2 100644 --- a/lib/pages/user_edit.dart +++ b/lib/fcs/common/pages/signin/signup_page.dart @@ -1,21 +1,19 @@ -import 'package:fcs/model/shared_pref.dart'; -import 'package:fcs/widget/bottom_up_page_route.dart'; -import 'package:fcs/widget/localization/app_translations.dart'; +import 'package:fcs/fcs/common/pages/signin/model/signin_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import '../theme/theme.dart'; -import '../widget/local_text.dart'; -import '../widget/progress.dart'; -import 'home_page.dart'; +import '../../../../widget/local_text.dart'; +import '../../../../widget/progress.dart'; +import '../../theme.dart'; +import 'package:provider/provider.dart'; -class UserEditPage extends StatefulWidget { +class SignupPage extends StatefulWidget { @override - _UserEditPageState createState() => _UserEditPageState(); + _SignupPageState createState() => _SignupPageState(); } -class _UserEditPageState extends State { +class _SignupPageState extends State { bool _isLoading = false; TextEditingController nameCtl; @@ -110,6 +108,7 @@ class _UserEditPageState extends State { } _submit() async { - Navigator.pushNamedAndRemoveUntil(context, "/homeLogin", (r) => false); + await context.read().signup(nameCtl.text); + Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false); } } diff --git a/lib/pages/splash.dart b/lib/fcs/common/pages/splash_page.dart similarity index 97% rename from lib/pages/splash.dart rename to lib/fcs/common/pages/splash_page.dart index 492c3ff..9a6f676 100644 --- a/lib/pages/splash.dart +++ b/lib/fcs/common/pages/splash_page.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:fcs/model/main_model.dart'; -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:flutter/material.dart'; @@ -51,9 +51,9 @@ class _SplashScreenState extends State { if (_loaded) { timer.cancel(); if (this._isLogin) { - Navigator.of(context).pushReplacementNamed('/homeLogin'); - } else { Navigator.of(context).pushReplacementNamed('/home'); + } else { + Navigator.of(context).pushReplacementNamed('/welcome'); } // if (_isSupport) { diff --git a/lib/pages/home_page_welcome.dart b/lib/fcs/common/pages/welcome_page.dart similarity index 68% rename from lib/pages/home_page_welcome.dart rename to lib/fcs/common/pages/welcome_page.dart index 74e232b..b4b14eb 100644 --- a/lib/pages/home_page_welcome.dart +++ b/lib/fcs/common/pages/welcome_page.dart @@ -13,21 +13,21 @@ import 'package:intl/intl.dart' as intl; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; -import '../theme/theme.dart'; +import '../theme.dart'; import 'profile_page.dart'; -import '../fcs/common/pages/signin/signin_page.dart'; -import 'term.dart'; +import 'signin/signin_page.dart'; +import '../../../pages/term.dart'; final msgLog = Logger('backgroundMessageHandler'); -class HomePageWelcome extends StatefulWidget { +class WelcomePage extends StatefulWidget { @override - _HomePageWelcomeState createState() => _HomePageWelcomeState(); + _WelcomePageState createState() => _WelcomePageState(); } typedef BtnCallback(); -class _HomePageWelcomeState extends State { +class _WelcomePageState extends State { final log = Logger('_HomePageWelcomeState'); bool login = false; bool customer = true; @@ -137,56 +137,54 @@ class _HomePageWelcomeState extends State { Color(0xfa272262), ], // whitish to gray )), - child: Column( + child: ListView( children: [ - Expanded( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.all(80.0), - child: Text( - "Welcome!", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 28, - fontFamily: "Roboto"), - ), + 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.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"), - ), + ), + 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"), - )), - ), - ], - ), + ), + 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: [ @@ -241,28 +239,29 @@ class _HomePageWelcomeState extends State { // ), // ], // ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - // _buildSmallButton( - // "Policies", FontAwesomeIcons.fileContract), - InkWell( - onTap: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (_) => Contact())); - }, - child: _buildSmallButton( - "Contact Us", SimpleLineIcons.support), - ), - InkWell( - onTap: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (_) => Term())); - }, - child: _buildSmallButton( - "Terms of service", Icons.info_outline), - ), - ], + Padding( + padding: const EdgeInsets.only(top: 28.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + InkWell( + onTap: () { + Navigator.of(context).push( + MaterialPageRoute(builder: (_) => Contact())); + }, + child: _buildSmallButton( + "Contact Us", SimpleLineIcons.support), + ), + InkWell( + onTap: () { + Navigator.of(context).push( + MaterialPageRoute(builder: (_) => Term())); + }, + child: _buildSmallButton( + "Terms of service", Icons.info_outline), + ), + ], + ), ) ], ))), @@ -285,20 +284,12 @@ class _HomePageWelcomeState extends State { return Padding( padding: const EdgeInsets.all(18.0), child: Row( + mainAxisAlignment: MainAxisAlignment.center, 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,), + 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/services/auth_imp.dart b/lib/fcs/common/services/auth_imp.dart index f510cd1..cef656d 100644 --- a/lib/fcs/common/services/auth_imp.dart +++ b/lib/fcs/common/services/auth_imp.dart @@ -31,7 +31,7 @@ class AuthImp implements AuthInterface { } @override - Future logout() { - return authFb.logout(); + Future signout() { + return authFb.signout(); } } diff --git a/lib/fcs/common/services/auth_interface.dart b/lib/fcs/common/services/auth_interface.dart index 8034341..bcf5d29 100644 --- a/lib/fcs/common/services/auth_interface.dart +++ b/lib/fcs/common/services/auth_interface.dart @@ -3,5 +3,5 @@ import 'package:fcs/fcs/common/domain/entities/auth.dart'; abstract class AuthInterface { Future sendSmsCodeToPhoneNumber(String phoneNumber); Future signInWithSmsCode(String smsCode); - Future logout(); + Future signout(); } diff --git a/lib/theme/theme.dart b/lib/fcs/common/theme.dart similarity index 98% rename from lib/theme/theme.dart rename to lib/fcs/common/theme.dart index 1c84937..a8b4a9f 100644 --- a/lib/theme/theme.dart +++ b/lib/fcs/common/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: 14, color: Colors.white, fontWeight: FontWeight.w500); + TextStyle(fontSize: 11, color: Colors.white, fontWeight: FontWeight.w500); const TextStyle siginButtonStyle = TextStyle(fontSize: 16, color: Colors.white, fontWeight: FontWeight.w500); diff --git a/lib/main-dev.dart b/lib/main-dev.dart index 050eee0..889ea4a 100644 --- a/lib/main-dev.dart +++ b/lib/main-dev.dart @@ -1,7 +1,6 @@ +import 'package:fcs/config.dart'; 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,8 +8,7 @@ void main() { Config( flavor: Flavor.DEV, color: Colors.blue, - apiURL: - "https://asia-northeast1-mokkon-wholesale-dev.cloudfunctions.net/APIOK", + apiURL: "http://192.168.100.11:7777", reportURL: "http://petrok-dev.mokkon.com:8080", reportProjectID: "dev", level: Level.ALL); diff --git a/lib/model/base_model.dart b/lib/model/base_model.dart index fac0fb9..6b220fb 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/model/api_helper.dart'; +import 'package:fcs/fcs/common/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 88a277d..f5326e4 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 d311062..3816e6b 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/model/api_helper.dart'; +import 'package:fcs/fcs/common/api_helper.dart'; import 'package:fcs/model/constants.dart'; import 'package:fcs/pages/do/do_files.dart'; import 'package:fcs/vo/do.dart'; @@ -27,7 +27,6 @@ class DOModel extends BaseModel { _loadDOs(); } - @override logout() async { if (listener != null) await listener.cancel(); @@ -247,7 +246,8 @@ class DOModel extends BaseModel { .where("status", isEqualTo: do_approved_status) .where("delivery_date", isGreaterThanOrEqualTo: date) .where("delivery_date", isLessThan: dateAddOne) - .orderBy("delivery_date").orderBy("user_name") + .orderBy("delivery_date") + .orderBy("user_name") .limit(100) .getDocuments(); snapshots.documents.forEach((d) { diff --git a/lib/model/main_model.dart b/lib/model/main_model.dart index 730b399..c82615f 100644 --- a/lib/model/main_model.dart +++ b/lib/model/main_model.dart @@ -22,7 +22,7 @@ import 'package:fcs/widget/NetworkConnectivity.dart'; import '../config.dart'; import '../vo/status.dart'; import '../vo/user.dart'; -import 'api_helper.dart'; +import '../fcs/common/api_helper.dart'; import 'base_model.dart'; import 'constants.dart'; import 'firebase_helper.dart'; @@ -97,10 +97,10 @@ class MainModel extends ChangeNotifier { phone: '+959123456789', mail: 'kbz@gmail.com'), PaymentMethod( - name: 'PayPal', - accountName: 'FCS', - link: 'https://www.paypal.com/donate/buttons', - ), + name: 'PayPal', + accountName: 'FCS', + link: 'https://www.paypal.com/donate/buttons', + ), ]; return methods; } diff --git a/lib/model/report_model.dart b/lib/model/report_model.dart index 849ba98..e958caa 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/model/api_helper.dart' as api; +import 'package:fcs/fcs/common/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 e70aed4..1591a81 100644 --- a/lib/pages/add_pin_editor.dart +++ b/lib/pages/add_pin_editor.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 '../theme/theme.dart' as Theme; +import '../fcs/common/theme.dart' as Theme; import 'util.dart'; class AddPINEditor extends StatefulWidget { diff --git a/lib/pages/announcement.dart b/lib/pages/announcement.dart index 8eb7ef4..e81a807 100644 --- a/lib/pages/announcement.dart +++ b/lib/pages/announcement.dart @@ -12,7 +12,7 @@ import 'package:fcs/widget/popupmenu.dart'; import 'package:fcs/widget/progress.dart'; import 'package:zefyr/zefyr.dart'; -import '../theme/theme.dart'; +import '../fcs/common/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 4cdcd04..e2ff07a 100644 --- a/lib/pages/announcement_editor.dart +++ b/lib/pages/announcement_editor.dart @@ -5,7 +5,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 1866ac9..4119f47 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'announcement.dart'; import 'announcement_editor.dart'; @@ -43,15 +43,13 @@ class _AnnouncementListState extends State { inAsyncCall: _isLoading, child: Scaffold( appBar: AppBar( - backgroundColor: primaryColor, - title: - LocalText( - context, - "announcement.title", - color: Colors.white, - fontSize: 20, - ) - ), + backgroundColor: primaryColor, + title: LocalText( + context, + "announcement.title", + color: Colors.white, + fontSize: 20, + )), floatingActionButton: isOwnerAndAbove || hasAdmin ? FloatingActionButton( backgroundColor: primaryColor, @@ -118,19 +116,22 @@ class _AnnouncementListState extends State { ], ), ), - Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: Text(announce.time==null?"":timeFormatter.format(announce.time)), - ), - announce.fromToday() - ? Container() - : Text(announce.time==null?"":dateFormatter.format(announce.time)), - ], - ) - + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Text(announce.time == null + ? "" + : timeFormatter.format(announce.time)), + ), + announce.fromToday() + ? Container() + : Text(announce.time == null + ? "" + : dateFormatter.format(announce.time)), + ], + ) ], ), ), diff --git a/lib/pages/banks/bank_edit.dart b/lib/pages/banks/bank_edit.dart index f5e4b1f..2b5252a 100644 --- a/lib/pages/banks/bank_edit.dart +++ b/lib/pages/banks/bank_edit.dart @@ -5,7 +5,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 c2471a5..aa1bdb7 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 f1d4e5c..4e5d72f 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 01a5989..a341f10 100644 --- a/lib/pages/block_list.dart +++ b/lib/pages/block_list.dart @@ -2,7 +2,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 f39e419..e81b45f 100644 --- a/lib/pages/buyer_info.dart +++ b/lib/pages/buyer_info.dart @@ -12,7 +12,7 @@ import 'package:fcs/widget/label_widgets.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/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 9d3501a..c4edf25 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 '../theme/theme.dart'; +import '../fcs/common/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 e0d4fa1..c29d03f 100644 --- a/lib/pages/buyer_list_row.dart +++ b/lib/pages/buyer_list_row.dart @@ -2,7 +2,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 8583efd..7c8cc70 100644 --- a/lib/pages/buying_online.dart +++ b/lib/pages/buying_online.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 '../theme/theme.dart'; +import '../fcs/common/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 955191c..bc84b34 100644 --- a/lib/pages/calculate_shipment_cost_editor.dart +++ b/lib/pages/calculate_shipment_cost_editor.dart @@ -6,17 +6,19 @@ import 'package:fcs/widget/localization/app_translations.dart'; import 'package:flutter/material.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class CalculateShipmentCostEditor extends StatefulWidget { final PickUp pickUp; CalculateShipmentCostEditor({this.pickUp}); @override - _CalculateShipmentCostEditorState createState() => _CalculateShipmentCostEditorState(); + _CalculateShipmentCostEditorState createState() => + _CalculateShipmentCostEditorState(); } -class _CalculateShipmentCostEditorState extends State { +class _CalculateShipmentCostEditorState + extends State { TextEditingController _addressEditingController = new TextEditingController(); TextEditingController _fromTimeEditingController = new TextEditingController(); diff --git a/lib/pages/chage_phone_number.dart b/lib/pages/chage_phone_number.dart index c65004a..77b46bb 100644 --- a/lib/pages/chage_phone_number.dart +++ b/lib/pages/chage_phone_number.dart @@ -9,7 +9,7 @@ import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart' as Theme; +import '../fcs/common/theme.dart' as Theme; import 'confirm_email.dart'; import 'util.dart'; diff --git a/lib/pages/change_password.dart b/lib/pages/change_password.dart index e64e363..9a158d8 100644 --- a/lib/pages/change_password.dart +++ b/lib/pages/change_password.dart @@ -9,7 +9,7 @@ import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart' as Theme; +import '../fcs/common/theme.dart' as Theme; import 'util.dart'; class ChangePassword extends StatefulWidget { diff --git a/lib/pages/confirm_email.dart b/lib/pages/confirm_email.dart index efaa60f..5e509d2 100644 --- a/lib/pages/confirm_email.dart +++ b/lib/pages/confirm_email.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/user_model.dart'; -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; @@ -38,7 +38,7 @@ class _ConfirmEmailState extends State { try { await userModel.confirmEmail( widget.id, widget.email, widget.phoneNumber, _sms.text); - Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false); + Navigator.pushNamedAndRemoveUntil(context, "/welcome", (r) => false); } catch (e) { showMsgDialog(context, "Error", e.toString()); } diff --git a/lib/pages/contact.dart b/lib/pages/contact.dart index 6fd2967..7dc16f9 100644 --- a/lib/pages/contact.dart +++ b/lib/pages/contact.dart @@ -7,7 +7,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 16f1c7f..2020895 100644 --- a/lib/pages/contact_editor.dart +++ b/lib/pages/contact_editor.dart @@ -5,7 +5,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 086deec..bbacc51 100644 --- a/lib/pages/custom_editor.dart +++ b/lib/pages/custom_editor.dart @@ -4,7 +4,7 @@ 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class CustomEditor extends StatefulWidget { final Custom custom; diff --git a/lib/pages/customer_editor.dart b/lib/pages/customer_editor.dart index c67ab45..d436d3f 100644 --- a/lib/pages/customer_editor.dart +++ b/lib/pages/customer_editor.dart @@ -4,7 +4,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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/customer_list.dart b/lib/pages/customer_list.dart index c2b20f6..8023dd8 100644 --- a/lib/pages/customer_list.dart +++ b/lib/pages/customer_list.dart @@ -7,10 +7,10 @@ import 'package:flutter_icons/flutter_icons.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import '../vo/user.dart'; import '../widget/local_text.dart'; import 'customer_editor.dart'; diff --git a/lib/pages/delivery/delivery_item.dart b/lib/pages/delivery/delivery_item.dart index 1edf5fc..3611100 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/do.dart'; import 'package:fcs/widget/img_file.dart'; import 'package:fcs/widget/local_text.dart'; @@ -425,8 +425,8 @@ class _DeliveryItemState extends State { label: LocalText(context, "do.storage"), ), MyDataColumn( - label: LocalText(context, "do.quantity"),numeric: true - ), + label: LocalText(context, "do.quantity"), + numeric: true), ], rows: getProductRow(doObj.doLines), ), @@ -446,7 +446,7 @@ class _DeliveryItemState extends State { List getProductRow(List doLines) { ProductModel productModel = Provider.of(context); - if (doLines.isNotEmpty) { + if (doLines.isNotEmpty) { doLines.forEach((d) { productModel.products.forEach((p) { if (p.id == d.productID) { @@ -471,9 +471,7 @@ class _DeliveryItemState extends State { MyDataCell( new Text(d.storageName, style: textStyle), ), - MyDataCell( - NumberCell(d.qty) - ), + MyDataCell(NumberCell(d.qty)), ], ); }).toList(); diff --git a/lib/pages/delivery/delivery_list.dart b/lib/pages/delivery/delivery_list.dart index aa9968d..7e30966 100644 --- a/lib/pages/delivery/delivery_list.dart +++ b/lib/pages/delivery/delivery_list.dart @@ -7,7 +7,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 a0a3db4..9d38ef9 100644 --- a/lib/pages/device_list.dart +++ b/lib/pages/device_list.dart @@ -8,7 +8,7 @@ import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/popupmenu.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'util.dart'; class PhoneDeviceList extends StatefulWidget { diff --git a/lib/pages/discount_by_weight_editor.dart b/lib/pages/discount_by_weight_editor.dart index 245c9c5..e9af24f 100644 --- a/lib/pages/discount_by_weight_editor.dart +++ b/lib/pages/discount_by_weight_editor.dart @@ -5,7 +5,7 @@ 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class DiscountByWeightEditor extends StatefulWidget { final Discount discount; diff --git a/lib/pages/discount_editor.dart b/lib/pages/discount_editor.dart index fae6a23..1b6c49a 100644 --- a/lib/pages/discount_editor.dart +++ b/lib/pages/discount_editor.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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class DiscountEditor extends StatefulWidget { final Discount discount; diff --git a/lib/pages/discount_list.dart b/lib/pages/discount_list.dart index 765baaf..7cb569c 100644 --- a/lib/pages/discount_list.dart +++ b/lib/pages/discount_list.dart @@ -7,7 +7,7 @@ import 'package:provider/provider.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class DiscountList extends StatefulWidget { @override @@ -95,7 +95,8 @@ class _DiscountListState extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ Padding( - padding: const EdgeInsets.only(left: 10.0,bottom: 5.0), + padding: + const EdgeInsets.only(left: 10.0, bottom: 5.0), child: Text( '\$ ${discount.amount.toString()}', style: TextStyle( @@ -104,7 +105,7 @@ class _DiscountListState extends State { fontSize: 16), ), ), - getStatus(discount.status), + getStatus(discount.status), ], ), ], diff --git a/lib/pages/do/do_approve.dart b/lib/pages/do/do_approve.dart index d4042b0..ad62733 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/do.dart'; import 'package:fcs/vo/po.dart'; import 'package:fcs/widget/img_file.dart'; @@ -539,8 +539,9 @@ class _DOApprovalState extends State { label: LocalText(context, "do.storage"), ), MyDataColumn( - label: LocalText(context, "do.quantity"),numeric: true - ), + label: + LocalText(context, "do.quantity"), + numeric: true), ], rows: getProductRow(doObj.doLines), ), @@ -633,16 +634,20 @@ class _DOApprovalState extends State { MyDataColumn(label: LocalText(context, "po.number")), MyDataColumn(label: LocalText(context, "po.product")), MyDataColumn( - label: LocalText(context, "do.po_qty"),numeric: true, + label: LocalText(context, "do.po_qty"), + numeric: true, ), MyDataColumn( - label: LocalText(context, "do.po_balance_qty"),numeric: true, + label: LocalText(context, "do.po_balance_qty"), + numeric: true, ), MyDataColumn( - label: LocalText(context, "po.retrieved.amount"),numeric: true, + label: LocalText(context, "po.retrieved.amount"), + numeric: true, ), MyDataColumn( - label: LocalText(context, "do.do_qty"),numeric: true, + label: LocalText(context, "do.do_qty"), + numeric: true, ), ], rows: getPOProductRow(), diff --git a/lib/pages/do/do_creation_form.dart b/lib/pages/do/do_creation_form.dart index ce34abe..3c11275 100644 --- a/lib/pages/do/do_creation_form.dart +++ b/lib/pages/do/do_creation_form.dart @@ -9,7 +9,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/do.dart'; import 'package:fcs/vo/po.dart'; import 'package:fcs/widget/img_file.dart'; @@ -415,9 +415,7 @@ class _DOFormState extends State { columns: [ MyDataColumn(label: LocalText(context, "do.product")), MyDataColumn( - label: LocalText(context, "po.avail.qty"), - numeric: true - ), + label: LocalText(context, "po.avail.qty"), numeric: true), MyDataColumn( label: LocalText(context, "do.do_qty"), numeric: true, @@ -464,19 +462,17 @@ class _DOFormState extends State { style: textStyle, ), ), - MyDataCell( - NumberCell(d.poBalQty) - ), + MyDataCell(NumberCell(d.poBalQty)), MyDataCell( Container( color: Colors.cyan, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - new Text(d.qty == null ? "0" : d.qty.toString(), - style: textStyle), - ], - )), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + new Text(d.qty == null ? "0" : d.qty.toString(), + style: textStyle), + ], + )), ), ], ); @@ -504,16 +500,20 @@ class _DOFormState extends State { MyDataColumn(label: LocalText(context, "po.number")), MyDataColumn(label: LocalText(context, "po.product")), MyDataColumn( - label: LocalText(context, "do.po_qty"),numeric: true, + label: LocalText(context, "do.po_qty"), + numeric: true, ), MyDataColumn( - label: LocalText(context, "po.avail.qty"),numeric: true, + label: LocalText(context, "po.avail.qty"), + numeric: true, ), MyDataColumn( - label: LocalText(context, "po.retrieved.amount"),numeric: true, + label: LocalText(context, "po.retrieved.amount"), + numeric: true, ), MyDataColumn( - label: LocalText(context, "do.do_qty"),numeric: true, + label: LocalText(context, "do.do_qty"), + numeric: true, ), ], rows: getPOProductRow(), @@ -540,8 +540,8 @@ class _DOFormState extends State { }); doSubmission.dopoLies.sort((p1, p2) { - if (p1.displayOrder!=p2.displayOrder) - return p1.displayOrder.compareTo(p2.displayOrder); + if (p1.displayOrder != p2.displayOrder) + return p1.displayOrder.compareTo(p2.displayOrder); return p1.poNumber.compareTo(p2.poNumber); }); } @@ -560,15 +560,9 @@ class _DOFormState extends State { style: textStyle, ), ), - MyDataCell( - NumberCell(d.poQty) - ), - MyDataCell( - NumberCell(d.poBalQty) - ), - MyDataCell( - NumberCell(d.getPoBalanceQty) - ), + MyDataCell(NumberCell(d.poQty)), + MyDataCell(NumberCell(d.poBalQty)), + MyDataCell(NumberCell(d.getPoBalanceQty)), MyDataCell( Container( color: Colors.grey, diff --git a/lib/pages/do/do_creation_todelete.dart b/lib/pages/do/do_creation_todelete.dart index 9b6bb20..0dddc74 100644 --- a/lib/pages/do/do_creation_todelete.dart +++ b/lib/pages/do/do_creation_todelete.dart @@ -3,7 +3,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 b18f6d0..45c0f94 100644 --- a/lib/pages/do/do_list.dart +++ b/lib/pages/do/do_list.dart @@ -6,7 +6,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 ebb7e92..b7bf75e 100644 --- a/lib/pages/do/do_product_item.dart +++ b/lib/pages/do/do_product_item.dart @@ -3,7 +3,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 5fc50d4..ec8a381 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 24b4807..f6189a2 100644 --- a/lib/pages/do/photo_page.dart +++ b/lib/pages/do/photo_page.dart @@ -3,7 +3,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import '../util.dart'; diff --git a/lib/pages/do/po_selection.dart b/lib/pages/do/po_selection.dart index 12d7e70..d9e45c8 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 1d4faea..766b797 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 2a687ae..0c097ef 100644 --- a/lib/pages/email_page.dart +++ b/lib/pages/email_page.dart @@ -4,7 +4,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/user.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -82,7 +82,8 @@ class _EmailPageState extends State { child: InkWell( onTap: () { SharedPref.saveSkippedRecoverEmail(true); - Navigator.pushNamedAndRemoveUntil(context, "/home", (r) => false); + Navigator.pushNamedAndRemoveUntil( + context, "/welcome", (r) => false); }, child: Row( mainAxisAlignment: MainAxisAlignment.end, diff --git a/lib/pages/fcs_profile_page.dart b/lib/pages/fcs_profile_page.dart index cd4a8ff..8cd1695 100644 --- a/lib/pages/fcs_profile_page.dart +++ b/lib/pages/fcs_profile_page.dart @@ -9,7 +9,7 @@ import 'package:provider/provider.dart'; import 'package:flutter/material.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class FCSProfilePage extends StatefulWidget { final PickUp pickUp; diff --git a/lib/pages/forget_password.dart b/lib/pages/forget_password.dart index 784aae2..6208dae 100644 --- a/lib/pages/forget_password.dart +++ b/lib/pages/forget_password.dart @@ -4,7 +4,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; diff --git a/lib/pages/instruction.dart b/lib/pages/instruction.dart index f6d8e87..94de671 100644 --- a/lib/pages/instruction.dart +++ b/lib/pages/instruction.dart @@ -1,4 +1,4 @@ -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/language_model.dart'; @@ -53,9 +53,10 @@ class _InstructionPageState extends State { ), body: Container( padding: EdgeInsets.only(left: 5, right: 5, top: 5), - child: Card(elevation: 0, + child: Card( + elevation: 0, child: Expanded( - child: FittedBox( + child: FittedBox( child: Image.asset(widget.image), fit: BoxFit.contain), )), ), diff --git a/lib/pages/invitation_page.dart b/lib/pages/invitation_page.dart index 9d2ba4a..d5374ab 100644 --- a/lib/pages/invitation_page.dart +++ b/lib/pages/invitation_page.dart @@ -3,7 +3,7 @@ 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class InvitationPage extends StatefulWidget { @override diff --git a/lib/pages/invoice/box_addition.dart b/lib/pages/invoice/box_addition.dart index b2c07c1..663f79d 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/box.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; @@ -61,7 +61,9 @@ class _BoxAdditionState extends State { icon: Icon(Icons.pages)), items: boxModel.processed .map((e) => DropdownMenuItem( - child: Text('${e.shipmentNumber}-${e.receiverNumber} #${e.boxNumber}'), value: e)) + child: Text( + '${e.shipmentNumber}-${e.receiverNumber} #${e.boxNumber}'), + value: e)) .toList(), onChanged: (map) => {}, ), diff --git a/lib/pages/invoice/invoce_list.dart b/lib/pages/invoice/invoce_list.dart index ed072bb..f6e52eb 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:provider/provider.dart'; @@ -39,7 +39,7 @@ class _InvoiceListState extends State { @override Widget build(BuildContext context) { - var owner = Provider.of(context).isOwner(); + var owner = Provider.of(context).isOwner(); return LocalProgress( inAsyncCall: _isLoading, @@ -73,16 +73,19 @@ class _InvoiceListState extends State { ], ), ), - floatingActionButton:owner? FloatingActionButton.extended( - onPressed: () { - _newInvoice(); - }, - icon: Icon(Icons.add), - label: Text(AppTranslations.of(context).text("invoices.add")), - backgroundColor: primaryColor, - ):null, + floatingActionButton: owner + ? FloatingActionButton.extended( + onPressed: () { + _newInvoice(); + }, + icon: Icon(Icons.add), + label: + Text(AppTranslations.of(context).text("invoices.add")), + backgroundColor: primaryColor, + ) + : null, body: TabBarView( - children: [ _pending(), _paided()], + children: [_pending(), _paided()], )), ), ); diff --git a/lib/pages/invoice/invoice_editor.dart b/lib/pages/invoice/invoice_editor.dart index a4c54e8..abdc266 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/box.dart'; import 'package:fcs/vo/cargo.dart'; import 'package:fcs/vo/invoice.dart'; @@ -173,8 +173,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Invoice Date', - labelStyle: - TextStyle(fontSize: 16,), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -194,7 +195,8 @@ class _InvoiceEditorState extends State { fillColor: Colors.white, labelText: 'Invoice Number', labelStyle: TextStyle( - fontSize: 16,), + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -213,8 +215,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Customer Name', - labelStyle: - TextStyle(fontSize: 16,), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, focusedBorder: UnderlineInputBorder( borderSide: BorderSide( @@ -243,7 +246,8 @@ class _InvoiceEditorState extends State { fillColor: Colors.white, labelText: 'Customer Name', labelStyle: TextStyle( - fontSize: 16,), + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -288,7 +292,8 @@ class _InvoiceEditorState extends State { fillColor: Colors.white, labelText: 'Status', labelStyle: TextStyle( - fontSize: 16, ), + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -307,8 +312,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Amount', - labelStyle: - TextStyle(fontSize: 16,), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -327,8 +333,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Balance', - labelStyle: - TextStyle(fontSize: 16, ), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -347,8 +354,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Handling Fee', - labelStyle: - TextStyle(fontSize: 16,), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, enabledBorder: InputBorder.none, focusedBorder: InputBorder.none, @@ -367,8 +375,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Customs Fee', - labelStyle: - TextStyle(fontSize: 16,), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, icon: Icon( FontAwesomeIcons.moneyBill, @@ -388,8 +397,9 @@ class _InvoiceEditorState extends State { decoration: InputDecoration( fillColor: Colors.white, labelText: 'Customs Fee Description', - labelStyle: - TextStyle(fontSize: 16,), + labelStyle: TextStyle( + fontSize: 16, + ), filled: true, icon: Icon( Icons.comment, diff --git a/lib/pages/invoice/invoice_list_row.dart b/lib/pages/invoice/invoice_list_row.dart index 4346531..bfdf174 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/invoice.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; import 'package:flutter/cupertino.dart'; @@ -132,29 +132,30 @@ class _InvoiceListRowState extends State { // padding: const EdgeInsets.all(0), // child: getStatus(_invoice.status), // ), - _invoice.status=="Pending"? - Padding( - padding: const EdgeInsets.only(left: 10.0), - child: InkWell( - child: RaisedButton( - child: Row( - children: [ - Icon( - Icons.payment, - color: primaryColor, - ), - Padding( - padding: const EdgeInsets.only(left:8.0), - child: Text("Payment"), - ) - ], - ), - onPressed: () { - Navigator.of(context) - .push(BottomUpPageRoute(PaymentPage(invoice: _invoice))); - }, - )), - ):Container(), + _invoice.status == "Pending" + ? Padding( + padding: const EdgeInsets.only(left: 10.0), + child: InkWell( + child: RaisedButton( + child: Row( + children: [ + Icon( + Icons.payment, + color: primaryColor, + ), + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Text("Payment"), + ) + ], + ), + onPressed: () { + Navigator.of(context).push( + BottomUpPageRoute(PaymentPage(invoice: _invoice))); + }, + )), + ) + : Container(), Padding( padding: const EdgeInsets.only(left: 8.0), child: InkWell( diff --git a/lib/pages/invoice/package_addition.dart b/lib/pages/invoice/package_addition.dart index 58b76e1..5b8d7b0 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 5807b57..024b83f 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/package.dart'; import 'package:fcs/widget/label_widgets.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -61,7 +61,9 @@ class _PackageInfoState extends State { padding: EdgeInsets.only(top: 10), child: Row( children: [ - Icon(Icons.calendar_today,), + Icon( + Icons.calendar_today, + ), Padding( padding: const EdgeInsets.only(right: 8.0, left: 15), child: labeledText( diff --git a/lib/pages/invoice/payment_page.dart b/lib/pages/invoice/payment_page.dart index 105e37a..397c42c 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 853b375..ea01da4 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -30,7 +30,7 @@ class _PaymentPDFScreenState extends State return Scaffold( appBar: AppBar( backgroundColor: primaryColor, - title:Text("Invoice File"), + title: Text("Invoice File"), actions: [ IconButton( icon: Icon(Icons.share), diff --git a/lib/pages/log_list.dart b/lib/pages/log_list.dart index 1e7926e..cae3afd 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class LogList extends StatefulWidget { @override diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 1d5c150..8f06498 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -10,7 +10,7 @@ import 'package:fcs/widget/bubble_indication_painter.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart' as Theme; +import '../fcs/common/theme.dart' as Theme; import 'forget_password.dart'; import 'sms_page.dart'; import 'util.dart'; @@ -82,7 +82,7 @@ class _LoginPageState extends State : 580.0, child: Column( mainAxisSize: MainAxisSize.max, - children: [ + children: [ Padding( padding: EdgeInsets.only(top: 50.0), child: _buildMenuBar(context), @@ -662,14 +662,13 @@ class _LoginPageState extends State var phoneNumber = signupPhoneNumberController.text; try { await authModel.signup(name, password, confirmPassword, phoneNumber); - Navigator.push( + Navigator.push( context, MaterialPageRoute( builder: (context) => SmsCodePage(id: phoneNumber, password: password), ), ); - } catch (e) { showMsgDialog(context, "Error", e.toString()); } finally { diff --git a/lib/pages/manual/instruction_data_page.dart b/lib/pages/manual/instruction_data_page.dart index 4d32f60..de59b6b 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 dde65f9..6ec770b 100644 --- a/lib/pages/manual/manual_page.dart +++ b/lib/pages/manual/manual_page.dart @@ -9,7 +9,7 @@ import 'package:fcs/vo/manual.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/progress.dart'; -import '../../theme/theme.dart'; +import '../../fcs/common/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 1af2130..c76d0b4 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/message.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; @@ -82,7 +82,7 @@ class MessageDetail extends StatelessWidget { @override Widget build(BuildContext context) { - DateFormat dateFormat=DateFormat("HH:mm"); + DateFormat dateFormat = DateFormat("HH:mm"); MessageModel messageModel = Provider.of(context); List messages = messageModel.getMessage(msg.receiverName); List bubbles = messages diff --git a/lib/pages/my_registeration.dart b/lib/pages/my_registeration.dart index f0c2c2a..76d7f91 100644 --- a/lib/pages/my_registeration.dart +++ b/lib/pages/my_registeration.dart @@ -10,7 +10,7 @@ import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/my_data_table.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/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 9f25235..d25a403 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import '../util.dart'; import '../widget/localization/app_translations.dart'; import 'my_registeration.dart'; @@ -50,13 +50,17 @@ class _MyRegisterationInfoState extends State { labeledText(context, regModel.reg.bizType, "buyer.type_biz"); final statusBox = labeledText(context, regModel.reg.status, "reg.status"); final dailyQuotaBox = labeledText( - context, formatNumber(regModel.reg.dailyQuota), "reg.quota",number: true); + context, formatNumber(regModel.reg.dailyQuota), "reg.quota", + number: true); final dailyQuotaUsedBox = labeledText( - context, formatNumber(regModel.reg.dailyQuotaUsed), "reg.quota.used",number: true); + context, formatNumber(regModel.reg.dailyQuotaUsed), "reg.quota.used", + number: true); final maxQuotaBox = labeledText( - context, formatNumber(regModel.reg.maxQuota), "reg.max_quota",number: true); + context, formatNumber(regModel.reg.maxQuota), "reg.max_quota", + number: true); final maxQuotaUsedBox = labeledText( - context, formatNumber(regModel.reg.maxQuotaUsed), "reg.max_quota.used",number: true); + context, formatNumber(regModel.reg.maxQuotaUsed), "reg.max_quota.used", + number: true); final nricFrontBox = labeledImg(context, regModel.reg.nricFrontUrl, "reg_info.nric_front"); final nricBackBox = diff --git a/lib/pages/my_registeration_item.dart b/lib/pages/my_registeration_item.dart index eea09a5..a0d7d76 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 dcd75f7..8c498f6 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 '../theme/theme.dart'; +import '../fcs/common/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 7ed7ba0..c81ae09 100644 --- a/lib/pages/payment_editor.dart +++ b/lib/pages/payment_editor.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 '../theme/theme.dart'; +import '../fcs/common/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 4b700d6..0e18b06 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class PaymentMethodPage extends StatefulWidget { @override diff --git a/lib/pages/pd/pd_form.dart b/lib/pages/pd/pd_form.dart index a35b28c..5d520a0 100644 --- a/lib/pages/pd/pd_form.dart +++ b/lib/pages/pd/pd_form.dart @@ -5,7 +5,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/pd.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -142,13 +142,11 @@ class _PDFormState extends State { scrollDirection: Axis.horizontal, child: MyDataTable( columns: [ - MyDataColumn( - label: LocalText(context, "pd.product")), + MyDataColumn(label: LocalText(context, "pd.product")), MyDataColumn( label: LocalText(context, "pd.storage"), ), - MyDataColumn( - label: LocalText(context, "pd.quantity")), + MyDataColumn(label: LocalText(context, "pd.quantity")), ], rows: getProductRow(pd), ), diff --git a/lib/pages/pd/pd_item.dart b/lib/pages/pd/pd_item.dart index 8b3f7e5..d39acbc 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 3344980..41565ff 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 253e910..60a18e7 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -16,7 +16,7 @@ class _PhoneEditorState extends State { @override void initState() { super.initState(); - _phone.text ='09'; + _phone.text = '09'; } @override diff --git a/lib/pages/pickup_box_editor.dart b/lib/pages/pickup_box_editor.dart index dff56db..9116bcc 100644 --- a/lib/pages/pickup_box_editor.dart +++ b/lib/pages/pickup_box_editor.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 '../theme/theme.dart'; +import '../fcs/common/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 66feeaf..f927d36 100644 --- a/lib/pages/pickup_editor.dart +++ b/lib/pages/pickup_editor.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 '../theme/theme.dart'; +import '../fcs/common/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 33f1368..0968627 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 '../theme/theme.dart'; +import '../fcs/common/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 21528d8..e817c0a 100644 --- a/lib/pages/pickup_list_row.dart +++ b/lib/pages/pickup_list_row.dart @@ -7,7 +7,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 349d67d..2b48f84 100644 --- a/lib/pages/pin_login_dialog.dart +++ b/lib/pages/pin_login_dialog.dart @@ -5,7 +5,7 @@ import 'package:flutter_verification_code_input/flutter_verification_code_input. import 'package:provider/provider.dart'; import 'package:fcs/model/main_model.dart'; import 'package:fcs/pages/util.dart'; -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/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 9db9e39..1eb2b1e 100644 --- a/lib/pages/po/po_item.dart +++ b/lib/pages/po/po_item.dart @@ -3,7 +3,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/po.dart'; import 'package:fcs/vo/product.dart'; import 'package:fcs/widget/local_text.dart'; @@ -62,7 +62,7 @@ class _POItemState extends State { width: 170.0, child: DropdownButton( value: currentProductID, - isExpanded: true, + isExpanded: true, hint: Text( 'Select Product', style: labelStyle, diff --git a/lib/pages/po/po_submission_form.dart b/lib/pages/po/po_submission_form.dart index ab51231..9699a41 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/attach.dart'; import 'package:fcs/vo/po.dart'; import 'package:fcs/widget/img_file.dart'; diff --git a/lib/pages/product_edit_item.dart b/lib/pages/product_edit_item.dart index d2b3ad5..1060c2e 100644 --- a/lib/pages/product_edit_item.dart +++ b/lib/pages/product_edit_item.dart @@ -8,7 +8,7 @@ import 'package:fcs/vo/product.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class ProductEditItem extends StatefulWidget { final Product product; diff --git a/lib/pages/products_list.dart b/lib/pages/products_list.dart index f3edc40..ef04b08 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 66f6031..25645da 100644 --- a/lib/pages/products_list_edit.dart +++ b/lib/pages/products_list_edit.dart @@ -8,7 +8,7 @@ import 'package:fcs/vo/product.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/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 ef76977..1190621 100644 --- a/lib/pages/profile_edit.dart +++ b/lib/pages/profile_edit.dart @@ -6,7 +6,7 @@ import 'package:fcs/pages/util.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; typedef void ProfileCallback(); diff --git a/lib/pages/profile_setting.dart b/lib/pages/profile_setting.dart index 5a4b459..0f457bf 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 '../theme/theme.dart'; +import '../fcs/common/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 d91bf39..73ff056 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 1590579..948e17e 100644 --- a/lib/pages/quota_page.dart +++ b/lib/pages/quota_page.dart @@ -8,7 +8,7 @@ import 'package:fcs/vo/buyer.dart'; import 'package:fcs/widget/localization/app_translations.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/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 74b8972..0ebab33 100644 --- a/lib/pages/report_user_editor.dart +++ b/lib/pages/report_user_editor.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/report_user_model.dart'; -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/report.dart'; import 'package:fcs/vo/report_user.dart'; import 'package:fcs/vo/user.dart'; diff --git a/lib/pages/report_user_list.dart b/lib/pages/report_user_list.dart index bcb8c72..01bc46f 100644 --- a/lib/pages/report_user_list.dart +++ b/lib/pages/report_user_list.dart @@ -7,7 +7,7 @@ import 'package:fcs/widget/local_text.dart'; import 'package:flutter/material.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'report_user_editor.dart'; import 'util.dart'; diff --git a/lib/pages/reset_password.dart b/lib/pages/reset_password.dart index 121b10d..4e94c9a 100644 --- a/lib/pages/reset_password.dart +++ b/lib/pages/reset_password.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 '../theme/theme.dart' as Theme; +import '../fcs/common/theme.dart' as Theme; import 'util.dart'; class ResetPasswordPage extends StatefulWidget { @@ -319,7 +319,7 @@ class _ResetPasswordPageState extends State UserModel userModel = Provider.of(context); try { await userModel.resetPassword(widget.phoneNumber, password, smsCode); - Navigator.pushNamedAndRemoveUntil(context, "/login", (r) => false); + Navigator.pushNamedAndRemoveUntil(context, "/login", (r) => false); } catch (e) { showMsgDialog(context, "Error", e.toString()); } finally { diff --git a/lib/pages/search_page.dart b/lib/pages/search_page.dart index e53f10b..bd46881 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 70c2b7c..cbecf85 100644 --- a/lib/pages/setting_editor.dart +++ b/lib/pages/setting_editor.dart @@ -4,7 +4,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/setting.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/progress.dart'; @@ -21,7 +21,7 @@ class _SettingEidtorState extends State { TextEditingController _poExpire = new TextEditingController(); TextEditingController _poOpend = new TextEditingController(); TextEditingController _poClosed = new TextEditingController(); - TextEditingController _latestDeliveryDay = new TextEditingController(); + TextEditingController _latestDeliveryDay = new TextEditingController(); TextEditingController _firstStorageDay = new TextEditingController(); TextEditingController _firstStorageCharge = new TextEditingController(); TextEditingController _secondStorageDay = new TextEditingController(); @@ -40,7 +40,7 @@ class _SettingEidtorState extends State { _poExpire.text = widget.setting.poExpireInHours.toString(); _poOpend.text = widget.setting.poOpenAt.toString(); _poClosed.text = widget.setting.poCloseAt.toString(); - _latestDeliveryDay.text =widget.setting.latestDeliveryDay.toString(); + _latestDeliveryDay.text = widget.setting.latestDeliveryDay.toString(); _firstStorageDay.text = widget.setting.firstStorageChargeIn.toString(); _firstStorageCharge.text = widget.setting.firstStorageCharge.toString(); _secondStorageDay.text = widget.setting.secondStorageChargeIn.toString(); @@ -395,7 +395,7 @@ class _SettingEidtorState extends State { widget.setting.poExpireInHours = int.parse(_poExpire.text); widget.setting.poOpenAt = int.parse(_poOpend.text); widget.setting.poCloseAt = int.parse(_poClosed.text); - widget.setting.latestDeliveryDay=int.parse(_latestDeliveryDay.text); + widget.setting.latestDeliveryDay = int.parse(_latestDeliveryDay.text); widget.setting.firstStorageChargeIn = int.parse(_firstStorageDay.text); widget.setting.firstStorageCharge = int.parse(_firstStorageCharge.text); widget.setting.secondStorageChargeIn = int.parse(_secondStorageDay.text); diff --git a/lib/pages/setting_editor_byOwner.dart b/lib/pages/setting_editor_byOwner.dart index 59be90a..0c6401f 100644 --- a/lib/pages/setting_editor_byOwner.dart +++ b/lib/pages/setting_editor_byOwner.dart @@ -2,7 +2,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 27293c1..bef76b6 100644 --- a/lib/pages/shipment_editor.dart +++ b/lib/pages/shipment_editor.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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class ShipmentEditor extends StatefulWidget { final Shipment shipment; diff --git a/lib/pages/shipment_list.dart b/lib/pages/shipment_list.dart index b8899f1..778dbf7 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 '../theme/theme.dart'; +import '../fcs/common/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 a389585..f2a4c0f 100644 --- a/lib/pages/shipment_list_row.dart +++ b/lib/pages/shipment_list_row.dart @@ -1,4 +1,4 @@ -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/shipment.dart'; import 'package:fcs/widget/bottom_up_page_route.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/shipment_rates.dart b/lib/pages/shipment_rates.dart index 19d1c75..eff95fe 100644 --- a/lib/pages/shipment_rates.dart +++ b/lib/pages/shipment_rates.dart @@ -12,7 +12,7 @@ import 'package:fcs/widget/localization/app_translations.dart'; import 'package:flutter/material.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'util.dart'; class ShipmentRates extends StatefulWidget { diff --git a/lib/pages/shipment_rates_calculate.dart b/lib/pages/shipment_rates_calculate.dart index f30f1eb..07f5716 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 '../theme/theme.dart'; +import '../fcs/common/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 263f03a..da5769f 100644 --- a/lib/pages/shipment_rates_edit.dart +++ b/lib/pages/shipment_rates_edit.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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'custom_editor.dart'; import 'discount_by_weight_editor.dart'; import 'util.dart'; diff --git a/lib/pages/shipping_address_editor.dart b/lib/pages/shipping_address_editor.dart index b5c9c16..8c62c20 100644 --- a/lib/pages/shipping_address_editor.dart +++ b/lib/pages/shipping_address_editor.dart @@ -5,7 +5,7 @@ import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter/material.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class ShippingAddressEditor extends StatefulWidget { final ShippingAddress shippingAddress; @@ -85,7 +85,7 @@ class _ShippingAddressEditorState extends State { children: [ Expanded( child: Padding( - padding: const EdgeInsets.only(left: 10.0,right: 10), + padding: const EdgeInsets.only(left: 10.0, right: 10), child: ListView(children: [ usaAddress, SizedBox(height: 10), diff --git a/lib/pages/sms_page.dart b/lib/pages/sms_page.dart index 4d43744..b186c3b 100644 --- a/lib/pages/sms_page.dart +++ b/lib/pages/sms_page.dart @@ -3,7 +3,7 @@ import 'package:progress/progress.dart'; import 'package:provider/provider.dart'; import '../model/main_model.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import '../widget/localization/app_translations.dart'; import '../widget/progress.dart'; import 'util.dart'; diff --git a/lib/pages/staff_editor.dart b/lib/pages/staff_editor.dart index 568f197..c8d4772 100644 --- a/lib/pages/staff_editor.dart +++ b/lib/pages/staff_editor.dart @@ -4,7 +4,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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/staff_list.dart b/lib/pages/staff_list.dart index 7659c95..1e696b4 100644 --- a/lib/pages/staff_list.dart +++ b/lib/pages/staff_list.dart @@ -6,10 +6,10 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:fcs/model/employee_model.dart'; -import 'package:fcs/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/progress.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import '../vo/user.dart'; import '../widget/local_text.dart'; import 'staff_editor.dart'; diff --git a/lib/pages/storage/inventory_item.dart b/lib/pages/storage/inventory_item.dart index e184938..ed8fefe 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 c6d3698..86bd1ec 100644 --- a/lib/pages/storage/inventory_take.dart +++ b/lib/pages/storage/inventory_take.dart @@ -3,7 +3,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/inventory_line.dart'; import 'package:fcs/vo/inventory_taking.dart'; import 'package:fcs/widget/local_text.dart'; @@ -78,10 +78,8 @@ class _TakeInventoryState extends State { scrollDirection: Axis.horizontal, child: MyDataTable( columns: [ - MyDataColumn( - label: LocalText(context, "inventory.product")), - MyDataColumn( - label: LocalText(context, "inventory.storage")), + MyDataColumn(label: LocalText(context, "inventory.product")), + MyDataColumn(label: LocalText(context, "inventory.storage")), MyDataColumn( label: LocalText(context, "inventory.old.qty"), ), diff --git a/lib/pages/storage/inventory_taking_list.dart b/lib/pages/storage/inventory_taking_list.dart index dfb11dd..193f2f7 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 b559c6e..9a8cf4d 100644 --- a/lib/pages/storage/storage_addition.dart +++ b/lib/pages/storage/storage_addition.dart @@ -3,7 +3,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/storage.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -39,14 +39,20 @@ class _StorageAdditionState extends State { child: Scaffold( appBar: AppBar( backgroundColor: primaryColor, - title: LocalText(context, "storage.item.title",color: Colors.white,fontSize: 20,), + title: LocalText( + context, + "storage.item.title", + color: Colors.white, + fontSize: 20, + ), actions: [ widget.storage == null ? Container() : IconButton( icon: Icon(Icons.delete), onPressed: () { - showConfirmDialog(context, "storage.delete_confirm", () { + showConfirmDialog(context, "storage.delete_confirm", + () { _delete(context); }); }, diff --git a/lib/pages/storage/storage_list.dart b/lib/pages/storage/storage_list.dart index b1e55b5..945bc42 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/popup_menu.dart'; import 'package:fcs/vo/storage.dart'; import 'package:fcs/widget/local_text.dart'; @@ -174,9 +174,7 @@ class _StorageListState extends State { style: textStyle, ), ), - MyDataCell( - NumberCell(p.quantity) - ), + MyDataCell(NumberCell(p.quantity)), ], ); }).toList(); diff --git a/lib/pages/term.dart b/lib/pages/term.dart index 4afdc8c..cd70908 100644 --- a/lib/pages/term.dart +++ b/lib/pages/term.dart @@ -9,7 +9,7 @@ import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/progress.dart'; import 'package:zefyr/zefyr.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; typedef void ProfileCallback(); diff --git a/lib/pages/term_edit.dart b/lib/pages/term_edit.dart index 744b02b..bd88c3a 100644 --- a/lib/pages/term_edit.dart +++ b/lib/pages/term_edit.dart @@ -9,7 +9,7 @@ import 'package:fcs/pages/util.dart'; import 'package:fcs/widget/progress.dart'; import 'package:zefyr/zefyr.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; typedef void ProfileCallback(); diff --git a/lib/pages/test_list.dart b/lib/pages/test_list.dart index 2b0b7c3..77d0e52 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 fed99de..f33275c 100644 --- a/lib/pages/user_editor.dart +++ b/lib/pages/user_editor.dart @@ -5,7 +5,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 617575b..7f87d5e 100644 --- a/lib/pages/user_list.dart +++ b/lib/pages/user_list.dart @@ -2,7 +2,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 5696618..a3e9cd3 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/user.dart'; import 'user_editor.dart'; diff --git a/lib/pages/util.dart b/lib/pages/util.dart index 3cb6a6a..25f48c7 100644 --- a/lib/pages/util.dart +++ b/lib/pages/util.dart @@ -11,7 +11,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/buyer.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -479,7 +479,7 @@ Widget fcsInputReadOnly(String label, IconData iconData, filled: true, icon: Icon( iconData, - color:primaryColor, + color: primaryColor, ), )); // return Row( diff --git a/lib/pages/welcome_page.dart b/lib/pages/welcome_page.dart deleted file mode 100644 index 2a392d2..0000000 --- a/lib/pages/welcome_page.dart +++ /dev/null @@ -1,161 +0,0 @@ -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:fcs/model/language_model.dart'; -import 'package:fcs/widget/banner.dart'; -import 'package:fcs/widget/localization/transalation.dart'; -import 'package:fcs/widget/offline_redirect.dart'; -import 'package:fcs/widget/products.dart'; - -import 'contact.dart'; -import 'login_page.dart'; -import 'manual/manual_page.dart'; - -class WelcomePage extends StatefulWidget { - @override - _WelcomePageState createState() => _WelcomePageState(); -} - -class _WelcomePageState extends State { - String version = ""; - List _selection = List.generate(2, (_) => false); - - @override - void initState() { - super.initState(); - _loadVersion(); - var languageModel = Provider.of(context, listen: false); - languageModel.isEng ? _selection[0] = true : _selection[1] = true; - } - - _loadVersion() async { - var version = await getVersionNumber(); - setState(() { - this.version = version; - }); - } - - Future getVersionNumber() async { - PackageInfo packageInfo = await PackageInfo.fromPlatform(); - return "v${packageInfo.version}+${packageInfo.buildNumber}"; - } - - @override - Widget build(BuildContext context) { - var languageModel = Provider.of(context); - - var toggleButtons = ToggleButtons( - constraints: BoxConstraints(minWidth: 25.0, minHeight: 25.0), - children: [ - Padding( - padding: const EdgeInsets.only(right: 8.0), - child: Container( - decoration: languageModel.isEng - ? BoxDecoration( - border: Border.all(color: Colors.blueAccent, width: 1)) - : null, - child: Image.asset( - "assets/eng_flag.png", - width: 23, - ), - ), - ), - Container( - decoration: !languageModel.isEng - ? BoxDecoration( - border: Border.all(color: Colors.blueAccent, width: 1)) - : null, - child: Image.asset( - "assets/myan_flag.png", - width: 23, - ), - ), - ], - renderBorder: false, - isSelected: _selection, - fillColor: Colors.white, - onPressed: (int index) { - languageModel.saveLanguage(Translation().supportedLanguages[index]); - setState(() { - for (int buttonIndex = 0; - buttonIndex < _selection.length; - buttonIndex++) { - if (buttonIndex == index) { - _selection[buttonIndex] = true; - } else { - _selection[buttonIndex] = false; - } - } - }); - }, - ); - - return OfflineRedirect( - child: FlavorBanner( - child: Scaffold( - backgroundColor: Colors.white, - appBar: AppBar( - backgroundColor: Colors.white, - iconTheme: IconThemeData( - color: Colors.grey, - ), - elevation: 0, - title: Image( - height: 30, - fit: BoxFit.scaleDown, - image: new AssetImage('assets/img/logo.png')), - actions: [ - IconButton( - icon: Image.asset( - "assets/manual.png", - width: 30, - height: 30, - color: Colors.black, - ), - onPressed: () => Navigator.of(context) - .push(MaterialPageRoute(builder: (_) => ManualPage())), - ), - IconButton( - icon: Icon( - FontAwesomeIcons.phone, - color: Colors.black, - size: 20, - ), - onPressed: () => Navigator.of(context) - .push(MaterialPageRoute(builder: (_) => Contact())), - ), - IconButton( - icon: Icon( - FontAwesomeIcons.signInAlt, - color: Colors.black, - size: 20, - ), - onPressed: () => Navigator.of(context) - .push(MaterialPageRoute(builder: (_) => LoginPage())), - ), - ], - ), - body: ListView( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Padding( - padding: const EdgeInsets.only(right: 8.0), - child: toggleButtons, - ), - ], - ), - Padding( - padding: const EdgeInsets.only(top: 5), - child: ProductsWidget(isWelcomePage: false), - ), - SizedBox(height: 30,), - Center(child: Text("${this.version}")), - ], - )), - ), - ); - } -} diff --git a/lib/pages_fcs/box_editor.dart b/lib/pages_fcs/box_editor.dart index a969342..9816302 100644 --- a/lib/pages_fcs/box_editor.dart +++ b/lib/pages_fcs/box_editor.dart @@ -21,7 +21,7 @@ import 'package:provider/provider.dart'; import 'package:timeline_list/timeline.dart'; import 'package:timeline_list/timeline_model.dart'; -import '../theme/theme.dart'; +import '../fcs/common/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 9d02ab8..9ef6b13 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'pickup_editor.dart'; class BoxList extends StatefulWidget { diff --git a/lib/pages_fcs/cargo_editor.dart b/lib/pages_fcs/cargo_editor.dart index 2101b3e..2d61cf2 100644 --- a/lib/pages_fcs/cargo_editor.dart +++ b/lib/pages_fcs/cargo_editor.dart @@ -3,7 +3,7 @@ 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 '../theme/theme.dart'; +import '../fcs/common/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 859e88f..dc60fc3 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'delivery_list_row.dart'; class DeliverList extends StatefulWidget { diff --git a/lib/pages_fcs/package_editor.dart b/lib/pages_fcs/package_editor.dart index aefa7bb..bf62d4e 100644 --- a/lib/pages_fcs/package_editor.dart +++ b/lib/pages_fcs/package_editor.dart @@ -18,7 +18,7 @@ import 'package:provider/provider.dart'; import 'package:timeline_list/timeline.dart'; import 'package:timeline_list/timeline_model.dart'; -import '../theme/theme.dart'; +import '../fcs/common/theme.dart'; import 'shipping_address_list.dart'; class PackageEditor extends StatefulWidget { @@ -363,8 +363,7 @@ class _PackageEditorState extends State { ), ], ), - isNew?Container(): - getShippingAddressList(context), + isNew ? Container() : getShippingAddressList(context), isNew ? Container() : ExpansionTile( diff --git a/lib/pages_fcs/package_list.dart b/lib/pages_fcs/package_list.dart index 0276184..1d995dd 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class PackageList extends StatefulWidget { @override diff --git a/lib/pages_fcs/pickup_editor.dart b/lib/pages_fcs/pickup_editor.dart index 85525e8..b162ffb 100644 --- a/lib/pages_fcs/pickup_editor.dart +++ b/lib/pages_fcs/pickup_editor.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 '../theme/theme.dart'; +import '../fcs/common/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 02807e5..f0e7e1c 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 '../theme/theme.dart'; +import '../fcs/common/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 231b38b..0d4e8cf 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 a6a59ec..9121572 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 f892490..56e5da9 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class ReportFilterListPage extends StatefulWidget { final Report report; diff --git a/lib/reports/report_list.dart b/lib/reports/report_list.dart index 3933c81..cd0baad 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 '../theme/theme.dart'; +import '../fcs/common/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 b967701..cf13625 100644 --- a/lib/reports/reports_data_table.dart +++ b/lib/reports/reports_data_table.dart @@ -13,7 +13,7 @@ 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 b774038..4888bc0 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/model/api_helper.dart'; +import 'package:fcs/fcs/common/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 a9c4df8..cecfd2b 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 '../theme/theme.dart'; +import '../fcs/common/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 74dd82e..9ae2b83 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 '../theme/theme.dart'; +import '../fcs/common/theme.dart'; class FCSTextFieldReadOnly extends StatelessWidget { final TextEditingController controller; diff --git a/lib/widget/label_widgets.dart b/lib/widget/label_widgets.dart index 551c238..9fa4eb2 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/widget/img_url.dart'; import 'package:fcs/widget/local_text.dart'; @@ -14,16 +14,16 @@ Widget labeledText(BuildContext context, String text, String label, crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: const EdgeInsets.only(top:8.0), - child: LocalText( + padding: const EdgeInsets.only(top: 8.0), + child: LocalText( context, label, fontSize: 14, - color:primaryColor, + color: primaryColor, fontWeight: FontWeight.bold, ), ), - + // number ? Spacer() : Container(), Container( padding: EdgeInsets.only(top: 10), diff --git a/lib/widget/local_text.dart b/lib/widget/local_text.dart index 7f1d41b..4875ac5 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'localization/app_translations.dart'; diff --git a/lib/widget/local_text_field.dart b/lib/widget/local_text_field.dart index 398cf2f..596b0cc 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'localization/app_translations.dart'; diff --git a/lib/widget/number_cell.dart b/lib/widget/number_cell.dart index eca556b..54d43e5 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/theme/theme.dart' as theme; +import 'package:fcs/fcs/common/theme.dart' as theme; class NumberCell extends StatelessWidget { final int number; diff --git a/lib/widget/products.dart b/lib/widget/products.dart index f51eb96..f6740dd 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/product.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -119,7 +119,7 @@ class _ProductsWidgetState extends State { Spacer(), Container( alignment: Alignment.bottomRight, - padding: EdgeInsets.only(right: 15,bottom: 5), + padding: EdgeInsets.only(right: 15, bottom: 5), child: InkWell( onTap: () => { Navigator.of(context).push(MaterialPageRoute( diff --git a/lib/widget/products_price_table.dart b/lib/widget/products_price_table.dart index 50399ac..59a75dc 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; import 'package:fcs/vo/product.dart'; import 'package:fcs/widget/local_text.dart'; import 'package:fcs/widget/localization/app_translations.dart'; @@ -19,7 +19,6 @@ class _ProductPriceTableState extends State { final numberFormatter = new NumberFormat("#,###"); var dateFormatter = new DateFormat('dd MMM yyyy\nhh:mm:ss a'); - @override Widget build(BuildContext context) { var productModel = Provider.of(context); @@ -42,7 +41,8 @@ class _ProductPriceTableState extends State { columns: [ DataColumn(label: LocalText(context, "product.update.date")), DataColumn(label: LocalText(context, "prodcuts")), - DataColumn(label: LocalText(context, "products.prices"),numeric: true), + DataColumn( + label: LocalText(context, "products.prices"), numeric: true), ], rows: getProductRow(productModel.getPrices), ), diff --git a/lib/widget/progress.dart b/lib/widget/progress.dart index 6ea60bc..3f35d0a 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/theme/theme.dart'; +import 'package:fcs/fcs/common/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 330def7..a0a8717 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/theme/theme.dart'; +import 'package:fcs/fcs/common/theme.dart'; class ShowImage extends StatefulWidget { final String url; diff --git a/pubspec.lock b/pubspec.lock index cffe47f..8c81efa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -513,6 +513,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.9.7" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4" notus: dependency: transitive description: @@ -659,7 +666,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.1+1" + version: "4.3.2+1" pub_semver: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 44856c5..1ce2236 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: firebase_storage: ^3.1.0 firebase_auth: ^0.14.0 firebase_messaging: ^6.0.15 - provider: ^2.0.0+1 + provider: ^4.3.2+1 flutter_launcher_icons: "^0.7.2" qr_flutter: ^2.1.0+55 image_picker: ^0.6.0+9