Merge pull request #328 from covid19cuba/develop

Implement phases section

.github/workflows/update-jsons.yml

@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - master
-      - develop
 jobs:
   UpdateJsons:
     runs-on: ubuntu-latest

lib/src/blocs/general_bloc.dart

@@ -23,6 +23,8 @@ import 'package:covid19cuba/src/models/faqs/faqs_state.dart';
 import 'package:covid19cuba/src/models/model.dart';
 import 'package:covid19cuba/src/models/news/news.dart';
 import 'package:covid19cuba/src/models/news/news_state.dart';
+import 'package:covid19cuba/src/models/phases/phases.dart';
+import 'package:covid19cuba/src/models/phases/phases_state.dart';
 import 'package:covid19cuba/src/models/protocols/protocols.dart';
 import 'package:covid19cuba/src/models/protocols/protocols_state.dart';
 import 'package:covid19cuba/src/models/tips/tips.dart';
@@ -77,6 +79,12 @@ class GeneralBloc<T extends Model, E extends CacheModel>
     );
   }
 
+  static GeneralBloc<Phases, PhasesState> getPhasesBloc() {
+    return GeneralBloc<Phases, PhasesState>(
+      provider: PhasesProvider(),
+    );
+  }
+
   static GeneralBloc<Protocols, ProtocolsState> getProtocolsBloc() {
     return GeneralBloc<Protocols, ProtocolsState>(
       provider: ProtocolsProvider(),

lib/src/data_providers/data_providers.dart

@@ -9,5 +9,6 @@ export 'state_provider.dart';
 export 'about_us_provider.dart';
 export 'faqs_provider.dart';
 export 'bulletins_provider.dart';
+export 'phases_provider.dart';
 export 'data_provider.dart';
 export 'tips_provider.dart';

lib/src/data_providers/phases_provider.dart

@@ -0,0 +1,40 @@
+// Copyright (C) 2020 covid19cuba
+// Use of this source code is governed by a GNU GPL 3 license that can be
+// found in the LICENSE file.
+
+import 'package:covid19cuba/src/data_providers/data_providers.dart';
+import 'package:covid19cuba/src/models/phases/phases.dart';
+import 'package:covid19cuba/src/models/phases/phases_state.dart';
+import 'package:covid19cuba/src/utils/utils.dart';
+
+class PhasesProvider extends DataProvider<Phases, PhasesState> {
+  @override
+  String get urlDataCU =>
+      'https://cusobu.nat.cu/covid/api/v2/phases.json';
+
+  @override
+  String get urlDataIO =>
+      'https://covid19cuba.github.io/covid19cubadata.github.io/api/v2/phases.json';
+
+  @override
+  String get urlDataStateCU =>
+      'https://cusobu.nat.cu/covid/api/v2/phases_state.json';
+
+  @override
+  String get urlDataStateIO =>
+      'https://covid19cuba.github.io/covid19cubadata.github.io/api/v2/phases_state.json';
+
+  @override
+  String get prefData => Constants.prefPhases;
+
+  @override
+  String get prefHash => Constants.prefPhasesState;
+
+  @override
+  Phases dataFromJson(Map<String, dynamic> data) =>
+      Phases.fromJson(data);
+
+  @override
+  PhasesState dataStateFromJson(Map<String, dynamic> data) =>
+      PhasesState.fromJson(data);
+}

lib/src/models/phases/phases.dart

@@ -0,0 +1,24 @@
+// Copyright (C) 2020 covid19cuba
+// Use of this source code is governed by a GNU GPL 3 license that can be
+// found in the LICENSE file.
+
+import 'package:covid19cuba/src/models/model.dart';
+import 'package:covid19cuba/src/models/phases/phases_category.dart';
+import 'package:covid19cuba/src/models/phases/phases_item.dart';
+import 'package:covid19cuba/src/models/phases/phases_measure.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'phases.g.dart';
+
+@JsonSerializable()
+class Phases extends Model {
+  List<PhasesItem> phases;
+  Map<String, PhasesCategory> categories;
+  Map<String, PhasesMeasure> measures;
+
+  Phases();
+
+  factory Phases.fromJson(Map<String, dynamic> json) => _$PhasesFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PhasesToJson(this);
+}

lib/src/models/phases/phases_category.dart

@@ -0,0 +1,21 @@
+// Copyright (C) 2020 covid19cuba
+// Use of this source code is governed by a GNU GPL 3 license that can be
+// found in the LICENSE file.
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'phases_category.g.dart';
+
+@JsonSerializable()
+class PhasesCategory {
+  String name;
+  @JsonKey(required: false)
+  String parent;
+
+  PhasesCategory();
+
+  factory PhasesCategory.fromJson(Map<String, dynamic> json) =>
+      _$PhasesCategoryFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PhasesCategoryToJson(this);
+}

lib/src/models/phases/phases_item.dart

@@ -0,0 +1,22 @@
+// Copyright (C) 2020 covid19cuba
+// Use of this source code is governed by a GNU GPL 3 license that can be
+// found in the LICENSE file.
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'phases_item.g.dart';
+
+@JsonSerializable()
+class PhasesItem {
+  int order;
+  String name;
+  List<String> provinces;
+  List<String> measures;
+
+  PhasesItem();
+
+  factory PhasesItem.fromJson(Map<String, dynamic> json) =>
+      _$PhasesItemFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PhasesItemToJson(this);
+}

lib/src/models/phases/phases_measure.dart

@@ -0,0 +1,21 @@
+// Copyright (C) 2020 covid19cuba
+// Use of this source code is governed by a GNU GPL 3 license that can be
+// found in the LICENSE file.
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'phases_measure.g.dart';
+
+@JsonSerializable()
+class PhasesMeasure {
+  String text;
+  String category;
+  List<int> phases;
+
+  PhasesMeasure();
+
+  factory PhasesMeasure.fromJson(Map<String, dynamic> json) =>
+      _$PhasesMeasureFromJson(json);
+
+  Map<String, dynamic> toJson() => _$PhasesMeasureToJson(this);
+}

lib/src/models/phases/phases_state.dart

@@ -0,0 +1,18 @@
+// Copyright (C) 2020 covid19cuba
+// Use of this source code is governed by a GNU GPL 3 license that can be
+// found in the LICENSE file.
+
+import 'package:covid19cuba/src/models/model.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'phases_state.g.dart';
+
+@JsonSerializable()
+class PhasesState extends CacheModel {
+    PhasesState();
+
+    factory PhasesState.fromJson(Map<String, dynamic> json) =>
+    _$PhasesStateFromJson(json);
+
+    Map<String, dynamic> toJson() => _$PhasesStateToJson(this);
+}

lib/src/pages/notifications_settings.dart

@@ -113,7 +113,6 @@ class NotificationSettingsState extends State<NotificationSettings> {
   }
 
   void showDialog({@required BuildContext context, bool start = true}) {
-    DateTime now = DateTime.now();
     showTimePicker(
       context: context,
       initialTime:

lib/src/pages/pages.dart

@@ -19,6 +19,7 @@ export 'news_page_more.dart';
 export 'municipality_item_page.dart';
 export 'municipality_list_page.dart';
 export 'on_boarding_page.dart';
+export 'phases_page.dart';
 export 'phone_details_page.dart';
 export 'province_item_page.dart';
 export 'province_list_page.dart';