dio updated

mirmoktadir · Mar 13, 2023 · f6dc53a · f6dc53a
1 parent ebfd07b
commit f6dc53a
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 87 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -41,10 +41,10 @@ PODS:
   - Firebase/Messaging (10.3.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 10.3.0)
-  - firebase_core (2.4.1):
+  - firebase_core (2.7.1):
     - Firebase/CoreOnly (= 10.3.0)
     - Flutter
-  - firebase_messaging (14.2.1):
+  - firebase_messaging (14.2.6):
     - Firebase/Messaging (= 10.3.0)
     - firebase_core
     - Flutter
@@ -166,8 +166,8 @@ SPEC CHECKSUMS:
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: ce3938a0df3cc1ef404671531facef740d03f920
   Firebase: f92fc551ead69c94168d36c2b26188263860acd9
-  firebase_core: bf59c32d2e53814f558efa20840c1902fa2fe461
-  firebase_messaging: ee597229fc260f8fa491fa8f2d4a32dfbfa406fa
+  firebase_core: 1ae9f9aa76e6e1edc14fb181637ad466fd6c6fa4
+  firebase_messaging: f8c01f8b540feb4196e8dbe45ae17534747d779d
   FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
   FirebaseCoreInternal: e301297f4c15a17489e48ed722d733b1578e0c02
   FirebaseInstallations: 36b38c733fd37e50857e5e8d74138648f466f18c
@@ -179,10 +179,10 @@ SPEC CHECKSUMS:
   integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
   IosAwnCore: 6494e0e174d49f04f513e8a002187be226889a37
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
   SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
+  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3

diff --git a/lib/app/components/navbar/bottom_navbar.dart b/lib/app/components/navbar/bottom_navbar.dart
@@ -72,7 +72,7 @@ class BottomNavbar extends StatelessWidget {
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
                           color: _selectedIndex == 0
-                              ? theme.colorScheme.secondary
+                              ? theme.primaryColor
                               : Colors.white,
                         ),
                         child: Center(
@@ -120,7 +120,7 @@ class BottomNavbar extends StatelessWidget {
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
                           color: _selectedIndex == 1
-                              ? theme.colorScheme.secondary
+                              ? theme.primaryColor
                               : Colors.white,
                         ),
                         child: Center(
@@ -166,7 +166,7 @@ class BottomNavbar extends StatelessWidget {
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
                           color: _selectedIndex == 2
-                              ? theme.colorScheme.secondary
+                              ? theme.primaryColor
                               : Colors.white,
                         ),
                         child: Center(
@@ -213,7 +213,7 @@ class BottomNavbar extends StatelessWidget {
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
                           color: _selectedIndex == 3
-                              ? theme.colorScheme.secondary
+                              ? theme.primaryColor
                               : Colors.white,
                         ),
                         child: Center(
@@ -260,14 +260,14 @@ class BottomNavbar extends StatelessWidget {
                         decoration: BoxDecoration(
                           shape: BoxShape.circle,
                           color: _selectedIndex == 4
-                              ? theme.colorScheme.secondary
+                              ? theme.primaryColor
                               : Colors.white,
                         ),
                         child: Center(
                           child: Icon(
                             IconlyLight.buy,
                             size: 20,
-                            color: _selectedIndex == 3
+                            color: _selectedIndex == 4
                                 ? Colors.white
                                 : theme.primaryColor.withOpacity(.5),
                           ),

diff --git a/lib/app/service/api_exceptions.dart b/lib/app/service/api_exceptions.dart
@@ -9,22 +9,25 @@ class DioExceptions implements Exception {
       case DioErrorType.cancel:
         message = Strings.requestCanceled.tr;
         break;
-      case DioErrorType.connectTimeout:
+      case DioErrorType.connectionTimeout:
         message = Strings.connectionTimeout.tr;
         break;
-      case DioErrorType.other:
+      case DioErrorType.connectionError:
         message = Strings.connectionProblem.tr;
         break;
       case DioErrorType.receiveTimeout:
         message = Strings.receiveTimeout.tr;
         break;
-      case DioErrorType.response:
+      case DioErrorType.badResponse:
         message = _handleError(
             dioError.response!.statusCode!.toInt(), dioError.response!.data);
         break;
       case DioErrorType.sendTimeout:
         message = Strings.sendTimeout.tr;
         break;
+      case DioErrorType.unknown:
+        message = Strings.somethingWrong.tr;
+        break;
       default:
         message = Strings.somethingWrong.tr;
         break;

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:getx_standard/app/modules/home/bindings/home_binding.dart';
 
 import 'app/data/local/my_shared_pref.dart';
 import 'app/routes/app_pages.dart';