From 0f1a5db2141320d1fd688490b2df6b3dc1a74709 Mon Sep 17 00:00:00 2001
From: adya1904 <imadyahsa.padhee@gmail.com>
Date: Fri, 27 Mar 2020 10:08:32 +0530
Subject: [PATCH] added heat map suppport

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../java/india/coronavirus/fight/HeatMap.java |  53 ++++++++
 .../india/coronavirus/fight/MainActivity.java |  42 ++++++
 .../fight/dataAdapter/DataAdapterMain.java    |  50 +++++++-
 .../coronavirus/fight/model/HeaderData.java   |  11 +-
 .../fight/ui/heatmap/HeatMapFrgament.java     |  41 ++++++
 .../fight/ui/helpline/HelplineFragment.java   |   2 +-
 .../fight/ui/home/HomeViewModel.java          |  13 +-
 .../fight/ui/statewise/StateFragment.java     |  18 ++-
 .../fight/ui/statewise/StateViewModel.java    |   2 +-
 app/src/main/res/drawable/arrow_right.xml     |   8 ++
 app/src/main/res/drawable/map_marker.xml      |   8 ++
 app/src/main/res/layout/activity_main.xml     |  47 ++++++-
 app/src/main/res/layout/cardview.xml          | 121 +++++++++++-------
 .../main/res/layout/fragment_statewise.xml    |  33 ++++-
 app/src/main/res/layout/fragment_web.xml      |  26 ++++
 app/src/main/res/layout/state_layout.xml      |   2 +-
 .../main/res/navigation/mobile_navigation.xml |   1 -
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |  30 +++--
 21 files changed, 426 insertions(+), 88 deletions(-)
 create mode 100644 app/src/main/java/india/coronavirus/fight/HeatMap.java
 create mode 100644 app/src/main/java/india/coronavirus/fight/ui/heatmap/HeatMapFrgament.java
 create mode 100644 app/src/main/res/drawable/arrow_right.xml
 create mode 100644 app/src/main/res/drawable/map_marker.xml
 create mode 100644 app/src/main/res/layout/fragment_web.xml

diff --git a/app/build.gradle b/app/build.gradle
index acda880..22e0516 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,7 +23,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 1
-        versionName "1.3"
+        versionName "1.5"
 
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 756ffbf..2514dcb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".About" />
-
+        <activity android:name=".HeatMap"/>
         <service
             android:name=".APIService"
             android:enabled="true"
diff --git a/app/src/main/java/india/coronavirus/fight/HeatMap.java b/app/src/main/java/india/coronavirus/fight/HeatMap.java
new file mode 100644
index 0000000..3a7ec2b
--- /dev/null
+++ b/app/src/main/java/india/coronavirus/fight/HeatMap.java
@@ -0,0 +1,53 @@
+package india.coronavirus.fight;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class HeatMap extends AppCompatActivity {
+    private ProgressBar progressBar;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.fragment_web);
+
+        WebView webView = findViewById(R.id.web);
+        progressBar = findViewById(R.id.progress_bar);
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.getSettings().setPluginState(WebSettings.PluginState.ON);
+        webView.setWebViewClient(new webViewClient());
+        webView.loadUrl("http://ac41bf31.ngrok.io/india");
+    }
+
+    public class webViewClient extends WebViewClient {
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            // TODO Auto-generated method stub
+            super.onPageStarted(view, url, favicon);
+        }
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            // TODO Auto-generated method stub
+            progressBar.setVisibility(View.VISIBLE);
+            view.loadUrl(url);
+            return true;
+
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            // TODO Auto-generated method stub
+            super.onPageFinished(view, url);
+            progressBar.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/app/src/main/java/india/coronavirus/fight/MainActivity.java b/app/src/main/java/india/coronavirus/fight/MainActivity.java
index f494b6f..ca2953c 100644
--- a/app/src/main/java/india/coronavirus/fight/MainActivity.java
+++ b/app/src/main/java/india/coronavirus/fight/MainActivity.java
@@ -25,6 +25,7 @@
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.onesignal.OneSignal;
 
+import java.util.ArrayList;
 import java.util.Objects;
 
 public class MainActivity extends AppCompatActivity {
@@ -34,6 +35,9 @@ public class MainActivity extends AppCompatActivity {
     private SharedPreferences.Editor editor;
     private String new_version;
     private String newVersion;
+    private Thread thread;
+    private ArrayList<String> quoteList = new ArrayList<>();
+    private Integer i = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,6 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         BottomNavigationView navView = findViewById(R.id.nav_view);
+        MaterialTextView quotetext = findViewById(R.id.quoteText);
         MaterialTextView textView = findViewById(R.id.marquee);
         textView.setSelected(true);
         OneSignal.startInit(this)
@@ -51,12 +56,15 @@ protected void onCreate(Bundle savedInstanceState) {
         SharedPreferences sharedPreferences = this.getSharedPreferences("API", MODE_PRIVATE);
         editor = sharedPreferences.edit();
 
+
         CollectionReference apiCollection = FirebaseFirestore.getInstance().collection("apilink");
         apiCollection.addSnapshotListener((queryDocumentSnapshots, e) -> {
             if (queryDocumentSnapshots != null) {
                 for (DocumentChange documentChange : queryDocumentSnapshots.getDocumentChanges()) {
                     api = documentChange.getDocument().getString("api");
                     new_version = documentChange.getDocument().getString("version");
+                    boolean showgraph = documentChange.getDocument().getBoolean("showgraph");
+                    editor.putBoolean("showgraph", showgraph);
                     editor.putString("new_version", version);
                     editor.putString("API", api);
                     editor.apply();
@@ -84,6 +92,40 @@ protected void onCreate(Bundle savedInstanceState) {
                 startActivity(intent);
             }
         });
+        quoteList.add("Don't Hoard groceries and essentials. Please ensure that people who are in need don't face a shortage because of you!");
+        quoteList.add("Plan ahead! Take a minute and check how much you have at home. Planning ahead let's you buy exactly what you need!");
+        quoteList.add("If you have symptoms and suspect you have coronavirus - reach out to your doctor or call state helplines. \uD83D\uDCDE Get help.");
+        quoteList.add("Panic mode : OFF! ❌ ESSENTIALS ARE ON! ✔️");
+        quoteList.add("Help out the elderly by bringing them their groceries and other essentials.");
+        quoteList.add("Be considerate : While buying essentials remember : You need to share with 130 Crore Others!  ");
+        quoteList.add("Stand Against FAKE News and WhatsApp Forwards! Do NOT ❌ forward a message until you verify the content it contains.");
+        quoteList.add("Be compassionate! Help those in need like the elderly and poor. They are facing a crisis you cannot even imagine!  ");
+
+        thread = new Thread() {
+            @Override
+            public void run() {
+                try {
+                    while (!thread.isInterrupted()) {
+                        Thread.sleep(5000);
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                if (i < quoteList.size()) {
+                                    quotetext.setText(quoteList.get(i));
+                                    i++;
+                                } else {
+                                    i = 0;
+                                }
+                            }
+                        });
+                    }
+                } catch (InterruptedException ignored) {
+                }
+            }
+        };
+        thread.start();
+
+
     }
 
     @Override
diff --git a/app/src/main/java/india/coronavirus/fight/dataAdapter/DataAdapterMain.java b/app/src/main/java/india/coronavirus/fight/dataAdapter/DataAdapterMain.java
index 122fe4b..be6a288 100644
--- a/app/src/main/java/india/coronavirus/fight/dataAdapter/DataAdapterMain.java
+++ b/app/src/main/java/india/coronavirus/fight/dataAdapter/DataAdapterMain.java
@@ -1,9 +1,14 @@
 package india.coronavirus.fight.dataAdapter;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -19,9 +24,12 @@
 import india.coronavirus.fight.R;
 import india.coronavirus.fight.model.HeaderData;
 
+import static android.content.Context.MODE_PRIVATE;
+
 public class DataAdapterMain extends RecyclerView.Adapter<DataAdapterMain.ViewHolder> {
     private List<HeaderData> headerDataList;
     private Context mContext;
+    private SharedPreferences sharedPreferences ;
 
     public DataAdapterMain(ArrayList<HeaderData> headerDatalist, Context context) {
         this.headerDataList = headerDatalist;
@@ -35,9 +43,47 @@ public DataAdapterMain.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent,
         return new ViewHolder(view);
     }
 
+    @SuppressLint("ResourceAsColor")
     @Override
     public void onBindViewHolder(@NonNull DataAdapterMain.ViewHolder holder, int position) {
-//        Toast.makeText(mContext, String.valueOf(position), Toast.LENGTH_SHORT).show();
+        sharedPreferences = mContext.getSharedPreferences("API", MODE_PRIVATE);
+        if (!sharedPreferences.getBoolean("showgraph",true)) {
+            holder.grahView.setVisibility(View.GONE);
+        }
+        HeaderData headerData = headerDataList.get(position);
+        holder.grahView.setScrollbarFadingEnabled(true);
+        holder.grahView.setVerticalScrollBarEnabled(false);
+        holder.grahView.setHorizontalScrollBarEnabled(false);
+        if (headerData.getHeader().trim().equals("CONFIRMED")) {
+            holder.grahView.loadUrl("http://ac41bf31.ngrok.io/api/graphsvg/cases");
+        } else if (headerData.getHeader().trim().equals("ACTIVE")) {
+            holder.grahView.loadUrl("http://ac41bf31.ngrok.io/api/graphsvg/active");
+        } else if (headerData.getHeader().trim().equals("RECOVERED")) {
+            holder.grahView.loadUrl("http://ac41bf31.ngrok.io/api/graphsvg/cured");
+        } else if (headerData.getHeader().trim().equals("DEATH")) {
+            holder.grahView.loadUrl("http://ac41bf31.ngrok.io/api/graphsvg/death");
+        }
+        if (headerData.getColor().trim().equals("red")) {
+            holder.heading_card.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#34FB0032")));
+            holder.heading_card.setTextColor(Color.parseColor("#B0FB0032"));
+            holder.total_case.setTextColor(Color.parseColor("#B0FB0032"));
+            holder.new_case.setTextColor(Color.parseColor("#B0FB0032"));
+        } else if (headerData.getColor().trim().equals("green")) {
+            holder.heading_card.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#2748A107")));
+            holder.heading_card.setTextColor(Color.parseColor("#D348A107"));
+            holder.total_case.setTextColor(Color.parseColor("#D348A107"));
+            holder.new_case.setTextColor(Color.parseColor("#D348A107"));
+        } else if (headerData.getColor().trim().equals("blue")) {
+            holder.heading_card.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#2000C5F6")));
+            holder.heading_card.setTextColor(Color.parseColor("#D300C5F6"));
+            holder.total_case.setTextColor(Color.parseColor("#D300C5F6"));
+            holder.new_case.setTextColor(Color.parseColor("#D300C5F6"));
+        } else if (headerData.getColor().trim().equals("gray")) {
+            holder.heading_card.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#22828383")));
+            holder.heading_card.setTextColor(Color.parseColor("#D0828383"));
+            holder.total_case.setTextColor(Color.parseColor("#D0828383"));
+            holder.new_case.setTextColor(Color.parseColor("#D0828383"));
+        }
         holder.heading_card.setText(headerDataList.get(position).getHeader());
         holder.total_case.setText(headerDataList.get(position).getCases());
         holder.sub_heading_1.setText(headerDataList.get(position).getSubheader());
@@ -60,6 +106,8 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
         MaterialTextView sub_heading_1;
         @BindView(R.id.subheading2)
         MaterialTextView sub_heading_2;
+        @BindView(R.id.graph)
+        WebView grahView;
 
         public ViewHolder(@NonNull View itemView) {
             super(itemView);
diff --git a/app/src/main/java/india/coronavirus/fight/model/HeaderData.java b/app/src/main/java/india/coronavirus/fight/model/HeaderData.java
index 59cc9cc..e83e8ce 100644
--- a/app/src/main/java/india/coronavirus/fight/model/HeaderData.java
+++ b/app/src/main/java/india/coronavirus/fight/model/HeaderData.java
@@ -5,13 +5,22 @@ public class HeaderData {
     private String header;
     private String subheader;
     private String newcase;
+    private String color;
 
-    public HeaderData(String cases, String header, String subheader, String new_case) {
+    public HeaderData(String cases, String header, String subheader, String new_case, String color) {
         this.cases = cases;
         this.header = header;
         this.subheader = subheader;
         this.newcase = new_case;
+        this.color = color;
+    }
+
+    public String getColor() {
+        return color;
+    }
 
+    public void setColor(String color) {
+        this.color = color;
     }
 
     public String getNewcase() {
diff --git a/app/src/main/java/india/coronavirus/fight/ui/heatmap/HeatMapFrgament.java b/app/src/main/java/india/coronavirus/fight/ui/heatmap/HeatMapFrgament.java
new file mode 100644
index 0000000..b3f45d6
--- /dev/null
+++ b/app/src/main/java/india/coronavirus/fight/ui/heatmap/HeatMapFrgament.java
@@ -0,0 +1,41 @@
+package india.coronavirus.fight.ui.heatmap;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import india.coronavirus.fight.R;
+
+public class HeatMapFrgament extends Fragment {
+
+    @BindView(R.id.progress_bar)
+    ProgressBar progressBar;
+    @BindView(R.id.web)
+    WebView webView;
+
+    @SuppressLint("SetJavaScriptEnabled")
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+
+        View root = inflater.inflate(R.layout.fragment_web, container, false);
+        ButterKnife.bind(this, root);
+        progressBar.setVisibility(View.VISIBLE);
+
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.getSettings().setPluginState(WebSettings.PluginState.ON);
+        webView.loadUrl("http://ac41bf31.ngrok.io/india");
+        webView.setWebViewClient(new WebViewClient());
+        return root;
+    }
+}
diff --git a/app/src/main/java/india/coronavirus/fight/ui/helpline/HelplineFragment.java b/app/src/main/java/india/coronavirus/fight/ui/helpline/HelplineFragment.java
index 4a6000d..e148101 100644
--- a/app/src/main/java/india/coronavirus/fight/ui/helpline/HelplineFragment.java
+++ b/app/src/main/java/india/coronavirus/fight/ui/helpline/HelplineFragment.java
@@ -25,7 +25,7 @@ public class HelplineFragment extends Fragment {
 
     private HelplineViewModel notificationsViewModel;
     private ArrayList<ArrayList<StateData>> headerDatalist = new ArrayList<>();
-    ;
+
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
     @BindView(R.id.progress_bar)
diff --git a/app/src/main/java/india/coronavirus/fight/ui/home/HomeViewModel.java b/app/src/main/java/india/coronavirus/fight/ui/home/HomeViewModel.java
index 93a246c..7ca64f4 100644
--- a/app/src/main/java/india/coronavirus/fight/ui/home/HomeViewModel.java
+++ b/app/src/main/java/india/coronavirus/fight/ui/home/HomeViewModel.java
@@ -67,19 +67,20 @@ public void refreshData() {
                         JSONObject json = new JSONObject(response1);
                         Log.d("response", String.valueOf(json));
                         String filtered = "{\"stats\": [{\"stat1\":\"" + json.getInt("cases") +
-                                "\"," + "\"oldcount\":\"" + new_cases + "\",\"heading\":\"Total CASES\",\"subheading\":Total}," +
+                                "\"," + "\"oldcount\":\"" + new_cases + "\",\"heading\":\"CONFIRMED\",\"subheading\":Total,\"color\":red}," +
+                                "{\"stat1\":\"" + json.getInt("hospitalized") +
+                                "\"," + "\"oldcount\":\"" + oldhospitalized + "\",\"heading\":\"ACTIVE\",\"subheading\":Active,\"color\":blue}," +
                                 "{\"stat1\":\"" + json.getInt("cured") +
-                                "\"," + "\"oldcount\":\"" + new_cured + "\",\"heading\":\"Recovered CASES\",\"subheading\":Recovered}," +
+                                "\"," + "\"oldcount\":\"" + new_cured + "\",\"heading\":\"RECOVERED\",\"subheading\":Recovered,\"color\":green}," +
                                 "{\"stat1\":\"" + json.getInt("death") +
-                                "\"," + "\"oldcount\":\"" + new_death + "\",\"heading\":\"Death CASES\",\"subheading\":Deaths}," +
-                                "{\"stat1\":\"" + json.getInt("hospitalized") +
-                                "\"," + "\"oldcount\":\"" + oldhospitalized + "\",\"heading\":\"Hospitalized CASES\",\"subheading\":Hospitalized}]}";
+                                "\"," + "\"oldcount\":\"" + new_death + "\",\"heading\":\"DEATH\",\"subheading\":Deaths,\"color\":gray}]}";
 
                         JSONObject jsonObject2 = new JSONObject(filtered);
                         JSONArray jsonArray = jsonObject2.getJSONArray("stats");
                         for (int i = 0; i < jsonArray.length(); i++) {
                             JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                            headerData.add(new HeaderData(jsonObject1.getString("stat1"), jsonObject1.getString("heading"), jsonObject1.getString("subheading"), jsonObject1.getString("oldcount")));
+                            headerData.add(new HeaderData(jsonObject1.getString("stat1"), jsonObject1.getString("heading"), jsonObject1.getString("subheading"), jsonObject1.getString("oldcount"),
+                                    jsonObject1.getString("color")));
                             dataMutableLiveData.setValue(headerData);
                         }
                     } catch (JSONException e) {
diff --git a/app/src/main/java/india/coronavirus/fight/ui/statewise/StateFragment.java b/app/src/main/java/india/coronavirus/fight/ui/statewise/StateFragment.java
index be5b40e..9ed1501 100644
--- a/app/src/main/java/india/coronavirus/fight/ui/statewise/StateFragment.java
+++ b/app/src/main/java/india/coronavirus/fight/ui/statewise/StateFragment.java
@@ -1,11 +1,12 @@
 package india.coronavirus.fight.ui.statewise;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
@@ -16,9 +17,9 @@
 import java.util.ArrayList;
 import java.util.Objects;
 
-import butterknife.BindDimen;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import india.coronavirus.fight.HeatMap;
 import india.coronavirus.fight.R;
 import india.coronavirus.fight.dataAdapter.StateAdapter;
 import india.coronavirus.fight.model.StateData;
@@ -30,13 +31,14 @@ public class StateFragment extends Fragment {
     RecyclerView recyclerView;
     @BindView(R.id.progress_bar)
     ProgressBar progressBar;
-
+    @BindView(R.id.quote_layout)
+    LinearLayout linearLayout;
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
 
         StateViewModel stateViewModel = ViewModelProviders.of(this).get(StateViewModel.class);
 
-        View root = inflater.inflate(R.layout.fragment_home, container, false);
+        View root = inflater.inflate(R.layout.fragment_statewise, container, false);
         ButterKnife.bind(this, root);
         progressBar.setVisibility(View.VISIBLE);
         StateAdapter stateAdapter = new StateAdapter(stateDatalist, getContext());
@@ -51,6 +53,14 @@ public View onCreateView(@NonNull LayoutInflater inflater,
                 progressBar.setVisibility(View.GONE);
             }
         });
+
+        linearLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getContext(), HeatMap.class);
+                startActivity(intent);
+            }
+        });
         return root;
     }
 
diff --git a/app/src/main/java/india/coronavirus/fight/ui/statewise/StateViewModel.java b/app/src/main/java/india/coronavirus/fight/ui/statewise/StateViewModel.java
index 558f12a..68e5b00 100644
--- a/app/src/main/java/india/coronavirus/fight/ui/statewise/StateViewModel.java
+++ b/app/src/main/java/india/coronavirus/fight/ui/statewise/StateViewModel.java
@@ -54,7 +54,7 @@ private void refreshData() {
                     String statename = toTitleCase(js.getString("state"));
                     stateDataArrayList.add(new StateData(statename, js.getString("cases"),
                             js.getString("cured"), js.getString("death"), "Cases",
-                            "Cured", "Deaths"));
+                            "Recovered", "Deaths"));
                     dataMutableLiveData.setValue(stateDataArrayList);
                 }
             } catch (JSONException e) {
diff --git a/app/src/main/res/drawable/arrow_right.xml b/app/src/main/res/drawable/arrow_right.xml
new file mode 100644
index 0000000..cefde19
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_right.xml
@@ -0,0 +1,8 @@
+<!-- drawable/arrow_right.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#6200EE" android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/map_marker.xml b/app/src/main/res/drawable/map_marker.xml
new file mode 100644
index 0000000..c3b9d48
--- /dev/null
+++ b/app/src/main/res/drawable/map_marker.xml
@@ -0,0 +1,8 @@
+<!-- drawable/map_marker.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M12,11.5A2.5,2.5 0 0,1 9.5,9A2.5,2.5 0 0,1 12,6.5A2.5,2.5 0 0,1 14.5,9A2.5,2.5 0 0,1 12,11.5M12,2A7,7 0 0,0 5,9C5,14.25 12,22 12,22C12,22 19,14.25 19,9A7,7 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2159ee4..6e88d69 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -21,23 +22,42 @@
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <LinearLayout
+        android:id="@+id/quote_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:background="@color/transaprentcolorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/marquee">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/quoteText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:layout_margin="10dp"
+            android:textColor="@color/colorPrimary"
+            android:text="Don't Hoard groceries and essentials. Please ensure that people who are in need don't face a shortage because of you!" />
+    </LinearLayout>
+
     <fragment
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="100dp"
         android:layout_marginBottom="60dp"
         app:defaultNavHost="true"
-        app:layout_constraintTop_toBottomOf="@+id/marquee"
+        app:layout_constraintBottom_toTopOf="@+id/nav_view"
+        app:layout_constraintTop_toBottomOf="@+id/quote_layout"
         app:navGraph="@navigation/mobile_navigation" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
         android:layout_width="0dp"
         android:layout_height="60dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
         android:background="?android:attr/windowBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -60,4 +80,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/marquee" />
 
+
+<!--    <LinearLayout-->
+<!--        android:id="@+id/map_layout"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:background="@color/transaprentcolorPrimary"-->
+<!--        app:layout_constraintBottom_toBottomOf="@+id/nav_host_fragment">-->
+
+<!--        <com.google.android.material.textview.MaterialTextView-->
+<!--            android:id="@+id/mapText"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_margin="10dp"-->
+<!--            android:visibility="gone"-->
+<!--            android:text="Try out new Heat Map!"-->
+<!--            android:textAlignment="textStart"-->
+<!--            android:textColor="@color/colorPrimary" />-->
+<!--    </LinearLayout>-->
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cardview.xml b/app/src/main/res/layout/cardview.xml
index 993d624..77984c5 100644
--- a/app/src/main/res/layout/cardview.xml
+++ b/app/src/main/res/layout/cardview.xml
@@ -13,69 +13,92 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/heading"
-            style="@style/TextAppearance.MaterialComponents.Button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
             android:layout_marginTop="16dp"
-            android:backgroundTint="@color/lightBlue"
+            android:backgroundTint="@color/bggray"
             android:singleLine="true"
             android:text="Total CASES"
             android:textAllCaps="false"
-            android:textColor="#ffffff"
+            android:textColor="@color/bggray"
             android:textSize="18sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/totalcase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="50dp"
-            android:layout_marginTop="15dp"
-            android:text="197,777"
-            android:textColor="@android:color/black"
-            android:textSize="30sp"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/heading" />
+            app:layout_constraintTop_toBottomOf="@+id/heading">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/subheading1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginStart="50dp"
-            android:text="Total"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/totalcase" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/totalcase"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="197,777"
+                android:textColor="@color/bggray"
+                android:textSize="30sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/newcase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="60dp"
-            android:layout_marginEnd="50dp"
-            android:text="15,249"
-            android:textAlignment="center"
-            android:textColor="@android:color/black"
-            android:textSize="30sp"
-            app:layout_constraintBaseline_toBaselineOf="@+id/totalcase"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/heading" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/subheading1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="Total"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/totalcase" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/subheading2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="50dp"
-            android:text="New"
-            android:textSize="20sp"
-            app:layout_constraintBaseline_toBaselineOf="@id/subheading1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/subheading1" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/newcase"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="15,24"
+                android:textAlignment="center"
+                android:textColor="@color/bggray"
+                android:textSize="30sp"
+                android:textStyle="bold"
+                app:layout_constraintBaseline_toBaselineOf="@+id/totalcase"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/subheading2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="New"
+                android:textSize="20sp"
+                android:textStyle="bold"
+                app:layout_constraintBaseline_toBaselineOf="@id/subheading1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/subheading1" />
+
+            <WebView
+                android:id="@+id/graph"
+                android:layout_width="120dp"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/newcase"
+                app:layout_constraintStart_toEndOf="@+id/totalcase"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_statewise.xml b/app/src/main/res/layout/fragment_statewise.xml
index 3ab36a1..ed62c92 100644
--- a/app/src/main/res/layout/fragment_statewise.xml
+++ b/app/src/main/res/layout/fragment_statewise.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ScrollView
+        android:id="@+id/scrollView2"
         android:layout_width="match_parent"
+        android:layout_marginBottom="44dp"
         android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:listitem="@layout/cardview" />
+            android:layout_height="wrap_content" />
     </ScrollView>
 
     <ProgressBar
@@ -22,8 +22,33 @@
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:indeterminateTint="@color/colorPrimary"
+        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:visibility="gone"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/quote_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/transaprentcolorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/quoteText"
+            android:layout_width="350dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="@string/try_out_new_heat_map"
+            android:textAlignment="textStart"
+            android:textColor="@color/colorPrimary" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:src="@drawable/arrow_right"
+            android:layout_marginStart="10dp"
+            />
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_web.xml b/app/src/main/res/layout/fragment_web.xml
new file mode 100644
index 0000000..ce82a2c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_web.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <WebView
+        android:id="@+id/web"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@+id/web"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:indeterminateTint="@color/colorPrimary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/state_layout.xml b/app/src/main/res/layout/state_layout.xml
index a809821..390d832 100644
--- a/app/src/main/res/layout/state_layout.xml
+++ b/app/src/main/res/layout/state_layout.xml
@@ -107,7 +107,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:text="Cured"
+            android:text="@string/recoverd"
 
             android:textSize="20sp"
             app:layout_constraintEnd_toStartOf="@+id/subheading2"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index ef70d84..291f92e 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -22,7 +22,6 @@
         android:name="india.coronavirus.fight.ui.statewise.StateFragment"
         android:label="@string/title_statewise"
         tools:layout="@layout/fragment_statewise" />
-
     <fragment
         android:id="@+id/navigation_notifications"
         android:name="india.coronavirus.fight.ui.helpline.HelplineFragment"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0ecaa1a..680db2e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="lightBlue">#856200EE</color>
+    <color name="transaprentcolorPrimary">#460D3B8A</color>
+    <color name="bggray">#22828383</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d9a18e..4ab8617 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,15 +1,19 @@
 <resources>
-<string name="app_name">COVID19 India</string>
-<string name="title_home">Home</string>
-<string name="title_dashboard">News</string>
-<string name="title_notifications">Helpline</string>
-<string name="title_guides">Guides</string>
-<string name="title_statewise">State Stats</string>
-<string name="prediction"><u>Predicted Infection rate</u></string>
-<string name="the_helpline_number_for_corona_virus_91_11_23978046_toll_free_no_1075">The Helpline Number for corona–virus : +91–11–23978046 Toll Free No: 1075</string>
-<string name="about">About</string>
-<string name="pawan0411"><u>Pawan0411</u></string>
-<string name="speedx"><u>SpeedX</u></string>
-<string name="update"><u>Update Available :http://tiny.cc/covid-19india</u></string>
-<string name="this_app_is_about_updates_related_to_coronavirus_in_india">This app is about updates related to coronavirus in India.</string>
+    <string name="app_name">COVID19 India</string>
+    <string name="title_home">Home</string>
+    <string name="title_dashboard">News</string>
+    <string name="title_notifications">Helpline</string>
+    <string name="title_guides">Guides</string>
+    <string name="title_statewise">State Stats</string>
+    <string name="prediction"><u>Predicted Infection rate</u></string>
+    <string name="the_helpline_number_for_corona_virus_91_11_23978046_toll_free_no_1075">The Helpline Number for corona–virus : +91–11–23978046 Toll Free No: 1075</string>
+    <string name="about">About</string>
+    <string name="pawan0411"><u>Pawan0411</u></string>
+    <string name="speedx"><u>SpeedX</u></string>
+    <string name="update"><u>Update Available :http://tiny.cc/covid-19india</u></string>
+    <string name="this_app_is_about_updates_related_to_coronavirus_in_india">This app is about updates related to coronavirus in India. \n
+                    All data are fetched from Ministry of Health and Family Welfare website.</string>
+    <string name="recoverd">Recovered</string>
+    <string name="title_heatmap">Heat Map</string>
+    <string name="try_out_new_heat_map"><u>Try out new Heat Map!</u></string>
 </resources>