Merge pull request #77 from ryanaidilp/refactor/remove-dio

refactor(network): remove dio and implement my own network client
ryanaidilp · Nov 2, 2024 · 168b425 · 168b425
2 parents cbefa8d + 9e5a835
commit 168b425
Show file tree

Hide file tree

Showing 62 changed files with 961 additions and 1,142 deletions.
diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -43,7 +43,12 @@ jobs:
           lcov --remove ./coverage/lcov.info \
           "**/*.config.dart" \
           "**/base_entity_*.dart" \
-          "base_entity.dart" \
+          "**/base_entity.dart" \
+          "**/network_client.dart" \
+          "**/request_data.dart" \
+          "**/response_data.dart" \
+          "**/base_network_injector.dart" \
+          "**/result.dart" \
           "**/stadata_flutter_sdk.dart" \
           "**/register_module.dart" \
           "**/http_*.dart" \
@@ -52,8 +57,10 @@ jobs:
           "**/*.g.dart" \
           "**/*.freezed.dart" \
           "**/*_serializer.dart" \
+          "**/*_converter.dart" \
           "**/service_locator.dart" \
           "**/env.dart" \
+          "**/api_config.dart" \
           "**/usecase.dart" \
           "**/injector.dart" \
           "**/*_injector.dart" \

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -27,4 +27,4 @@ jobs:
       working_directory: packages/stadata_flutter_sdk
       flutter_channel: stable
       min_coverage: 80
-      coverage_excludes: "**/*.config.dart **/base_entity_*.dart **/base_entity.dart **/stadata_flutter_sdk.dart **/register_module.dart **/http_*.dart **/*_http_module.dart **/*_log_*.dart **/*.g.dart **/*.freezed.dart **/*_serializer.dart **/service_locator.dart **/env.dart **/usecase.dart **/injector.dart **/*_injector.dart"
+      coverage_excludes: "**/*.config.dart **/base_entity_*.dart **/base_entity.dart **/stadata_flutter_sdk.dart **/register_module.dart **/http_*.dart **/*_http_module.dart **/*_log_*.dart **/*.g.dart **/*.freezed.dart **/*_serializer.dart **/*_converter.dart **/service_locator.dart **/env.dart **/usecase.dart **/injector.dart **/*_injector.dart **/network_client.dart **/request_data.dart **/response_data.dart **/api_config.dart **/base_network_injector.dart **/result.dart"
diff --git a/app/example/lib/app/modules/static_table_detail/views/static_table_detail_view.dart b/app/example/lib/app/modules/static_table_detail/views/static_table_detail_view.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_widget_from_html/flutter_widget_from_html.dart';
-
 import 'package:get/get.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:stadata_example/app/utils/date_formatter.dart';
-
 import '../controllers/static_table_detail_controller.dart';
 
 class StaticTableDetailView extends GetView<StaticTableDetailController> {

diff --git a/app/example/pubspec.lock b/app/example/pubspec.lock
@@ -226,10 +226,10 @@ packages:
     dependency: transitive
     description:
       name: csslib
-      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "0.17.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -254,38 +254,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.10"
-  dio:
-    dependency: transitive
-    description:
-      name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.7.0"
-  dio_cache_interceptor:
-    dependency: transitive
-    description:
-      name: dio_cache_interceptor
-      sha256: fb7905c0d12075d8786a6b63bffd64ae062d053f682cfaf28d145a2686507308
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.5.0"
-  dio_smart_retry:
-    dependency: transitive
-    description:
-      name: dio_smart_retry
-      sha256: "3d71450c19b4d91ef4c7d726a55a284bfc11eb3634f1f25006cdfab3f8595653"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
-  dio_web_adapter:
-    dependency: transitive
-    description:
-      name: dio_web_adapter
-      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
   drop_shadow:
     dependency: "direct main"
     description:
@@ -330,10 +298,10 @@ packages:
     dependency: "direct main"
     description:
       name: extended_image
-      sha256: "69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78"
+      sha256: "278a62de62c96204035b68e98d6cef3cc047e8de5e43c9d859ccfb071e42188f"
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.1"
+    version: "9.0.5"
   extended_image_library:
     dependency: transitive
     description:
@@ -387,14 +355,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.4.1"
+  flutter_html:
+    dependency: "direct main"
+    description:
+      name: flutter_html
+      sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0-beta.2"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "5.0.0"
   flutter_screenutil:
     dependency: "direct main"
     description:
@@ -403,54 +379,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.9.3"
-  flutter_secure_storage:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage
-      sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.2"
-  flutter_secure_storage_linux:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_linux
-      sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  flutter_secure_storage_macos:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_macos
-      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
-  flutter_secure_storage_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_platform_interface
-      sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  flutter_secure_storage_web:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_web
-      sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  flutter_secure_storage_windows:
-    dependency: transitive
-    description:
-      name: flutter_secure_storage_windows
-      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
   flutter_svg:
     dependency: transitive
     description:
@@ -481,18 +409,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_widget_from_html
-      sha256: "22c911b6ccf82b83e0c457d987bac4e703440fea0fc88dab24f4dfe995a5f33f"
+      sha256: "9e2a6201c4d2eb910b6b3ebb2a9f5c490fc61c9a1aa35eafdde38f0fc659cf4c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.11"
+    version: "0.15.2"
   flutter_widget_from_html_core:
     dependency: transitive
     description:
       name: flutter_widget_from_html_core
-      sha256: cc1d9be3d187ce668ee02091cd5442dfb050cdaf98e0ab9a4d12ad008f966979
+      sha256: b1048fd119a14762e2361bd057da608148a895477846d6149109b2151d2f7abf
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.12"
+    version: "0.15.2"
   frontend_server_client:
     dependency: transitive
     description:
@@ -521,10 +449,10 @@ packages:
     dependency: transitive
     description:
       name: fwfh_just_audio
-      sha256: "209cf9644599e37b0edb6961c4f30ce80d156f5a53a50355f75fb4a22f9fdb0a"
+      sha256: "38dc2c55803bd3cef33042c473e0c40b891ad4548078424641a32032f6a1245f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.3"
+    version: "0.15.2"
   fwfh_svg:
     dependency: transitive
     description:
@@ -545,10 +473,10 @@ packages:
     dependency: transitive
     description:
       name: fwfh_webview
-      sha256: b828bb5ddd4361a866cdb8f1b0de4f3348f332915ecf2f4215ba17e46c656adc
+      sha256: f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.8"
+    version: "0.15.2"
   get:
     dependency: "direct main"
     description:
@@ -577,10 +505,18 @@ packages:
     dependency: transitive
     description:
       name: html
-      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.4"
+  html_unescape:
+    dependency: "direct main"
+    description:
+      name: html_unescape
+      sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.5"
+    version: "2.0.0"
   http:
     dependency: transitive
     description:
@@ -617,10 +553,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -697,10 +633,18 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "5.0.0"
+  list_counter:
+    dependency: transitive
+    description:
+      name: list_counter
+      sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   logger:
     dependency: transitive
     description:
@@ -969,10 +913,10 @@ packages:
     dependency: "direct main"
     description:
       name: skeletonizer
-      sha256: ff4c36e826efd5288d7a84e7619a6e9be8185d3064cecf101a9133762f3b401b
+      sha256: "3b202e4fa9c49b017d368fb0e570d4952bcd19972b67b2face071bdd68abbfae"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "1.4.2"
   sky_engine:
     dependency: transitive
     description: flutter

diff --git a/app/example/pubspec.yaml b/app/example/pubspec.yaml
@@ -6,29 +6,31 @@ environment:
   sdk: ">=3.1.1 <4.0.0"
 
 dependencies:
-  animate_do: ^3.1.2
-  cupertino_icons: ^1.0.2
+  animate_do: ^3.3.4
+  cupertino_icons: ^1.0.8
   drop_shadow: ^0.1.0
   easy_debounce: ^2.0.3
-  envied: ^0.5.1
-  extended_image: ^8.1.1
+  envied: ^0.5.4+1
+  extended_image: ^9.0.5
   flutter:
     sdk: flutter
-  flutter_screenutil: ^5.9.0
+  flutter_html: ^3.0.0-beta.2
+  flutter_screenutil: ^5.9.3
   flutter_switch: ^0.3.2
-  flutter_widget_from_html: ^0.14.6
+  flutter_widget_from_html: ^0.15.2
   get: ^4.6.6
-  intl: ^0.18.1
-  number_paginator: ^0.4.0
+  html_unescape: ^2.0.0
+  intl: ^0.19.0
+  number_paginator: ^0.4.1
   reading_time: ^2.0.0
-  skeletonizer: ^0.8.0
+  skeletonizer: ^1.4.2
   stadata_flutter_sdk:
     path: ../../packages/stadata_flutter_sdk
 
 dev_dependencies:
-  build_runner: ^2.4.6
-  envied_generator: ^0.5.1
-  flutter_lints: ^3.0.1
+  build_runner: ^2.4.13
+  envied_generator: ^0.5.4+1
+  flutter_lints: ^5.0.0
   flutter_test:
     sdk: flutter
 

diff --git a/packages/stadata_flutter_sdk/lib/src/core/di/injector.dart b/packages/stadata_flutter_sdk/lib/src/core/di/injector.dart
@@ -23,23 +23,22 @@ class Injector {
       ..registerLazySingleton<ApiConfig>(
         ApiConfig.new,
       )
-      ..factory<HttpClient>(
+      ..registerLazySingleton<Log>(Log.new)
+      ..factory<Logger>(registerModule.logger)
+      ..registerLazySingleton<StadataList>(
+        StadataListImpl.new,
+      )
+      ..factory<NetworkClient>(
+        registerModule.httpClient,
+      )
+      ..factory<NetworkClient>(
         registerModule.listHttpClient,
         instanceName: 'listClient',
       )
-      ..factory<HttpClient>(
+      ..factory<NetworkClient>(
         registerModule.viewHttpClient,
         instanceName: 'viewClient',
       )
-      ..registerLazySingleton<Log>(Log.new)
-      ..factory<HttpClient>(registerModule.httpClient)
-      ..factory<Logger>(registerModule.logger)
-      ..registerLazySingleton(StadataHttpModule.new)
-      ..registerLazySingleton(StadataListHttpModule.new)
-      ..registerLazySingleton(StadataViewHttpModule.new)
-      ..registerLazySingleton<StadataList>(
-        StadataListImpl.new,
-      )
       ..registerLazySingleton<StadataView>(
         StadataViewImpl.new,
       );