update

7wilightxdev · 7wilightxdev · commit d090973623b2 · 2021-04-25T18:06:42.000+07:00
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,9 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />     
     <application
         android:label="Peachy"
         android:icon="@mipmap/ic_launcher"
diff --git a/lib/configs/config.dart b/lib/configs/config.dart
@@ -3,4 +3,3 @@ export 'router.dart';
 export 'size_config.dart';
 export 'theme.dart';
 export 'application.dart';
-export 'enum.dart';
diff --git a/lib/configs/enum.dart b/lib/configs/enum.dart
diff --git a/lib/configs/router.dart b/lib/configs/router.dart
@@ -1,5 +1,5 @@
 import 'package:e_commerce_app/bottom_navigation.dart';
-import 'package:e_commerce_app/presentation/screens/chat/chat_screen.dart';
+import 'package:e_commerce_app/presentation/screens/message/message_screen.dart';
 import 'package:e_commerce_app/presentation/screens/detail_order_screen.dart/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';
@@ -36,7 +36,7 @@ class AppRouter {
   static const String MAP = '/map';
   static const String CATEGORIES = '/categories';
   static const String SETTING = '/setting';
-  static const String CHAT = '/chat';
+  static const String MESSAGES = '/messages';
   static const String SEARCH = '/search';
 
   static Route<dynamic> generateRoute(RouteSettings settings) {
@@ -108,9 +108,9 @@ class AppRouter {
         return MaterialPageRoute(
           builder: (_) => MapScreen(),
         );
-      case CHAT:
+      case MESSAGES:
         return MaterialPageRoute(
-          builder: (_) => ChatScreen(),
+          builder: (_) => MessagesScreen(),
         );
       case SEARCH:
         return MaterialPageRoute(
diff --git a/lib/data/entities/category.dart b/lib/data/entities/category.dart
@@ -30,13 +30,6 @@ class Category extends Equatable {
     };
   }
 
-  /// Represent to all category
-  static const all = Category(
-    id: "default",
-    name: "All products",
-    imageUrl: "",
-  );
-
   @override
   String toString() {
     return this.name;
diff --git a/lib/data/entities/entites.dart b/lib/data/entities/entites.dart
@@ -6,3 +6,4 @@ export 'feedback.dart';
 export 'category.dart';
 export 'order.dart';
 export 'delivery_address.dart';
+export 'message.dart';
diff --git a/lib/data/entities/order.dart b/lib/data/entities/order.dart
@@ -107,7 +107,7 @@ class Order extends Equatable {
         priceOfGoods,
         deliveryFee,
         coupon,
-        createdAt
+        createdAt,
       ];
 }
 
diff --git a/lib/data/repository/app_repository.dart b/lib/data/repository/app_repository.dart
@@ -9,6 +9,7 @@ class AppRepository {
   static final cartRepository = FirebaseCartRepository();
   static final orderRepository = FirebaseOrderRepository();
   static final feedbackRepository = FirebaseFeedbackRepository();
+  static final messageRepository = FirebaseMessageRepository();
   static final storageRepository = StorageRepository();
 
   /// Singleton factory
diff --git a/lib/data/repository/repository.dart b/lib/data/repository/repository.dart
@@ -12,5 +12,7 @@ export 'order_repository/order_repo.dart';
 export 'order_repository/firebase_order_repo.dart';
 export 'feedback_repository/feedback_repo.dart';
 export 'feedback_repository/firebase_feedback_repo.dart';
+export 'message_repository/message_repo.dart';
+export 'message_repository/firebase_message_repo.dart';
 export 'storage_repository/storage_repo.dart';
 export 'app_repository.dart';
diff --git a/lib/data/repository/storage_repository/storage_repo.dart b/lib/data/repository/storage_repository/storage_repo.dart
@@ -1,20 +1,30 @@
 import 'dart:io';
+import 'dart:typed_data';
 
 import 'package:firebase_storage/firebase_storage.dart';
 
 class StorageRepository {
   static const String bucketRef = "gs://e-commerce-flutter-526ce.appspot.com";
   FirebaseStorage storage = FirebaseStorage.instanceFor(bucket: bucketRef);
 
-  /// Return photo URL
-  Future<String> uploadImage(String ref, File file) async {
+  /// Return image URL
+  Future<String> uploadImageFile(String ref, File file) async {
     var storageRef = storage.ref().child(ref);
     var uploadTask = await storageRef.putFile(file);
 
     String downloadURL = await uploadTask.ref.getDownloadURL();
     return downloadURL;
   }
 
+  /// Return photo URL
+  Future<String> uploadImageData(String ref, Uint8List fileData) async {
+    var storageRef = storage.ref().child(ref);
+    var uploadTask = await storageRef.putData(fileData);
+
+    String downloadURL = await uploadTask.ref.getDownloadURL();
+    return downloadURL;
+  }
+
   ///Singleton factory
   static final StorageRepository _instance = StorageRepository._internal();
 
diff --git a/lib/presentation/common_blocs/profile/profile_bloc.dart b/lib/presentation/common_blocs/profile/profile_bloc.dart
@@ -35,7 +35,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
       _profileStreamSub?.cancel();
       _profileStreamSub = _userRepository
           .loggedUserStream(_authRepository.loggedFirebaseUser)
-          .listen((cart) => add(ProfileUpdated(cart)));
+          .listen((updatedUser) => add(ProfileUpdated(updatedUser)));
     } catch (e) {
       yield ProfileLoadFailure(e.toString());
     }
@@ -45,7 +45,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
   Stream<ProfileState> _mapUploadAvatarToState(UploadAvatar event) async* {
     try {
       // Get image url from firebase storage
-      String imageUrl = await _storageRepository.uploadImage(
+      String imageUrl = await _storageRepository.uploadImageFile(
         "users/profile/${_loggedUser!.id}",
         event.imageFile,
       );
diff --git a/lib/presentation/screens/chat/chat_screen.dart b/lib/presentation/screens/chat/chat_screen.dart
diff --git a/lib/presentation/screens/feedbacks/widgets/feedback_bottom_sheet.dart b/lib/presentation/screens/feedbacks/widgets/feedback_bottom_sheet.dart
@@ -24,14 +24,8 @@ class _FeedbackBottomSheetState extends State<FeedbackBottomSheet> {
   String content = "";
 
   void onAddFeeback() {
-    if (content.isEmpty) {
-      UtilDialog.showInformation(
-        context,
-        content:
-            Translate.of(context).translate("you_need_to_complete_all_fields"),
-      );
-      return;
-    }
+    if (content.isEmpty) return;
+
     ProfileState profileState = BlocProvider.of<ProfileBloc>(context).state;
     if (profileState is ProfileLoaded) {
       var newFeedback = FeedBack(
diff --git a/lib/presentation/screens/profile/profile_header.dart b/lib/presentation/screens/profile/profile_header.dart
diff --git a/lib/presentation/screens/profile/profile_screen.dart b/lib/presentation/screens/profile/profile_screen.dart
@@ -1,7 +1,7 @@
 import 'package:e_commerce_app/presentation/common_blocs/auth/bloc.dart';
 import 'package:e_commerce_app/configs/config.dart';
 import 'package:e_commerce_app/constants/constants.dart';
-import 'package:e_commerce_app/presentation/screens/profile/widgets/profile_header.dart';
+import 'package:e_commerce_app/presentation/screens/profile/profile_header.dart';
 import 'package:e_commerce_app/presentation/widgets/custom_widgets.dart';
 import 'package:e_commerce_app/utils/utils.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/presentation/widgets/buttons/message_button.dart b/lib/presentation/widgets/buttons/message_button.dart
@@ -1,3 +1,4 @@
+import 'package:e_commerce_app/configs/config.dart';
 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';
@@ -15,7 +16,9 @@ class MessageButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return IconButtonWithCounter(
       icon: ICON_CONST.MESSAGE,
-      onPressed: () {},
+      onPressed: () {
+        Navigator.pushNamed(context, AppRouter.MESSAGES);
+      },
       counter: 1,
       size: SizeConfig.defaultSize * 2.4,
       color: color,
diff --git a/lib/utils/formatter.dart b/lib/utils/formatter.dart
@@ -8,7 +8,7 @@ class UtilFormatter {
   }
 
   static String formatTimeStamp(Timestamp timestamp) {
-    DateFormat formatter = DateFormat('yyyy-MM-dd');
+    DateFormat formatter = DateFormat.yMMMMd().add_jm();
     var date =
         new DateTime.fromMillisecondsSinceEpoch(timestamp.seconds * 1000);
     return formatter.format(date);
diff --git a/pubspec.lock b/pubspec.lock
@@ -399,6 +399,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
+  multi_image_picker:
+    dependency: "direct main"
+    description:
+      name: multi_image_picker
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.8.00"
   nested:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -26,6 +26,7 @@ dependencies:
   #image
   image_picker: ^0.7.2
   image_gallery_saver: ^1.6.8
+  multi_image_picker: ^4.8.0
   #bloc
   flutter_bloc: ^7.0.0
   #provider
@@ -54,10 +55,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-flutter_icons:
-  android: true
-  ios: true
-  image_path: "assets/images/ic_launcher.png"
 # The following section is specific to Flutter.
 flutter:
   # The following line ensures that the Material Icons font is

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class Order extends Equatable {`
`107`	`107`	`priceOfGoods,`
`108`	`108`	`deliveryFee,`
`109`	`109`	`coupon,`
`110`		`- createdAt`
	`110`	`+ createdAt,`
`111`	`111`	`];`
`112`	`112`	`}`
`113`	`113`