.

2023-08-21 20:48:23 +05:30
parent e2a7a04aa1
commit 668ef56c63
41 changed files with 2059 additions and 51 deletions
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="RZCW41EJRPN" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-08-18T14:20:11.935271800Z" />
    <runningDeviceTargetsSelectedWithDialog>
      <Target>
        <type value="RUNNING_DEVICE_TARGET" />
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -18,26 +19,32 @@
        android:theme="@style/Theme.SimpliTend"
        tools:targetApi="31">
        <activity
-            android:name=".caregiverdashboard.activities.PatientProfileShowerActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            />
-        <activity android:name=".caregiverdashboard.activities.PatientProfileInfoActivity"
+            android:name=".faqs.FAQ_Activity"
            android:exported="false"
            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".articles.ArticleShowerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".articles.ArticlesActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".caregiverdashboard.activities.PatientProfileShowerActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".caregiverdashboard.activities.PatientProfileInfoActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
        <activity
            android:name=".caregiverdashboard.activities.CgProfileProgressActivity"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            >
-
-        </activity>
+            android:exported="false"
+            android:screenOrientation="portrait" />
        <activity
            android:name=".cg_geofencing.CgGeoFencingActivity"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize"
-            />
+            android:exported="false"
+            android:screenOrientation="portrait" />

        <meta-data
            android:name="com.google.android.geo.API_KEY"
@@ -62,7 +69,6 @@
            android:name=".welcome.activities.WelcomeActivity"
            android:exported="true"
            android:screenOrientation="portrait">
-
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

--- a/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
+++ b/app/src/main/java/com/ssb/simplitend/apputils/AppUtil.java
@@ -4,7 +4,9 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -31,6 +33,7 @@ import java.util.ArrayList;

 public abstract class AppUtil {

+    public static final String IMAGE_BASE_URL = "https://simplitend.betadelivery.com/storage/upload/";
    private static final String TAG = "AppUtil";

    // fields
@@ -269,4 +272,10 @@ public abstract class AppUtil {
        saveCgData(null, -1, context);
        setWantSecurityFlag(context, NOT_ASKED_CG_SECURITY);
    }
+
+    public static void dialPhone(Activity activity, String phone_number) {
+        Intent intent = new Intent(Intent.ACTION_DIAL, Uri.fromParts("tel",
+                phone_number, null));
+        if (activity != null) activity.startActivity(intent);
+    }
 }
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticleApiService.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticleApiService.java
@@ -0,0 +1,15 @@
+package com.ssb.simplitend.articles;
+
+import com.ssb.simplitend.welcome.welcomepatient.mvvm.models.CallResponse;
+
+import java.util.ArrayList;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+
+public interface ArticleApiService {
+
+    @GET("api/get-list-of-news-articles")
+    Call<CallResponse<ArrayList<ArticleResult>>> getArticles();
+
+}
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticleContracts.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticleContracts.java
@@ -0,0 +1,13 @@
+package com.ssb.simplitend.articles;
+
+import java.util.ArrayList;
+
+public interface ArticleContracts {
+
+    interface GetArticleCallback{
+        void onArticlesFetched(ArrayList<ArticleResult> articleResults);
+
+        void onArticleFetchFailed(Throwable t, String message);
+    }
+
+}
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticlePresenter.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticlePresenter.java
@@ -0,0 +1,57 @@
+package com.ssb.simplitend.articles;
+
+import androidx.annotation.NonNull;
+
+import com.ssb.simplitend.apputils.RetrofitHelper;
+import com.ssb.simplitend.welcome.welcomepatient.mvvm.models.CallResponse;
+
+import java.util.ArrayList;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+public class ArticlePresenter {
+
+    private static ArticlePresenter articlePresenter;
+
+    private ArticleApiService apiService;
+
+    private ArticlePresenter(){
+        this.apiService = RetrofitHelper.getRetrofit()
+                .create(ArticleApiService.class);
+    }
+
+    public static synchronized ArticlePresenter getArticlePresenter() {
+        if (articlePresenter == null) {
+            articlePresenter = new ArticlePresenter();
+        }
+
+        return articlePresenter;
+    }
+
+    public void getArticles(@NonNull ArticleContracts.GetArticleCallback getArticleCallback){
+        apiService.getArticles()
+                .enqueue(new Callback<CallResponse<ArrayList<ArticleResult>>>() {
+                    @Override
+                    public void onResponse(Call<CallResponse<ArrayList<ArticleResult>>> call, Response<CallResponse<ArrayList<ArticleResult>>> response) {
+                        if (response.body() != null){
+                            if (response.body().status != 200 || response.body().result == null){
+                                getArticleCallback.onArticleFetchFailed(new Exception(), response.body().message);
+                                return;
+                            }
+
+                            getArticleCallback.onArticlesFetched(response.body().result);
+                        }else{
+                            getArticleCallback.onArticleFetchFailed(new Exception(), "Please try again later.");
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<CallResponse<ArrayList<ArticleResult>>> call, Throwable t) {
+                        getArticleCallback.onArticleFetchFailed(new Exception(), "Please try again later.");
+                    }
+                });
+    }
+
+}
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticleResult.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticleResult.java
@@ -0,0 +1,26 @@
+package com.ssb.simplitend.articles;
+
+class ArticleCategory{
+    public int id;
+    public String title;
+}
+
+public class ArticleResult{
+    public int id;
+    public String article_category_xid;
+    public String article_title;
+    public String article_detail;
+    public String article_link;
+    public String article_author;
+    public String article_datetime;
+    public String small_image;
+    public String large_image;
+    public String tags;
+    public String active;
+    public String deleted_at;
+    public String created_by;
+    public String updated_by;
+    public String created_at;
+    public String updated_at;
+    public ArticleCategory article_category;
+}
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticleShowerActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticleShowerActivity.java
@@ -0,0 +1,69 @@
+package com.ssb.simplitend.articles;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.webkit.WebSettings;
+import android.webkit.WebViewClient;
+import android.widget.Toast;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.ActivityArticleShowerBinding;
+
+public class ArticleShowerActivity extends AppCompatActivity {
+
+    protected ActivityArticleShowerBinding binding;
+
+    private String url, title;
+
+    public static final String ARTICLE_URL_KEY = "article_url";
+    public static final String ARTICLE_TITLE = "article_title";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityArticleShowerBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initViews();
+
+        clickEvents();
+
+    }
+
+    private void initViews() {
+
+        Intent intent = getIntent();
+        if (intent != null){
+            url = intent.getStringExtra(ARTICLE_URL_KEY);
+            title = intent.getStringExtra(ARTICLE_TITLE);
+            if (title != null){
+                binding.toolbar.setTitle(title);
+            }
+
+            loadUrl();
+        }
+    }
+
+    private void loadUrl() {
+        if (url == null){
+            Toast.makeText(this, "Couldn't load the article.", Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        binding.webView.getSettings().setJavaScriptEnabled(true);
+        binding.webView.getSettings().setBuiltInZoomControls(true);
+        binding.webView.getSettings().setDisplayZoomControls(false);
+
+        binding.webView.setWebViewClient(new WebViewClient());
+
+        binding.webView.loadUrl(url);
+    }
+
+    private void clickEvents() {
+        binding.toolbar.setNavigationOnClickListener(v -> {
+            onBackPressed();
+        });
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticlesActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticlesActivity.java
@@ -0,0 +1,91 @@
+package com.ssb.simplitend.articles;
+
+import static com.ssb.simplitend.articles.ArticleShowerActivity.ARTICLE_TITLE;
+import static com.ssb.simplitend.articles.ArticleShowerActivity.ARTICLE_URL_KEY;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.ActivityArticlesBinding;
+
+import java.util.ArrayList;
+
+public class ArticlesActivity extends AppCompatActivity
+        implements ArticlesAdapter.ArticleClickListener, ArticleContracts.GetArticleCallback {
+
+    protected ActivityArticlesBinding binding;
+
+    private ArticlePresenter presenter;
+
+    private ArticlesAdapter articlesAdapter;
+
+    private ProgressDialog progressDialog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityArticlesBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        presenter = ArticlePresenter.getArticlePresenter();
+
+        initViews();
+
+        clickEvents();
+
+        getArticles();
+
+    }
+
+    private void getArticles() {
+        progressDialog.setTitle("Please wait...");
+        progressDialog.setMessage("while we fetch the articles");
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+
+        presenter.getArticles(this);
+    }
+
+    private void initViews() {
+
+        progressDialog = new ProgressDialog(this);
+
+        binding.articlesRv.setLayoutManager(new LinearLayoutManager(this));
+        articlesAdapter = new ArticlesAdapter(this);
+        binding.articlesRv.setAdapter(articlesAdapter);
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> {
+            onBackPressed();
+        });
+    }
+
+    @Override
+    public void onArticleClick(ArticleResult articleResult) {
+        Intent intent = new Intent(this, ArticleShowerActivity.class);
+        intent.putExtra(ARTICLE_URL_KEY, articleResult.article_link);
+        intent.putExtra(ARTICLE_TITLE, articleResult.article_title);
+        startActivity(intent);
+    }
+
+    @Override
+    public void onArticlesFetched(ArrayList<ArticleResult> articleResults) {
+        progressDialog.dismiss();
+
+        articlesAdapter.submitList(articleResults);
+    }
+
+    @Override
+    public void onArticleFetchFailed(Throwable t, String message) {
+        progressDialog.dismiss();
+
+        Toast.makeText(this, "" + message, Toast.LENGTH_SHORT).show();
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/articles/ArticlesAdapter.java
+++ b/app/src/main/java/com/ssb/simplitend/articles/ArticlesAdapter.java
@@ -0,0 +1,117 @@
+package com.ssb.simplitend.articles;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.databinding.ArticleViewHolderBinding;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class ArticlesAdapter extends ListAdapter<ArticleResult, ArticlesAdapter.ArticleViewHOlder> {
+
+    private final ArticleClickListener articleClickListener;
+
+    private static final DiffUtil.ItemCallback<ArticleResult> DIFF_UTIL = new DiffUtil.ItemCallback<ArticleResult>() {
+        @Override
+        public boolean areItemsTheSame(@NonNull ArticleResult oldItem, @NonNull ArticleResult newItem) {
+            return oldItem.id == newItem.id;
+        }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull ArticleResult oldItem, @NonNull ArticleResult newItem) {
+            return false;
+        }
+    };
+
+    public ArticlesAdapter(@NonNull ArticleClickListener articleClickListener){
+        super(DIFF_UTIL);
+        this.articleClickListener = articleClickListener;
+    }
+
+    @NonNull
+    @Override
+    public ArticleViewHOlder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        ArticleViewHolderBinding binding = ArticleViewHolderBinding.inflate(
+                LayoutInflater.from(parent.getContext()),
+                parent, false);
+        return new ArticleViewHOlder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ArticleViewHOlder holder, int position) {
+        holder.setData(getItem(position));
+
+        holder.binding.card.setOnClickListener(v -> {
+            articleClickListener.onArticleClick(getItem(position));
+        });
+    }
+
+    public static class ArticleViewHOlder extends RecyclerView.ViewHolder{
+        public ArticleViewHolderBinding binding;
+
+        public ArticleViewHOlder(@NonNull ArticleViewHolderBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void setData(ArticleResult articleResult){
+            if (articleResult == null) return;
+
+            Glide.with(itemView.getContext())
+                    .load(AppUtil.IMAGE_BASE_URL + articleResult.large_image)
+                    .placeholder(android.R.color.darker_gray)
+                    .error(android.R.color.darker_gray)
+                    .into(binding.articleImg);
+
+            if (articleResult.article_title == null){
+                articleResult.article_title = "No title";
+            }
+
+            binding.title.setText(articleResult.article_title);
+
+            if (articleResult.article_author == null){
+                articleResult.article_author = "No author";
+            }
+
+            binding.authorName.setText(articleResult.article_author);
+
+            try {
+                if (articleResult.created_at == null) throw new Exception();
+                // parsing time of created at
+                SimpleDateFormat format = new SimpleDateFormat(
+                        "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+                format.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+                Date date = format.parse(articleResult.created_at);
+                if (date == null) throw new Exception();
+
+                SimpleDateFormat pretty_format = new SimpleDateFormat("dd MMM yy, HH:mm a", Locale.getDefault());
+                String time = pretty_format.format(date);
+
+                binding.createdAt.setText(time);
+
+            }catch (Exception e){
+                // do nothing
+                String none = "None";
+                binding.createdAt.setText(none);
+            }
+
+        }
+    }
+
+    // interfaces
+    @FunctionalInterface
+    public interface ArticleClickListener{
+        void onArticleClick(ArticleResult articleResult);
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/activities/CaregiverDashActivity.java
@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider;

 import com.ssb.simplitend.R;
 import com.ssb.simplitend.apputils.CaregiverDataCache;
+import com.ssb.simplitend.articles.ArticlesActivity;
 import com.ssb.simplitend.caregiverdashboard.fragments.CaregiverChatsFragment;
 import com.ssb.simplitend.caregiverdashboard.fragments.DashBoardFragment;
 import com.ssb.simplitend.caregiverdashboard.fragments.MyPatientFragment;
@@ -21,6 +22,7 @@ import com.ssb.simplitend.customsviews.HomeBottomNav;
 import com.ssb.simplitend.customsviews.MenuItem;
 import com.ssb.simplitend.databinding.CaregiverDashboardActivityBinding;
 import com.ssb.simplitend.databinding.CaregiverDashboardMenuBinding;
+import com.ssb.simplitend.faqs.FAQ_Activity;
 import com.ssb.simplitend.welcome.welcomecg.mvvm.CareGiverData;
 import com.yarolegovich.slidingrootnav.SlidingRootNavBuilder;
 import com.yarolegovich.slidingrootnav.callback.DragStateListener;
@@ -77,6 +79,8 @@ public class CaregiverDashActivity extends AppCompatActivity implements

        // initializing dashboard fragment
        replaceFragment(new DashBoardFragment());
+
+        setLayoutDetails();
        
    }

@@ -96,6 +100,17 @@ public class CaregiverDashActivity extends AppCompatActivity implements
                binding.tint.setVisibility(View.GONE);
            }
        });
+
+        menuBinding.articles.setOnClickListener(v -> {
+            Intent intent = new Intent(this, ArticlesActivity.class);
+            startActivity(intent);
+        });
+
+        menuBinding.faqs.setOnClickListener(v -> {
+            Intent intent = new Intent(this, FAQ_Activity.class);
+            startActivity(intent);
+        });
+
    }

    private void watchSubscription(){
@@ -112,6 +127,14 @@ public class CaregiverDashActivity extends AppCompatActivity implements
        }
    }

+    private void setLayoutDetails() {
+        if (careGiverData == null || careGiverData.patientDetails == null){
+            return;
+        }
+
+        menuBinding.name.setText(careGiverData.patientDetails.first_name);
+    }
+
    private void replaceFragment(Fragment fragment){
        getSupportFragmentManager().beginTransaction()
                .replace(R.id.fcv_cg_home, fragment)
@@ -143,7 +166,16 @@ public class CaregiverDashActivity extends AppCompatActivity implements
            // setting up toolbar accordingly
            binding.toolbar.setNavigationIcon(AppCompatResources.getDrawable(this, R.drawable.ic_menu));
            binding.toolbar.setNavigationIconTint(getResources().getColor(R.color.black));
-            binding.toolbar.setTitle("Welcome Aditya");
+
+            String first_name = "";
+            if (careGiverData != null && careGiverData.patientDetails != null && careGiverData.patientDetails.first_name != null){
+                String[] name = careGiverData.patientDetails.first_name.split(" ");
+                if (name.length > 0){
+                    first_name = name[0];
+                }
+            }
+
+            binding.toolbar.setTitle("Welcome " + first_name);

        }else if (selectedItem == MenuItem.MY_PATIENT){
            replaceFragment(new MyPatientFragment());
--- a/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/caregiverdashboard/fragments/MyPatientFragment.java
@@ -1,22 +1,34 @@
 package com.ssb.simplitend.caregiverdashboard.fragments;

+import static com.ssb.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity.*;
+
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

+import com.ssb.simplitend.apputils.AppUtil;
+import com.ssb.simplitend.apputils.CaregiverDataCache;
+import com.ssb.simplitend.caregiverdashboard.activities.PatientProfileInfoActivity;
+import com.ssb.simplitend.caregiverdashboard.activities.PatientProfileShowerActivity;
+import com.ssb.simplitend.cg_geofencing.CgGeoFencingActivity;
 import com.ssb.simplitend.databinding.CaregiverDashFragmentBinding;
 import com.ssb.simplitend.databinding.MyPatientFragmentBinding;
+import com.ssb.simplitend.welcome.welcomecg.mvvm.CareGiverData;

 public class MyPatientFragment extends Fragment {

    // view binding
    protected MyPatientFragmentBinding binding;

+    private CareGiverData careGiverData;
+
    public MyPatientFragment(){
        // required empty
    }
@@ -26,6 +38,66 @@ public class MyPatientFragment extends Fragment {
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        binding = MyPatientFragmentBinding.inflate(inflater, container, false);

+        initViews();
+
+        clickEvents();
+
        return binding.getRoot();
    }
+
+    private void initViews() {
+        CaregiverDataCache.getCaregiverData(requireContext(), (careGiverData1 -> {
+            this.careGiverData = careGiverData1;
+            if (careGiverData1 == null || careGiverData1.patientDetails == null){
+                Toast.makeText(requireContext(), "Couldn't load patient details.", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            binding.name.setText(careGiverData1.patientDetails.first_name);
+            binding.phoneNumber.setText(careGiverData1.patientDetails.phone_number);
+
+        }), true);
+    }
+
+    private void clickEvents() {
+
+        binding.peronalInfo.setOnClickListener(v -> {
+            Intent intent = new Intent(requireActivity(), PatientProfileInfoActivity.class);
+            startActivity(intent);
+        });
+
+        binding.geofence.setOnClickListener(v -> {
+            Intent intent = new Intent(requireActivity(), CgGeoFencingActivity.class);
+            startActivity(intent);
+        });
+
+        binding.medication.setOnClickListener(v -> {
+            gotoProfileShower(MED_REMINDER_F);
+        });
+
+        binding.contacts.setOnClickListener(v -> {
+            gotoProfileShower(CONTACTS_F);
+        });
+
+        binding.medRecords.setOnClickListener(v -> {
+            gotoProfileShower(MED_INFO_F);
+        });
+
+        binding.patActivities.setOnClickListener(v -> {
+            gotoProfileShower(ACTIVITY_F);
+        });
+
+        binding.phoneNumber.setOnClickListener(v -> {
+            if (careGiverData != null && careGiverData.patientDetails != null){
+                AppUtil.dialPhone(requireActivity(), careGiverData.patientDetails.phone_number);
+            }
+        });
+
+    }
+
+    private void gotoProfileShower(String which_f) {
+        Intent intent = new Intent(requireActivity(), PatientProfileShowerActivity.class);
+        intent.putExtra(WHICH_FRAGMENT, which_f);
+        startActivity(intent);
+    }
 }
--- a/app/src/main/java/com/ssb/simplitend/faqs/FAQAdapter.java
+++ b/app/src/main/java/com/ssb/simplitend/faqs/FAQAdapter.java
@@ -0,0 +1,78 @@
+package com.ssb.simplitend.faqs;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.AsyncDifferConfig;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.databinding.FaqViewholderBinding;
+
+public class FAQAdapter extends ListAdapter<FAQResult, FAQAdapter.FAQViewHolder> {
+
+    private static final DiffUtil.ItemCallback<FAQResult> DIFF_UTIL = new DiffUtil.ItemCallback<FAQResult>() {
+        @Override
+        public boolean areItemsTheSame(@NonNull FAQResult oldItem, @NonNull FAQResult newItem) {
+            return oldItem.id == newItem.id;
+        }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull FAQResult oldItem, @NonNull FAQResult newItem) {
+            return false;
+        }
+    };
+
+    public FAQAdapter(){
+        super(DIFF_UTIL);
+    }
+
+    @NonNull
+    @Override
+    public FAQViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        FaqViewholderBinding binding = FaqViewholderBinding.inflate(LayoutInflater.from(parent.getContext()),
+                parent, false);
+        return new FAQViewHolder(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FAQViewHolder holder, int position) {
+        holder.setDate(getItem(position));
+
+        holder.binding.addRemove.setOnClickListener(v -> {
+            int visibility = holder.binding.answer.getVisibility();
+
+            if (visibility == View.VISIBLE){
+                holder.binding.addRemove.setImageResource(R.drawable.ic_add_primary);
+                holder.binding.answer.setVisibility(View.GONE);
+            }else{
+                holder.binding.addRemove.setImageResource(R.drawable.ic_remove_primary);
+                holder.binding.answer.setVisibility(View.VISIBLE);
+            }
+        });
+
+    }
+
+    public static class FAQViewHolder extends RecyclerView.ViewHolder{
+        public FaqViewholderBinding binding;
+
+        public FAQViewHolder(@NonNull FaqViewholderBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void setDate(FAQResult result){
+            if (result == null) return;
+
+            binding.title.setText(result.faq_question);
+            binding.answer.setText(result.faq_answer);
+            binding.answer.setVisibility(View.GONE);
+            binding.addRemove.setImageResource(R.drawable.ic_add_primary);
+        }
+    }
+
+}
--- a/app/src/main/java/com/ssb/simplitend/faqs/FAQApiService.java
+++ b/app/src/main/java/com/ssb/simplitend/faqs/FAQApiService.java
@@ -0,0 +1,15 @@
+package com.ssb.simplitend.faqs;
+
+import com.ssb.simplitend.welcome.welcomepatient.mvvm.models.CallResponse;
+
+import java.util.ArrayList;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+
+public interface FAQApiService {
+
+    @GET("api/get-list-of-faqs")
+    Call<CallResponse<ArrayList<FAQResult>>> getFAQs();
+
+}
--- a/app/src/main/java/com/ssb/simplitend/faqs/FAQContracts.java
+++ b/app/src/main/java/com/ssb/simplitend/faqs/FAQContracts.java
@@ -0,0 +1,13 @@
+package com.ssb.simplitend.faqs;
+
+import java.util.ArrayList;
+
+public interface FAQContracts {
+
+    interface GETFAQsCallback{
+        void onFAQsFetched(ArrayList<FAQResult> faqResults);
+
+        void onFAQsFetchedFailed(Throwable t, String message);
+    }
+
+}
--- a/app/src/main/java/com/ssb/simplitend/faqs/FAQResult.java
+++ b/app/src/main/java/com/ssb/simplitend/faqs/FAQResult.java
@@ -0,0 +1,22 @@
+package com.ssb.simplitend.faqs;
+
+class FaqCategory{
+    public int id;
+    public String title;
+}
+
+public class FAQResult{
+    public int id;
+    public String faq_category_xid;
+    public String faq_question;
+    public String faq_answer;
+    public String small_image;
+    public String large_image;
+    public String active;
+    public String deleted_at;
+    public String created_by;
+    public String updated_by;
+    public String created_at;
+    public String updated_at;
+    public FaqCategory faq_category;
+}
--- a/app/src/main/java/com/ssb/simplitend/faqs/FAQ_Activity.java
+++ b/app/src/main/java/com/ssb/simplitend/faqs/FAQ_Activity.java
@@ -0,0 +1,79 @@
+package com.ssb.simplitend.faqs;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import com.ssb.simplitend.R;
+import com.ssb.simplitend.articles.ArticlesAdapter;
+import com.ssb.simplitend.databinding.ActivityFaqBinding;
+
+import java.util.ArrayList;
+
+public class FAQ_Activity extends AppCompatActivity implements FAQContracts.GETFAQsCallback {
+
+    private ActivityFaqBinding binding;
+
+    private FAQsPresenter presenter;
+
+    private ProgressDialog progressDialog;
+
+    private FAQAdapter faqAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityFaqBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        presenter = FAQsPresenter.getFaqsPresenter();
+
+        initViews();
+
+        clickEvents();
+
+        getFAQs();
+
+    }
+
+    private void initViews() {
+        progressDialog = new ProgressDialog(this);
+
+        binding.faqsRv.setLayoutManager(new LinearLayoutManager(this));
+        faqAdapter = new FAQAdapter();
+        binding.faqsRv.setAdapter(faqAdapter);
+    }
+
+    private void clickEvents() {
+        binding.backBtn.setOnClickListener(v -> {
+            onBackPressed();
+        });
+    }
+
+    private void getFAQs() {
+        progressDialog.setTitle("Please wait...");
+        progressDialog.setMessage("while we fetch the FAQs");
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+
+        presenter.getFAQs(this);
+    }
+
+    @Override
+    public void onFAQsFetched(ArrayList<FAQResult> faqResults) {
+        progressDialog.dismiss();
+
+        faqAdapter.submitList(faqResults);
+
+    }
+
+    @Override
+    public void onFAQsFetchedFailed(Throwable t, String message) {
+        progressDialog.dismiss();
+
+        Toast.makeText(this, "" + message, Toast.LENGTH_SHORT).show();
+    }
+}
--- a/app/src/main/java/com/ssb/simplitend/faqs/FAQsPresenter.java
+++ b/app/src/main/java/com/ssb/simplitend/faqs/FAQsPresenter.java
@@ -0,0 +1,60 @@
+package com.ssb.simplitend.faqs;
+
+import androidx.annotation.NonNull;
+
+import com.ssb.simplitend.apputils.RetrofitHelper;
+import com.ssb.simplitend.articles.ArticleApiService;
+import com.ssb.simplitend.articles.ArticleContracts;
+import com.ssb.simplitend.articles.ArticleResult;
+import com.ssb.simplitend.welcome.welcomepatient.mvvm.models.CallResponse;
+
+import java.util.ArrayList;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+public class FAQsPresenter {
+
+    private static FAQsPresenter faqsPresenter;
+
+    private FAQApiService apiService;
+
+    private FAQsPresenter(){
+        this.apiService = RetrofitHelper.getRetrofit()
+                .create(FAQApiService.class);
+    }
+
+    public static synchronized FAQsPresenter getFaqsPresenter() {
+        if (faqsPresenter == null) {
+            faqsPresenter = new FAQsPresenter();
+        }
+
+        return faqsPresenter;
+    }
+
+    public void getFAQs(@NonNull FAQContracts.GETFAQsCallback faqCallbacks){
+        apiService.getFAQs()
+                .enqueue(new Callback<CallResponse<ArrayList<FAQResult>>>() {
+                    @Override
+                    public void onResponse(Call<CallResponse<ArrayList<FAQResult>>> call, Response<CallResponse<ArrayList<FAQResult>>> response) {
+                        if (response.body() != null){
+                            if (response.body().status != 200 || response.body().result == null){
+                                faqCallbacks.onFAQsFetchedFailed(new Exception(), response.body().message);
+                                return;
+                            }
+
+                            faqCallbacks.onFAQsFetched(response.body().result);
+                        }else{
+                            faqCallbacks.onFAQsFetchedFailed(new Exception(), "Please try again later.");
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<CallResponse<ArrayList<FAQResult>>> call, Throwable t) {
+                        faqCallbacks.onFAQsFetchedFailed(new Exception(), "Please try again later.");
+                    }
+                });
+    }
+
+}
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/ContactInfoFragment.java
@@ -79,7 +79,7 @@ public class ContactInfoFragment extends Fragment implements WelcomeContracts.De

    private void loadUserData() {
        Glide.with(requireContext())
-                .load("https://simplitend.betadelivery.com/storage/upload/" + contactData.contact_photo)
+                .load(AppUtil.IMAGE_BASE_URL + contactData.contact_photo)
                .placeholder(android.R.color.darker_gray)
                .error(R.drawable.ic_contact)
                .fitCenter().into(binding.image);
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
@@ -531,7 +531,7 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.

        if (contactData.contact_photo != null) {
            Glide.with(requireContext())
-                    .load("https://simplitend.betadelivery.com/storage/upload/" + contactData.contact_photo)
+                    .load(AppUtil.IMAGE_BASE_URL + contactData.contact_photo)
                    .placeholder(android.R.color.darker_gray)
                    .error(R.drawable.ic_contact)
                    .fitCenter().into(binding.image);
--- a/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java
+++ b/app/src/main/java/com/ssb/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/AddContactAdapter.java
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;

 import com.bumptech.glide.Glide;
 import com.ssb.simplitend.R;
+import com.ssb.simplitend.apputils.AppUtil;
 import com.ssb.simplitend.databinding.AddContactViewholderBinding;
 import com.ssb.simplitend.welcome.welcomepatient.fragments.contacts.mvvm.models.ContactData;

@@ -108,7 +109,7 @@ public class AddContactAdapter extends ListAdapter<ContactData, AddContactAdapte
                   binding.imag.setVisibility(View.VISIBLE);

                   Glide.with(itemView.getContext())
-                           .load("https://simplitend.betadelivery.com/storage/upload/" + contact.contact_photo)
+                           .load(AppUtil.IMAGE_BASE_URL + contact.contact_photo)
                           .placeholder(android.R.color.darker_gray)
                           .error(R.drawable.ic_contact)
                           .fitCenter().into(binding.imag);
--- a/app/src/main/res/drawable/ic_add_primary.xml
+++ b/app/src/main/res/drawable/ic_add_primary.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"
+      android:fillColor="#1b6dc1"/>
+  <path
+      android:pathData="M19.62,12.7L5.78,12.7"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12.7,19.621L12.7,5.781"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+</vector>
--- a/app/src/main/res/drawable/ic_contacts_2.xml
+++ b/app/src/main/res/drawable/ic_contacts_2.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="120dp"
+    android:height="120dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M9.2,1.2c-0.7,0.7 -1.2,3.9 -1.2,7.4l0,6.2 -3.4,0.6c-2.8,0.5 -4.6,2.1 -4.6,4.1 0,1.3 3.6,3.5 5.6,3.5 2.4,-0 2.4,-0 2.4,11 0,11 0,11 -2.4,11 -2.4,-0 -5.6,2.3 -5.6,3.9 0,1.4 2.3,2.9 5,3.3 2.5,0.3 2.5,0.4 2.8,11.5l0.3,11.3 -2.5,-0c-2.4,-0 -5.6,2.3 -5.6,3.9 0,1.4 2.3,2.9 5,3.3 2.5,0.3 2.5,0.4 2.8,11.6l0.3,11.2 -2.5,-0c-2.4,-0 -5.6,2.3 -5.6,3.9 0,1.4 2.3,2.9 5,3.3 1.8,0.2 2.6,1 2.8,2.8 0.8,5.1 -0.2,5 41.6,5 44.2,-0 46.6,-0.3 53.8,-6.8 2.3,-2 5.2,-6 6.4,-8.7 2.1,-4.4 2.4,-6.5 2.4,-17.3l0,-12.2 2.4,-0c4.8,-0 5.6,-2.1 5.6,-15 0,-12.9 -0.8,-15 -5.6,-15l-2.4,-0 0,-11.6c0,-14.8 -1.1,-18.5 -7.5,-25.1 -8,-8.2 -8.8,-8.3 -55,-8.3 -29.1,-0 -39.4,0.3 -40.3,1.2zM94.5,9.2c3.7,2 6.8,5.3 8.9,9.5 1.2,2.4 1.6,6.1 1.6,14.7l0,11.4 -3.1,0.7c-4.2,0.9 -9.5,5.9 -10.9,10.1 -2.5,7.4 2.3,16.2 10.1,18.5l3.9,1.2 0,11.4c0,12 -0.9,15.2 -5.4,20.1 -5.1,5.7 -5.2,5.7 -43.9,6l-35.8,0.3 1.3,-2c1.7,-2.8 0,-5.5 -3.6,-5.9l-2.6,-0.3 0,-11.5 0,-11.4 3,-0c5.5,-0 5.1,-6.2 -0.4,-6.8l-2.6,-0.3 0,-11.5 0,-11.4 3,-0c5.5,-0 5.1,-6.2 -0.4,-6.8l-2.6,-0.3 0,-11c0,-10.9 0,-10.9 2.4,-10.9 2.4,-0 5.6,-2.3 5.6,-4 0,-1.3 -4.2,-4 -6.2,-4 -1.4,-0 -1.8,-0.8 -1.8,-4.1l0,-4 38.3,0.3c33.3,0.3 38.6,0.5 41.2,2zM112.5,60l0,7.5 -4.8,0.3c-4.1,0.3 -5.1,-0.1 -7.7,-2.7 -1.7,-1.6 -3,-3.9 -3,-5.1 0,-1.2 1.3,-3.5 3,-5.1 2.6,-2.6 3.6,-3 7.7,-2.7l4.8,0.3 0,7.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M54.5,31.4c-6.9,3 -10.8,11.2 -8.5,18 1.2,3.8 7,9.5 9.8,9.7 0.9,-0 -0.5,0.6 -3.3,1.3 -6.2,1.6 -12.3,4.7 -15.1,7.8 -5.9,6.4 -8.8,17.2 -6,22.6 3.1,6.1 3.8,6.2 28.7,6.2 21,-0 22.8,-0.1 25.1,-2 5.9,-4.6 6,-12.8 0.5,-22.1 -3.8,-6.3 -11.4,-11.4 -18.5,-12.5l-4.5,-0.7 3,-1.2c9.5,-4 12,-16.7 4.5,-23.8 -4.8,-4.6 -10.2,-5.7 -15.7,-3.3zM65.1,39.9c1.6,1.6 2.9,3.9 2.9,5.1 0,2.8 -5.2,8 -8,8 -2.8,-0 -8,-5.2 -8,-8 0,-2.8 5.2,-8 8,-8 1.2,-0 3.5,1.3 5.1,2.9zM73.1,70.2c6.3,3.5 11.2,13.5 8.8,18 -0.9,1.6 -2.7,1.8 -21.9,1.8 -23.5,-0 -23.7,-0.1 -22.1,-7.2 1.7,-7.6 6.9,-13 14.5,-14.9 5.4,-1.4 16.2,-0.2 20.7,2.3z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_freq_app_2.xml
+++ b/app/src/main/res/drawable/ic_freq_app_2.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="120dp"
+    android:height="120dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M6.2,1.5c-5.4,2.3 -6.2,5.8 -6.2,26.1 0,27.6 0.1,27.7 29,27.2l19,-0.3 3.2,-3.3 3.3,-3.2 0.3,-19c0.5,-28.9 0.4,-29 -27.5,-29 -13.1,0.1 -18.7,0.5 -21.1,1.5zM47.2,7.7c1.6,1.4 1.8,3.4 1.8,19.6 0,15.4 -0.2,18.3 -1.7,19.9 -1.4,1.6 -3.4,1.8 -19.6,1.8 -15.4,-0 -18.3,-0.2 -19.9,-1.7 -1.6,-1.4 -1.8,-3.5 -1.8,-19.9 0,-15.3 0.3,-18.5 1.6,-19.8 2.4,-2.4 36.9,-2.4 39.6,0.1z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M71.3,1.6c-5.7,2.9 -6.5,6.1 -6.1,27.4l0.3,19 3.3,3.2 3.2,3.3 19,0.3c28.9,0.5 29,0.4 29,-27.3 0,-27.4 -0.2,-27.5 -27.7,-27.5 -14.1,-0 -18.5,0.4 -21,1.6zM112.4,7.6c2.4,2.4 2.4,36.9 -0.1,39.6 -1.4,1.6 -3.4,1.8 -19.6,1.8 -15.4,-0 -18.3,-0.2 -19.9,-1.7 -1.6,-1.4 -1.8,-3.4 -1.8,-19.6 0,-15.4 0.2,-18.3 1.7,-19.9 1.4,-1.6 3.5,-1.8 19.9,-1.8 15.3,-0 18.5,0.3 19.8,1.6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M6.3,66.6c-5.5,2.8 -6.3,6 -6.3,25.8 0,27.5 0.1,27.6 27.5,27.6 27.7,-0 27.8,-0.1 27.3,-29l-0.3,-19 -3.3,-3.2 -3.2,-3.3 -19.3,-0.3c-16,-0.2 -19.7,0.1 -22.4,1.4zM47.2,72.7c1.6,1.4 1.8,3.4 1.8,19.6 0,15.4 -0.2,18.3 -1.7,19.9 -1.4,1.6 -3.5,1.8 -19.9,1.8 -15.3,-0 -18.5,-0.3 -19.8,-1.6 -2.4,-2.4 -2.4,-36.9 0.1,-39.6 1.4,-1.6 3.4,-1.8 19.6,-1.8 15.4,-0 18.3,0.2 19.9,1.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M72.5,66c-1.1,0.4 -3.1,2 -4.5,3.5 -2.5,2.6 -2.5,3 -2.8,21.5 -0.5,28.9 -0.4,29 27.3,29 27.3,-0 27.5,-0.2 27.5,-27.5 0,-27.4 -0.2,-27.5 -27.7,-27.4 -9.8,-0 -18.7,0.4 -19.8,0.9zM112.2,72.7c1.6,1.4 1.8,3.5 1.8,19.9 0,15.3 -0.3,18.5 -1.6,19.8 -2.4,2.4 -36.9,2.4 -39.6,-0.1 -1.6,-1.4 -1.8,-3.4 -1.8,-19.6 0,-15.4 0.2,-18.3 1.7,-19.9 1.4,-1.6 3.4,-1.8 19.6,-1.8 15.4,-0 18.3,0.2 19.9,1.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="88dp"
+    android:height="120dp"
+    android:viewportWidth="88"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M34.5,1.4c-17.9,4.3 -31.1,19.1 -33.7,37.8 -1.4,9.2 -0.1,15.8 5,26.1 4,8 34.9,53.3 37,54.1 0.6,0.3 1.8,0.3 2.5,-0 1.6,-0.6 32.4,-45.1 36.5,-52.8 7.6,-14.3 7.8,-27.8 0.8,-42.1 -8.9,-18 -29.2,-27.7 -48.1,-23.1zM61.1,7.7c8,4 15.9,12 19.7,20 2.4,5.2 2.7,7 2.7,16.3 0,10 -0.2,10.9 -3.6,18 -3.7,7.6 -34.3,51.5 -35.9,51.5 -1.6,-0 -32.2,-43.9 -35.9,-51.5 -3.4,-7.1 -3.6,-8 -3.6,-18 0,-9.3 0.3,-11.2 2.7,-16.2 2.7,-5.8 8.9,-13.3 14.1,-17 1.7,-1.2 5.5,-3.2 8.6,-4.5 4.8,-2 7,-2.3 15.1,-2.1 8.4,0.3 10.3,0.7 16.1,3.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M37.8,20.4c-19.6,5.3 -25.9,27.6 -11.9,41.6 3.5,3.5 6.3,5.3 10.2,6.4 6.5,2 9.2,2 15.5,0.1 14.5,-4.3 22,-21.1 15.4,-34.8 -5,-10.4 -18,-16.4 -29.2,-13.3zM52.8,24.6c8.1,3.3 13.1,11.1 13.2,20.2 0.1,19.4 -24.8,28.9 -38.1,14.5 -7.9,-8.4 -7.9,-21.3 -0.1,-29.7 5.8,-6.2 16.9,-8.4 25,-5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M38.5,27.7c-6.3,1.7 -12.4,10.2 -12.5,17.2 0,11 11.9,20.3 22.2,17.2 5.7,-1.8 9.5,-4.8 11.8,-9.6 5.4,-11.2 -1.9,-24.1 -14.2,-25 -2.9,-0.2 -6.2,-0.1 -7.3,0.2zM51,32.2c5.4,3.7 7.4,7.2 7.3,12.7 -0.1,8.4 -5.9,14.1 -14.3,14.1 -8.4,-0 -14.4,-5.9 -14.4,-14.2 0,-7.7 6.9,-14.8 14.4,-14.8 2.2,-0 5.1,0.9 7,2.2z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_med_records.xml
+++ b/app/src/main/res/drawable/ic_med_records.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="104dp"
+    android:height="120dp"
+    android:viewportWidth="104"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M45.3,1.9c-4.2,2 -7.3,6.1 -7.3,10 0,1.7 -0.8,2 -5.2,2.3 -5.1,0.3 -5.3,0.4 -5.6,3.4 -0.3,2.6 0.1,3.3 2,3.8 1.3,0.3 11.8,0.6 23.4,0.6 22.8,-0 24.9,-0.4 24.2,-5.1 -0.3,-2.1 -0.9,-2.5 -5.8,-2.9 -5.2,-0.5 -5.5,-0.6 -6.1,-3.8 -0.8,-4.1 -3.4,-7.1 -7.6,-8.8 -4.3,-1.9 -7,-1.7 -12,0.5zM57,8c1.1,1.1 2,2.9 2,4 0,1.8 -0.7,2 -8.1,2 -7.9,-0 -8,-0 -7.4,-2.3 1.6,-5.5 9.5,-7.7 13.5,-3.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M1.6,16.2c-1.4,2 -1.6,8.1 -1.6,50.6l0,48.3 2.5,2.4 2.4,2.5 46.3,-0c25.5,-0 47.3,-0.3 48.4,-0.6 4.2,-1.1 4.4,-3.3 4.4,-53.3 0,-56.7 1,-52.4 -11.5,-51.9 -7.6,0.3 -8,0.4 -8.3,2.7 -0.5,3.3 2.1,5.1 7.5,5.1l4.3,-0 0,45 0,45 -44,-0 -44,-0 0,-45 0,-45 4.8,-0c5.8,-0 8.5,-1.7 8,-5.1 -0.3,-2.3 -0.6,-2.4 -9,-2.7 -8,-0.3 -8.7,-0.1 -10.2,2z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M22.6,40.6c-0.9,0.8 -1.6,2.2 -1.6,2.9 0,0.7 0.7,2.1 1.6,2.9 2.3,2.4 56.5,2.4 58.8,-0 0.9,-0.8 1.6,-2.2 1.6,-2.9 0,-0.7 -0.7,-2.1 -1.6,-2.9 -1.3,-1.4 -5.4,-1.6 -29.4,-1.6 -24,-0 -28.1,0.2 -29.4,1.6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M22.2,62.2c-1.6,1.6 -1.5,4.3 0.2,5.7 0.9,0.8 9.7,1.1 30.1,0.9 26.2,-0.3 28.9,-0.5 29.9,-2.1 0.8,-1.2 0.8,-2.2 0,-3.5 -1,-1.5 -3.8,-1.7 -30,-2 -21.7,-0.2 -29.3,0.1 -30.2,1z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M22.6,83.6c-1.8,1.7 -1.9,2.4 -1,4.8 0.5,1.4 4.2,1.6 30.4,1.6 26.2,-0 29.9,-0.2 30.4,-1.6 0.9,-2.4 0.8,-3.1 -1,-4.8 -1.3,-1.4 -5.4,-1.6 -29.4,-1.6 -24,-0 -28.1,0.2 -29.4,1.6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_medication.xml
+++ b/app/src/main/res/drawable/ic_medication.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="120dp"
+    android:height="120dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M32,9.3c-5.7,1.8 -13.5,10.3 -15.4,16.6 -2.3,7.9 -2.3,60.2 0,68 5.1,17.2 26.5,23.7 41.2,12.5l3.3,-2.6 3.9,2.7c15.1,10.5 35.6,5.5 44.2,-10.7 3.3,-6.2 3.3,-20.4 0,-26.5 -2.9,-5.5 -8.2,-10.7 -13.5,-13.4 -5.7,-3 -16,-3.7 -22.3,-1.5 -2.6,0.9 -5.1,1.6 -5.6,1.6 -0.4,-0 -0.8,-6.4 -0.8,-14.3 0,-13.4 -0.2,-14.6 -2.6,-19.5 -4.5,-9.1 -12.8,-14.2 -22.9,-14.1 -3.3,0.1 -7.6,0.6 -9.5,1.2zM51.8,18.2c6.7,4.5 8.2,9.1 8.2,24.6l0,13.2 -19.1,-0 -19.1,-0 0.4,-13.8c0.3,-10 0.8,-14.5 2,-16.7 5.4,-10.1 18.2,-13.5 27.6,-7.3zM90.8,61.6c6.2,2.5 11.6,8.6 13.6,15.1l0.7,2.3 -22.5,-0c-12.4,-0 -22.6,-0.2 -22.6,-0.5 0,-2 3.6,-8.6 6.3,-11.4 6.3,-6.6 16.4,-8.9 24.5,-5.5zM56.2,69.1c-3.4,6.9 -4,15.2 -1.7,23 2.1,6.8 1.7,7.7 -4.9,10.8 -7.3,3.6 -15.2,2.4 -21.4,-3.3 -4.7,-4.2 -5.6,-7.3 -6,-21.9l-0.4,-13.7 18.4,-0 18.5,-0 -2.5,5.1zM104.4,88.2c-3,9.9 -12.1,16.8 -21.9,16.8 -9.8,-0 -18.9,-6.9 -21.9,-16.8l-0.7,-2.2 22.6,-0 22.6,-0 -0.7,2.2z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_pat_activites.xml
+++ b/app/src/main/res/drawable/ic_pat_activites.xml
@@ -0,0 +1,54 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="120dp"
+    android:viewportWidth="108"
+    android:viewportHeight="120">
+  <path
+      android:pathData="M27.5,1.4c-1.6,1.2 -2,2.9 -2.3,9.5 -0.2,4.5 -0.1,9.3 0.2,10.7 0.6,2.4 0.8,2.5 8.4,2.2l7.7,-0.3 0.3,-9.9c0.3,-12 -0.6,-13.6 -7.8,-13.6 -2.5,-0 -5.5,0.6 -6.5,1.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M67.7,1.8c-1.4,1.5 -1.7,4 -1.7,12l0,10.2 8,-0c7.7,-0 8,-0.1 8.6,-2.5 0.3,-1.4 0.4,-6.1 0.2,-10.6 -0.3,-6.6 -0.7,-8.3 -2.3,-9.5 -2.8,-2.1 -10.8,-1.8 -12.8,0.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M8.4,14.1c-1.6,0.5 -4.1,2 -5.5,3.5l-2.4,2.6 -0.3,44.8c-0.3,50.4 -0.2,50.8 6.2,53.5 5.4,2.3 90.3,2.2 95.1,-0.1 6.5,-3 6.5,-3.3 6.5,-52.2l0,-43.9 -2.3,-3.4c-2.6,-3.9 -7.1,-5.8 -13.9,-5.8l-4.8,-0.1 0,6c0,8.7 -1.6,10 -12.3,10 -11.1,-0 -12.5,-1 -12.9,-9.3l-0.3,-6.2 -7.5,-0 -7.5,-0 -0.5,6.3c-0.7,8.3 -1.8,9.2 -12.7,9.2 -10.7,-0 -12.3,-1.3 -12.3,-10l0,-6 -4.7,0.1c-2.7,-0 -6.2,0.5 -7.9,1zM100,75.8c0,25 -0.3,34.1 -1.2,35 -1.7,1.7 -87.9,1.7 -89.6,-0 -0.9,-0.9 -1.2,-10 -1.2,-35l0,-33.8 46,-0 46,-0 0,33.8z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M22,58l0,6 6,-0 6,-0 0,-6 0,-6 -6,-0 -6,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M57,58l0,6 5.5,-0 5.5,-0 0,-6 0,-6 -5.5,-0 -5.5,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M74,58l0,6 6,-0 6,-0 0,-6 0,-6 -6,-0 -6,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M22.2,76.7l0.3,5.8 5.8,0.3 5.7,0.3 0,-6.1 0,-6 -6,-0 -6.1,-0 0.3,5.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M40,77l0,6 5.5,-0 5.5,-0 0,-6 0,-6 -5.5,-0 -5.5,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M57,77l0,6 5.5,-0 5.5,-0 0,-6 0,-6 -5.5,-0 -5.5,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M40,95l0,6 5.5,-0 5.5,-0 0,-6 0,-6 -5.5,-0 -5.5,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M57,95l0,6 5.5,-0 5.5,-0 0,-6 0,-6 -5.5,-0 -5.5,-0 0,6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M74,95l0,6 6,-0 6.1,-0 -0.3,-5.8 -0.3,-5.7 -5.7,-0.3 -5.8,-0.3 0,6.1z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_remove_primary.xml
+++ b/app/src/main/res/drawable/ic_remove_primary.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"
+      android:fillColor="#1b6dc1"/>
+  <path
+      android:pathData="M19.62,12.7L5.78,12.7"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+</vector>
--- a/app/src/main/res/drawable/ic_subs_plan.xml
+++ b/app/src/main/res/drawable/ic_subs_plan.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="102dp"
+    android:height="128dp"
+    android:viewportWidth="102"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M0,63.5c0,34.9 0.2,63.5 0.5,63.5 0.2,-0 11.4,-4.9 24.7,-11 13.4,-6 25,-11 25.8,-11 0.8,-0 12.4,5 25.8,11 13.3,6.1 24.5,11 24.7,11 0.3,-0 0.5,-28.6 0.5,-63.5l0,-63.5 -51,-0 -51,-0 0,63.5zM96,62.1c0,54.1 -0.1,56 -1.9,55.4 -1,-0.3 -11.1,-4.8 -22.5,-10l-20.6,-9.4 -20.6,9.4c-11.4,5.2 -21.5,9.7 -22.5,10 -1.8,0.6 -1.9,-1.3 -1.9,-55.4l0,-56.1 45,-0 45,-0 0,56.1z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M46.2,30.5l-4.2,13.4 -14.1,0.3 -14,0.3 10.5,7.8c5.9,4.4 10.9,8.3 11.2,8.8 0.3,0.5 -1.3,6.8 -3.6,14 -2.3,7.2 -4,13.2 -3.8,13.4 0.2,0.2 5,-3.2 10.8,-7.5 5.8,-4.4 11.2,-7.9 12,-7.9 0.8,-0 6.2,3.5 12,7.9 5.8,4.3 10.6,7.7 10.8,7.5 0.2,-0.2 -1.5,-6.2 -3.8,-13.4 -2.3,-7.2 -3.9,-13.5 -3.6,-14 0.3,-0.5 5.3,-4.4 11.2,-8.8l10.5,-7.8 -14,-0.3 -14.1,-0.3 -4.2,-13.4c-2.3,-7.4 -4.4,-13.5 -4.8,-13.5 -0.4,-0 -2.5,6.1 -4.8,13.5zM53.6,41.7l2,6.8 7.7,0.3c4.2,0.2 7.7,0.6 7.7,1 0,0.4 -2.7,2.6 -5.9,5l-5.9,4.2 2.3,7.5c1.2,4.1 2.1,7.5 1.8,7.5 -0.2,-0 -3.1,-2.1 -6.4,-4.6l-5.9,-4.5 -5.9,4.5c-3.3,2.5 -6.2,4.6 -6.4,4.6 -0.3,-0 0.6,-3.4 1.8,-7.5l2.3,-7.5 -5.9,-4.2c-3.2,-2.4 -5.9,-4.6 -5.9,-5 0,-0.4 3.5,-0.8 7.7,-1l7.7,-0.3 2,-6.8c1,-3.7 2.2,-6.7 2.6,-6.7 0.4,-0 1.6,3 2.6,6.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/top_round_corner_25dp.xml
+++ b/app/src/main/res/drawable/top_round_corner_25dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@android:color/white"
+        />
+
+    <corners android:topRightRadius="25dp"
+        android:topLeftRadius="25dp"/>
+
+</shape>
--- a/app/src/main/res/layout/activity_article_shower.xml
+++ b/app/src/main/res/layout/activity_article_shower.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/white"
+    tools:context=".articles.ArticleShowerActivity">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        app:titleCentered="true"
+        app:titleMarginStart="40dp"
+        app:titleMarginEnd="40dp"
+
+        app:navigationIcon="@drawable/arrow_back"
+
+        />
+
+    <WebView
+        android:id="@+id/web_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
+        />
+
+</RelativeLayout>
--- a/app/src/main/res/layout/activity_articles.xml
+++ b/app/src/main/res/layout/activity_articles.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context=".articles.ArticlesActivity">
+
+    <ImageView
+        android:id="@+id/back_btn"
+        android:layout_width="35sp"
+        android:layout_height="35sp"
+        android:layout_margin="15dp"
+        android:contentDescription="@string/back_button"
+        android:padding="5dp"
+        android:paddingStart="-15dp"
+        android:paddingEnd="0dp"
+        android:src="@drawable/arrow_back" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="5dp"
+        android:fontFamily="@font/nunito_medium"
+        android:text="@string/articles"
+        android:textSize="@dimen/_18ssp"
+        android:textColor="@color/black" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/search"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        android:layout_marginHorizontal="@dimen/_10sdp"
+        android:layout_marginVertical="@dimen/_10sdp"
+
+        app:cardBackgroundColor="@color/white"
+        app:cardElevation="5dp"
+
+        app:strokeWidth="2dp"
+        app:strokeColor="@color/color_accent"
+
+        app:cardCornerRadius="20dp"
+
+        >
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:hint="@string/search_places"
+            android:fontFamily="@font/nunito_regular"
+            android:textColorHint="@android:color/darker_gray"
+            android:textColor="@color/black"
+            android:textSize="@dimen/_14ssp"
+
+            android:background="@android:color/transparent"
+
+            android:layout_marginVertical="10dp"
+            android:layout_marginHorizontal="15dp"
+
+            app:drawableStartCompat="@drawable/ic_search_outline"
+            android:drawablePadding="15dp"
+
+            android:maxLines="1"
+
+            android:inputType="textCapSentences"
+
+            />
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/articles_rv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:overScrollMode="never"
+        />
+
+</LinearLayout>
--- a/app/src/main/res/layout/activity_faq.xml
+++ b/app/src/main/res/layout/activity_faq.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context=".articles.ArticlesActivity">
+
+    <ImageView
+        android:id="@+id/back_btn"
+        android:layout_width="35sp"
+        android:layout_height="35sp"
+        android:layout_margin="15dp"
+        android:contentDescription="@string/back_button"
+        android:padding="5dp"
+        android:paddingStart="-15dp"
+        android:paddingEnd="0dp"
+        android:src="@drawable/arrow_back" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="5dp"
+        android:fontFamily="@font/nunito_medium"
+        android:text="@string/faq"
+        android:textSize="@dimen/_18ssp"
+        android:textColor="@color/black" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/faqs_rv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:overScrollMode="never"
+        />
+
+</LinearLayout>
--- a/app/src/main/res/layout/article_view_holder.xml
+++ b/app/src/main/res/layout/article_view_holder.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        android:layout_marginBottom="15dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginTop="5dp"
+
+        app:cardCornerRadius="25dp"
+        app:cardElevation="5dp"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                app:cardElevation="0dp"
+                app:cardCornerRadius="15dp"
+
+                android:layout_margin="15dp"
+
+                >
+
+                <ImageView
+                    android:id="@+id/article_img"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/_120sdp"
+
+                    android:scaleType="fitXY"
+                    />
+
+            </androidx.cardview.widget.CardView>
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                tools:text="What are the treatments for Dementia?"
+                android:fontFamily="@font/nunito_bold"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_16ssp"
+
+                android:layout_marginHorizontal="15dp"
+
+                android:maxLines="2"
+                android:ellipsize="end"
+
+                />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="15dp"
+                android:layout_marginHorizontal="15dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <de.hdodenhof.circleimageview.CircleImageView
+                    android:id="@+id/author_img"
+                    android:layout_width="@dimen/_20sdp"
+                    android:layout_height="@dimen/_20sdp"
+
+                    android:src="@drawable/static_3"
+
+                    />
+
+                <TextView
+                    android:id="@+id/author_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    tools:text="@string/aditya_gaikwad"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_12ssp"
+
+                    android:layout_marginStart="15dp"
+
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:ems="4"
+
+                    />
+
+                <ImageView
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
+
+                    android:src="@drawable/ic_white_dot"
+
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="5dp"
+
+                    app:tint="@color/black" />
+
+                <TextView
+                    android:id="@+id/created_at"
+                    android:visibility="visible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+
+                    tools:text="02 sep 23, 11;23 am"
+                    android:fontFamily="@font/nunito_regular"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/_12ssp"
+
+                    android:layout_marginStart="5dp"
+
+                    />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</RelativeLayout>
--- a/app/src/main/res/layout/caregiver_dashboard_activity.xml
+++ b/app/src/main/res/layout/caregiver_dashboard_activity.xml
@@ -21,7 +21,6 @@
            android:layout_width="match_parent"
            android:layout_height="?android:attr/actionBarSize"

-            android:layout_marginTop="15dp"
            android:background="@android:color/transparent"

            app:title="Welcome Aditya"
--- a/app/src/main/res/layout/caregiver_dashboard_menu.xml
+++ b/app/src/main/res/layout/caregiver_dashboard_menu.xml
@@ -3,6 +3,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:orientation="horizontal"
    android:weightSum="10"
    android:background="@color/cg_dash_bg">
@@ -58,11 +59,12 @@
            >

            <TextView
+                android:id="@+id/name"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="7"

-                android:text="@string/aditya_gaikwad"
+                tools:text="@string/aditya_gaikwad"
                android:fontFamily="@font/nunito_medium"
                android:textColor="@color/white"
                android:textSize="@dimen/_18ssp"
@@ -96,6 +98,7 @@
            />

        <LinearLayout
+            android:id="@+id/articles"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
@@ -158,6 +161,7 @@
        </LinearLayout>

        <LinearLayout
+            android:id="@+id/faqs"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
--- a/app/src/main/res/layout/faq_viewholder.xml
+++ b/app/src/main/res/layout/faq_viewholder.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        android:layout_marginBottom="15dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginTop="5dp"
+
+        app:cardCornerRadius="15dp"
+
+        app:strokeColor="@color/color_accent"
+        app:strokeWidth="1dp"
+
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="15dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                tools:text="What is dementia?"
+                android:fontFamily="@font/nunito_semibold"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_14ssp"
+
+                android:layout_toStartOf="@id/add_remove"
+
+                android:layout_marginEnd="15dp"
+
+                />
+
+            <ImageView
+                android:id="@+id/add_remove"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+
+                android:src="@drawable/ic_add_primary"
+
+                android:layout_alignParentEnd="true"
+
+                />
+
+            <TextView
+                android:id="@+id/answer"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                tools:text="Random text text text and random"
+                android:fontFamily="@font/nunito_regular"
+                android:textColor="@color/black"
+                android:textSize="@dimen/_12ssp"
+
+                android:layout_below="@id/title"
+                android:layout_marginTop="5dp"
+
+                />
+
+        </RelativeLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</RelativeLayout>
--- a/app/src/main/res/layout/my_patient_fragment.xml
+++ b/app/src/main/res/layout/my_patient_fragment.xml
@@ -1,26 +1,688 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="@color/white">

-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:weightSum="10"
-        >
+    <RelativeLayout
+        android:id="@+id/relativeLayout3"
+        android:layout_width="0dp"
+
+        android:layout_height="0dp"
+
+        android:background="@color/color_primary_dark"
+        app:layout_constraintBottom_toTopOf="@+id/guideline"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="?android:attr/actionBarSize"
+            android:fontFamily="@font/nunito_medium"
+            android:text="@string/patient_profile"
+
+            android:textColor="@color/white"
+            android:textSize="@dimen/_18ssp"

-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="3"
-            android:src="@color/color_primary"
-            android:contentDescription="@string/background"
-            android:scaleType="fitXY"
            />

-    </LinearLayout>
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/profile_img"
+            android:layout_width="@dimen/_80sdp"
+            android:layout_height="@dimen/_80sdp"

-</RelativeLayout>
+            android:layout_below="@id/title"
+
+            android:layout_centerInParent="true"
+
+            android:layout_marginTop="15dp"
+            android:contentDescription="@string/patient_profile"
+            android:elevation="15dp"
+
+            android:src="@drawable/static_3"
+
+            />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/profile_img"
+            android:layout_centerHorizontal="true"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:layout_marginTop="5dp"
+                android:ellipsize="end"
+                android:fontFamily="@font/nunito_semibold"
+                android:maxEms="10"
+                android:maxLines="1"
+
+                android:text="@string/aditya_gaikwad"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+
+                android:textSize="@dimen/_16ssp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="5dp"
+                android:baselineAligned="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon"
+                    android:layout_width="@dimen/_35sdp"
+                    android:layout_height="@dimen/_35sdp"
+
+                    android:paddingStart="0dp"
+
+                    android:paddingTop="5dp"
+
+                    android:paddingEnd="-5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_phone_img"
+
+                    />
+
+                <TextView
+                    android:id="@+id/phone_number"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginTop="1dp"
+                    android:ellipsize="end"
+                    android:fontFamily="@font/nunito_semibold"
+
+                    android:gravity="center"
+
+                    android:maxLines="1"
+
+                    android:text="@string/_918208401763"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/_14ssp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.45" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        android:background="@color/color_primary_dark"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/relativeLayout3">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/top_round_corner_25dp"
+            >
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="15dp"
+                    android:orientation="vertical"
+                    >
+
+                    <LinearLayout
+                        android:id="@+id/peronal_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        android:layout_marginTop="25dp"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_user_outline"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/personal_information"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_1"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_1"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/contacts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_contacts_2"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/contacts"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_2"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_2"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/medication"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_medication"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/medication"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_3"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_3"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/med_records"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_med_records"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/medical_records"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_4"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_4"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/pat_activities"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_pat_activites"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/patient_activities"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_5"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_5"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/freq_used_apps"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_freq_app_2"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/frequently_used_apps"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_6"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_6"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/sub_plans"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_subs_plan"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/subscription_plan"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_7"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_7"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/geofence"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginBottom="30dp"
+                        android:gravity="center_vertical"
+                        >
+
+                        <androidx.cardview.widget.CardView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+
+                            app:cardCornerRadius="8dp"
+
+                            app:cardElevation="0dp"
+
+                            >
+
+                            <ImageView
+                                android:layout_width="@dimen/_40sdp"
+                                android:layout_height="@dimen/_40sdp"
+
+                                android:padding="10dp"
+
+                                android:src="@drawable/ic_location"
+                                android:background="#e2f4ff"
+                                app:tint="@color/color_primary_dark" />
+
+                        </androidx.cardview.widget.CardView>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            >
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+
+                                android:text="@string/geofence"
+                                android:fontFamily="@font/nunito_semibold"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/_16ssp"
+
+                                android:layout_marginStart="15dp"
+                                android:layout_toStartOf="@id/btn_8"
+
+                                />
+
+                            <ImageView
+                                android:id="@+id/btn_8"
+                                android:layout_width="@dimen/_25sdp"
+                                android:layout_height="@dimen/_25sdp"
+
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+
+                                android:src="@drawable/ic_next"
+                                app:tint="#043E61" />
+
+                        </RelativeLayout>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ScrollView>
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,6 +12,8 @@
    <color name="color_primary">#1B6DC1</color>
    <color name="color_accent">#C9E0FB</color>

+    <color name="color_primary_dark">#005F9A</color>
+
    <color name="cg_dash_bg">#005F9A</color>
    <color name="pwd_bg">#545454</color>

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -252,7 +252,7 @@
    <string name="check_your_loved_one_s_medication_schedule">Update your loved one\'s profile information.</string>
    <string name="setup_a_geofence_to_protect_your_loved_one">Setup a geofence to\nprotect your loved one.</string>
    <string name="you_are_always_connected_and_will_be_notified_when_your_loved_ones_need_you">Be notified if your loved one ventures too far from home or a designated safe area</string>
-    <string name="application_will_notify_you_when_it_is_time_for_your_loved_one_to_take_his_her_medication">For example, you may use your phone to examine and verify your loved one\'s medication schedule.</string>
+    <string name="application_will_notify_you_when_it_is_time_for_your_loved_one_to_take_his_her_medication">For example, you may use your phone to verify and update your loved one\'s medication schedule.</string>
    <string name="be_notified_if_your_loved_one_ventures_too_far_from_home_or_a_designated_safe_area">Be notified if your loved one ventures too far from home or a designated safe area.</string>
    <string name="skip">Skip</string>
    <string name="get_started">Get started</string>
@@ -326,6 +326,14 @@
    <string name="enter_a_message">Enter a message</string>
    <string name="syncing_patient_information">Syncing patient information</string>
    <string name="we_are_currently_syncing_patient_data_this_may_take_a_few_seconds">We are currently syncing patient data. This may take a few seconds.</string>
+    <string name="patient_profile">Patient profile</string>
+    <string name="contacts">Contacts</string>
+    <string name="medication">Medication</string>
+    <string name="medical_records">Medical Records</string>
+    <string name="patient_activities">Patient activities</string>
+    <string name="subscription_plan">Subscription plan</string>
+    <string name="geofence">Geofence</string>
+    <string name="faq">FAQ</string>

    <string-array name="radius_units">
        <item>Kms</item>