update model

jsons/Crop.json

@@ -1,6 +1,6 @@
 {
-    "tbCropDTO": "$plot",
-    "activities": "$[]historyAction",
+    "tbCropDTO": "$plotCrop",
+    "activities": "$[]historyActivity",
     "sowingDate": "2020-08-20T02:34:18Z",
     "soakSeedsTime": 1,
     "seedIncubationTime": 1,

lib/data/api/rest_client.dart

@@ -1,10 +1,10 @@
 import 'package:dio/dio.dart';
+import 'package:farm_tpf/custom_model/account.dart';
+import 'package:farm_tpf/custom_model/password.dart';
+import 'package:farm_tpf/custom_model/user.dart';
+import 'package:farm_tpf/custom_model/user_request.dart';
 import 'package:farm_tpf/models/Supply.dart';
-import 'package:farm_tpf/models/account.dart';
 import 'package:farm_tpf/models/index.dart';
-import 'package:farm_tpf/models/password.dart';
-import 'package:farm_tpf/models/user.dart';
-import 'package:farm_tpf/models/user_request.dart';
 import 'package:farm_tpf/utils/const_common.dart';
 import 'package:retrofit/retrofit.dart';
 
@@ -40,7 +40,7 @@ abstract class RestClient {
   Future<void> updateFcmToken(@Body() String token);
 
   @GET("/api/tb-crops?page={page}&size={size}&query={query}")
-  Future<List<Plot>> getPlots(
+  Future<List<PlotCrop>> getPlots(
       {@Path() int page = 0, @Path() int size = 20, @Path() String query = ""});
   @GET("/api/listActivityTypesOther")
   Future<List<ActionType>> getActionTypes();

lib/data/api/rest_client.g.dart

@@ -0,0 +1,228 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'rest_client.dart';
+
+// **************************************************************************
+// RetrofitGenerator
+// **************************************************************************
+
+class _RestClient implements RestClient {
+  _RestClient(this._dio, {this.baseUrl}) {
+    ArgumentError.checkNotNull(_dio, '_dio');
+    this.baseUrl ??= 'http://tpf.aztrace.vn';
+  }
+
+  final Dio _dio;
+
+  String baseUrl;
+
+  @override
+  login(userRequest) async {
+    ArgumentError.checkNotNull(userRequest, 'userRequest');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(userRequest?.toJson() ?? <String, dynamic>{});
+    final Response<Map<String, dynamic>> _result = await _dio.request(
+        '/api/authenticate',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = User.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  getMe() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final Response<Map<String, dynamic>> _result = await _dio.request(
+        '/api/account',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = Account.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  forgotPassword(email) async {
+    ArgumentError.checkNotNull(email, 'email');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = email;
+    await _dio.request<void>('/api/account/reset-password/init',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    return null;
+  }
+
+  @override
+  resetPassword(password) async {
+    ArgumentError.checkNotNull(password, 'password');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(password?.toJson() ?? <String, dynamic>{});
+    await _dio.request<void>('/api/account/reset-password/finish',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    return null;
+  }
+
+  @override
+  changePassword(password) async {
+    ArgumentError.checkNotNull(password, 'password');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(password?.toJson() ?? <String, dynamic>{});
+    await _dio.request<void>('/api/account/change-password',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    return null;
+  }
+
+  @override
+  updateProfile(account) async {
+    ArgumentError.checkNotNull(account, 'account');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(account?.toJson() ?? <String, dynamic>{});
+    final Response<Map<String, dynamic>> _result = await _dio.request(
+        '/api/update-my-profile',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'PUT',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = Account.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  getSupplies(type) async {
+    ArgumentError.checkNotNull(type, 'type');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final Response<List<dynamic>> _result = await _dio.request(
+        '/api/tb-supplies-by-type/$type',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    var value = _result.data
+        .map((dynamic i) => Supply.fromJson(i as Map<String, dynamic>))
+        .toList();
+    return value;
+  }
+
+  @override
+  updateFcmToken(token) async {
+    ArgumentError.checkNotNull(token, 'token');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = token;
+    await _dio.request<void>('/api/update-fcmToken',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'PUT',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    return null;
+  }
+
+  @override
+  getPlots({page = 0, size = 20, query = ""}) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    queryParameters.removeWhere((k, v) => v == null);
+    final _data = <String, dynamic>{};
+    final Response<List<dynamic>> _result = await _dio.request(
+        '/api/tb-crops?page=$page&size=$size&query=$query',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    var value = _result.data
+        .map((dynamic i) => PlotCrop.fromJson(i as Map<String, dynamic>))
+        .toList();
+    return value;
+  }
+
+  @override
+  getActionTypes() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final Response<List<dynamic>> _result = await _dio.request(
+        '/api/listActivityTypesOther',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    var value = _result.data
+        .map((dynamic i) => ActionType.fromJson(i as Map<String, dynamic>))
+        .toList();
+    return value;
+  }
+
+  @override
+  getCropDetail(cropId, {page = 0, size = 20}) async {
+    ArgumentError.checkNotNull(cropId, 'cropId');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    queryParameters.removeWhere((k, v) => v == null);
+    final _data = <String, dynamic>{};
+    final Response<Map<String, dynamic>> _result = await _dio.request(
+        '/api/tb-crops-detail/$cropId?page=$page&size=$size&sort=executeDate,DESC',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = Crop.fromJson(_result.data);
+    return value;
+  }
+}

lib/data/repository/repository.dart

@@ -3,7 +3,6 @@ import 'package:farm_tpf/custom_model/user_request.dart';
 import 'package:farm_tpf/data/api/dio_provider.dart';
 import 'package:farm_tpf/data/api/rest_client.dart';
 import 'package:farm_tpf/models/PagedResult.dart';
-import 'package:farm_tpf/models/Plot.dart';
 import 'package:farm_tpf/models/Supply.dart';
 import 'package:farm_tpf/models/index.dart';
 import 'package:farm_tpf/utils/const_common.dart';
@@ -21,7 +20,7 @@ class Repository {
     return client.getCropDetail(cropId, page: page, size: size);
   }
 
-  Future<List<Plot>> getPlots({int page, int size, String searchString}) {
+  Future<List<PlotCrop>> getPlots({int page, int size, String searchString}) {
     final client = RestClient(dio);
     return client.getPlots(page: page, size: size, query: searchString);
   }
@@ -50,7 +49,7 @@ class Repository {
   Object getInstanceClass() {
     var instanceClass;
     if (1 == 1) {
-      instanceClass = new Plot();
+      instanceClass = new PlotCrop();
     }
     return instanceClass;
   }

lib/models/ActionType.g.dart

@@ -17,5 +17,5 @@ Map<String, dynamic> _$ActionTypeToJson(ActionType instance) =>
     <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
-      'description': instance.description
+      'description': instance.description,
     };

lib/models/Crop.dart

@@ -1,21 +1,20 @@
+import 'package:farm_tpf/models/index.dart';
 import 'package:json_annotation/json_annotation.dart';
-import "plot.dart";
-import "historyAction.dart";
 part 'Crop.g.dart';
 
 @JsonSerializable()
 class Crop {
-    Crop();
+  Crop();
 
-    Plot tbCropDTO;
-    List<HistoryAction> activities;
-    String sowingDate;
-    num soakSeedsTime;
-    num seedIncubationTime;
-    num numberPlants;
-    num numberCurrentPlants;
-    String endOfFarmingDate;
-    
-    factory Crop.fromJson(Map<String,dynamic> json) => _$CropFromJson(json);
-    Map<String, dynamic> toJson() => _$CropToJson(this);
+  PlotCrop tbCropDTO;
+  List<HistoryActivity> activities;
+  String sowingDate;
+  num soakSeedsTime;
+  num seedIncubationTime;
+  num numberPlants;
+  num numberCurrentPlants;
+  String endOfFarmingDate;
+
+  factory Crop.fromJson(Map<String, dynamic> json) => _$CropFromJson(json);
+  Map<String, dynamic> toJson() => _$CropToJson(this);
 }

lib/models/Crop.g.dart

@@ -26,5 +26,5 @@ Map<String, dynamic> _$CropToJson(Crop instance) => <String, dynamic>{
       'seedIncubationTime': instance.seedIncubationTime,
       'numberPlants': instance.numberPlants,
       'numberCurrentPlants': instance.numberCurrentPlants,
-      'endOfFarmingDate': instance.endOfFarmingDate
+      'endOfFarmingDate': instance.endOfFarmingDate,
     };

lib/models/HistoryAction.dart

@@ -1,19 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'HistoryAction.g.dart';
-
-@JsonSerializable()
-class HistoryAction {
-    HistoryAction();
-
-    num id;
-    num ageDay;
-    num cropId;
-    String executeDate;
-    String description;
-    num activityTypeId;
-    String activityTypeName;
-    
-    factory HistoryAction.fromJson(Map<String,dynamic> json) => _$HistoryActionFromJson(json);
-    Map<String, dynamic> toJson() => _$HistoryActionToJson(this);
-}

lib/models/HistoryActivity.dart

@@ -0,0 +1,19 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'HistoryActivity.g.dart';
+
+@JsonSerializable()
+class HistoryActivity {
+    HistoryActivity();
+
+    num id;
+    num ageDay;
+    num cropId;
+    String executeDate;
+    String description;
+    num activityTypeId;
+    String activityTypeName;
+    
+    factory HistoryActivity.fromJson(Map<String,dynamic> json) => _$HistoryActivityFromJson(json);
+    Map<String, dynamic> toJson() => _$HistoryActivityToJson(this);
+}

lib/models/HistoryAction.g.dart → lib/models/HistoryActivity.g.dart

@@ -1,13 +1,13 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'HistoryAction.dart';
+part of 'HistoryActivity.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
-HistoryAction _$HistoryActionFromJson(Map<String, dynamic> json) {
-  return HistoryAction()
+HistoryActivity _$HistoryActivityFromJson(Map<String, dynamic> json) {
+  return HistoryActivity()
     ..id = json['id'] as num
     ..ageDay = json['ageDay'] as num
     ..cropId = json['cropId'] as num
@@ -17,7 +17,7 @@ HistoryAction _$HistoryActionFromJson(Map<String, dynamic> json) {
     ..activityTypeName = json['activityTypeName'] as String;
 }
 
-Map<String, dynamic> _$HistoryActionToJson(HistoryAction instance) =>
+Map<String, dynamic> _$HistoryActivityToJson(HistoryActivity instance) =>
     <String, dynamic>{
       'id': instance.id,
       'ageDay': instance.ageDay,
@@ -25,5 +25,5 @@ Map<String, dynamic> _$HistoryActionToJson(HistoryAction instance) =>
       'executeDate': instance.executeDate,
       'description': instance.description,
       'activityTypeId': instance.activityTypeId,
-      'activityTypeName': instance.activityTypeName
+      'activityTypeName': instance.activityTypeName,
     };

lib/models/OtherAction.g.dart

@@ -23,5 +23,5 @@ Map<String, dynamic> _$OtherActionToJson(OtherAction instance) =>
       'executeDate': instance.executeDate,
       'description': instance.description,
       'activityTypeName': instance.activityTypeName,
-      'workerName': instance.workerName
+      'workerName': instance.workerName,
     };

lib/models/Plot.dart → lib/models/PlotCrop.dart

@@ -1,10 +1,10 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'Plot.g.dart';
+part 'PlotCrop.g.dart';
 
 @JsonSerializable()
-class Plot {
-    Plot();
+class PlotCrop {
+    PlotCrop();
 
     num id;
     String qrCode;
@@ -24,6 +24,6 @@ class Plot {
     num areaId;
     String area;
     
-    factory Plot.fromJson(Map<String,dynamic> json) => _$PlotFromJson(json);
-    Map<String, dynamic> toJson() => _$PlotToJson(this);
+    factory PlotCrop.fromJson(Map<String,dynamic> json) => _$PlotCropFromJson(json);
+    Map<String, dynamic> toJson() => _$PlotCropToJson(this);
 }

lib/models/Plot.g.dart → lib/models/PlotCrop.g.dart

@@ -1,13 +1,13 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'Plot.dart';
+part of 'PlotCrop.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
-Plot _$PlotFromJson(Map<String, dynamic> json) {
-  return Plot()
+PlotCrop _$PlotCropFromJson(Map<String, dynamic> json) {
+  return PlotCrop()
     ..id = json['id'] as num
     ..qrCode = json['qrCode'] as String
     ..code = json['code'] as String
@@ -27,7 +27,7 @@ Plot _$PlotFromJson(Map<String, dynamic> json) {
     ..area = json['area'] as String;
 }
 
-Map<String, dynamic> _$PlotToJson(Plot instance) => <String, dynamic>{
+Map<String, dynamic> _$PlotCropToJson(PlotCrop instance) => <String, dynamic>{
       'id': instance.id,
       'qrCode': instance.qrCode,
       'code': instance.code,
@@ -44,5 +44,5 @@ Map<String, dynamic> _$PlotToJson(Plot instance) => <String, dynamic>{
       'netHouseId': instance.netHouseId,
       'netHouseName': instance.netHouseName,
       'areaId': instance.areaId,
-      'area': instance.area
+      'area': instance.area,
     };

lib/models/ResourceHelper.g.dart

@@ -19,5 +19,5 @@ Map<String, dynamic> _$ResourceHelperToJson(ResourceHelper instance) =>
       'id': instance.id,
       'name': instance.name,
       'description': instance.description,
-      'isSelected': instance.isSelected
+      'isSelected': instance.isSelected,
     };

lib/models/index.dart

@@ -1,7 +1,7 @@
+export 'HistoryActivity.dart' ; 
+export 'PlotCrop.dart' ; 
 export 'Supply.dart' ; 
-export 'Plot.dart' ; 
 export 'Crop.dart' ; 
 export 'ResourceHelper.dart' ; 
-export 'HistoryAction.dart' ; 
 export 'ActionType.dart' ; 
 export 'OtherAction.dart' ; 

lib/presentation/screens/home/view/home_page.dart

@@ -103,8 +103,10 @@ class _HomePageState extends State<HomePage> {
             MaterialButton(
                 child: Text("Chi tiết lô"),
                 onPressed: () {
-                  Navigator.of(context).push(
-                      MaterialPageRoute(builder: (_) => PlotDetailScreen()));
+                  Navigator.of(context).push(MaterialPageRoute(
+                      builder: (_) => PlotDetailScreen(
+                            cropId: 1,
+                          )));
                 }),
             MaterialButton(
                 child: Text("Danh sách lô"),

lib/presentation/screens/plot/sc_plot.dart

@@ -1,5 +1,5 @@
 import 'package:farm_tpf/data/repository/repository.dart';
-import 'package:farm_tpf/models/Plot.dart';
+import 'package:farm_tpf/models/index.dart';
 import 'package:farm_tpf/presentation/custom_widgets/bottom_loader.dart';
 import 'package:farm_tpf/presentation/custom_widgets/loading_list_page.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_loading.dart';
@@ -124,7 +124,7 @@ class _InfinityViewState extends State<InfinityView> {
 }
 
 class ItemInfinityWidget extends StatelessWidget {
-  final Plot item;
+  final PlotCrop item;
 
   const ItemInfinityWidget({Key key, @required this.item}) : super(key: key);
 

lib/presentation/screens/plot_detail/sc_plot_action.dart

@@ -238,7 +238,7 @@ class _InfinityViewState extends State<InfinityView> {
 }
 
 class ItemInfinityWidget extends StatelessWidget {
-  final HistoryAction item;
+  final HistoryActivity item;
 
   const ItemInfinityWidget({Key key, @required this.item}) : super(key: key);
 

lib/presentation/screens/plot_detail/sc_plot_information.dart

@@ -1,11 +1,10 @@
-import 'package:farm_tpf/models/Plot.dart';
-import 'package:farm_tpf/presentation/custom_widgets/widget_media_helper.dart';
+import 'package:farm_tpf/models/index.dart';
 import 'package:farm_tpf/utils/const_color.dart';
 import 'package:flutter/material.dart';
 import 'package:keyboard_dismisser/keyboard_dismisser.dart';
 
 class PlotInformationScreen extends StatefulWidget {
-  final Plot plot;
+  final PlotCrop plot;
   PlotInformationScreen({this.plot});
   @override
   _PlotInformationScreenState createState() => _PlotInformationScreenState();
@@ -15,7 +14,7 @@ class _PlotInformationScreenState extends State<PlotInformationScreen> {
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
   GlobalKey<FormState> _formKey = GlobalKey();
   bool _autoValidate = false;
-  Plot _plot = Plot();
+  PlotCrop _plot = PlotCrop();
 
   _validateInputs() async {
     if (_formKey.currentState.validate()) {

pubspec.lock

@@ -1,13 +1,20 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.36.4"
+    version: "0.39.14"
   archive:
     dependency: transitive
     description:
@@ -42,7 +49,7 @@ packages:
       name: bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.3"
   boolean_selector:
     dependency: transitive
     description:
@@ -56,14 +63,14 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1+1"
+    version: "0.4.2"
   build_daemon:
     dependency: transitive
     description:
@@ -77,21 +84,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.11"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.9"
+    version: "1.10.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "6.0.1"
   built_collection:
     dependency: transitive
     description:
@@ -127,13 +134,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.4.0"
+    version: "3.4.1"
   collection:
     dependency: transitive
     description:
@@ -175,7 +189,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.9"
+    version: "1.3.6"
   dio:
     dependency: "direct main"
     description:
@@ -189,7 +203,7 @@ packages:
       name: equatable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.5"
   file:
     dependency: transitive
     description:
@@ -250,7 +264,7 @@ packages:
       name: flutter_bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.5"
   flutter_datetime_picker:
     dependency: "direct main"
     description:
@@ -296,20 +310,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
-  front_end:
-    dependency: transitive
-    description:
-      name: front_end
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.19"
   get:
     dependency: "direct main"
     description:
       name: get
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.8.0"
+    version: "3.10.1"
   glob:
     dependency: transitive
     description:
@@ -365,7 +372,7 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.7+4"
+    version: "0.6.7+7"
   image_picker_platform_interface:
     dependency: transitive
     description:
@@ -400,28 +407,14 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
-  json_model:
-    dependency: "direct dev"
-    description:
-      name: json_model
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.2"
+    version: "3.0.1"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
-  kernel:
-    dependency: transitive
-    description:
-      name: kernel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.19"
+    version: "3.4.1"
   keyboard_dismisser:
     dependency: "direct main"
     description:
@@ -456,7 +449,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6+3"
+    version: "0.9.7"
   nested:
     dependency: transitive
     description:
@@ -492,13 +485,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.3"
-  package_resolver:
-    dependency: transitive
-    description:
-      name: package_resolver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.10"
   path:
     dependency: transitive
     description:
@@ -519,7 +505,7 @@ packages:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   pattern_formatter:
     dependency: "direct main"
     description:
@@ -582,7 +568,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.1"
+    version: "4.3.2+2"
   pub_semver:
     dependency: transitive
     description:
@@ -604,6 +590,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
+  retrofit:
+    dependency: transitive
+    description:
+      name: retrofit
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.4"
+  retrofit_generator:
+    dependency: "direct dev"
+    description:
+      name: retrofit_generator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.7+6"
   rxdart:
     dependency: "direct main"
     description:
@@ -617,14 +617,14 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.8"
+    version: "0.5.10"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.2+1"
+    version: "0.0.2+2"
   shared_preferences_macos:
     dependency: transitive
     description:
@@ -652,7 +652,7 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.7"
+    version: "0.7.9"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -678,7 +678,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.4+4"
+    version: "0.9.6"
   source_span:
     dependency: transitive
     description:
@@ -706,7 +706,7 @@ packages:
       name: stream_transform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.20"
+    version: "1.2.0"
   string_scanner:
     dependency: transitive
     description:
@@ -735,6 +735,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.1+2"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
   typed_data:
     dependency: transitive
     description:
@@ -755,14 +762,14 @@ packages:
       name: video_player
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.11+2"
+    version: "0.10.12+2"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   video_player_web:
     dependency: transitive
     description:

pubspec.yaml

@@ -43,9 +43,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   #flutter packages pub run build_runner build --delete-conflicting-outputs
-  # retrofit_generator: ^1.3.7
+  retrofit_generator: ^1.3.7
   # flutter packages pub run json_model
-  json_model: ^0.0.2
+  # json_model: ^0.0.2
   build_runner: any
   json_serializable: any