rename

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

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-6.5-bin.zip

lib/main.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:fooddeliveryapp/screen/cart.dart';
-import 'package:fooddeliveryapp/screen/check_out.dart';
-import 'package:fooddeliveryapp/screen/login.dart';
-import 'package:fooddeliveryapp/models/tableDetail.dart';
-import 'package:fooddeliveryapp/screen/table.dart';
+import 'package:fooddeliveryapp/pages/cart.dart';
+import 'package:fooddeliveryapp/pages/check_out.dart';
+import 'package:fooddeliveryapp/pages/login.dart';
+import 'package:fooddeliveryapp/model/tableDetail.dart';
+import 'package:fooddeliveryapp/pages/table.dart';
 import 'package:provider/provider.dart';
 
-import 'screen/Staff.dart';
-import 'screen/Welcome.dart';
-import 'models/table.dart';
-import 'models/user.dart';
+import 'pages/Staff.dart';
+import 'pages/welcome_page.dart';
+import 'model/table.dart';
+import 'model/user.dart';
 
 void main() => runApp(MyApp());
 

lib/models/tableDetail.dart → lib/model/tableDetail.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/cupertino.dart';
-import 'package:fooddeliveryapp/models/product.dart';
+import 'package:fooddeliveryapp/model/product.dart';
 
 class Item {
   int count;

lib/screen/cart.dart → lib/pages/cart.dart

@@ -2,10 +2,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/tableDetail.dart';
-import 'package:fooddeliveryapp/screen/check_out.dart';
-import 'package:fooddeliveryapp/screen/details/components/add_to_cart.dart';
-import 'package:fooddeliveryapp/screen/table.dart';
+import 'package:fooddeliveryapp/model/tableDetail.dart';
+import 'package:fooddeliveryapp/pages/check_out.dart';
+import 'package:fooddeliveryapp/pages/details/components/add_to_cart.dart';
+import 'package:fooddeliveryapp/pages/table.dart';
 import 'package:provider/provider.dart';
 
 class OrderCart extends StatelessWidget {

lib/screen/check_out.dart → lib/pages/check_out.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/table.dart';
-import 'package:fooddeliveryapp/models/tableDetail.dart';
+import 'package:fooddeliveryapp/model/table.dart';
+import 'package:fooddeliveryapp/model/tableDetail.dart';
 import 'package:provider/provider.dart';
 
 class CheckOut extends StatelessWidget {

lib/screen/details/components/body.dart → lib/pages/details/components/body.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
-// import 'package:fooddeliveryapp/models/tableDetail.dart';
+import 'package:fooddeliveryapp/model/product.dart';
+// import 'package:fooddeliveryapp/model/tableDetail.dart';
 // import 'package:provider/provider.dart';
 
 // import 'add_to_cart.dart';

lib/screen/details/components/cart_counter.dart → lib/pages/details/components/cart_counter.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
-import 'package:fooddeliveryapp/models/tableDetail.dart';
+import 'package:fooddeliveryapp/model/product.dart';
+import 'package:fooddeliveryapp/model/tableDetail.dart';
 import 'package:provider/provider.dart';
 
 class CartCounter extends StatefulWidget {

lib/screen/details/components/color_and_size.dart → lib/pages/details/components/color_and_size.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
+import 'package:fooddeliveryapp/model/product.dart';
 
 class ColorAndSize extends StatelessWidget {
   const ColorAndSize({

lib/screen/details/components/counter_with_fav_btn.dart → lib/pages/details/components/counter_with_fav_btn.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:fooddeliveryapp/models/product.dart';
-// import 'package:fooddeliveryapp/models/tableDetail.dart';
+import 'package:fooddeliveryapp/model/product.dart';
+// import 'package:fooddeliveryapp/model/tableDetail.dart';
 
 import 'cart_counter.dart';
 

lib/screen/details/components/description.dart → lib/pages/details/components/description.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
+import 'package:fooddeliveryapp/model/product.dart';
 
 class Description extends StatelessWidget {
   const Description({

lib/screen/details/components/product_title_with_image copy.dart → lib/pages/details/components/product_title_with_image copy.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:shop_app/models/Product.dart';
-
 import '../../../constants.dart';
+import 'package:fooddeliveryapp/model/product.dart';
 
 class ProductTitleWithImage extends StatelessWidget {
   const ProductTitleWithImage({

lib/screen/details/components/product_title_with_image.dart → lib/pages/details/components/product_title_with_image.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
+import 'package:fooddeliveryapp/model/product.dart';
 
 class ProductTitleWithImage extends StatelessWidget {
   const ProductTitleWithImage({

lib/screen/details/detail_screen.dart → lib/pages/details/detail_screen.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:fooddeliveryapp/screen/cart.dart';
+import 'package:fooddeliveryapp/pages/cart.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
-import 'package:fooddeliveryapp/screen/details/components/body.dart';
+import 'package:fooddeliveryapp/model/product.dart';
+import 'package:fooddeliveryapp/pages/details/components/body.dart';
 
 class DetailsScreen extends StatelessWidget {
   final Product product;

lib/screen/login.dart → lib/pages/login.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
 
-import 'Welcome.dart';
-import '../models/user.dart';
+import 'welcome_page.dart';
+import '../model/user.dart';
 
 class LoginPage extends StatefulWidget {
   static const routeName = "/";

lib/screen/order/components/body.dart → lib/pages/order/components/body.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
-import 'package:fooddeliveryapp/screen/details/detail_screen.dart';
-import 'package:fooddeliveryapp/screen/order/order_home_screen.dart';
+import 'package:fooddeliveryapp/model/product.dart';
+import 'package:fooddeliveryapp/pages/details/detail_screen.dart';
+import 'package:fooddeliveryapp/pages/order/order_home_screen.dart';
 
 import 'item-card.dart';
 

lib/screen/order/components/item-card.dart → lib/pages/order/components/item-card.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/models/product.dart';
+import 'package:fooddeliveryapp/model/product.dart';
 
 class ItemCard extends StatelessWidget {
   final Product product;

lib/screen/order/order_home_screen.dart → lib/pages/order/order_home_screen.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:fooddeliveryapp/models/product.dart';
-import 'package:fooddeliveryapp/screen/cart.dart';
+import 'package:fooddeliveryapp/model/product.dart';
+import 'package:fooddeliveryapp/pages/cart.dart';
 import 'package:fooddeliveryapp/constants.dart';
-import 'package:fooddeliveryapp/screen/order/components/body.dart';
+import 'package:fooddeliveryapp/pages/order/components/body.dart';
 
 class HomeSrcreen extends StatelessWidget {
   static const routeName = '/order';

lib/screen/table.dart → lib/pages/table.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:fooddeliveryapp/models/tableDetail.dart';
-import 'package:fooddeliveryapp/screen/order/order_home_screen.dart';
+import 'package:fooddeliveryapp/model/tableDetail.dart';
+import 'package:fooddeliveryapp/pages/order/order_home_screen.dart';
 import 'package:provider/provider.dart';
 
-import '../models/table.dart';
+import '../model/table.dart';
 
 class TablePage extends StatefulWidget {
   static const String routeName = '/table';

lib/screen/Welcome.dart → lib/pages/welcome_page.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:fooddeliveryapp/screen/table.dart';
+import 'package:fooddeliveryapp/pages/table.dart';
 import 'package:provider/provider.dart';
 
 import 'Staff.dart';
 import 'login.dart';
-import '../models/user.dart';
+import '../model/user.dart';
 
 class WelcomePage extends StatelessWidget {
   static const routeName = '/welcome';

pubspec.lock

@@ -1,69 +1,76 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
+  async:
     dependency: transitive
     description:
-      name: archive
+      name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.13"
-  args:
+    version: "2.8.1"
+  boolean_selector:
     dependency: transitive
     description:
-      name: args
+      name: boolean_selector
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.0"
-  async:
+    version: "2.1.0"
+  characters:
     dependency: transitive
     description:
-      name: async
+      name: characters
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.1"
-  boolean_selector:
+    version: "1.1.0"
+  charcode:
     dependency: transitive
     description:
-      name: boolean_selector
+      name: charcode
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
-  charcode:
+    version: "1.3.1"
+  clock:
     dependency: transitive
     description:
-      name: charcode
+      name: clock
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.14.12"
-  convert:
+    version: "1.15.0"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.3"
+  fake_async:
     dependency: transitive
     description:
-      name: convert
+      name: fake_async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.2.0"
+  ffi:
     dependency: transitive
     description:
-      name: crypto
+      name: ffi
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.4"
-  cupertino_icons:
-    dependency: "direct main"
+    version: "1.1.2"
+  file:
+    dependency: transitive
     description:
-      name: cupertino_icons
+      name: file
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3"
+    version: "6.1.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -75,7 +82,7 @@ packages:
       name: flutter_svg
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.17.4"
+    version: "0.22.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -107,27 +114,27 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.4"
-  image:
+  js:
     dependency: transitive
     description:
-      name: image
+      name: js
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.12"
+    version: "0.6.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.8"
+    version: "1.7.0"
   nested:
     dependency: transitive
     description:
@@ -141,21 +148,42 @@ packages:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.4"
+    version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.1"
+    version: "0.5.1+1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.4"
+    version: "0.2.1"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.5"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.3"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.5"
   pedantic:
     dependency: transitive
     description:
@@ -169,7 +197,28 @@ packages:
       name: petitparser
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "4.4.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.1.0"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.2"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.2.4"
   provider:
     dependency: "direct main"
     description:
@@ -177,41 +226,62 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.5+1"
-  quiver:
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.12"
+  shared_preferences_android:
     dependency: transitive
     description:
-      name: quiver
+      name: shared_preferences_android
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.3"
-  shared_preferences:
-    dependency: "direct main"
+    version: "2.0.10"
+  shared_preferences_ios:
+    dependency: transitive
     description:
-      name: shared_preferences
+      name: shared_preferences_ios
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.5.7+3"
+    version: "2.0.9"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.4"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1+10"
+    version: "2.0.2"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.2+7"
+    version: "2.0.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -223,63 +293,77 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.3"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.15"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.6"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.0"
   xml:
     dependency: transitive
     description:
       name: xml
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.6.1"
+    version: "5.3.1"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+  dart: ">=2.14.0 <3.0.0"
+  flutter: ">=2.5.0"

pubspec.yaml

@@ -25,9 +25,9 @@ dependencies:
   cupertino_icons: ^0.1.2
   provider: ^4.0.5+1
   http: ^0.12.1
-  shared_preferences: ^0.5.7+2
+  shared_preferences: ^2.0.9
   fluttertoast: ^3.0.3
-  flutter_svg: ^0.17.4 # it help us to use SVG in our app
+  flutter_svg: ^0.22.0 # it help us to use SVG in our app
 
 dev_dependencies:
   flutter_test: