update model name

Author: 7wilightxdev

assets/locale/en.json

@@ -164,5 +164,7 @@
   "order_successfully": "Order successfully",
   "cancel_successfully": "Cancel successfully",
   "add_successfully": "Add successfully",
-  "save": "Save"
+  "save": "Save",
+  "district": "District",
+  "ward": "Ward"
 }

assets/locale/vi.json

@@ -139,5 +139,8 @@
   "order_successfully": "Đặt hàng thành công",
   "cancel_successfully": "Hủy đơn hàng thành công",
   "add_successfully": "Thêm thành công",
-  "save": "Lưu"
+  "save": "Lưu",
+  "city": "Thành phố/ Tỉnh",
+  "district": "Quận / Huyện",
+  "ward": "Phường / Xã"
 }

lib/configs/router.dart

@@ -1,12 +1,12 @@
 import 'package:e_commerce_app/bottom_navigation.dart';
+import 'package:e_commerce_app/data/models/models.dart';
 import 'package:e_commerce_app/presentation/screens/detail_image/detail_image_screen.dart';
 import 'package:e_commerce_app/presentation/screens/message/message_screen.dart';
 import 'package:e_commerce_app/presentation/screens/detail_order/detail_order_screen.dart';
 import 'package:e_commerce_app/presentation/screens/map/map_screen.dart';
 import 'package:e_commerce_app/presentation/screens/my_orders/my_orders_screen.dart';
 import 'package:e_commerce_app/presentation/screens/search/search_screen.dart';
 import 'package:flutter/material.dart';
-import 'package:e_commerce_app/data/entities/entites.dart';
 import 'package:e_commerce_app/presentation/screens/delivery_address/delivery_address_screen.dart';
 import 'package:e_commerce_app/presentation/screens/categories/categories_screen.dart';
 import 'package:e_commerce_app/presentation/screens/cart/cart_screen.dart';
@@ -82,7 +82,7 @@ class AppRouter {
         return MaterialPageRoute(
             builder: (_) => FeedbacksScreen(product: product));
       case CATEGORIES:
-        var category = settings.arguments as Category;
+        var category = settings.arguments as CategoryModel;
         return MaterialPageRoute(
             builder: (_) => CategoriesScreen(category: category));
       case CART:
@@ -94,12 +94,12 @@ class AppRouter {
           builder: (_) => MyOrdersScreen(),
         );
       case DETAIL_ORDER:
-        var order = settings.arguments as Order;
+        var order = settings.arguments as OrderModel;
         return MaterialPageRoute(
             builder: (_) => DetailOrderScreen(order: order));
       case DELIVERY_ADDRESS:
         return MaterialPageRoute(
-          builder: (_) => DeliveryAddressScreen(),
+          builder: (_) => DeliveryAddressModelScreen(),
         );
       case MAP:
         return MaterialPageRoute(

lib/configs/theme.dart

@@ -1,3 +1,4 @@
+import 'package:e_commerce_app/configs/size_config.dart';
 import 'package:e_commerce_app/constants/color_constant.dart';
 import 'package:e_commerce_app/constants/constants.dart';
 import 'package:flutter/material.dart';
@@ -6,15 +7,16 @@ class AppTheme {
   static final ThemeData currentTheme = ThemeData(
     scaffoldBackgroundColor: COLOR_CONST.backgroundColor,
     fontFamily: "Roboto",
-    appBarTheme: appBarTheme,
-    textTheme: textTheme,
+    appBarTheme: _appBarTheme,
+    textTheme: _textTheme,
     floatingActionButtonTheme: FloatingActionButtonThemeData(
       backgroundColor: COLOR_CONST.primaryColor,
     ),
     visualDensity: VisualDensity.adaptivePlatformDensity,
+    inputDecorationTheme: _inputDecorationThem,
   );
 
-  static final appBarTheme = AppBarTheme(
+  static final _appBarTheme = AppBarTheme(
     color: Colors.white,
     shadowColor: COLOR_CONST.cardShadowColor,
     elevation: 0.4,
@@ -25,9 +27,18 @@ class AppTheme {
     textTheme: TextTheme(headline6: FONT_CONST.BOLD_DEFAULT_20),
   );
 
-  static final textTheme = TextTheme(
-      bodyText1: TextStyle(color: COLOR_CONST.textColor),
-      bodyText2: TextStyle(color: COLOR_CONST.textColor));
+  static final _textTheme = TextTheme(
+    bodyText1: TextStyle(color: COLOR_CONST.textColor),
+    bodyText2: TextStyle(color: COLOR_CONST.textColor),
+  );
+
+  static final _inputDecorationThem = InputDecorationTheme(
+    contentPadding: EdgeInsets.symmetric(horizontal: SizeConfig.defaultPadding),
+    border: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(5),
+      borderSide: BorderSide(color: COLOR_CONST.textColor),
+    ),
+  );
 
   /// Singleton factory
   static final AppTheme _instance = AppTheme._internal();

lib/constants/key_constant.dart

@@ -0,0 +1,18 @@
+abstract class KEY_CONST {
+  //error description
+  static const request_send_timeout = "request_send_timeout";
+  static const request_cancelled = "request_cancelled";
+  static const request_connect_timeout = "request_connect_timeout";
+  static const no_internet = "no_internet";
+  static const request_receive_timeout = "request_receive_timeout";
+  static const not_found = "Not found.";
+  static const error = "Error";
+  static const unknown_error = "Unknown_error";
+}
+
+class MovieListType {
+  static String popular = "popular";
+  static String nowPlaying = "now_playing";
+  static String topRated = "top_rated";
+  static String upcoming = "upcoming";
+}

lib/data/entities/delivery_address.dart

@@ -1,14 +1,14 @@
 import 'package:equatable/equatable.dart';
 
-class BannerItem extends Equatable {
+class BannerModel extends Equatable {
   final String id;
   final String imageUrl;
 
-  BannerItem({required this.id, required this.imageUrl});
+  BannerModel({required this.id, required this.imageUrl});
 
   /// Json data from server turns into model data
-  static BannerItem fromMap(Map<String, dynamic> data) {
-    return BannerItem(
+  static BannerModel fromMap(Map<String, dynamic> data) {
+    return BannerModel(
       id: data["id"] ?? "",
       imageUrl: data["imageUrl"] ?? "",
     );
@@ -24,7 +24,7 @@ class BannerItem extends Equatable {
 
   @override
   String toString() {
-    return 'BannerItem{id: $id, url: $imageUrl}';
+    return 'BannerModel{id: $id, url: $imageUrl}';
   }
 
   @override

lib/data/entities/entites.dart

@@ -1,8 +1,8 @@
-import 'package:e_commerce_app/data/entities/entites.dart';
+import 'package:e_commerce_app/data/models/models.dart';
 import 'package:equatable/equatable.dart';
 
 /// Cart item model
-class CartItem extends Equatable {
+class CartItemModel extends Equatable {
   /// Cart item id
   final String id;
 
@@ -19,7 +19,7 @@ class CartItem extends Equatable {
   final Product? productInfo;
 
   /// Constructor
-  CartItem({
+  CartItemModel({
     required this.id,
     required this.productId,
     required this.price,
@@ -28,8 +28,8 @@ class CartItem extends Equatable {
   });
 
   /// Json data from server turns into model data
-  static CartItem fromMap(Map<String, dynamic> data) {
-    return CartItem(
+  static CartItemModel fromMap(Map<String, dynamic> data) {
+    return CartItemModel(
       id: data["id"] ?? "",
       productId: data["productId"],
       price: data["price"],
@@ -48,14 +48,14 @@ class CartItem extends Equatable {
   }
 
   /// Clone and update
-  CartItem cloneWith({
+  CartItemModel cloneWith({
     id,
     productId,
     productInfo,
     price,
     quantity,
   }) {
-    return CartItem(
+    return CartItemModel(
       id: id ?? this.id,
       productId: productId ?? this.productId,
       productInfo: productInfo ?? this.productInfo,

lib/data/entities/banner.dart renamed to lib/data/models/banner_model.dart

@@ -1,20 +1,20 @@
 import 'package:equatable/equatable.dart';
 
-/// Category model
-class Category extends Equatable {
+/// CategoryModel model
+class CategoryModel extends Equatable {
   final String id;
   final String name;
   final String imageUrl;
 
-  const Category({
+  const CategoryModel({
     required this.id,
     required this.name,
     required this.imageUrl,
   });
 
   /// Json data from server turns into model data
-  static Category fromMap(String id, Map<String, dynamic> data) {
-    return Category(
+  static CategoryModel fromMap(String id, Map<String, dynamic> data) {
+    return CategoryModel(
       id: data["id"] ?? "",
       name: data["name"] ?? "",
       imageUrl: data["imageUrl"] ?? "",