From 02d7e070ef21f186f043a47b7e4aef5a793a478f Mon Sep 17 00:00:00 2001 From: abdullahalhakimi Date: Sat, 3 Aug 2024 18:44:30 +0300 Subject: [PATCH] Enable Null Safety --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- lib/animation/RotationRoute.dart | 2 +- lib/animation/ScaleRoute.dart | 2 +- lib/main.dart | 4 - lib/pages/FoodDetailsPage.dart | 18 +- lib/pages/FoodOrderPage.dart | 26 +-- lib/pages/HomePage.dart | 3 +- lib/pages/SignInPage.dart | 2 - lib/widgets/BestFoodWidget.dart | 26 +-- lib/widgets/BottomNavBarWidget.dart | 20 +- lib/widgets/FoodDetailsSlider.dart | 59 +++-- lib/widgets/PopularFoodsWidget.dart | 27 ++- lib/widgets/TopMenus.dart | 67 +++--- pubspec.lock | 203 +++++++++--------- pubspec.yaml | 8 +- test/widget_test.dart | 5 +- 16 files changed, 227 insertions(+), 247 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 296b146..3c2adb5 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip \ No newline at end of file diff --git a/lib/animation/RotationRoute.dart b/lib/animation/RotationRoute.dart index 939bd29..300b0ef 100644 --- a/lib/animation/RotationRoute.dart +++ b/lib/animation/RotationRoute.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class RotationRoute extends PageRouteBuilder { final Widget page; - RotationRoute({this.page}) + RotationRoute({required this.page}) : super( pageBuilder: ( BuildContext context, diff --git a/lib/animation/ScaleRoute.dart b/lib/animation/ScaleRoute.dart index cd85249..979a735 100644 --- a/lib/animation/ScaleRoute.dart +++ b/lib/animation/ScaleRoute.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class ScaleRoute extends PageRouteBuilder { final Widget page; - ScaleRoute({this.page}) + ScaleRoute({required this.page}) : super( pageBuilder: ( BuildContext context, diff --git a/lib/main.dart b/lib/main.dart index b5c2760..9e3c2cf 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/pages/FoodDetailsPage.dart'; -import 'package:flutter_app/pages/FoodOrderPage.dart'; import 'package:flutter_app/pages/HomePage.dart'; -import 'package:flutter_app/pages/SignInPage.dart'; -import 'package:flutter_app/pages/SignUpPage.dart'; void main() => runApp(MaterialApp( debugShowCheckedModeBanner: false, diff --git a/lib/pages/FoodDetailsPage.dart b/lib/pages/FoodDetailsPage.dart index 35c0380..d304b83 100644 --- a/lib/pages/FoodDetailsPage.dart +++ b/lib/pages/FoodDetailsPage.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_app/animation/ScaleRoute.dart'; import 'package:flutter_app/pages/FoodOrderPage.dart'; -import 'package:flutter_app/widgets/FoodDetailsSlider.dart'; class FoodDetailsPage extends StatefulWidget { @override @@ -25,7 +25,7 @@ class _FoodDetailsPageState extends State { ), onPressed: () => Navigator.of(context).pop(), ), - brightness: Brightness.light, + systemOverlayStyle: SystemUiOverlayStyle.light, actions: [ IconButton( icon: Icon( @@ -121,15 +121,15 @@ class _FoodDetailsPageState extends State { } class FoodTitleWidget extends StatelessWidget { - String productName; - String productPrice; - String productHost; + final String productName; + final String productPrice; + final String productHost; FoodTitleWidget({ - Key key, - @required this.productName, - @required this.productPrice, - @required this.productHost, + Key? key, + required this.productName, + required this.productPrice, + required this.productHost, }) : super(key: key); @override diff --git a/lib/pages/FoodOrderPage.dart b/lib/pages/FoodOrderPage.dart index 6ca4540..b519e15 100644 --- a/lib/pages/FoodOrderPage.dart +++ b/lib/pages/FoodOrderPage.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; class FoodOrderPage extends StatefulWidget { @override @@ -32,7 +32,7 @@ class _FoodOrderPageState extends State { textAlign: TextAlign.center, ), ), - brightness: Brightness.light, + systemOverlayStyle: SystemUiOverlayStyle.light, actions: [ CartIconWithBadge(), ], @@ -303,17 +303,17 @@ class PromoCodeWidget extends StatelessWidget { } class CartItem extends StatelessWidget { - String productName; - String productPrice; - String productImage; - String productCartQuantity; + final String productName; + final String productPrice; + final String productImage; + final String productCartQuantity; CartItem({ - Key key, - @required this.productName, - @required this.productPrice, - @required this.productImage, - @required this.productCartQuantity, + Key? key, + required this.productName, + required this.productPrice, + required this.productImage, + required this.productCartQuantity, }) : super(key: key); @override @@ -420,7 +420,7 @@ class CartItem extends StatelessWidget { } class CartIconWithBadge extends StatelessWidget { - int counter = 3; + final int counter = 3; @override Widget build(BuildContext context) { @@ -463,7 +463,7 @@ class CartIconWithBadge extends StatelessWidget { } class AddToCartMenu extends StatelessWidget { - int productCounter; + final int productCounter; AddToCartMenu(this.productCounter); diff --git a/lib/pages/HomePage.dart b/lib/pages/HomePage.dart index 9d5335f..5b6d595 100644 --- a/lib/pages/HomePage.dart +++ b/lib/pages/HomePage.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_app/animation/ScaleRoute.dart'; import 'package:flutter_app/pages/SignInPage.dart'; import 'package:flutter_app/widgets/BestFoodWidget.dart'; @@ -25,7 +26,7 @@ class _HomePageState extends State { fontSize: 16, fontWeight: FontWeight.w500), ), - brightness: Brightness.light, + systemOverlayStyle: SystemUiOverlayStyle.light, actions: [ IconButton( icon: Icon( diff --git a/lib/pages/SignInPage.dart b/lib/pages/SignInPage.dart index 22bdf74..9f332ae 100644 --- a/lib/pages/SignInPage.dart +++ b/lib/pages/SignInPage.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; import 'package:flutter_app/animation/ScaleRoute.dart'; -import 'package:flutter_app/pages/FoodDetailsPage.dart'; import 'package:flutter_app/pages/SignUpPage.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/widgets/BestFoodWidget.dart b/lib/widgets/BestFoodWidget.dart index 7a429ca..c48d284 100644 --- a/lib/widgets/BestFoodWidget.dart +++ b/lib/widgets/BestFoodWidget.dart @@ -45,21 +45,21 @@ class BestFoodTitle extends StatelessWidget { } class BestFoodTiles extends StatelessWidget { - String name; - String imageUrl; - String rating; - String numberOfRating; - String price; - String slug; + final String name; + final String imageUrl; + final String rating; + final String numberOfRating; + final String price; + final String slug; BestFoodTiles( - {Key key, - @required this.name, - @required this.imageUrl, - @required this.rating, - @required this.numberOfRating, - @required this.price, - @required this.slug}) + {Key? key, + required this.name, + required this.imageUrl, + required this.rating, + required this.numberOfRating, + required this.price, + required this.slug}) : super(key: key); @override diff --git a/lib/widgets/BottomNavBarWidget.dart b/lib/widgets/BottomNavBarWidget.dart index 27bfbfa..143cd40 100644 --- a/lib/widgets/BottomNavBarWidget.dart +++ b/lib/widgets/BottomNavBarWidget.dart @@ -22,31 +22,19 @@ class _BottomNavBarWidgetState extends State { items: const [ BottomNavigationBarItem( icon: Icon(Icons.home), - title: Text( - 'Home', - style: TextStyle(color: Color(0xFF2c2b2b)), - ), + label: 'Home', ), BottomNavigationBarItem( icon: Icon(Icons.near_me), - title: Text( - 'Near By', - style: TextStyle(color: Color(0xFF2c2b2b)), - ), + label: 'Near By', ), BottomNavigationBarItem( icon: Icon(Icons.card_giftcard), - title: Text( - 'Cart', - style: TextStyle(color: Color(0xFF2c2b2b)), - ), + label: 'Cart', ), BottomNavigationBarItem( icon: Icon(FontAwesomeIcons.user), - title: Text( - 'Account', - style: TextStyle(color: Color(0xFF2c2b2b)), - ), + label: 'Account', ), ], currentIndex: _selectedIndex, diff --git a/lib/widgets/FoodDetailsSlider.dart b/lib/widgets/FoodDetailsSlider.dart index 22228cb..be98aae 100644 --- a/lib/widgets/FoodDetailsSlider.dart +++ b/lib/widgets/FoodDetailsSlider.dart @@ -1,16 +1,16 @@ -import 'package:carousel_pro/carousel_pro.dart'; +import 'package:another_carousel_pro/another_carousel_pro.dart'; import 'package:flutter/material.dart'; class FoodDetailsSlider extends StatelessWidget { - String slideImage1; - String slideImage2; - String slideImage3; + final String slideImage1; + final String slideImage2; + final String slideImage3; FoodDetailsSlider( - {Key key, - @required this.slideImage1, - @required this.slideImage2, - @required this.slideImage3}) + {Key? key, + required this.slideImage1, + required this.slideImage2, + required this.slideImage3}) : super(key: key); @override @@ -18,32 +18,23 @@ class FoodDetailsSlider extends StatelessWidget { return Padding( padding: EdgeInsets.only(left: 10, right: 10), child: Container( - child: Carousel( - images: [ - Image.asset( - slideImage1, - ), - /* Image.asset( - slideImage2, - height: double.infinity, - width: double.infinity, - ), - Image.asset( - slideImage3, - height: double.infinity, - width: double.infinity, - ),*/ - ], - dotSize: 4.0, - dotSpacing: 15.0, - dotColor: Colors.purple, - indicatorBgPadding: 5.0, - dotBgColor: Colors.black54.withOpacity(0), - borderRadius: true, - radius: Radius.circular(20), - moveIndicatorFromBottom: 180.0, - noRadiusForIndicator: true, - )), + child: AnotherCarousel( + images: [ + Image.asset(slideImage1), + // Uncomment and include these if you have more images + // Image.asset(slideImage2), + // Image.asset(slideImage3), + ], + dotSize: 4.0, + dotSpacing: 15.0, + dotColor: Colors.purple, + indicatorBgPadding: 5.0, + dotBgColor: Colors.black54.withOpacity(0), + borderRadius: true, + radius: const Radius.circular(20), + moveIndicatorFromBottom: 180.0, + noRadiusForIndicator: true, + )), ); } } diff --git a/lib/widgets/PopularFoodsWidget.dart b/lib/widgets/PopularFoodsWidget.dart index 0d879b7..224ef30 100644 --- a/lib/widgets/PopularFoodsWidget.dart +++ b/lib/widgets/PopularFoodsWidget.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_app/animation/RotationRoute.dart'; import 'package:flutter_app/animation/ScaleRoute.dart'; import 'package:flutter_app/pages/FoodDetailsPage.dart'; @@ -27,21 +26,21 @@ class _PopularFoodsWidgetState extends State { } class PopularFoodTiles extends StatelessWidget { - String name; - String imageUrl; - String rating; - String numberOfRating; - String price; - String slug; + final String name; + final String imageUrl; + final String rating; + final String numberOfRating; + final String price; + final String slug; PopularFoodTiles( - {Key key, - @required this.name, - @required this.imageUrl, - @required this.rating, - @required this.numberOfRating, - @required this.price, - @required this.slug}) + {Key? key, + required this.name, + required this.imageUrl, + required this.rating, + required this.numberOfRating, + required this.price, + required this.slug}) : super(key: key); @override diff --git a/lib/widgets/TopMenus.dart b/lib/widgets/TopMenus.dart index d235a3a..1c5ce7a 100644 --- a/lib/widgets/TopMenus.dart +++ b/lib/widgets/TopMenus.dart @@ -28,16 +28,16 @@ class _TopMenusState extends State { } class TopMenuTiles extends StatelessWidget { - String name; - String imageUrl; - String slug; + final String name; + final String imageUrl; + final String slug; - TopMenuTiles( - {Key key, - @required this.name, - @required this.imageUrl, - @required this.slug}) - : super(key: key); + const TopMenuTiles({ + Key? key, + required this.name, + required this.imageUrl, + required this.slug, + }) : super(key: key); @override Widget build(BuildContext context) { @@ -46,38 +46,43 @@ class TopMenuTiles extends StatelessWidget { child: Column( children: [ Container( - padding: EdgeInsets.only(left: 10, right: 5, top: 5, bottom: 5), - decoration: new BoxDecoration(boxShadow: [ - new BoxShadow( + padding: const EdgeInsets.only(left: 10, right: 5, top: 5, bottom: 5), + decoration: const BoxDecoration(boxShadow: [ + BoxShadow( color: Color(0xFFfae3e2), blurRadius: 25.0, offset: Offset(0.0, 0.75), ), ]), child: Card( - color: Colors.white, - elevation: 0, - shape: RoundedRectangleBorder( - borderRadius: const BorderRadius.all( - Radius.circular(3.0), - ), + color: Colors.white, + elevation: 0, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all( + Radius.circular(3.0), ), - child: Container( - width: 50, - height: 50, - child: Center( - child: Image.asset( - 'assets/images/topmenu/' + imageUrl + ".png", + ), + child: Container( + width: 50, + height: 50, + child: Center( + child: Image.asset( + 'assets/images/topmenu/$imageUrl.png', width: 24, height: 24, - )), - )), + ), + ), + ), + ), + ), + Text( + name, + style: const TextStyle( + color: Color(0xFF6e6e71), + fontSize: 14, + fontWeight: FontWeight.w400, + ), ), - Text(name, - style: TextStyle( - color: Color(0xFF6e6e71), - fontSize: 14, - fontWeight: FontWeight.w400)), ], ), ); diff --git a/pubspec.lock b/pubspec.lock index 308e8f1..3e00464 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,76 +1,70 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.11" - args: - dependency: transitive + another_carousel_pro: + dependency: "direct main" description: - name: args - url: "https://pub.dartlang.org" + name: another_carousel_pro + sha256: "3973eac89f0df07c9032f597dc8f8e48ad3d73065c62cefd46231de04a71d433" + url: "https://pub.dev" source: hosted - version: "1.5.2" + version: "1.0.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "1.0.5" - carousel_pro: - dependency: "direct main" + version: "2.1.1" + characters: + dependency: transitive description: - name: carousel_pro - url: "https://pub.dartlang.org" + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.0.0" - charcode: + version: "1.3.0" + clock: dependency: transitive description: - name: charcode - url: "https://pub.dartlang.org" + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.14.11" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "2.1.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -85,58 +79,66 @@ packages: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + sha256: "4aee924361dbb8d9ed2d30ec1020596ddac23d5eb3b54610814c0a2d7666d855" + url: "https://pub.dev" source: hosted - version: "8.8.1" - image: + version: "9.0.0" + leak_tracker: dependency: transitive description: - name: image - url: "https://pub.dartlang.org" + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" source: hosted - version: "2.1.4" - matcher: + version: "10.0.4" + leak_tracker_flutter_testing: dependency: transitive description: - name: matcher - url: "https://pub.dartlang.org" + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" source: hosted - version: "0.12.6" - meta: + version: "3.0.3" + leak_tracker_testing: dependency: transitive description: - name: meta - url: "https://pub.dartlang.org" + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" source: hosted - version: "1.1.8" - path: + version: "3.0.1" + matcher: dependency: transitive description: - name: path - url: "https://pub.dartlang.org" + name: matcher + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" source: hosted - version: "1.6.4" - pedantic: + version: "0.12.16+1" + material_color_utilities: dependency: transitive description: - name: pedantic - url: "https://pub.dartlang.org" + name: material_color_utilities + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" source: hosted - version: "1.8.0+1" - petitparser: + version: "0.8.0" + meta: dependency: transitive description: - name: petitparser - url: "https://pub.dartlang.org" + name: meta + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + url: "https://pub.dev" source: hosted - version: "2.4.0" - quiver: + version: "1.12.0" + path: dependency: transitive description: - name: quiver - url: "https://pub.dartlang.org" + name: path + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -146,65 +148,66 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.5.5" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.9.3" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + url: "https://pub.dev" source: hosted - version: "0.2.11" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.6" + version: "0.7.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.0.8" - xml: + version: "2.1.4" + vm_service: dependency: transitive description: - name: xml - url: "https://pub.dartlang.org" + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" source: hosted - version: "3.5.0" + version: "14.2.1" sdks: - dart: ">=2.4.0 <3.0.0" - flutter: ">=1.2.0 <2.0.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 91fe9e8..15f38ee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: '>=2.12.0 <4.0.0' dependencies: flutter: @@ -22,9 +22,9 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 - carousel_pro: ^1.0.0 - font_awesome_flutter: 8.8.1 + cupertino_icons: ^1.0.1 + another_carousel_pro: ^1.0.2 + font_awesome_flutter: 9.0.0 dev_dependencies: diff --git a/test/widget_test.dart b/test/widget_test.dart index 5e7d4e8..99d4ca8 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -6,14 +6,13 @@ // tree, read text, and verify that the values of widget properties are correct. import 'package:flutter/material.dart'; +import 'package:flutter_app/pages/HomePage.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter_app/main.dart'; - void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); + await tester.pumpWidget(HomePage()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget);