diff --git a/.gitignore b/.gitignore index ac4a906..44440fa 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ **/ios/Flutter/flutter_assets/ **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* +**/ios/Flutter/flutter_export_environment.sh # Exceptions to above rules. !**/ios/**/default.mode1v3 diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh deleted file mode 100755 index 2fe4957..0000000 --- a/ios/Flutter/flutter_export_environment.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/gabrielsavio/Documents/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/gabrielsavio/Documents/Desenvolvedor/Mobile/Youtube/flutter_api_rest" -export "FLUTTER_TARGET=/Users/gabrielsavio/Documents/Desenvolvedor/Mobile/Youtube/flutter_api_rest/lib/main.dart" -export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "FLUTTER_FRAMEWORK_DIR=/Users/gabrielsavio/Documents/flutter/bin/cache/artifacts/engine/ios" -export "FLUTTER_BUILD_NAME=1.0.0" -export "FLUTTER_BUILD_NUMBER=1" -export "TRACK_WIDGET_CREATION=true" diff --git a/lib/src/app/app_module.dart b/lib/src/app/app_module.dart index 4f907cf..22f9678 100644 --- a/lib/src/app/app_module.dart +++ b/lib/src/app/app_module.dart @@ -12,9 +12,8 @@ class AppModule extends ModuleWidget { ]; @override - List get dependencies => [ - Dependency((i) => CustomDio()) - ]; + List get dependencies => + [Dependency((i) => CustomDio().createDio())]; @override Widget get view => AppWidget(); diff --git a/lib/src/pages/home/home_module.dart b/lib/src/pages/home/home_module.dart index 4f613c5..e44720d 100644 --- a/lib/src/pages/home/home_module.dart +++ b/lib/src/pages/home/home_module.dart @@ -1,10 +1,10 @@ import 'package:bloc_pattern/bloc_pattern.dart'; +import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:tratar_erros_dio/src/app/app_module.dart'; import 'package:tratar_erros_dio/src/pages/create/create_bloc.dart'; import 'package:tratar_erros_dio/src/pages/home/home_repository.dart'; import 'package:tratar_erros_dio/src/pages/update/update_bloc.dart'; -import 'package:tratar_erros_dio/src/shared/custom_dio/custom_dio.dart'; import 'home_bloc.dart'; import 'home_page.dart'; @@ -18,10 +18,8 @@ class HomeModule extends ModuleWidget { ]; @override - List get dependencies => [ - Dependency( - (i) => HomeRepository(AppModule.to.getDependency())) - ]; + List get dependencies => + [Dependency((i) => HomeRepository(AppModule.to.getDependency()))]; @override Widget get view => HomePage(); diff --git a/lib/src/pages/home/home_repository.dart b/lib/src/pages/home/home_repository.dart index d2acc22..eba9c99 100644 --- a/lib/src/pages/home/home_repository.dart +++ b/lib/src/pages/home/home_repository.dart @@ -1,9 +1,8 @@ import 'package:dio/dio.dart'; -import 'package:tratar_erros_dio/src/shared/custom_dio/custom_dio.dart'; import 'package:tratar_erros_dio/src/shared/models/post_model.dart'; class HomeRepository { - final CustomDio _client; + final Dio _client; HomeRepository(this._client); @@ -27,7 +26,7 @@ class HomeRepository { } } - Future updatePost(Map data,int id) async { + Future updatePost(Map data, int id) async { try { var response = await _client.patch("/posts/$id", data: data); return response.statusCode; diff --git a/lib/src/shared/custom_dio/custom_dio.dart b/lib/src/shared/custom_dio/custom_dio.dart index 12bb50c..951e60c 100644 --- a/lib/src/shared/custom_dio/custom_dio.dart +++ b/lib/src/shared/custom_dio/custom_dio.dart @@ -1,16 +1,15 @@ - - import 'package:dio/dio.dart'; import 'package:tratar_erros_dio/src/shared/constants.dart'; import 'package:tratar_erros_dio/src/shared/custom_dio/interceptors.dart'; -class CustomDio extends Dio{ +class CustomDio { + Dio createDio() { + Dio dio = Dio(); + dio.options.baseUrl = BASE_URL; + dio.interceptors.add(CustomIntercetors()); + dio.options.connectTimeout = 5000; - CustomDio(){ - options.baseUrl = BASE_URL; - interceptors.add(CustomIntercetors()); - options.connectTimeout = 5000; + return dio; } - -} \ No newline at end of file +} diff --git a/lib/src/shared/custom_dio/interceptors.dart b/lib/src/shared/custom_dio/interceptors.dart index 4f78e89..bc0f6c1 100644 --- a/lib/src/shared/custom_dio/interceptors.dart +++ b/lib/src/shared/custom_dio/interceptors.dart @@ -1,32 +1,26 @@ - - import 'package:dio/dio.dart'; - -class CustomIntercetors extends InterceptorsWrapper{ - +class CustomIntercetors extends InterceptorsWrapper { @override - onRequest(RequestOptions options){ + Future onRequest(RequestOptions options) async { print("REQUEST[${options.method}] => PATH: ${options.path}"); - return options; - } + return options; + } - @override - onResponse(Response response) { - //200 - //201 - print("RESPONSE[${response.statusCode}] => PATH: ${response.request.path}"); - return response; - } - - @override - onError(DioError e) { - //Exception - print("ERROR[${e.response.statusCode}] => PATH: ${e.request.path}"); - if(e.response.statusCode == 404) - return DioError(message: "Erro interno"); - - return e; - } + @override + Future onResponse(Response response) async { + //200 + //201 + print("RESPONSE[${response.statusCode}] => PATH: ${response.request.path}"); + return response; + } -} \ No newline at end of file + @override + Future onError(DioError e) async { + //Exception + print("ERROR[${e.response.statusCode}] => PATH: ${e.request.path}"); + if (e.response.statusCode == 404) return DioError(error: "Erro interno"); + + return e; + } +} diff --git a/pubspec.lock b/pubspec.lock index f3fe69d..30b9ef9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,20 +1,6 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: @@ -50,27 +36,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.14.11" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - cookie_jar: - dependency: transitive - description: - name: cookie_jar - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.2" cupertino_icons: dependency: "direct main" description: @@ -84,7 +49,7 @@ packages: name: dio url: "https://pub.dartlang.org" source: hosted - version: "2.1.13" + version: "3.0.0" flutter: dependency: "direct main" description: flutter @@ -95,13 +60,13 @@ packages: description: flutter source: sdk version: "0.0.0" - image: + http_parser: dependency: transitive description: - name: image + name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "3.1.3" matcher: dependency: transitive description: @@ -130,13 +95,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" quiver: dependency: transitive description: @@ -212,12 +170,5 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">2.4.0 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6f3c551..64a372b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ environment: sdk: ">=2.1.0 <3.0.0" dependencies: - dio: ^2.1.13 + dio: ^3.0.0 rxdart: ^0.22.1+1 bloc_pattern: ^2.2.3 flutter: