Update: change backend api source and project update with latest flutter version

Author: Sameera-Perera

assets/status_image/cloths-choosing.png

@@ -8,7 +8,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
 
@@ -17,7 +17,7 @@ DEPENDENCIES:
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
 
 EXTERNAL SOURCES:
   Flutter:
@@ -28,16 +28,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.16.2

ios/Podfile.lock

@@ -215,7 +215,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {

ios/Runner.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

ios/Runner/AppDelegate.swift

@@ -2,7 +2,7 @@
 const String appTitle = 'EShop';
 
 // Networking and APIs
-const String baseUrl = 'https://rich-jade-mackerel-kit.cyclic.app';
+const String baseUrl = 'https://e-commerce-mock-api-webservice.onrender.com';
 const String defaultApiKey = '';
 const String defaultSources = '';
 

lib/core/constant/strings.dart

@@ -17,15 +17,6 @@ class AppTheme {
     textButtonTheme: TextButtonThemeData(
         style: TextButton.styleFrom(foregroundColor: kLightSecondaryColor)),
     colorScheme: ColorScheme.light(secondary: kLightSecondaryColor)
-        .copyWith(background: kLightBackgroundColor),
+        .copyWith(surface: kLightBackgroundColor),
   );
-
-  // static final darkTheme = ThemeData(
-  //     brightness: Brightness.dark,
-  //     primaryColor: darkPrimaryColor,
-  //     visualDensity: VisualDensity.adaptivePlatformDensity,
-  //     textButtonTheme: TextButtonThemeData(
-  //         style: TextButton.styleFrom(foregroundColor: darkTextColor)),
-  //     colorScheme: ColorScheme.light(secondary: lightSecondaryColor)
-  //         .copyWith(background: darkBackgroundColor));
 }

lib/core/theme/app_theme.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:http/http.dart' as http;
 
 import '../../../../core/error/exceptions.dart';
@@ -17,7 +15,7 @@ class ProductRemoteDataSourceImpl implements ProductRemoteDataSource {
 
   @override
   Future<ProductResponseModel> getProducts(params) => _getProductFromUrl(
-      '$baseUrl/products?keyword=${params.keyword}&pageSize=${params.pageSize}&page=${params.limit}&categories=${jsonEncode(params.categories.map((e) => e.id).toList())}');
+      '$baseUrl/products');//?keyword=${params.keyword}&pageSize=${params.pageSize}&page=${params.limit}&categories=${jsonEncode(params.categories.map((e) => e.id).toList())}');
 
   Future<ProductResponseModel> _getProductFromUrl(String url) async {
     final response = await client.get(

lib/data/data_sources/remote/product_remote_data_source.dart

@@ -12,7 +12,7 @@ class PaginationMetaDataModel extends PaginationMetaData {
   );
 
   factory PaginationMetaDataModel.fromJson(Map<String, dynamic> json) => PaginationMetaDataModel(
-    page: json["page"],
+    page: json["page"]??0,
     pageSize: json["pageSize"],
     total: json["total"],
   );

lib/data/models/product/pagination_data_model.dart

@@ -17,12 +17,13 @@ class ProductResponseModel extends ProductResponse {
     required List<Product> data,
   }) : super(products: data, paginationMetaData: meta);
 
-  factory ProductResponseModel.fromJson(Map<String, dynamic> json) =>
-      ProductResponseModel(
+  factory ProductResponseModel.fromJson(Map<String, dynamic> json) {
+      return ProductResponseModel(
         meta: PaginationMetaDataModel.fromJson(json["meta"]),
         data: List<ProductModel>.from(
             json["data"].map((x) => ProductModel.fromJson(x))),
       );
+  }
 
   Map<String, dynamic> toJson() => {
         "meta": (paginationMetaData as PaginationMetaDataModel).toJson(),

lib/data/models/product/product_response_model.dart

@@ -27,7 +27,6 @@ class DeliveryInfoFetchCubit extends Cubit<DeliveryInfoFetchState> {
       emit(DeliveryInfoFetchLoading(
           deliveryInformation: const [],
           selectedDeliveryInformation: state.selectedDeliveryInformation));
-      print("fetching");
       final cachedResult = await _getCachedDeliveryInfoUseCase(NoParams());
       cachedResult.fold(
         (failure) => (),
@@ -53,9 +52,7 @@ class DeliveryInfoFetchCubit extends Cubit<DeliveryInfoFetchState> {
             deliveryInformation: deliveryInfo,
             selectedDeliveryInformation: state.selectedDeliveryInformation)),
       );
-      print("done");
     } catch (e) {
-      print(e);
       emit(DeliveryInfoFetchFail(
           deliveryInformation: state.deliveryInformation,
           selectedDeliveryInformation: state.selectedDeliveryInformation));

lib/presentation/blocs/delivery_info/delivery_info_fetch/delivery_info_fetch_cubit.dart

@@ -254,29 +254,46 @@ class _HomeViewState extends State<HomeView> {
                         },
                       );
                     }
-                    return Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        if (state.failure is ServerFailure)
-                          Image.asset(
-                              'assets/status_image/internal-server-error.png'),
-                        if (state.failure is CacheFailure)
-                          Image.asset('assets/status_image/no-connection.png'),
-                        const Text("Products not found!"),
-                        IconButton(
-                            onPressed: () {
-                              context.read<ProductBloc>().add(GetProducts(
-                                  FilterProductParams(
-                                      keyword: context
-                                          .read<FilterCubit>()
-                                          .searchController
-                                          .text)));
-                            },
-                            icon: const Icon(Icons.refresh)),
-                        SizedBox(
-                          height: MediaQuery.of(context).size.height * 0.1,
-                        )
-                      ],
+                    return Center(
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          if (state.failure is ServerFailure)
+                            Image.asset(
+                              'assets/status_image/internal-server-error.png',
+                              width: MediaQuery.of(context).size.width * 0.7,
+                            ),
+                          if (state.failure is CacheFailure)
+                            Image.asset(
+                              'assets/status_image/no-connection.png',
+                              width: MediaQuery.of(context).size.width * 0.7,
+                            ),
+                          // if (state.products.isEmpty)
+                          //   Image.asset(
+                          //     'assets/status_image/cloths-choosing.png',
+                          //     width: MediaQuery.of(context).size.width * 0.7,
+                          //   ),
+                          Text(
+                            "Products not found!",
+                            style: TextStyle(color: Colors.grey.shade600),
+                          ),
+                          IconButton(
+                              color: Colors.grey.shade600,
+                              onPressed: () {
+                                context.read<ProductBloc>().add(GetProducts(
+                                    FilterProductParams(
+                                        keyword: context
+                                            .read<FilterCubit>()
+                                            .searchController
+                                            .text)));
+                              },
+                              icon: const Icon(Icons.refresh)),
+                          SizedBox(
+                            height: MediaQuery.of(context).size.height * 0.1,
+                          )
+                        ],
+                      ),
                     );
                   }
                   return RefreshIndicator(

lib/presentation/views/main/home/home_view.dart

@@ -24,14 +24,14 @@ class InputFormButton extends StatelessWidget {
     return ElevatedButton(
       onPressed: onClick,
       style: ButtonStyle(
-        padding: MaterialStateProperty.all<EdgeInsets>(padding),
+        padding: WidgetStateProperty.all<EdgeInsets>(padding),
         maximumSize:
-            MaterialStateProperty.all<Size>(const Size(double.maxFinite, 50)),
+            WidgetStateProperty.all<Size>(const Size(double.maxFinite, 50)),
         minimumSize:
-            MaterialStateProperty.all<Size>(const Size(double.maxFinite, 50)),
-        backgroundColor: MaterialStateProperty.all<Color>(
+            WidgetStateProperty.all<Size>(const Size(double.maxFinite, 50)),
+        backgroundColor: WidgetStateProperty.all<Color>(
             color ?? Theme.of(context).primaryColor),
-        shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
           RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(cornerRadius ?? 12.0)),
         ),

lib/presentation/widgets/input_form_button.dart

@@ -1,4 +1,3 @@
-import 'package:dartz/dartz.dart';
 import 'package:eshop/core/error/failures.dart';
 import 'package:eshop/core/network/network_info.dart';
 import 'package:eshop/core/usecases/usecase.dart';