clean up
This commit is contained in:
163
lib/app.dart
163
lib/app.dart
@@ -1,87 +1,45 @@
|
||||
import 'package:fcs/fcs/common/localization/app_translations_delegate.dart';
|
||||
import 'package:fcs/fcs/common/localization/transalation.dart';
|
||||
import 'package:fcs/fcs/common/pages/contact/model/contact_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/customer/model/customer_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/faq/model/faq_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/initial_language_selection.dart';
|
||||
import 'package:fcs/fcs/common/pages/market/model/market_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/model/language_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/model/main_model.dart' as fcs;
|
||||
import 'package:fcs/fcs/common/pages/package/model/package_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/package/model/shipment_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/payment_methods/model/payment_method_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/staff/model/staff_model.dart';
|
||||
import 'package:fcs/fcs/common/pages/term/model/term_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/storage_model.dart';
|
||||
import 'package:fcs/model/test_model.dart';
|
||||
import 'package:fcs/pages/email_page.dart';
|
||||
import 'package:fcs/pages/login_page.dart';
|
||||
import 'package:fcs/localization/app_translations_delegate.dart';
|
||||
import 'package:fcs/localization/transalation.dart';
|
||||
import 'package:fcs/pages/box/model/box_model.dart';
|
||||
import 'package:fcs/pages/chat/model/message_model.dart';
|
||||
import 'package:fcs/pages/contact/model/contact_model.dart';
|
||||
import 'package:fcs/pages/customer/model/customer_model.dart';
|
||||
import 'package:fcs/pages/discount/model/discount_model.dart';
|
||||
import 'package:fcs/pages/faq/model/faq_model.dart';
|
||||
import 'package:fcs/pages/fcs_shipment/model/fcs_shipment_model.dart';
|
||||
import 'package:fcs/pages/main/home_page.dart';
|
||||
import 'package:fcs/pages/main/initial_language_selection.dart';
|
||||
import 'package:fcs/pages/invoice/model/invoice_model.dart';
|
||||
import 'package:fcs/pages/market/model/market_model.dart';
|
||||
import 'package:fcs/pages/main/model/language_model.dart';
|
||||
import 'package:fcs/pages/main/model/main_model.dart';
|
||||
import 'package:fcs/pages/package/model/package_model.dart';
|
||||
import 'package:fcs/pages/payment_methods/model/payment_method_model.dart';
|
||||
import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
|
||||
import 'package:fcs/pages/shipment/model/pickup_model.dart';
|
||||
import 'package:fcs/pages/shipment_address/model/shipment_address_model.dart';
|
||||
import 'package:fcs/pages/main/splash_page.dart';
|
||||
import 'package:fcs/pages/staff/model/staff_model.dart';
|
||||
import 'package:fcs/pages/term/model/term_model.dart';
|
||||
import 'package:fcs/pages/main/welcome_page.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'fcs/common/pages/chat/model/message_model.dart';
|
||||
import 'fcs/common/pages/home_page.dart';
|
||||
import 'fcs/common/pages/splash_page.dart';
|
||||
import 'fcs/common/pages/welcome_page.dart';
|
||||
import 'model/announcement_model.dart';
|
||||
import 'model/chart_model.dart';
|
||||
import 'model/device_model.dart';
|
||||
import 'model/do_model.dart';
|
||||
import 'model/invoice_model.dart';
|
||||
import 'model/log_model.dart';
|
||||
import 'model/main_model.dart';
|
||||
import 'model/pickup_model.dart';
|
||||
import 'model/po_model.dart';
|
||||
import 'model/product_model.dart';
|
||||
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/term.dart';
|
||||
|
||||
class App extends StatefulWidget {
|
||||
@override
|
||||
_AppState createState() => _AppState();
|
||||
}
|
||||
|
||||
class _AppState extends State<App> {
|
||||
final fcs.MainModel mainModel2 = new fcs.MainModel();
|
||||
final MainModel mainModel = new MainModel();
|
||||
final ContactModel contactModel = new ContactModel();
|
||||
final TermModel termModel = new TermModel();
|
||||
final MainModel mainModel = new MainModel();
|
||||
final FAQModel faqModel = new FAQModel();
|
||||
final PaymentMethodModel paymentMethodModel = new PaymentMethodModel();
|
||||
|
||||
final UserModel userModel = new UserModel();
|
||||
final ProductModel productModel = new ProductModel();
|
||||
final POSubmissionModel poSubmissionModel = new POSubmissionModel();
|
||||
final DOModel doModel = new DOModel();
|
||||
final FcsShipmentModel fcsShipmentModel = new FcsShipmentModel();
|
||||
final LanguageModel lanuguageModel = new LanguageModel();
|
||||
final StorageModel storageModel = new StorageModel();
|
||||
final PDModel pdModel = new PDModel();
|
||||
final RegModel regModel = new RegModel();
|
||||
final BuyerModel buyerModel = new BuyerModel();
|
||||
final NotificationModel notificationModel = new NotificationModel();
|
||||
final ChartModel chartModel = new ChartModel();
|
||||
final DeliveryModel deliveryModel = new DeliveryModel();
|
||||
final ManualModel manualModel = new ManualModel();
|
||||
final TestModel testModel = new TestModel();
|
||||
final LogModel logModel = new LogModel();
|
||||
final PhoneDeviceModel phoneDeviceModel = new PhoneDeviceModel();
|
||||
final ReportModel reportModel = new ReportModel();
|
||||
final AnnouncementModel announcementModel = new AnnouncementModel();
|
||||
final ReportUserModel reportUserModel = new ReportUserModel();
|
||||
final PickUpModel pickUpModel = new PickUpModel();
|
||||
final ShipmentRateModel shipmentRateModel = new ShipmentRateModel();
|
||||
final BoxModel boxModel = new BoxModel();
|
||||
@@ -90,54 +48,31 @@ class _AppState extends State<App> {
|
||||
final CustomerModel customerModel = new CustomerModel();
|
||||
final DiscountModel discountModel = new DiscountModel();
|
||||
final StaffModel staffModel = new StaffModel();
|
||||
final ShipmentModel shipmentModel = new ShipmentModel();
|
||||
final ShipmentAddressModel shipmentAddressModel = new ShipmentAddressModel();
|
||||
final PackageModel packageModel = new PackageModel();
|
||||
final MarketModel marketModel = new MarketModel();
|
||||
|
||||
AppTranslationsDelegate _newLocaleDelegate;
|
||||
static FlutterLocalNotificationsPlugin _flutterLocalNotificationsPlugin =
|
||||
FlutterLocalNotificationsPlugin();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
mainModel2
|
||||
mainModel
|
||||
..addModel(customerModel)
|
||||
..addModel(staffModel)
|
||||
..addModel(shipmentModel)
|
||||
..addModel(shipmentAddressModel)
|
||||
..addModel(packageModel)
|
||||
..addModel(messageModel)
|
||||
..addModel(fcsShipmentModel)
|
||||
..addModel(discountModel)
|
||||
..addModel(shipmentRateModel)
|
||||
..addModel(boxModel)
|
||||
..addModel(pickUpModel)
|
||||
..addModel(invoiceModel)
|
||||
..addModel(marketModel);
|
||||
|
||||
_newLocaleDelegate = AppTranslationsDelegate(newLocale: null);
|
||||
Translation().onLocaleChanged = onLocaleChange;
|
||||
mainModel
|
||||
..addModel(userModel)
|
||||
..addModel(storageModel)
|
||||
..addModel(regModel)
|
||||
..addModel(poSubmissionModel)
|
||||
..addModel(doModel)
|
||||
..addModel(productModel)
|
||||
..addModel(pdModel)
|
||||
..addModel(buyerModel)
|
||||
..addModel(notificationModel)
|
||||
..addModel(chartModel)
|
||||
..addModel(deliveryModel)
|
||||
..addModel(logModel)
|
||||
..addModel(manualModel)
|
||||
..addModel(phoneDeviceModel)
|
||||
..addModel(regModel)
|
||||
..addModel(announcementModel)
|
||||
..addModel(reportModel)
|
||||
..addModel(testModel)
|
||||
..addModel(reportUserModel)
|
||||
..addModel(pickUpModel)
|
||||
..addModel(shipmentRateModel)
|
||||
..addModel(boxModel)
|
||||
..addModel(shipmentRateModel)
|
||||
..addModel(invoiceModel)
|
||||
..addModel(discountModel);
|
||||
this.mainModel.init();
|
||||
}
|
||||
|
||||
void onLocaleChange(Locale locale) {
|
||||
@@ -151,11 +86,6 @@ class _AppState extends State<App> {
|
||||
'/': (_) => SplashScreen(),
|
||||
'/welcome': (_) => WelcomePage(),
|
||||
'/home': (_) => HomePage(),
|
||||
'/term': (context) => Term(
|
||||
agreePage: true,
|
||||
),
|
||||
'/login': (context) => LoginPage(),
|
||||
'/email': (context) => EmailPage(),
|
||||
'/language_selection': (context) => InitialLanguageSelectionPage(),
|
||||
};
|
||||
return routes;
|
||||
@@ -166,40 +96,23 @@ class _AppState extends State<App> {
|
||||
return MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider.value(value: mainModel),
|
||||
ChangeNotifierProvider.value(value: userModel),
|
||||
ChangeNotifierProvider.value(value: productModel),
|
||||
ChangeNotifierProvider.value(value: staffModel),
|
||||
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: shipmentAddressModel),
|
||||
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.value(value: mainModel2),
|
||||
ChangeNotifierProvider.value(value: contactModel),
|
||||
ChangeNotifierProvider.value(value: termModel),
|
||||
ChangeNotifierProvider.value(value: faqModel),
|
||||
ChangeNotifierProvider.value(value: paymentMethodModel),
|
||||
ChangeNotifierProvider.value(value: marketModel),
|
||||
ChangeNotifierProvider.value(value: fcsShipmentModel),
|
||||
],
|
||||
child: Consumer<LanguageModel>(
|
||||
builder: (context, value, child) {
|
||||
@@ -224,9 +137,7 @@ class _AppState extends State<App> {
|
||||
routes: route(context),
|
||||
localizationsDelegates: [
|
||||
_newLocaleDelegate,
|
||||
//provides localised strings
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
//provides RTL support
|
||||
GlobalWidgetsLocalizations.delegate,
|
||||
],
|
||||
supportedLocales: Translation().supportedLocales());
|
||||
|
||||
Reference in New Issue
Block a user