Merge branch 'master' into 'IGuider_KumaraRPIN'

# Conflicts:
#   lib/home_screen.dart

lib/home_screen.dart

 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 
 class HomeScreen extends StatefulWidget {
   _HomeScreenState createState() => _HomeScreenState();
@@ -9,6 +8,18 @@ class _HomeScreenState extends State<HomeScreen> {
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
     return Scaffold(
+      appBar: AppBar( 
+        leading: IconButton(icon: Icon(Icons.menu),onPressed: (){
+
+        }),
+        title: Text("CoviDefender Dashboard"),
+        actions: <Widget>[
+          IconButton(icon: Icon(Icons.search),onPressed: (){
+
+        }),
+        ],
+      ),
+
       body: Stack(
       children: <Widget>[
         Container(
@@ -40,8 +51,8 @@ class _HomeScreenState extends State<HomeScreen> {
                         mainAxisAlignment: MainAxisAlignment.center,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: <Widget>[
-                          Text('John Richardo'),
-                          Text('20201190')
+                          Text('CoviDefender', style: TextStyle(fontSize: 35.0, color: Colors.white)),
+                          Text('Smart Assistent')
                         ],
                       )
                     ],
@@ -66,9 +77,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/boralu.jpg')),
+                                            'lib/assets/images/man80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('My Profile', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -125,9 +136,10 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/mino.jpg')),
+                                            'lib/assets/images/bar80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Personal Data',style: TextStyle(fontSize: 20.0)),
+                              Text('QR Code', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -142,9 +154,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/boralu.jpg')),
+                                            'lib/assets/images/coach80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Intelligent Guider', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -159,9 +171,9 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/mino.jpg')),
+                                            'lib/assets/images/time80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Travelling History', style: TextStyle(fontSize: 20.0))
                             ],
                           )),
                       Card(
@@ -176,11 +188,12 @@ class _HomeScreenState extends State<HomeScreen> {
                                   decoration: BoxDecoration(
                                     image: DecorationImage(
                                         image: AssetImage(
-                                            'lib/assets/images/boralu.jpg')),
+                                            'lib/assets/images/event80.png')),
                                   )),
-                              Text('Personal Data')
+                              Text('Event Risk Analyzer', style: TextStyle(fontSize: 20.0))
                             ],
-                          )),
+                          )
+                          ),
                     ],
                   ),
                 )

pubspec.lock

@@ -127,7 +127,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
@@ -162,7 +162,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -50,6 +50,12 @@ flutter:
     - lib/assets/images/top_header.jpg
     - lib/assets/images/mino.jpg
     - lib/assets/images/boralu.jpg
+    - lib/assets/images/map80.png
+    - lib/assets/images/man80.png
+    - lib/assets/images/bar80.png
+    - lib/assets/images/coach80.png
+    - lib/assets/images/time80.png
+    - lib/assets/images/event80.png
 
   # To add assets to your application, add an assets section, like this:
   # assets: