Merge pull request #6 from VB10/feature/core-network

Author: VB10

lib/core/base/model/base_error.dart

@@ -1,4 +1,6 @@
-class BaseError {
+import 'package:fluttermvvmtemplate/core/init/network/IResponseModel.dart';
+
+class BaseError extends IErrorModel {
   final String message;
 
   BaseError(this.message);

lib/core/base/model/base_view_model.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:fluttermvvmtemplate/core/init/network/ICoreDio.dart';
+import 'package:fluttermvvmtemplate/core/init/network/network_manager.dart';
 
 abstract class BaseViewModel {
   BuildContext context;
 
+  ICoreDio coreDio = NetworkManager.instance.coreDio;
   void setContext(BuildContext context);
   void init();
 }

lib/core/constants/enums/http_request_enum.dart

@@ -0,0 +1 @@
+enum HttpTypes { GET, POST }

lib/core/extension/network_exntension.dart

@@ -0,0 +1,14 @@
+import '../constants/enums/http_request_enum.dart';
+
+extension NetworkTypeExtension on HttpTypes {
+  String get rawValue {
+    switch (this) {
+      case HttpTypes.GET:
+        return "GET";
+      case HttpTypes.POST:
+        return "POST";
+      default:
+        throw "ERROR TYPE";
+    }
+  }
+}

lib/core/init/network/ICoreDio.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:fluttermvvmtemplate/core/init/network/IResponseModel.dart';
+
+import '../../base/model/base_model.dart';
+import '../../constants/enums/http_request_enum.dart';
+
+abstract class ICoreDio {
+  Future<IResponseModel<R>> fetch<R, T extends BaseModel>(String path,
+      {@required HttpTypes type,
+      @required T parseModel,
+      dynamic data,
+      Map<String, dynamic> queryParameters,
+      void Function(int, int) onReceiveProgress});
+}

lib/core/init/network/IResponseModel.dart

@@ -0,0 +1,15 @@
+abstract class IResponseModel<T> {
+  T data;
+  IErrorModel error;
+}
+
+abstract class IErrorModel<T> {
+  void statusCode() {}
+}
+
+class ResponseModel<T> extends IResponseModel<T> {
+  final T data;
+  final IErrorModel error;
+
+  ResponseModel({this.data, this.error});
+}

lib/core/init/network/core_dio.dart

@@ -0,0 +1,41 @@
+import 'dart:io';
+
+import 'package:dio/adapter.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+
+import '../../base/model/base_error.dart';
+import '../../base/model/base_model.dart';
+import '../../constants/enums/http_request_enum.dart';
+import '../../extension/network_exntension.dart';
+import 'ICoreDio.dart';
+import 'IResponseModel.dart';
+
+part "./network_core/core_operations.dart";
+
+class CoreDio with DioMixin implements Dio, ICoreDio {
+  final BaseOptions options;
+
+  CoreDio(this.options) {
+    this.options = options;
+    this.interceptors.add(InterceptorsWrapper());
+    this.httpClientAdapter = DefaultHttpClientAdapter();
+  }
+
+  Future<IResponseModel<R>> fetch<R, T extends BaseModel>(String path,
+      {@required HttpTypes type,
+      @required T parseModel,
+      dynamic data,
+      Map<String, dynamic> queryParameters,
+      void Function(int, int) onReceiveProgress}) async {
+    final response = await request(path, data: data, options: Options(method: type.rawValue));
+    switch (response.statusCode) {
+      case HttpStatus.ok:
+      case HttpStatus.accepted:
+        final model = _responseParser<R>(parseModel, _responseParser);
+        return ResponseModel<R>(data: model);
+      default:
+        return ResponseModel(error: BaseError("message"));
+    }
+  }
+}

lib/core/init/network/network_core/core_operations.dart

@@ -0,0 +1,12 @@
+part of "../core_dio.dart";
+
+extension _CoreDioOperations on CoreDio {
+  R _responseParser<R>(BaseModel model, dynamic data) {
+    if (data is List) {
+      return data.map((e) => model.fromJson(e)).toList() as R;
+    } else if (data is Map) {
+      return model.fromJson(data) as R;
+    }
+    return data as R;
+  }
+}

lib/core/init/network/network_manager.dart

@@ -1,11 +1,13 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:fluttermvvmtemplate/core/init/network/ICoreDio.dart';
 
 import '../../base/model/base_error.dart';
 import '../../base/model/base_model.dart';
 import '../../constants/enums/locale_keys_enum.dart';
 import '../cache/locale_manager.dart';
+import 'core_dio.dart';
 
 class NetworkManager {
   static NetworkManager _instance;
@@ -14,42 +16,24 @@ class NetworkManager {
     return _instance;
   }
 
+  ICoreDio coreDio;
+
   NetworkManager._init() {
     final baseOptions = BaseOptions(
       baseUrl: "https://jsonplaceholder.typicode.com/",
       headers: {"val": LocaleManager.instance.getStringValue(PreferencesKeys.TOKEN)},
     );
-    _dio = Dio(baseOptions);
-
-    _dio.interceptors.add(InterceptorsWrapper(
-      onRequest: (options) {
-        options.path += "veli";
-      },
-      // onResponse: (e) {
-      //   return e.data;
-      // },
-      onError: (e) {
-        return BaseError(e.message);
-      },
-    ));
-  }
-
-  Dio _dio;
-
-  Future dioGet<T extends BaseModel>(String path, T model) async {
-    final response = await _dio.get(path);
-
-    switch (response.statusCode) {
-      case HttpStatus.ok:
-        final responeBody = response.data;
-        if (responeBody is List) {
-          return responeBody.map((e) => model.fromJson(e)).toList();
-        } else if (responeBody is Map) {
-          return model.fromJson(responeBody);
-        }
-        return responeBody;
-        break;
-      default:
-    }
+    // _dio = Dio(baseOptions);
+
+    coreDio = CoreDio(baseOptions);
+
+    // _dio.interceptors.add(InterceptorsWrapper(
+    //   onRequest: (options) {
+    //     options.path += "veli";
+    //   },
+    //   onError: (e) {
+    //     return BaseError(e.message);
+    //   },
+    // ));
   }
 }

lib/core/init/notifier/theme_notifer.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:izmirtarih/core/constants/enums/app_theme_enum.dart';
-import 'package:izmirtarih/core/init/theme/app_theme_light.dart';
+
+import '../../constants/enums/app_theme_enum.dart';
+import '../theme/app_theme_light.dart';
 
 class ThemeNotifier extends ChangeNotifier {
   ThemeData _currentTheme = AppThemeLight.instance.theme;