Update to dart null-safety

vinothvino42 · Jun 8, 2021 · 687c47d · 687c47d
1 parent 9c14d5d
commit 687c47d
Show file tree

Hide file tree

Showing 48 changed files with 400 additions and 333 deletions.
diff --git a/lib/models/all_restaurant.dart b/lib/models/all_restaurant.dart
@@ -1,12 +1,11 @@
-import 'package:flutter/foundation.dart';
 import 'package:swiggy_ui/models/spotlight_best_top_food.dart';
 
 import 'indian_food.dart';
 
 class AllRestaurant {
   const AllRestaurant({
-    @required this.image,
-    @required this.name,
+    required this.image,
+    required this.name,
   });
 
   final String image;
@@ -187,9 +186,9 @@ class AllRestaurant {
 
 class LargeRestaurantBanner {
   const LargeRestaurantBanner({
-    @required this.image,
-    @required this.title,
-    @required this.subtitle,
+    required this.image,
+    required this.title,
+    required this.subtitle,
   });
 
   final String image;

diff --git a/lib/models/available_coupon.dart b/lib/models/available_coupon.dart
@@ -1,10 +1,8 @@
-import 'package:flutter/foundation.dart';
-
 class AvailableCoupon {
   const AvailableCoupon({
-    @required this.coupon,
-    @required this.discount,
-    @required this.desc,
+    required this.coupon,
+    required this.discount,
+    required this.desc,
   });
 
   final String coupon;
@@ -16,37 +14,44 @@ class AvailableCoupon {
       AvailableCoupon(
         coupon: '100INDUSIND',
         discount: 'Get 20 % discount using Induslnd Bank Credit Cards',
-        desc: 'Use code 100INDUSIND & get 20 % discount up to Rs100 on orders above Rs400',
+        desc:
+            'Use code 100INDUSIND & get 20 % discount up to Rs100 on orders above Rs400',
       ),
       AvailableCoupon(
         coupon: 'HSBC500',
         discount: 'Get 15 % discount using HSBC Bank Credit Cards',
-        desc: 'Use code HSBC500 & get 14 % discount up to Rs125 on orders above Rs500',
+        desc:
+            'Use code HSBC500 & get 14 % discount up to Rs125 on orders above Rs500',
       ),
       AvailableCoupon(
         coupon: '100TMB',
         discount: 'Get 20 % discount using TMB Bank Credit Cards',
-        desc: 'Use code 100TMB & get 20 % discount up to Rs100 on orders above Rs400',
+        desc:
+            'Use code 100TMB & get 20 % discount up to Rs100 on orders above Rs400',
       ),
       AvailableCoupon(
         coupon: 'INDUSIND20',
         discount: 'Get 20 % discount using Induslnd Bank Credit Cards',
-        desc: 'Use code INDUSIND20 & get 20 % discount up to Rs200 on orders above Rs600',
+        desc:
+            'Use code INDUSIND20 & get 20 % discount up to Rs200 on orders above Rs600',
       ),
       AvailableCoupon(
         coupon: 'HSBC5100',
         discount: 'Get 20 % discount using Induslnd Bank Credit Cards',
-        desc: 'Use code HSBC5100 & get 20 % discount up to Rs100 on orders above Rs400',
+        desc:
+            'Use code HSBC5100 & get 20 % discount up to Rs100 on orders above Rs400',
       ),
       AvailableCoupon(
         coupon: '100AXIS',
         discount: 'Get 20 % discount using Axis Bank Credit Cards',
-        desc: 'Use code 100AXIS & get 20 % discount up to Rs100 on orders above Rs400',
+        desc:
+            'Use code 100AXIS & get 20 % discount up to Rs100 on orders above Rs400',
       ),
       AvailableCoupon(
         coupon: '100INDUSIND',
         discount: 'Get 20 % discount using Induslnd Bank Credit Cards',
-        desc: 'Use code 100INDUSIND & get 20 % discount up to Rs100 on orders above Rs400',
+        desc:
+            'Use code 100INDUSIND & get 20 % discount up to Rs100 on orders above Rs400',
       ),
     ];
   }

diff --git a/lib/models/genie.dart b/lib/models/genie.dart
@@ -1,9 +1,7 @@
-import 'package:flutter/foundation.dart';
-
 class Genie {
   const Genie({
-    @required this.image,
-    @required this.title,
+    required this.image,
+    required this.title,
   });
 
   final String image;

diff --git a/lib/models/indian_food.dart b/lib/models/indian_food.dart
@@ -1,9 +1,7 @@
-import 'package:flutter/foundation.dart';
-
 class IndianFood {
   const IndianFood({
-    @required this.image,
-    @required this.name,
+    required this.image,
+    required this.name,
   });
 
   final String image;

diff --git a/lib/models/popular_brands.dart b/lib/models/popular_brands.dart
@@ -1,10 +1,8 @@
-import 'package:flutter/foundation.dart';
-
 class PopularBrands {
   const PopularBrands({
-    @required this.image,
-    @required this.name,
-    @required this.minutes,
+    required this.image,
+    required this.name,
+    required this.minutes,
   });
 
   final String image;
@@ -13,15 +11,38 @@ class PopularBrands {
 
   static List<PopularBrands> getPopularBrands() {
     return const [
-      PopularBrands(image: 'assets/images/food5.jpg', name: 'Sangeetha', minutes: '42 mins'),
-      PopularBrands(image: 'assets/images/food4.jpg', name: 'Thalappakati', minutes: '32 mins'),
-      PopularBrands(image: 'assets/images/food1.jpg', name: 'Subway', minutes: '26 mins'),
-      PopularBrands(image: 'assets/images/food2.jpg', name: 'Chai Kings', minutes: '38 mins'),
-      PopularBrands(image: 'assets/images/food3.jpg', name: 'BBQ Nation', minutes: '53 mins'),
-      PopularBrands(image: 'assets/images/food4.jpg', name: 'A2B Chennai', minutes: '22 mins'),
-      PopularBrands(image: 'assets/images/food6.jpg', name: 'KFC', minutes: '13 mins'),
-      PopularBrands(image: 'assets/images/food7.jpg', name: 'Aasife Biryani', minutes: '31 mins'),
-      PopularBrands(image: 'assets/images/food8.jpg', name: 'Chennai Biryani', minutes: '44 mins'),
+      PopularBrands(
+          image: 'assets/images/food5.jpg',
+          name: 'Sangeetha',
+          minutes: '42 mins'),
+      PopularBrands(
+          image: 'assets/images/food4.jpg',
+          name: 'Thalappakati',
+          minutes: '32 mins'),
+      PopularBrands(
+          image: 'assets/images/food1.jpg', name: 'Subway', minutes: '26 mins'),
+      PopularBrands(
+          image: 'assets/images/food2.jpg',
+          name: 'Chai Kings',
+          minutes: '38 mins'),
+      PopularBrands(
+          image: 'assets/images/food3.jpg',
+          name: 'BBQ Nation',
+          minutes: '53 mins'),
+      PopularBrands(
+          image: 'assets/images/food4.jpg',
+          name: 'A2B Chennai',
+          minutes: '22 mins'),
+      PopularBrands(
+          image: 'assets/images/food6.jpg', name: 'KFC', minutes: '13 mins'),
+      PopularBrands(
+          image: 'assets/images/food7.jpg',
+          name: 'Aasife Biryani',
+          minutes: '31 mins'),
+      PopularBrands(
+          image: 'assets/images/food8.jpg',
+          name: 'Chennai Biryani',
+          minutes: '44 mins'),
     ];
   }
 }
diff --git a/lib/models/popular_category.dart b/lib/models/popular_category.dart
@@ -1,9 +1,7 @@
-import 'package:flutter/foundation.dart';
-
 class PopularCategory {
   const PopularCategory({
-    @required this.image,
-    @required this.name,
+    required this.image,
+    required this.name,
   });
 
   final String image;

diff --git a/lib/models/restaurant_detail.dart b/lib/models/restaurant_detail.dart
@@ -1,9 +1,7 @@
-import 'package:flutter/foundation.dart';
-
 class RestaurantDetail {
   const RestaurantDetail({
-    @required this.title,
-    @required this.price,
+    required this.title,
+    required this.price,
     this.image = '',
     this.desc = '',
   });
@@ -19,7 +17,8 @@ class RestaurantDetail {
         title: 'Idly(2Pcs) (Breakfast)',
         price: 'Rs48',
         image: 'assets/images/food1.jpg',
-        desc: 'A healthy breakfast item and an authentic south indian delicacy! Steamed and fluffy rice cake..more',
+        desc:
+            'A healthy breakfast item and an authentic south indian delicacy! Steamed and fluffy rice cake..more',
       ),
       RestaurantDetail(
         title: 'Sambar Idly (2Pcs)',
@@ -30,7 +29,8 @@ class RestaurantDetail {
         title: 'Ghee Pongal',
         image: 'assets/images/food3.jpg',
         price: 'Rs85',
-        desc: 'Cute, button idlis with authentic. South Indian sambar and coconut chutney gives the per..more',
+        desc:
+            'Cute, button idlis with authentic. South Indian sambar and coconut chutney gives the per..more',
       ),
       RestaurantDetail(
         title: 'Boori (1Set)',
@@ -46,7 +46,8 @@ class RestaurantDetail {
         title: 'Mini Idly with Sambar',
         image: 'assets/images/food6.jpg',
         price: 'Rs85',
-        desc: 'Cute, button idlis with authentic. South Indian sambar and coconut chutney gives the per..more',
+        desc:
+            'Cute, button idlis with authentic. South Indian sambar and coconut chutney gives the per..more',
       ),
     ];
   }
@@ -56,7 +57,8 @@ class RestaurantDetail {
       RestaurantDetail(
         title: 'Plain Dosa',
         price: 'Rs30',
-        desc: 'A healthy breakfast item and an authentic south indian delicacy!',
+        desc:
+            'A healthy breakfast item and an authentic south indian delicacy!',
       ),
       RestaurantDetail(
         title: 'Rava Dosa',
@@ -65,7 +67,8 @@ class RestaurantDetail {
       RestaurantDetail(
         title: 'Onion Dosa',
         price: 'Rs85',
-        desc: 'Cute, button dosas with authentic. South Indian sambar and coconut chutney gives the per..more',
+        desc:
+            'Cute, button dosas with authentic. South Indian sambar and coconut chutney gives the per..more',
       ),
       RestaurantDetail(
         title: 'Onion Uttapam',

diff --git a/lib/models/spotlight_best_top_food.dart b/lib/models/spotlight_best_top_food.dart
@@ -1,12 +1,10 @@
-import 'package:flutter/foundation.dart';
-
 class SpotlightBestTopFood {
   const SpotlightBestTopFood({
-    @required this.image,
-    @required this.name,
-    @required this.desc,
-    @required this.coupon,
-    @required this.ratingTimePrice,
+    required this.image,
+    required this.name,
+    required this.desc,
+    required this.coupon,
+    required this.ratingTimePrice,
   });
 
   final String image;

diff --git a/lib/models/tab_desktop/menu.dart b/lib/models/tab_desktop/menu.dart
@@ -1,10 +1,9 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 class Menu {
   const Menu({
-    @required this.icon,
-    @required this.title,
+    required this.icon,
+    required this.title,
   });
 
   final IconData icon;

diff --git a/lib/models/tab_desktop/order_menu.dart b/lib/models/tab_desktop/order_menu.dart
@@ -1,11 +1,9 @@
-import 'package:flutter/foundation.dart';
-
 class OrderMenu {
   const OrderMenu({
-    @required this.image,
-    @required this.title,
-    @required this.quantity,
-    @required this.price,
+    required this.image,
+    required this.title,
+    required this.quantity,
+    required this.price,
   });
 
   final String image;

diff --git a/lib/models/top_picks_food.dart b/lib/models/top_picks_food.dart
@@ -1,10 +1,8 @@
-import 'package:flutter/foundation.dart';
-
 class TopPicksFood {
   const TopPicksFood({
-    @required this.image,
-    @required this.name,
-    @required this.minutes,
+    required this.image,
+    required this.name,
+    required this.minutes,
   });
 
   final String image;
@@ -13,16 +11,46 @@ class TopPicksFood {
 
   static List<TopPicksFood> getTopPicksfoods() {
     return const [
-      TopPicksFood(image: 'assets/images/food5.jpg', name: 'Murugan Idli Shop', minutes: '42 mins'),
-      TopPicksFood(image: 'assets/images/food4.jpg', name: 'Thalappakati Biryani Hotel', minutes: '32 mins'),
-      TopPicksFood(image: 'assets/images/food1.jpg', name: 'Sangeetha', minutes: '26 mins'),
-      TopPicksFood(image: 'assets/images/food2.jpg', name: 'Hotel Chennai', minutes: '38 mins'),
-      TopPicksFood(image: 'assets/images/food3.jpg', name: 'Shri Balaajee', minutes: '53 mins'),
-      TopPicksFood(image: 'assets/images/food4.jpg', name: 'Namma Veedu Vasantha', minutes: '22 mins'),
-      TopPicksFood(image: 'assets/images/food6.jpg', name: 'SK Parota Stall', minutes: '13 mins'),
-      TopPicksFood(image: 'assets/images/food7.jpg', name: 'Aasife Biryani', minutes: '31 mins'),
-      TopPicksFood(image: 'assets/images/food8.jpg', name: 'Jesus Fast Food', minutes: '44 mins'),
-      TopPicksFood(image: 'assets/images/food9.jpg', name: 'Ananda Bhavan', minutes: '55 mins'),
+      TopPicksFood(
+          image: 'assets/images/food5.jpg',
+          name: 'Murugan Idli Shop',
+          minutes: '42 mins'),
+      TopPicksFood(
+          image: 'assets/images/food4.jpg',
+          name: 'Thalappakati Biryani Hotel',
+          minutes: '32 mins'),
+      TopPicksFood(
+          image: 'assets/images/food1.jpg',
+          name: 'Sangeetha',
+          minutes: '26 mins'),
+      TopPicksFood(
+          image: 'assets/images/food2.jpg',
+          name: 'Hotel Chennai',
+          minutes: '38 mins'),
+      TopPicksFood(
+          image: 'assets/images/food3.jpg',
+          name: 'Shri Balaajee',
+          minutes: '53 mins'),
+      TopPicksFood(
+          image: 'assets/images/food4.jpg',
+          name: 'Namma Veedu Vasantha',
+          minutes: '22 mins'),
+      TopPicksFood(
+          image: 'assets/images/food6.jpg',
+          name: 'SK Parota Stall',
+          minutes: '13 mins'),
+      TopPicksFood(
+          image: 'assets/images/food7.jpg',
+          name: 'Aasife Biryani',
+          minutes: '31 mins'),
+      TopPicksFood(
+          image: 'assets/images/food8.jpg',
+          name: 'Jesus Fast Food',
+          minutes: '44 mins'),
+      TopPicksFood(
+          image: 'assets/images/food9.jpg',
+          name: 'Ananda Bhavan',
+          minutes: '55 mins'),
     ];
   }
 }
diff --git a/lib/utils/app_colors.dart b/lib/utils/app_colors.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
 
 const Color appColor = Colors.orange;
-Color darkOrange = Colors.deepOrange[800];
-Color swiggyOrange = Colors.orange[900];
+Color? darkOrange = Colors.deepOrange[800];
+Color? swiggyOrange = Colors.orange[900];