feat: shared package & flutter svg

itsezlife · May 23, 2024 · 13e2d0b · 13e2d0b
1 parent 8ebbe78
commit 13e2d0b
Show file tree

Hide file tree

Showing 174 changed files with 1,511 additions and 822 deletions.
diff --git a/assets/icons/FilterSettingIcon.png b/assets/icons/FilterSettingIcon.png
diff --git a/assets/icons/facebook_logo_icon.png b/assets/icons/facebook_logo_icon.png
diff --git a/assets/icons/google_logo_icon.png b/assets/icons/google_logo_icon.png
diff --git a/assets/icons/pin.png b/assets/icons/pin.png
diff --git a/assets/images/HeartFilled.png b/assets/images/HeartFilled.png
diff --git a/assets/images/HeartNotFilled.png b/assets/images/HeartNotFilled.png
diff --git a/assets/images/NoImageFound.png b/assets/images/NoImageFound.png
diff --git a/assets/images/PapaBurger.png → assets/images/papa-burger.png b/assets/images/PapaBurger.png → assets/images/papa-burger.png
diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
@@ -4,11 +4,10 @@ import 'package:app_ui/app_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/network/notification_service.dart';
 import 'package:papa_burger/src/services/repositories/local_storage/local_storage.dart';
 import 'package:papa_burger/src/services/storage/storage.dart';
+import 'package:shared/shared.dart';
 
 class AppBlocObserver extends BlocObserver {
   @override

diff --git a/lib/isolates.dart b/lib/isolates.dart
@@ -1,10 +1,9 @@
 import 'dart:isolate';
 
-import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/network/api/api.dart';
 import 'package:papa_burger/src/services/storage/storage.dart';
 import 'package:papa_burger/src/views/pages/main/state/main_bloc.dart';
+import 'package:shared/shared.dart';
 
 Future<void> useRestaurantsIsolate() async {
   final mainBloc = MainBloc();

diff --git a/lib/src/config/config.dart b/lib/src/config/config.dart
@@ -1,6 +1,5 @@
 export 'animations/fade_animation.dart';
 export 'dotenv.dart';
 export 'extensions/extensions.dart';
-export 'logger.dart';
 export 'routes/app_routes.dart';
 export 'utils/utils.dart';
diff --git a/lib/src/config/extensions/navigator_extension.dart b/lib/src/config/extensions/navigator_extension.dart
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show HapticFeedback;
 import 'package:page_transition/page_transition.dart';
 import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/views/pages/main/components/drawer/views/orders/components/order_details/order_details_view.dart';
 import 'package:papa_burger/src/views/pages/main/components/drawer/views/orders/state/orders_bloc_test.dart';
 import 'package:papa_burger/src/views/pages/main/components/location/google_map_view.dart';
 import 'package:papa_burger/src/views/pages/main/components/menu/menu_view.dart';
 import 'package:papa_burger/src/views/pages/main/components/restaurant/restaurants_filtered_view.dart';
+import 'package:shared/shared.dart';
 
 Route<dynamic> _defaultRoute({
   required Widget child,

diff --git a/lib/src/config/extensions/show_bottom_modal_sheet_extension.dart b/lib/src/config/extensions/show_bottom_modal_sheet_extension.dart
@@ -2,9 +2,9 @@ import 'package:app_ui/app_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/views/pages/cart/state/cart_bloc.dart';
 import 'package:papa_burger/src/views/widgets/widgets.dart';
+import 'package:shared/shared.dart';
 
 extension BottomModalSheetExtension on BuildContext {
   Future<void> showBottomModalSheetWithItemDetails(
@@ -148,7 +148,7 @@ class IncreaseDecreaseQuantityBottomAppBar extends StatelessWidget {
               children: [
                 Text(item.name, style: context.titleLarge),
                 const Spacer(),
-                Text(item.priceString, style: context.titleLarge),
+                Text(item.priceToString, style: context.titleLarge),
               ],
             ),
             const SizedBox(

diff --git a/lib/src/config/utils/app_strings.dart b/lib/src/config/utils/app_strings.dart
@@ -1,31 +1,11 @@
-const _iconPath = 'assets/icons';
-const _imagesPath = 'assets/images';
-
-const loginLogo = '$_iconPath/login_icon.png';
-const googleIcon = '$_iconPath/google_logo_icon.png';
-const facebookIcon = '$_iconPath/facebook_logo_icon.png';
-const noInternetConnectionImage = '$_imagesPath/NoInternetConnection.jpg';
-const heartFilled = '$_imagesPath/HeartFilled.png';
-const heartNotFilled = '$_imagesPath/HeartNotFilled.png';
 const headerPhoto =
     'https://i.postimg.cc/TYmTcNQx/Whats-App-Image-2023-05-31-at-18-33-47.jpg';
-const fakeStreet = 'Olive Street 54/12, 5th floor.';
-
-const burgersImageUrlPath =
-    'https://img.freepik.com/premium-vector/hand-drawn-big-burger-illustration_266639-146.jpg';
-const drinksImageUrlPath =
-    'https://img.freepik.com/premium-vector/illustration-soft-drink-vector-cartoon-isolated_592024-28.jpg?w=2000';
-const fastFoodImageUrlPath =
-    'https://img.freepik.com/premium-vector/fast-food-tasty-set-fast-food-isolated-white_67394-543.jpg';
-const lunchImageUrlPath =
-    'https://static.vecteezy.com/system/resources/thumbnails/003/546/554/small/a-good-lunch-for-the-schoolboy-free-vector.jpg';
-const pizzaImageUrlPath =
-    'https://media.istockphoto.com/id/843213562/vector/cartoon-with-contour-of-pizza-slice-with-melted-cheese-and-pepperoni.jpg?s=612x612&w=0&k=20&c=St6rIJz83w2MjwSPj4EvHA8a4x_z9Rgmsd5TYkvSGH8=';
+const fakeStreet = 'Olive Street 54/12';
 
 const googleApiKey = '';
 
-const noLocation = 'No location, please pick one.';
-const searchFoodLabel = 'Search all Food';
+const noLocation = 'Pick location';
+const searchFoodLabel = 'Search food...';
 const quickSearchLabel = 'Quick Search';
 const searchLocationLabel = 'Search';
 

diff --git a/lib/src/models/cart.dart b/lib/src/models/cart.dart
diff --git a/lib/src/models/category.dart b/lib/src/models/category.dart
diff --git a/lib/src/models/menu_model.dart b/lib/src/models/menu_model.dart
diff --git a/lib/src/services/network/api/location_api.dart b/lib/src/services/network/api/location_api.dart
@@ -4,9 +4,8 @@ import 'package:dio/dio.dart' show Dio;
 import 'package:flutter/foundation.dart' show immutable;
 import 'package:geolocator/geolocator.dart'
     show Geolocator, LocationAccuracy, LocationPermission, Position;
-import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/network/api/api.dart';
+import 'package:shared/shared.dart';
 
 @immutable
 class LocationApi {

diff --git a/lib/src/services/network/api/orders_api.dart b/lib/src/services/network/api/orders_api.dart
@@ -1,7 +1,7 @@
 import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/repositories/orders/base_orders_repository.dart';
 import 'package:papa_burger_server/api.dart' as server;
+import 'package:shared/shared.dart';
 
 class OrdersApi implements BaseOrdersRepository {
   OrdersApi({server.ApiClient? apiClient})
@@ -53,7 +53,7 @@ class OrdersApi implements BaseOrdersRepository {
             restaurantPlaceId: restaurantPlaceId,
             restaurantName: restaurantName,
             orderAddress: orderAddress,
-            totalOrderSumm: totalOrderSum,
+            totalOrderSum: totalOrderSum,
             orderDeliveryFee: orderDeliveryFee,
           )
           .timeout(defaultTimeout);
@@ -92,7 +92,7 @@ class OrdersApi implements BaseOrdersRepository {
             getIdentifier: getIdentifier,
           )
           .timeout(defaultTimeout);
-      return listOrderDetails.map<OrderDetails>(OrderDetails.fromDB).toList();
+      return listOrderDetails.map<OrderDetails>(OrderDetails.fromDb).toList();
     } catch (error, stackTrace) {
       throw apiExceptionsFormatter(error, stackTrace);
     }
@@ -112,7 +112,7 @@ class OrdersApi implements BaseOrdersRepository {
             getIdentifier: getIdentifier,
           )
           .timeout(defaultTimeout);
-      return OrderDetails.fromDB(orderDetails);
+      return OrderDetails.fromDb(orderDetails);
     } catch (error, stackTrace) {
       throw apiExceptionsFormatter(error, stackTrace);
     }
@@ -140,7 +140,7 @@ class OrdersApi implements BaseOrdersRepository {
             restaurantPlaceId: restaurantPlaceId,
             restaurantName: restaurantName,
             orderAddress: orderAddress,
-            totalOrderSumm: totalOrderSum,
+            totalOrderSum: totalOrderSum,
             orderDeliveryFee: orderDeliveryFee,
           )
           .timeout(defaultTimeout);

diff --git a/lib/src/services/network/api/payment_controller.dart b/lib/src/services/network/api/payment_controller.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/foundation.dart' show immutable;
-import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/network/base/pay.dart';
 import 'package:papa_burger/src/services/storage/storage.dart';
 import 'package:papa_burger_server/api.dart' as server;
+import 'package:shared/shared.dart';
 
 @immutable
 class PaymentController implements Pay {
@@ -26,7 +25,7 @@ class PaymentController implements Pay {
   //   final uid = _firebaseAuth.currentUser?.uid;
   //   if (uid == null) throw Exception('User id equal null');
 
-  //   final mappedCard = card.toMap();
+  //   final mappedCard = card.toJson();
   //   final cardsCollection =
   //       _firebaseFirestore.collection('users').doc(uid).collection('cards');
 

diff --git a/lib/src/services/network/api/restaurant_api.dart b/lib/src/services/network/api/restaurant_api.dart
@@ -1,6 +1,6 @@
 import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger_server/api.dart' as api;
+import 'package:shared/shared.dart';
 
 class RestaurantApi {
   RestaurantApi({api.ApiClient? apiClient})

diff --git a/lib/src/services/network/api/search_api.dart b/lib/src/services/network/api/search_api.dart
@@ -1,6 +1,6 @@
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/views/pages/main/state/main_bloc.dart';
 import 'package:papa_burger_server/api.dart' as server;
+import 'package:shared/shared.dart';
 
 class SearchApi {
   SearchApi();

diff --git a/lib/src/services/network/api/user_api.dart b/lib/src/services/network/api/user_api.dart
@@ -1,7 +1,7 @@
 import 'package:papa_burger/src/config/utils/app_constants.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/repositories/user/user.dart';
 import 'package:papa_burger_server/api.dart' as server;
+import 'package:shared/shared.dart';
 
 class UserApi implements BaseUserRepository {
   UserApi({server.ApiClient? apiClient})

diff --git a/lib/src/services/network/notification_service.dart b/lib/src/services/network/notification_service.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:faker/faker.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:papa_burger/src/config/config.dart';
 import 'package:papa_burger/src/services/repositories/notifications/notifications_repository.dart';
 import 'package:papa_burger/src/services/repositories/notifications/user_notifications_repository.dart';
 import 'package:papa_burger/src/services/storage/storage.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:shared/shared.dart';
 
 final _flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
 final _userNotificationRepository = UserNotificationsRepository();

diff --git a/lib/src/services/repositories/local_storage/base_local_storage_repository.dart b/lib/src/services/repositories/local_storage/base_local_storage_repository.dart
@@ -1,7 +1,7 @@
 // ignore_for_file: comment_references
 
 import 'package:flutter/foundation.dart' show immutable;
-import 'package:papa_burger/src/models/models.dart';
+import 'package:shared/shared.dart';
 
 /// An abstract class to separate logic.
 @immutable

diff --git a/lib/src/services/repositories/local_storage/local_storage_repository.dart b/lib/src/services/repositories/local_storage/local_storage_repository.dart
@@ -2,9 +2,8 @@
 
 import 'package:flutter/foundation.dart' show immutable;
 import 'package:hive/hive.dart' show Box, Hive;
-import 'package:papa_burger/src/config/config.dart';
-import 'package:papa_burger/src/models/models.dart';
 import 'package:papa_burger/src/services/repositories/local_storage/local_storage.dart';
+import 'package:shared/shared.dart';
 
 /// [LocalStorageRepository] class, is made to maintain all the logic with
 /// Local Storage with [Hive]. [Hive] helps to storage the data locally

diff --git a/lib/src/services/repositories/orders/base_orders_repository.dart b/lib/src/services/repositories/orders/base_orders_repository.dart
@@ -1,4 +1,4 @@
-import 'package:papa_burger/src/models/order_details.dart';
+import 'package:shared/shared.dart';
 
 abstract class BaseOrdersRepository {
   Future<String> createOrder(