Merge branch 'master' of https://github.com/ayubowan/selft_tracking_app

assets/lang/en.json

@@ -1,21 +1,29 @@
-{
-  "welcome_screen_title": "Welcome",
-  "latest_figures_title": "Here are the Latest Figures",
-  "confirmed_card_text": "Confirmed",
-  "suspected_card_text": "Suspected",
-  "recovered_card_text": "Recovered",
-  "deaths_card_text": "Deaths",
-  "last_updated_text": "Last Updated",
-  "news_text": "News",
-  "home_tab_text": "Home",
-  "location_tab_text": "Location",
-  "contact_tab_text": "Contact Us",
-  "welcome_screen_subtitle": "Together we can defeat COVID-19",
-  "welcome_screen_button_text": "Next",
-  "welcome_screen_sinhala_button_text": "සිංහල",
-  "welcome_screen_english_button_text": "English",
+{ 
   "welcome_screen_tamil_button_text": "தமிழ்",
+  "welcome_screen_button_text": "Next",
+  "dashboard_welcome_title": "Welcome",
+  "dashboard_latest_figures_title": "Here are the Latest Figures",
+  "dashboard_confirmed_card_text": "Confirmed",
+  "dashboard_suspected_card_text" : "Suspected",
+  "dashboard_recovered_card_text" : "Recovered",
+  "dashboard_deaths_card_text" : "Deaths",
+  "dashboard_last_updated_text" : "Last Updated : ",
+  "dashboard_news_text": "News",
+  "dashboard_home_tab_text" : "Home",
+  "dashboard_location_tab_text" : "Location",
+  "dashboard_contact_tab_text" : "Contact Us",
+  "dashboard_register_tab_text": "Register",
+  "register_button_text" : "Register",
+  "user_register_screen_title": "Register for a Case",
+  "user_register_screen_subtitle": "Were you near a confirmed case?",
+  "user_register_screen_name": "Name",
+  "user_register_screen_email": "E-mail",
+  "user_register_screen_phone": "Mobile Number (0760000000)",
+  "user_register_screen_invalid_name": "Enter a valid name.",
+  "user_register_screen_invalid_number": "Enter a valid number.",
+  "user_register_screen_invalid_email": "Enter a valid email address.",
   "############": "####################################",
+  "welcome_screen_subtitle": "Together we can defeat COVID-19",
   "dashboard_screen_title": "Dashboard",
   "dashboard_screen_welcome_message": "Dashboard",
   "dashboard_screen_data_received": "Data Recived",
@@ -27,14 +35,6 @@
   "contact_us_screen_contact_us_title": "Get in touch.",
   "dashboard_screen_ok_button": "OK",
   "case_details_screen_title": "Case Detail Screen",
-  "user_register_screen_title": "User Registration",
-  "user_register_screen_name": "Name",
-  "user_register_screen_email": "E-mail",
-  "user_register_screen_phone": "Mobile Number (0760000000)",
-  "user_register_screen_register": "Register",
-  "user_register_screen_invalid_name": "Enter a valid name.",
-  "user_register_screen_invalid_number": "Enter a valid number.",
-  "user_register_screen_invalid_email": "Enter a valid email address.",
   "news_detail_page_title": "Register",
   "language_screen_choose": "Choose Your Preferred language.",
   "language_screen_choose_sub": "Please select a language below.",

assets/lang/si.json

@@ -1,21 +1,31 @@
 {
-  "welcome_screen_title": "ආයුබෝවන්",
-  "latest_figures_title": "නවතම දත්ත සටහන",
-  "confirmed_card_text": "තහවුරු කළ",
-  "suspected_card_text": "සැක සහිත",
-  "recovered_card_text": "සුවය ලද",
-  "deaths_card_text": "මියගිය",
-  "last_updated_text": "යාවත්කාලීන වූ වේලාව",
-  "news_text": "පුවත්",
-  "home_tab_text": "නිවස",
-  "location_tab_text": "පිහිටීම",
-  "contact_tab_text": "අමතන්න",
-  "welcome_screen_subtitle": "Together we can defeat COVID-19",
-  "welcome_screen_button_text": "Next",
-  "welcome_screen_sinhala_button_text": "සිංහල",
-  "welcome_screen_english_button_text": "English",
-  "welcome_screen_tamil_button_text": "தமிழ்",
+  "language_screen_choose": "ඔබේ මනාපය තෝරන්න",
+  "language_screen_choose_sub": "කරුණාකර පහත භාෂාවක් තෝරන්න",
+  "welcome_screen_language_button_text": "සිංහල",
+  "welcome_screen_button_text": "ඊළඟ",
+  "dashboard_welcome_title": "ආයුබෝවන්",
+  "dashboard_latest_figures_title": "නවතම දත්ත සටහන",
+  "dashboard_confirmed_card_text": "තහවුරු කළ",
+  "dashboard_suspected_card_text" : "සැක සහිත",
+  "dashboard_recovered_card_text" : "සුවය ලද",
+  "dashboard_deaths_card_text" : "මියගිය",
+  "dashboard_last_updated_text": "යාවත්කාලීන වූ වේලාව : ",
+  "dashboard_news_text": "පුවත්",
+  "dashboard_home_tab_text" : "නිවැසුම",
+  "dashboard_location_tab_text" : "පිහිටුම",
+  "dashboard_contact_tab_text" : "ඇමතුම්",
+  "dashboard_register_tab_text": "ලියාපදිංචිවීම්",
+  "register_button_text" : "ලියාපදිංචි වන්න",
+  "user_register_screen_title": "සබැඳි සිද්ධියක් සදහා ලියාපදිංචි වන්න",
+  "user_register_screen_subtitle": "රෝගය තහවුරු වූ අයෙක් අසළ සිටියේද ?",
+  "user_register_screen_name": "නම",
+  "user_register_screen_email": "විද්යුත් තැපෑල",
+  "user_register_screen_phone": "ජංගම දූරකථන අංකය (0760000000)",
+  "user_register_screen_invalid_name": "වලංගු නමක් ඇතුළත් කරන්න",
+  "user_register_screen_invalid_number": "වලංගු අංකයක් ඇතුළත් කරන්න",
+  "user_register_screen_invalid_email": "වලංගු විද්යුත්-තැපැල් ලිපිනයක් ඇතුලත් කරන්න",
   "############": "####################################",
+  "welcome_screen_subtitle": "Together we can defeat COVID-19",
   "dashboard_screen_title": "Dashboard",
   "dashboard_screen_welcome_message": "Dashboard",
   "dashboard_screen_data_received": "Data Recived",
@@ -26,18 +36,8 @@
   "dashboard_screen_privacy_policy_button": "Privacy Policy",
   "contact_us_screen_contact_us_title": "Get in touch.",
   "dashboard_screen_ok_button": "OK",
-  "case_details_screen_title": "Case Detail Screen",
-  "user_register_screen_title": "User Registration",
-  "user_register_screen_name": "Name",
-  "user_register_screen_email": "E-mail",
-  "user_register_screen_phone": "Mobile Number",
-  "user_register_screen_invalid_name": "Enter a valid name.",
-  "user_register_screen_invalid_number": "Enter a valid number.",
-  "user_register_screen_invalid_email": "Enter a valid email address.",
-  "user_register_screen_register": "Register",
+  "case_details_screen_title": "සිද්ධි විස්තරය",
   "news_detail_page_title": "Register",
-  "language_screen_choose": "ඔබේ මනාපය තෝරන්න.",
-  "language_screen_choose_sub": "කරුණාකර පහත භාෂාවක් තෝරන්න.",
   "dashboard_screen_figures": "මෙන්න නවතම රූප",
   "dashboard_screen_confirmed": "තහවුරු කර ඇත",
   "dashboard_screen_suspected": "සැකයි",
@@ -47,5 +47,5 @@
   "dashboard_screen_last_updated": "අවසන් වරට යාවත්කාලීන කළේ:",
   "ui_general_next": "ඊළඟ",
   "ui_general_welcome": "අයුබෝවන්",
-  "case_screen_search": "Search"
+  "case_screen_search": "සෙවුම"
 }

assets/lang/ta.json

@@ -1,11 +1,31 @@
 {
-    "welcome_screen_title": "Welcome",
-    "welcome_screen_subtitle": "Together we can defeat COVID-19",
-    "welcome_screen_button_text": "Next",
-    "welcome_screen_sinhala_button_text": "සිංහල",
-    "welcome_screen_english_button_text": "English",
-    "welcome_screen_tamil_button_text": "தமிழ்",
+    "language_screen_choose": "விருப்பமான மொழியைத் தேர்வுசெய்க",
+    "language_screen_choose_sub": "ஒரு மொழியைத் தெரிக",
+    "welcome_screen_language_button_text": "தமிழ்",
+    "welcome_screen_button_text": "அடுத்தது",
+    "dashboard_welcome_title": "நல்வரவு",
+    "dashboard_latest_figures_title": "சமீபத்திய புள்ளிவிவரங்களை தெரிந்து கொள்ள",
+    "dashboard_confirmed_card_text": "உறுதிசெய்யப்பட்டவர்கள்",
+    "dashboard_suspected_card_text" : "சந்தேகத்திற்குரியவர்கள்",
+    "dashboard_recovered_card_text" : "உடல் நலம் குணமடைந்தவர்கள்",
+    "dashboard_deaths_card_text" : "மரணித்தவர்கள்",
+    "dashboard_last_updated_text" : "இறுதியாக புதுப்பிக்கப்பட்டது : ",
+    "dashboard_news_text": "செய்திகள்",
+    "dashboard_home_tab_text" : "முற்பகுதி",
+    "dashboard_location_tab_text" : "எனது இருப்பிடம்",
+    "dashboard_contact_tab_text" : "தொடர்பு கொள்க",
+    "dashboard_register_tab_text": " பதிவு செய்க",
+    "register_button_text" : " பதிவு செய்க",
+    "user_register_screen_title": " பதிவு செய்க",
+    "user_register_screen_subtitle": "பதிவு செய்க",
+    "user_register_screen_name": "பெயர்",
+    "user_register_screen_email": "மின்னஞ்சல்",
+    "user_register_screen_phone": "கைபேசி எண் (0760000000)",
+    "user_register_screen_invalid_name": "சரியான பெயரை உள்ளிடவும்",
+    "user_register_screen_invalid_number": "சரியான எண்ணை உள்ளிடவும்",
+    "user_register_screen_invalid_email": "சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்",
     "############": "####################################",
+    "welcome_screen_subtitle": "Together we can defeat COVID-19",
     "dashboard_screen_title": "Dashboard",
     "dashboard_screen_welcome_message": "Dashboard",
     "dashboard_screen_data_received": "Data Recived",
@@ -16,26 +36,18 @@
     "dashboard_screen_privacy_policy_button": "Privacy Policy",
     "contact_us_screen_contact_us_title": "Get in touch.",
     "dashboard_screen_ok_button": "OK",
-    "case_details_screen_title": "Case Detail Screen",
-    "user_register_screen_title": "User Registration",
-    "user_register_screen_name": "Name",
-    "user_register_screen_email": "E-mail",
-    "user_register_screen_phone": "Mobile Number",
-    "user_register_screen_register": "Register",
-    "user_register_screen_invalid_name": "Enter a valid name.",
-    "user_register_screen_invalid_number": "Enter a valid number.",
-    "user_register_screen_invalid_email": "Enter a valid email address.",
-    "news_detail_page_title": "Register",
-    "language_screen_choose": "உங்கள் விருப்பமான லானுகேஜைத் தேர்வுசெய்க.",
-    "language_screen_choose_sub": "தயவுசெய்து கீழே ஒரு மொழியைத் தேர்ந்தெடுக்கவும்.",
-    "dashboard_screen_figures": "சமீபத்திய புள்ளிவிவரங்கள் இங்கே",
-    "dashboard_screen_confirmed": "உறுதி",
-    "dashboard_screen_suspected": "சந்தேகத்திற்குரிய",
-    "dashboard_screen_recovered": "மீட்கப்பட்டது",
-    "dashboard_screen_deaths": "இறப்புகள்",
-    "dashboard_screen_news": "செய்தி",
-    "dashboard_screen_last_updated": "கடைசியாக புதுப்பிக்கப்பட்டது:",
-    "ui_general_next": "அடுத்தது",
-    "ui_general_welcome": "வரவேற்பு",
-    "case_screen_search": "Search"
+    "case_details_screen_title": "வழக்கு விரிவான",
+    "ui_general_next": "Next",
+    "ui_general_welcome": "Welcome"    ,
+    "news_detail_page_title": "Register",    
+    "case_screen_search": "தேடல்",
+    "welcome_screen_tamil_button_text": "தமிழ்",
+    "dashboard_screen_figures": "Here are the Latest Figures",
+    "dashboard_screen_confirmed": "Confirmed",
+    "dashboard_screen_suspected": "Suspected",
+    "dashboard_screen_recovered": "Recovered",
+    "dashboard_screen_deaths": "Deaths",
+    "dashboard_screen_news": "News",
+    "dashboard_screen_last_updated": "Last Updated:",
+
 }

lib/models/reported_case.dart

@@ -1,6 +1,7 @@
+import 'package:equatable/equatable.dart';
 import 'package:selftrackingapp/models/location.dart';
 
-class ReportedCase {
+class ReportedCase extends Equatable {
   int id;
   String caseNumber;
   List<Location> locations;
@@ -24,4 +25,8 @@ class ReportedCase {
         message: json['message'],
         createdAt: DateTime.parse(json['created']));
   }
+
+  @override
+  // TODO: implement props
+  List<Object> get props => [id];
 }

lib/notifiers/registered_cases_model.dart

@@ -0,0 +1,16 @@
+import 'package:flutter/cupertino.dart';
+import 'package:selftrackingapp/models/reported_case.dart';
+
+class RegisteredCasesModel extends ChangeNotifier {
+  final List<ReportedCase> _reportedCases = [];
+
+  /// An unmodifiable view of the items in the cart.
+  List<ReportedCase> get reportedCases => _reportedCases;
+
+  void add(ReportedCase reportedCase) {
+    if (!_reportedCases.contains(reportedCase)) {
+      _reportedCases.insert(0, reportedCase);
+      notifyListeners();
+    }
+  }
+}

lib/page/screen/case_list_screen.dart

@@ -1,10 +1,14 @@
+import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logger/logger.dart';
+import 'package:provider/provider.dart';
 import 'package:selftrackingapp/app_localizations.dart';
 import 'package:selftrackingapp/models/location.dart';
 import 'package:selftrackingapp/models/reported_case.dart';
 import 'package:selftrackingapp/networking/data_repository.dart';
+import 'package:selftrackingapp/notifiers/registered_cases_model.dart';
+import 'package:selftrackingapp/page/screen/user_register_screen.dart';
 import 'package:selftrackingapp/utils/tracker_colors.dart';
 import 'package:selftrackingapp/widgets/case_item.dart';
 
@@ -14,13 +18,20 @@ class CaseListScreen extends StatefulWidget {
 }
 
 class _CaseListScreenState extends State<CaseListScreen> {
-  // int _selectedTab = 0;
-
   String _searchKey = "";
   List<ReportedCase> _cases = [];
+  final AsyncMemoizer<List<ReportedCase>> _memoizer = AsyncMemoizer();
+
+  _fetchCases() {
+    return _memoizer.runOnce(() async {
+      return await GetIt.instance<DataRepository>().fetchCases(
+          AppLocalizations.of(context).locale.toString().split("_")[0]);
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
+    print(Provider.of<RegisteredCasesModel>(context).reportedCases.length);
     return Container(
       child: CustomScrollView(
         slivers: <Widget>[
@@ -60,9 +71,75 @@ class _CaseListScreenState extends State<CaseListScreen> {
               ),
             ),
           ),
+          Provider.of<RegisteredCasesModel>(context).reportedCases.length > 0
+              ? SliverAppBar(
+                  backgroundColor: Colors.white,
+                  pinned: true,
+                  bottom: PreferredSize(
+                    preferredSize: Size.fromHeight(10.0),
+                    child: Text(''), // Add this code
+                  ),
+                  flexibleSpace: Container(
+                      child: Center(
+                          child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    mainAxisSize: MainAxisSize.max,
+                    children: <Widget>[
+                      FlatButton(
+                        onPressed: () {
+                          setState(() {
+                            Provider.of<RegisteredCasesModel>(context,
+                                    listen: false)
+                                .reportedCases
+                                .clear();
+                          });
+                        },
+                        child: Text("Remove all"),
+                      ),
+                      RaisedButton(
+                        shape: RoundedRectangleBorder(
+                            borderRadius:
+                                BorderRadius.all(Radius.circular(20.0))),
+                        color: TrackerColors.primaryColor,
+                        onPressed: () {
+                          RegisteredCasesModel model =
+                              Provider.of<RegisteredCasesModel>(context,
+                                  listen: false);
+
+                          Navigator.of(context).push(MaterialPageRoute(
+                            builder: (context) => ChangeNotifierProvider.value(
+                              value: model,
+                              child: UserRegisterScreen(),
+                            ),
+                          ));
+                        },
+                        child: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: <Widget>[
+                            Padding(
+                              padding: const EdgeInsets.all(8.0),
+                              child: Text(
+                                "See Added (${Provider.of<RegisteredCasesModel>(context).reportedCases.length})",
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    color: Colors.white),
+                              ),
+                            ),
+                            Icon(Icons.keyboard_arrow_right,
+                                color: Colors.white),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ))),
+                )
+              : SliverToBoxAdapter(
+                  child: Container(),
+                ),
           FutureBuilder(
-            future: GetIt.instance<DataRepository>().fetchCases(
-                AppLocalizations.of(context).locale.toString().split("_")[0]),
+            future: _fetchCases(),
             builder: (BuildContext context,
                 AsyncSnapshot<List<ReportedCase>> snapshot) {
               switch (snapshot.connectionState) {
@@ -107,15 +184,16 @@ class _CaseListScreenState extends State<CaseListScreen> {
                       return SliverToBoxAdapter(
                         child: Padding(
                           padding: const EdgeInsets.all(30.0),
-                          child: Center(
-                              child: Text("No cases found for that search.")),
+                          child: Center(child: Text("No cases found there.")),
                         ),
                       );
                     }
                   } else {
                     return SliverToBoxAdapter(
-                      child: Center(
-                        child: Text("No cases found."),
+                      child: Padding(
+                        padding: const EdgeInsets.all(30.0),
+                        child: Center(
+                            child: Text("No cases found for that search.")),
                       ),
                     );
                   }