From f7a9f36f9ad7f416b217fe1c2257b505341b38fe Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 12 Sep 2018 15:22:18 -0700 Subject: [PATCH] Update Flutter --- lib/ui/app/app_drawer.dart | 4 +- lib/ui/client/view/client_view_overview.dart | 4 +- lib/ui/payment/view/payment_view.dart | 2 +- lib/utils/icons.dart | 8 +-- pubspec.lock | 60 ++++++++++---------- pubspec.yaml | 28 ++++----- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/lib/ui/app/app_drawer.dart b/lib/ui/app/app_drawer.dart index baa88cf9a..4186aa580 100644 --- a/lib/ui/app/app_drawer.dart +++ b/lib/ui/app/app_drawer.dart @@ -172,7 +172,7 @@ class AppDrawer extends StatelessWidget { DrawerTile( company: company, entityType: EntityType.invoice, - icon: FontAwesomeIcons.filePdfO, + icon: FontAwesomeIcons.filePdf, title: AppLocalization.of(context).invoices, onTap: () => store.dispatch(ViewInvoiceList(context)), onCreateTap: () { @@ -197,7 +197,7 @@ class AppDrawer extends StatelessWidget { DrawerTile( company: company, entityType: EntityType.quote, - icon: FontAwesomeIcons.fileAltO, + icon: FontAwesomeIcons.fileAlt, title: AppLocalization.of(context).quotes, onTap: () => store.dispatch(ViewQuoteList(context)), onCreateTap: () { diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart index 40e7433be..c4bea3e89 100644 --- a/lib/ui/client/view/client_view_overview.dart +++ b/lib/ui/client/view/client_view_overview.dart @@ -67,7 +67,7 @@ class ClientOverview extends StatelessWidget { height: 1.0, ), EntityListTile( - icon: FontAwesomeIcons.filePdfO, + icon: FontAwesomeIcons.filePdf, title: localization.invoices, onTap: () => viewModel.onEntityPressed(context, EntityType.invoice), subtitle: memoizedInvoiceStatsForClient( @@ -88,7 +88,7 @@ class ClientOverview extends StatelessWidget { localization.archived), ), company.isModuleEnabled(EntityType.quote) ? EntityListTile( - icon: FontAwesomeIcons.fileAltO, + icon: FontAwesomeIcons.fileAlt, title: localization.quotes, onTap: () => viewModel.onEntityPressed(context, EntityType.quote), subtitle: memoizedQuoteStatsForClient( diff --git a/lib/ui/payment/view/payment_view.dart b/lib/ui/payment/view/payment_view.dart index d81ea7cbf..145a37e09 100644 --- a/lib/ui/payment/view/payment_view.dart +++ b/lib/ui/payment/view/payment_view.dart @@ -113,7 +113,7 @@ class _PaymentViewState extends State { color: Theme.of(context).canvasColor, child: ListTile( title: Text('${localization.invoice} ${invoice.invoiceNumber}'), - leading: Icon(FontAwesomeIcons.filePdfO, size: 18.0), + leading: Icon(FontAwesomeIcons.filePdf, size: 18.0), trailing: Icon(Icons.navigate_next), onTap: () => viewModel.onTapInvoice(context), ), diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index 483fa7980..b55b7d470 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -33,19 +33,19 @@ IconData getEntityIcon(EntityType entityType) { case EntityType.client: return FontAwesomeIcons.users; case EntityType.invoice: - return FontAwesomeIcons.filePdfO; + return FontAwesomeIcons.filePdf; case EntityType.payment: return FontAwesomeIcons.creditCard; case EntityType.credit: return FontAwesomeIcons.creditCard; case EntityType.quote: - return FontAwesomeIcons.fileAltO; + return FontAwesomeIcons.fileAlt; case EntityType.vendor: return FontAwesomeIcons.building; case EntityType.expense: - return FontAwesomeIcons.fileImageO; + return FontAwesomeIcons.fileImage; case EntityType.task: - return FontAwesomeIcons.clockO; + return FontAwesomeIcons.clock; default: return null; } diff --git a/pubspec.lock b/pubspec.lock index 916fe9144..e0dba1031 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: analyzer_plugin url: "https://pub.dartlang.org" source: hosted - version: "0.0.1-alpha.3" + version: "0.0.1-alpha.4" args: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.12.7+3" build_config: dependency: transitive description: @@ -56,42 +56,42 @@ packages: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "0.2.0+2" + version: "0.2.2+3" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "0.8.10" + version: "0.10.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.3.1+5" built_collection: dependency: "direct main" description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "4.0.0" built_value: dependency: "direct main" description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "5.5.5" + version: "6.1.2" built_value_generator: dependency: "direct dev" description: name: built_value_generator url: "https://pub.dartlang.org" source: hosted - version: "5.5.5" + version: "6.1.2" charcode: dependency: transitive description: @@ -112,14 +112,14 @@ packages: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.3" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.6" + version: "1.14.11" convert: dependency: transitive description: @@ -140,7 +140,7 @@ packages: name: csslib url: "https://pub.dartlang.org" source: hosted - version: "0.14.4+1" + version: "0.14.5" dart_style: dependency: transitive description: @@ -154,7 +154,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "5.0.1" + version: "5.0.6" fixnum: dependency: transitive description: @@ -190,7 +190,7 @@ packages: name: flutter_slidable url: "https://pub.dartlang.org" source: hosted - version: "0.4.5" + version: "0.4.6" flutter_test: dependency: transitive description: flutter @@ -202,7 +202,7 @@ packages: name: font_awesome_flutter url: "https://pub.dartlang.org" source: hosted - version: "6.0.0" + version: "8.0.1" front_end: dependency: transitive description: @@ -210,13 +210,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.4" - func: - dependency: transitive - description: - name: func - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" glob: dependency: transitive description: @@ -237,7 +230,7 @@ packages: name: html url: "https://pub.dartlang.org" source: hosted - version: "0.13.3+2" + version: "0.13.3+3" http: dependency: "direct main" description: @@ -314,21 +307,21 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.2+1" + version: "0.12.3+1" memoize: dependency: "direct main" description: name: memoize url: "https://pub.dartlang.org" source: hosted - version: "1.4.0" + version: "2.0.0" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.1.6" mime: dependency: transitive description: @@ -378,6 +371,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.4.1" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" plugin: dependency: transitive description: @@ -480,7 +480,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "0.8.3+1" + version: "0.9.1" source_map_stack_trace: dependency: transitive description: @@ -529,7 +529,7 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" term_glyph: dependency: transitive description: @@ -543,14 +543,14 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "0.12.41" + version: "1.3.0" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.1.6" url_launcher: dependency: "direct main" description: @@ -601,5 +601,5 @@ packages: source: hosted version: "2.1.15" sdks: - dart: ">=2.0.0-dev.65 <=2.0.0-dev.69.5.flutter-eab492385c" + dart: ">=2.0.0 <3.0.0" flutter: ">=0.1.4 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 321e9be9b..e911a98d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,33 +10,33 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - flutter_redux: ^0.5.0 + flutter_redux: ^0.5.2 redux_logging: ^0.3.0 - http: ^0.11.3+16 - path_provider: ^0.4.0 - shared_preferences: ^0.4.1 - font_awesome_flutter: ^6.0.0 - built_value: ^5.4.5 - built_collection: ^3.1.1 - memoize: ^1.4.0 - url_launcher: ^3.0.2 + http: ^0.11.3+17 + path_provider: ^0.4.1 + shared_preferences: ^0.4.2 + font_awesome_flutter: ^8.0.1 + built_value: ^6.1.2 + built_collection: ^4.0.0 + memoize: ^2.0.0 + url_launcher: ^3.0.3 #cached_network_image: ^0.4.1 - share: ^0.5.2 - intl: ^0.15.6 + share: ^0.5.3 + intl: ^0.15.7 #flutter_pdf_viewer: ^0.0.2 #flutter_html_view: ^0.5.2 #flutter_html: ^0.5.3 #google_sign_in: ^3.0.4 #firebase_auth: ^0.5.19 - flutter_slidable: ^0.4.5 + flutter_slidable: ^0.4.6 dev_dependencies: flutter_driver: sdk: flutter #flutter_test: # sdk: flutter - build_runner: ^0.8.9 - built_value_generator: ^5.4.5 + build_runner: ^0.10.2 + built_value_generator: ^6.1.2 # For information on the generic Dart part of this file, see the # following page: https://www.dartlang.org/tools/pub/pubspec