diff --git a/android-app/.idea/deploymentTargetSelector.xml b/android-app/.idea/deploymentTargetSelector.xml
index eda0e01..42283ba 100644
--- a/android-app/.idea/deploymentTargetSelector.xml
+++ b/android-app/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-05-10T05:08:09.984405500Z">
+        <DropdownSelection timestamp="2024-05-10T19:43:21.923635500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=8e7824f7" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Dell\.android\avd\Pixel_3a_API_34.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml
index 9d069e5..388b9c0 100644
--- a/android-app/app/src/main/AndroidManifest.xml
+++ b/android-app/app/src/main/AndroidManifest.xml
@@ -30,10 +30,8 @@
         tools:ignore="AllowBackup"
         tools:targetApi="m">
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.account.EditProfile" />
-        <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SelectTopic" />
-        <activity
-            android:name="com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SubTopic"
-            android:noHistory="true" />
+
+
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.post.SinglePostView" />
 
 
@@ -64,9 +62,9 @@
                     android:scheme="https" />
             </intent-filter>
         </activity>
-        <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.quiz.ResultActivity" />
+
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.post.WhoLikedActivity" />
-        <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.MapView" />
+        <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts.MapView" />
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.post.PostText" />
         <activity android:name="com.quantum_guys.dncc_eco_sync.messege.activity.MessageActivity" />
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.post.PostImage" />
@@ -74,16 +72,7 @@
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.issue.PostIssue" />
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.issue.SingleIssueView" />
 
-        <activity
-            android:name="com.quantum_guys.dncc_eco_sync.ui.activities.quiz.QuizBattle"
-            android:exported="true"
-            android:noHistory="true"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="org.jhm69.battle_of_quiz.TARGET_PLAY" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
+
         <activity
             android:name="com.quantum_guys.dncc_eco_sync.ui.activities.Splash"
             android:exported="true"
@@ -124,13 +113,13 @@
             android:name="com.quantum_guys.dncc_eco_sync.ui.activities.notification.ImagePreviewSave"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.quantum_guys.dncc_eco_sync.ui.activities.friends.SearchUsersActivity"
+            android:name="com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.SearchUsersActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile"
+            android:name="com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter android:label="View User Profile">
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/CommentsAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/CommentsAdapter.java
index 1db4e1a..149cdaf 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/CommentsAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/CommentsAdapter.java
@@ -1 +1 @@
-package com.quantum_guys.dncc_eco_sync.adapters;

import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.afollestad.materialdialogs.MaterialDialog;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.github.marlonlom.utilities.timeago.TimeAgo;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.firestore.FirebaseFirestore;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Comment;
import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
import com.quantum_guys.dncc_eco_sync.utils.MathView;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

import de.hdodenhof.circleimageview.CircleImageView;
import es.dmoral.toasty.Toasty;

public class CommentsAdapter extends RecyclerView.Adapter<CommentsAdapter.ViewHolder> {

    private final List<Comment> commentList;
    private final Context context;
    private final boolean isOwner;
    int lastPosition = -1;
    private FirebaseFirestore mFirestore;
    private FirebaseUser mCurrentUser;
    int comment_count;


    public CommentsAdapter(List<Comment> commentList, Context context, boolean owner, int comment_count) {
        this.commentList = commentList;
        this.context = context;
        this.isOwner = owner;
        this.comment_count = comment_count;
    }

    @NonNull
    @Override
    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
        mFirestore = FirebaseFirestore.getInstance();
        mCurrentUser = FirebaseAuth.getInstance().getCurrentUser();
        View view = LayoutInflater.from(context).inflate(R.layout.item_comment, parent, false);
        return new ViewHolder(view);
    }

    @Override
    public long getItemId(int position) {
        return position;
    }

    @Override
    public int getItemViewType(int position) {
        return position;
    }

    @Override
    public void onBindViewHolder(@NonNull final ViewHolder holder, @SuppressLint("RecyclerView") int position) {
        Animation animation = AnimationUtils.loadAnimation(context,
                (position > lastPosition) ? R.anim.up_from_bottom
                        : R.anim.down_from_top);
        holder.itemView.startAnimation(animation);
        lastPosition = position;

        if (isOwner) {
            enableDeletion(holder, position);
        } else {

            if (commentList.get(position).getId().equals(mCurrentUser.getUid())) {
                enableDeletion(holder, position);
            }
        }
        holder.username.setText(commentList.get(position).getUsername());
        holder.username.setOnClickListener(v -> context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", commentList.get(holder.getAdapterPosition()).getId())));
        holder.image.setOnClickListener(v -> context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", commentList.get(holder.getAdapterPosition()).getId())));

        Glide.with(context)
                .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                .load(commentList.get(position).getImage())
                .into(holder.image);

        holder.comment.setDisplayText(commentList.get(position).getComment());

        String timeAgo = TimeAgo.using(Long.parseLong(commentList.get(position).getTimestamp()));
        holder.timestamp.setText(timeAgo);

        try {
            mFirestore.collection("Users")
                    .document(commentList.get(position).getId())
                    .get()
                    .addOnSuccessListener(documentSnapshot -> {
                        try {
                            if (!Objects.equals(documentSnapshot.getString("username"), commentList.get(holder.getAdapterPosition()).getUsername()) &&
                                    !Objects.equals(documentSnapshot.getString("image"), commentList.get(holder.getAdapterPosition()).getImage())) {

                                Map<String, Object> commentMap = new HashMap<>();
                                commentMap.put("username", documentSnapshot.getString("username"));
                                commentMap.put("image", documentSnapshot.getString("image"));

                                mFirestore.collection("Posts")
                                        .document(commentList.get(holder.getAdapterPosition()).getPost_id())
                                        .collection("Comments")
                                        .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                                        .update(commentMap)
                                        .addOnSuccessListener(aVoid -> Log.i("comment_update", "success"))
                                        .addOnFailureListener(e -> Log.i("comment_update", "failure"));

                                holder.username.setText(documentSnapshot.getString("username"));

                                Glide.with(context)
                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                                        .load(documentSnapshot.getString("image"))
                                        .into(holder.image);


                            } else if (!Objects.equals(documentSnapshot.getString("username"), commentList.get(holder.getAdapterPosition()).getUsername())) {


                                Map<String, Object> commentMap = new HashMap<>();
                                commentMap.put("username", documentSnapshot.getString("username"));

                                mFirestore.collection("Posts")
                                        .document(commentList.get(holder.getAdapterPosition()).getPost_id())
                                        .collection("Comments")
                                        .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                                        .update(commentMap)
                                        .addOnSuccessListener(aVoid -> Log.i("comment_update", "success"))
                                        .addOnFailureListener(e -> Log.i("comment_update", "failure"));

                                holder.username.setText(documentSnapshot.getString("username"));

                            } else if (!Objects.equals(documentSnapshot.getString("image"), commentList.get(holder.getAdapterPosition()).getImage())) {

                                Map<String, Object> commentMap = new HashMap<>();
                                commentMap.put("image", documentSnapshot.getString("image"));

                                mFirestore.collection("Posts")
                                        .document(commentList.get(holder.getAdapterPosition()).getPost_id())
                                        .collection("Comments")
                                        .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                                        .update(commentMap)
                                        .addOnSuccessListener(aVoid -> Log.i("comment_update", "success"))
                                        .addOnFailureListener(e -> Log.i("comment_update", "failure"));

                                Glide.with(context)
                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                                        .load(documentSnapshot.getString("image"))
                                        .into(holder.image);

                            }


                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    })
                    .addOnFailureListener(e -> Log.e("Error", e.getMessage()));
        } catch (Exception ex) {
            Log.w("error", "fastscrolled", ex);
        }

    }

    @SuppressLint("NotifyDataSetChanged")
    private void enableDeletion(final ViewHolder holder, int pos) {

        holder.delete.setVisibility(View.VISIBLE);
        holder.delete.setAlpha(0.0f);

        holder.delete.animate()
                .alpha(1.0f)
                .start();

        holder.delete.setOnClickListener(v -> new MaterialDialog.Builder(context)
                .title("Delete comment")
                .content("Are you sure do you want to delete your comment?")
                .positiveText("Yes")
                .negativeText("No")
                .onPositive((dialog, which) -> {
                    dialog.dismiss();

                    final ProgressDialog progressDialog = new ProgressDialog(context);
                    progressDialog.setMessage("Deleting comment...");
                    progressDialog.setIndeterminate(true);
                    progressDialog.show();
                    String postId = commentList.get(holder.getAdapterPosition()).getPost_id();

                    mFirestore.collection("Posts")
                            .document(postId)
                            .collection("Comments")
                            .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                            .delete()
                            .addOnSuccessListener(aVoid -> {
                                commentList.remove(holder.getAdapterPosition());
                                deleteCount(postId);
                                Toasty.success(context, "Comment deleted", Toasty.LENGTH_SHORT, true).show();
                                notifyDataSetChanged();
                                progressDialog.dismiss();
                            })
                            .addOnFailureListener(e -> {
                                progressDialog.dismiss();
                                Toasty.error(context, "Error deleting comment: " + e.getLocalizedMessage(), Toasty.LENGTH_SHORT, true).show();
                                Log.w("Error", "delete comment", e);
                            });

                })
                .onNegative((dialog, which) -> dialog.dismiss())
                .show());

    }

    private void deleteCount( String postId) {
        try {
            comment_count = comment_count-1;
            HashMap<String, Object> scoreMap = new HashMap<>();
            scoreMap.put("comment_count", comment_count);
            mFirestore.collection("Posts")
                    .document(postId)
                    .update(scoreMap).addOnSuccessListener(aVoid -> {
            });
        } catch (Exception ignored) {

        }
    }


    @Override
    public int getItemCount() {
        return commentList.size();
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {

        private final CircleImageView image;
        private final TextView username;
        private final TextView timestamp;
        private final ImageView delete;
        final MathView comment;

        public ViewHolder(View itemView) {
            super(itemView);

            image = itemView.findViewById(R.id.comment_user_image);
            username = itemView.findViewById(R.id.comment_username);
            comment = itemView.findViewById(R.id.comment_text);
            timestamp = itemView.findViewById(R.id.comment_timestamp);
            delete = itemView.findViewById(R.id.delete);

        }
    }
}
\ No newline at end of file
+package com.quantum_guys.dncc_eco_sync.adapters;

import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.afollestad.materialdialogs.MaterialDialog;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.github.marlonlom.utilities.timeago.TimeAgo;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.firestore.FirebaseFirestore;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Comment;
import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
import com.quantum_guys.dncc_eco_sync.utils.MathView;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;

import de.hdodenhof.circleimageview.CircleImageView;
import es.dmoral.toasty.Toasty;

public class CommentsAdapter extends RecyclerView.Adapter<CommentsAdapter.ViewHolder> {

    private final List<Comment> commentList;
    private final Context context;
    private final boolean isOwner;
    int lastPosition = -1;
    private FirebaseFirestore mFirestore;
    private FirebaseUser mCurrentUser;
    int comment_count;


    public CommentsAdapter(List<Comment> commentList, Context context, boolean owner, int comment_count) {
        this.commentList = commentList;
        this.context = context;
        this.isOwner = owner;
        this.comment_count = comment_count;
    }

    @NonNull
    @Override
    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
        mFirestore = FirebaseFirestore.getInstance();
        mCurrentUser = FirebaseAuth.getInstance().getCurrentUser();
        View view = LayoutInflater.from(context).inflate(R.layout.item_comment, parent, false);
        return new ViewHolder(view);
    }

    @Override
    public long getItemId(int position) {
        return position;
    }

    @Override
    public int getItemViewType(int position) {
        return position;
    }

    @Override
    public void onBindViewHolder(@NonNull final ViewHolder holder, @SuppressLint("RecyclerView") int position) {
        Animation animation = AnimationUtils.loadAnimation(context,
                (position > lastPosition) ? R.anim.up_from_bottom
                        : R.anim.down_from_top);
        holder.itemView.startAnimation(animation);
        lastPosition = position;

        if (isOwner) {
            enableDeletion(holder, position);
        } else {

            if (commentList.get(position).getId().equals(mCurrentUser.getUid())) {
                enableDeletion(holder, position);
            }
        }
        holder.username.setText(commentList.get(position).getUsername());
        holder.username.setOnClickListener(v -> context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", commentList.get(holder.getAdapterPosition()).getId())));
        holder.image.setOnClickListener(v -> context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", commentList.get(holder.getAdapterPosition()).getId())));

        Glide.with(context)
                .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                .load(commentList.get(position).getImage())
                .into(holder.image);

        holder.comment.setDisplayText(commentList.get(position).getComment());

        String timeAgo = TimeAgo.using(Long.parseLong(commentList.get(position).getTimestamp()));
        holder.timestamp.setText(timeAgo);

        try {
            mFirestore.collection("Users")
                    .document(commentList.get(position).getId())
                    .get()
                    .addOnSuccessListener(documentSnapshot -> {
                        try {
                            if (!Objects.equals(documentSnapshot.getString("username"), commentList.get(holder.getAdapterPosition()).getUsername()) &&
                                    !Objects.equals(documentSnapshot.getString("image"), commentList.get(holder.getAdapterPosition()).getImage())) {

                                Map<String, Object> commentMap = new HashMap<>();
                                commentMap.put("username", documentSnapshot.getString("username"));
                                commentMap.put("image", documentSnapshot.getString("image"));

                                mFirestore.collection("Posts")
                                        .document(commentList.get(holder.getAdapterPosition()).getPost_id())
                                        .collection("Comments")
                                        .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                                        .update(commentMap)
                                        .addOnSuccessListener(aVoid -> Log.i("comment_update", "success"))
                                        .addOnFailureListener(e -> Log.i("comment_update", "failure"));

                                holder.username.setText(documentSnapshot.getString("username"));

                                Glide.with(context)
                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                                        .load(documentSnapshot.getString("image"))
                                        .into(holder.image);


                            } else if (!Objects.equals(documentSnapshot.getString("username"), commentList.get(holder.getAdapterPosition()).getUsername())) {


                                Map<String, Object> commentMap = new HashMap<>();
                                commentMap.put("username", documentSnapshot.getString("username"));

                                mFirestore.collection("Posts")
                                        .document(commentList.get(holder.getAdapterPosition()).getPost_id())
                                        .collection("Comments")
                                        .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                                        .update(commentMap)
                                        .addOnSuccessListener(aVoid -> Log.i("comment_update", "success"))
                                        .addOnFailureListener(e -> Log.i("comment_update", "failure"));

                                holder.username.setText(documentSnapshot.getString("username"));

                            } else if (!Objects.equals(documentSnapshot.getString("image"), commentList.get(holder.getAdapterPosition()).getImage())) {

                                Map<String, Object> commentMap = new HashMap<>();
                                commentMap.put("image", documentSnapshot.getString("image"));

                                mFirestore.collection("Posts")
                                        .document(commentList.get(holder.getAdapterPosition()).getPost_id())
                                        .collection("Comments")
                                        .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                                        .update(commentMap)
                                        .addOnSuccessListener(aVoid -> Log.i("comment_update", "success"))
                                        .addOnFailureListener(e -> Log.i("comment_update", "failure"));

                                Glide.with(context)
                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                                        .load(documentSnapshot.getString("image"))
                                        .into(holder.image);

                            }


                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    })
                    .addOnFailureListener(e -> Log.e("Error", e.getMessage()));
        } catch (Exception ex) {
            Log.w("error", "fastscrolled", ex);
        }

    }

    @SuppressLint("NotifyDataSetChanged")
    private void enableDeletion(final ViewHolder holder, int pos) {

        holder.delete.setVisibility(View.VISIBLE);
        holder.delete.setAlpha(0.0f);

        holder.delete.animate()
                .alpha(1.0f)
                .start();

        holder.delete.setOnClickListener(v -> new MaterialDialog.Builder(context)
                .title("Delete comment")
                .content("Are you sure do you want to delete your comment?")
                .positiveText("Yes")
                .negativeText("No")
                .onPositive((dialog, which) -> {
                    dialog.dismiss();

                    final ProgressDialog progressDialog = new ProgressDialog(context);
                    progressDialog.setMessage("Deleting comment...");
                    progressDialog.setIndeterminate(true);
                    progressDialog.show();
                    String postId = commentList.get(holder.getAdapterPosition()).getPost_id();

                    mFirestore.collection("Posts")
                            .document(postId)
                            .collection("Comments")
                            .document(commentList.get(holder.getAdapterPosition()).getCommentId())
                            .delete()
                            .addOnSuccessListener(aVoid -> {
                                commentList.remove(holder.getAdapterPosition());
                                deleteCount(postId);
                                Toasty.success(context, "Comment deleted", Toasty.LENGTH_SHORT, true).show();
                                notifyDataSetChanged();
                                progressDialog.dismiss();
                            })
                            .addOnFailureListener(e -> {
                                progressDialog.dismiss();
                                Toasty.error(context, "Error deleting comment: " + e.getLocalizedMessage(), Toasty.LENGTH_SHORT, true).show();
                                Log.w("Error", "delete comment", e);
                            });

                })
                .onNegative((dialog, which) -> dialog.dismiss())
                .show());

    }

    private void deleteCount( String postId) {
        try {
            comment_count = comment_count-1;
            HashMap<String, Object> scoreMap = new HashMap<>();
            scoreMap.put("comment_count", comment_count);
            mFirestore.collection("Posts")
                    .document(postId)
                    .update(scoreMap).addOnSuccessListener(aVoid -> {
            });
        } catch (Exception ignored) {

        }
    }


    @Override
    public int getItemCount() {
        return commentList.size();
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {

        private final CircleImageView image;
        private final TextView username;
        private final TextView timestamp;
        private final ImageView delete;
        final MathView comment;

        public ViewHolder(View itemView) {
            super(itemView);

            image = itemView.findViewById(R.id.comment_user_image);
            username = itemView.findViewById(R.id.comment_username);
            comment = itemView.findViewById(R.id.comment_text);
            timestamp = itemView.findViewById(R.id.comment_timestamp);
            delete = itemView.findViewById(R.id.delete);

        }
    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/FriendRequestAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/FriendRequestAdapter.java
index 4be1c9f..71ce7dd 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/FriendRequestAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/FriendRequestAdapter.java
@@ -22,7 +22,7 @@
 
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.models.FriendRequest;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/IssueViewHolder.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/IssueViewHolder.java
index fe744b5..3f570ce 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/IssueViewHolder.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/IssueViewHolder.java
@@ -15,27 +15,19 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.github.ivbaranov.mfb.MaterialFavoriteButton;
 import com.github.marlonlom.utilities.timeago.TimeAgo;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.firebase.auth.FirebaseAuth;
@@ -56,13 +48,10 @@
 import com.quantum_guys.dncc_eco_sync.notification.Client;
 import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
 import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
-import com.quantum_guys.dncc_eco_sync.ui.activities.post.CommentsActivity;
-import com.quantum_guys.dncc_eco_sync.ui.activities.post.WhoLikedActivity;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.issue.IssuesDetailsActivity;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.Home;
-import com.quantum_guys.dncc_eco_sync.ui.fragment.PostMenu;
 import com.quantum_guys.dncc_eco_sync.utils.MathView;
-import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
 import com.tbuonomo.viewpagerdotsindicator.DotsIndicator;
 
 import java.util.ArrayList;
@@ -84,14 +73,14 @@ public class IssueViewHolder extends RecyclerView.ViewHolder {
     private final FirebaseUser mCurrentUser;
     private final CircleImageView user_image;
     private final TextView user_name;
+
     private final TextView timestamp;
-    private final TextView institute_dept, likes_count;
+    private final TextView institute_dept;
     CollectionReference IssueDb = FirebaseFirestore.getInstance().collection("Issues");
     private final MathView Issue_desc;
 
-    private final MaterialFavoriteButton sav_button;
-    private final MaterialFavoriteButton like_btn;
-    private final MaterialFavoriteButton stat_btn;
+
+
     private final ConstraintLayout pager_layout;
     private final RelativeLayout indicator_holder;
     private final ImageView delete;
@@ -99,7 +88,7 @@ public class IssueViewHolder extends RecyclerView.ViewHolder {
     private final ViewPager pager;
     private final DotsIndicator indicator2;
     int position;
-    final Button see_more;
+
     private Context context;
     private boolean isOwner;
     private boolean alreadyLiked=false;
@@ -109,180 +98,83 @@ public class IssueViewHolder extends RecyclerView.ViewHolder {
 
     public IssueViewHolder(@NonNull View holder) {
         super(holder);
+
         FirebaseAuth mAuth = FirebaseAuth.getInstance();
         mFirestore = FirebaseFirestore.getInstance();
         mCurrentUser = mAuth.getCurrentUser();
         user_image = holder.findViewById(R.id.post_user_image);
-        like_btn = holder.findViewById(R.id.like_button);
-        stat_btn = holder.findViewById(R.id.stat_button);
         user_name = holder.findViewById(R.id.post_username);
         institute_dept = holder.findViewById(R.id.dept_institute);
-        likes_count = holder.findViewById(R.id.like_count);
+
         timestamp = holder.findViewById(R.id.post_timestamp);
         Issue_desc = holder.findViewById(R.id.post_desc);
         pager = holder.findViewById(R.id.pager);
         pager_layout = holder.findViewById(R.id.pager_layout);
-        see_more = holder.findViewById(R.id.share_button);
+
         delete = holder.findViewById(R.id.delete_button);
-        sav_button = holder.findViewById(R.id.save_button);
+
         indicator2 = holder.findViewById(R.id.indicator);
         indicator_holder = holder.findViewById(R.id.indicator_holder);
         menu = holder.findViewById(R.id.menu_button);
     }
 
-    private int updateLike(String IssueId, String IssueerId) {
-        try {
-            if(!alreadyLiked){
-                IssueLikes++;
-                try {
-                    Map<String, Boolean> likeMap = new HashMap<>();
-                    likeMap.put("liked", true);
-                    IssueDb.document(IssueId)
-                            .collection("Liked_Users")
-                            .document(mCurrentUser.getUid())
-                            .set(likeMap)
-                            .addOnSuccessListener(aVoid -> {
-                                alreadyLiked=true;
-                                UserViewModel userViewModel = ViewModelProviders.of((FragmentActivity) context).get(UserViewModel.class);
-                                userViewModel.user.observe((LifecycleOwner) context, users -> {
-                                    Notification notification = new Notification(IssueId,
-                                            IssueerId,
-                                            users.getUsername(),
-                                            users.getImage(),
-                                            "Liked your Issue",
-                                            String.valueOf(System.currentTimeMillis())
-                                            , "like"
-                                            , IssueId, false
-                                    );
-                                    addToNotification(IssueerId, notification);
-                                });
-                            })
-                            .addOnFailureListener(e -> Log.e("Error like", e.getMessage()));
-                } catch (Exception ignored) {
-                }
-            }else{
-                IssueLikes--;
-                try {
-                    mFirestore.collection("Issues")
-                            .document(IssueId)
-                            .collection("Liked_Users")
-                            .document(mCurrentUser.getUid())
-                            .delete()
-                            .addOnSuccessListener(aVoid -> {
-                                alreadyLiked=false;
-                                //holder.like_count.setText(String.valueOf(Integer.parseInt(holder.like_count.getText().toString())-1));
-                                //Toast.makeText(context, "Unliked Issue '" + Issue.IssueId, Toast.LENGTH_SHORT).show();
-                            })
-                            .addOnFailureListener(e -> Log.e("Error unlike", e.getMessage()));
-                } catch (Exception ignored) {
-                }
-            }
-            likes_count.setText(String.valueOf(IssueLikes));
-            mFirestore.collection("Issues").document(IssueId).update("liked_count", IssueLikes).addOnSuccessListener(aVoid -> {
-            });
-        } catch (NullPointerException ignored) {
-
-        }
-        return IssueLikes;
-    }
 
     @RequiresApi(api = Build.VERSION_CODES.R)
     @SuppressLint({"ResourceType", "SetTextI18n"})
-    public void bind(Issue Issue, final IssueViewHolder holder, int position, BottomSheetDialog mmBottomSheetDialog, View statsheetView, boolean approved) {
+    public void bind(Issue issue, final IssueViewHolder holder, int position, BottomSheetDialog mmBottomSheetDialog, View statsheetView, boolean approved) {
         Log.d("Approved", approved+" ");
         context = Home.context;
         this.position = position;
-        this.IssueLikes = Issue.getLiked_count();
-        getLikeandFav(Issue);
-        user_name.setText(Issue.getName());
-        user_name.setOnClickListener(v -> {
-            context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", Issue.getUserId()));
-        });
 
-        likes_count.setText(String.valueOf(Issue.getLiked_count()));
 
-        try {
-            if (Issue.getInstitute() == null) {
-                holder.institute_dept.setText(Issue.getDept());
-            } else if (Issue.getDept() == null) {
-                holder.institute_dept.setText(Issue.getInstitute());
-            } else {
-                holder.institute_dept.setText(Issue.getDept() + ", " + Issue.getInstitute());
-            }
-        }catch (Exception j){
-            holder.institute_dept.setText(Issue.getDept());
-        }
 
-        //Issue_desc.setDisplayText(Issue.getDescription());
-        stat_btn.setOnFavoriteChangeListener((buttonView, favorite) -> {
-
-            mmBottomSheetDialog.show();
-
-            final ProgressBar pbar = statsheetView.findViewById(R.id.pbar);
-            final LinearLayout main = statsheetView.findViewById(R.id.main);
-            final LinearLayout loveL = statsheetView.findViewById(R.id.love);
-            final LinearLayout saveL = statsheetView.findViewById(R.id.save);
-            final TextView smile = statsheetView.findViewById(R.id.smiles);
-            final TextView comments = statsheetView.findViewById(R.id.comments);
-            final TextView save = statsheetView.findViewById(R.id.saves);
-
-            pbar.setVisibility(View.VISIBLE);
-            main.setVisibility(View.GONE);
-            IssueDb.document(Issue.getPostId())
-                    .collection("Liked_Users")
-                    .get()
-                    .addOnSuccessListener(queryDocumentSnapshots -> {
-
-                        smile.setText(String.format(Home.context.getString(R.string.s_peopl_have_smiled_for_this_post), queryDocumentSnapshots.size()));
-                        loveL.setOnClickListener(view -> view.getContext().startActivity(new Intent(view.getContext(), WhoLikedActivity.class).putExtra("IssueId", Issue.getPostId()).putExtra("type", "Liked_Users")));
-
-                        IssueDb.document(Issue.getPostId())
-                                .collection("Saved_Users")
-                                .get()
-                                .addOnSuccessListener(queryDocumentSnapshots1 -> {
-                                    save.setText(String.format(Home.context.getString(R.string.s_peopl_have_saved_this_post), queryDocumentSnapshots1.size()));
-                                    saveL.setOnClickListener(view -> view.getContext().startActivity(new Intent(view.getContext(), WhoLikedActivity.class).putExtra("IssueId", Issue.getPostId()).putExtra("type", "Saved_Users"),  ActivityOptions.makeSceneTransitionAnimation((Activity) context).toBundle()));
-                                    pbar.setVisibility(View.GONE);
-                                    main.setVisibility(View.VISIBLE);
 
-                                })
-                                .addOnFailureListener(Throwable::printStackTrace);
+        if(issue.isAnonymous()){
+            user_name.setText("Anonymous");
+            user_image.setImageResource(R.drawable.logo_round);
+        }else{
+            user_name.setText(issue.getName());
+            user_name.setOnClickListener(v -> {
+                context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", issue.getUserId()));
+            });
 
-                        IssueDb.document(Issue.getPostId())
-                                .collection("Comments")
-                                .get()
-                                .addOnSuccessListener(queryDocumentSnapshots1 -> {
-                                    comments.setText(String.format(Home.context.getString(R.string.s_peopl_have_commented_this_post), queryDocumentSnapshots1.size()));
-                                    pbar.setVisibility(View.GONE);
-                                    main.setVisibility(View.VISIBLE);
+            Glide.with(Home.context)
+                    .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.placeholder))
+                    .load(issue.getUserimage())
+                    .into(holder.user_image);
+        }
 
-                                })
-                                .addOnFailureListener(Throwable::printStackTrace);
 
-                    })
-                    .addOnFailureListener(Throwable::printStackTrace);
 
-        });
-        Glide.with(Home.context)
-                .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.placeholder))
-                .load(Issue.getUserimage())
-                .into(holder.user_image);
 
-        String timeAgo = TimeAgo.using(Long.parseLong(Issue.getTimestamp()));
+        try {
+            if (issue.getInstitute() == null) {
+                holder.institute_dept.setText(issue.getDept());
+            } else if (issue.getDept() == null) {
+                holder.institute_dept.setText(issue.getInstitute());
+            } else {
+                holder.institute_dept.setText(issue.getDept());
+            }
+        }catch (Exception j){
+            holder.institute_dept.setText(issue.getDept());
+        }
+
+
+        String timeAgo = TimeAgo.using(Long.parseLong(issue.getTimestamp()));
         timestamp.setText(timeAgo);
         try {
-            String descc = Issue.getDescription();
+            String descc = issue.getDescription();
             Issue_desc.setDisplayText((descc.length() > 597) ? descc.substring(0, 600) + "..." : descc);
             if(descc.contains("video_loading_bg.svg")){
                 Issue_desc.setDisplayText((descc.length() > 1497) ? descc.substring(0, 1500) + "..." : descc);
             }
-            if (Issue.getImage_count() == 0) {
+            if (issue.getImage_count() == 0) {
                 pager_layout.setVisibility(View.GONE);
-            }  else if (Issue.getImage_count() == 1) {
+            }  else if (issue.getImage_count() == 1) {
                 pager_layout.setVisibility(View.VISIBLE);
                 ArrayList<MultipleImage> multipleImages = new ArrayList<>();
-                PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, activity, multipleImages, false, Issue.getPostId(), like_btn, Issue.getUserId(), approved);
-                setUrls(multipleImages, photosAdapter, Issue);
+                PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, activity, multipleImages, false, issue.getPostId(), null, issue.getUserId(), approved);
+                setUrls(multipleImages, photosAdapter, issue);
                 pager.setAdapter(photosAdapter);
                 indicator_holder.setVisibility(View.GONE);
                 photosAdapter.notifyDataSetChanged();
@@ -290,8 +182,8 @@ public void bind(Issue Issue, final IssueViewHolder holder, int position, Bottom
                 Issue_desc.setVisibility(View.VISIBLE);
             } else {
                 ArrayList<MultipleImage> multipleImages = new ArrayList<>();
-                PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, activity, multipleImages, false, Issue.getPostId(), like_btn, Issue.getUserId(), approved);
-                setUrls(multipleImages, photosAdapter, Issue);
+                PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, activity, multipleImages, false, issue.getPostId(), null, issue.getUserId(), approved);
+                setUrls(multipleImages, photosAdapter, issue);
 
                 pager.setAdapter(photosAdapter);
                 photosAdapter.notifyDataSetChanged();
@@ -322,21 +214,21 @@ public void run() {
 
         }
         try {
-            setupViews(Issue);
+            setupViews(issue);
         } catch (Exception ignored) {
         }
         menu.setOnClickListener(view -> {
-            FragmentManager fragmentManager = ((FragmentActivity) context).getSupportFragmentManager();
-            new PostMenu(Issue.getPostId(), Issue.getName()).show(fragmentManager, "");
+           // FragmentManager fragmentManager = ((FragmentActivity) context).getSupportFragmentManager();
+           // new PostMenu(issue.getPostId(), issue.getName()).show(fragmentManager, "");
 
         });
 
-        if (Issue.getUserId().equals(mCurrentUser.getUid()) || ADMIN_UID_LIST.contains(mCurrentUser.getUid())) {
+        if (issue.getUserId().equals(mCurrentUser.getUid()) || ADMIN_UID_LIST.contains(mCurrentUser.getUid())) {
             isOwner = true;
             delete.setVisibility(View.VISIBLE);
             delete.setOnClickListener(v -> new MaterialDialog.Builder(Home.context)
-                    .title("Delete Issue")
-                    .content("Are you sure do you want to delete this Issue?")
+                    .title("Delete issue")
+                    .content("Are you sure do you want to delete this issue?")
                     .positiveText("Yes")
                     .negativeText("No")
                     .onPositive((dialog, which) -> {
@@ -350,89 +242,89 @@ public void run() {
 
                         dialog.dismiss();
                         IssueDb
-                                .document(Issue.getPostId())
+                                .document(issue.getPostId())
                                 .delete()
                                 .addOnSuccessListener(aVoid -> {
 
 
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_0())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_0())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_0());
+                                                .getReferenceFromUrl(issue.getImage_url_0());
                                         img.delete().addOnSuccessListener(aVoid1 ->
                                         {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
                                     pdialog.show();
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_1())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_1())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_1());
+                                                .getReferenceFromUrl(issue.getImage_url_1());
                                         img.delete().addOnSuccessListener(aVoid12 -> {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
                                     pdialog.show();
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_2())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_2())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_2());
+                                                .getReferenceFromUrl(issue.getImage_url_2());
                                         img.delete().addOnSuccessListener(aVoid13 -> {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
                                     pdialog.show();
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_3())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_3())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_3());
+                                                .getReferenceFromUrl(issue.getImage_url_3());
                                         img.delete().addOnSuccessListener(aVoid14 -> {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
                                     pdialog.show();
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_4())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_4())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_4());
+                                                .getReferenceFromUrl(issue.getImage_url_4());
                                         img.delete().addOnSuccessListener(aVoid15 -> {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
                                     pdialog.show();
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_5())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_5())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_5());
+                                                .getReferenceFromUrl(issue.getImage_url_5());
                                         img.delete().addOnSuccessListener(aVoid16 -> {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
                                     pdialog.show();
-                                    if (!TextUtils.isEmpty(Issue.getImage_url_6())) {
+                                    if (!TextUtils.isEmpty(issue.getImage_url_6())) {
                                         StorageReference img = FirebaseStorage.getInstance()
-                                                .getReferenceFromUrl(Issue.getImage_url_6());
+                                                .getReferenceFromUrl(issue.getImage_url_6());
                                         img.delete().addOnSuccessListener(aVoid17 -> {
                                             pdialog.dismiss();
-                                            Log.i("Issue Image", "deleted");
+                                            Log.i("issue Image", "deleted");
                                         })
-                                                .addOnFailureListener(e -> Log.e("Issue Image", e.getLocalizedMessage()));
+                                                .addOnFailureListener(e -> Log.e("issue Image", e.getLocalizedMessage()));
                                     }
 
-                                    Toasty.success(context, "Issue deleted", Toasty.LENGTH_SHORT, true).show();
+                                    Toasty.success(context, "issue deleted", Toasty.LENGTH_SHORT, true).show();
 
                                     pdialog.dismiss();
 
@@ -451,85 +343,92 @@ public void run() {
             holder.delete.setVisibility(View.GONE);
         }
         try {
-            mFirestore.collection("Users")
-                    .document(Issue.getUserId())
-                    .get()
-                    .addOnSuccessListener(documentSnapshot -> {
-                        try {
-                            if (!documentSnapshot.getString("image").equals(Issue.getUserimage())) {
-                                Map<String, Object> IssueMap = new HashMap<>();
-                                IssueMap.put("name", documentSnapshot.getString("name"));
-                                IssueMap.put("userimage", documentSnapshot.getString("image"));
-
-                                IssueDb.document(Issue.getPostId())
-                                        .update(IssueMap)
-                                        .addOnSuccessListener(aVoid -> Log.i("Issue_update", "success"))
-                                        .addOnFailureListener(e -> Log.i("Issue_update", "failure"));
-
-                                user_name.setText(documentSnapshot.getString("name"));
-
-                                Glide.with(Home.context)
-                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                                        .load(documentSnapshot.getString("image"))
-                                        .into(user_image);
-                            } else if (!Objects.equals(documentSnapshot.getString("userId"), Issue.getUserId())) {
-                                Map<String, Object> IssueMap = new HashMap<>();
-                                IssueMap.put("name", documentSnapshot.getString("name"));
-                                IssueDb.document(Issue.getPostId())
-                                        .update(IssueMap)
-                                        .addOnSuccessListener(aVoid -> Log.i("Issue_update", "success"))
-                                        .addOnFailureListener(e -> Log.i("Issue_update", "failure"));
-
-                                user_name.setText(documentSnapshot.getString("name"));
-
-                            } else if (!Objects.equals(documentSnapshot.getString("image"), Issue.getUserimage())) {
-
-                                Map<String, Object> IssueMap = new HashMap<>();
-                                IssueMap.put("userimage", documentSnapshot.getString("image"));
-
-                                IssueDb.document(Issue.getPostId())
-                                        .update(IssueMap)
-                                        .addOnSuccessListener(aVoid -> Log.i("Issue_update", "success"))
-                                        .addOnFailureListener(e -> Log.i("Issue_update", "failure"));
-
-                                Glide.with(Home.context)
-                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                                        .load(documentSnapshot.getString("image"))
-                                        .into(user_image);
-
-                            }
-
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    })
-                    .addOnFailureListener(e -> Log.e("Error", e.getMessage()));
+           if(issue.isAnonymous()){
+                user_name.setText("Anonymous from "+issue.getAddress());
+                user_image.setImageResource(R.drawable.logo_round);
+           }else{
+               mFirestore.collection("Users")
+                       .document(issue.getUserId())
+                       .get()
+                       .addOnSuccessListener(documentSnapshot -> {
+                           try {
+                               if (!documentSnapshot.getString("image").equals(issue.getUserimage())) {
+                                   Map<String, Object> IssueMap = new HashMap<>();
+                                   IssueMap.put("name", documentSnapshot.getString("name"));
+                                   IssueMap.put("userimage", documentSnapshot.getString("image"));
+
+                                   IssueDb.document(issue.getPostId())
+                                           .update(IssueMap)
+                                           .addOnSuccessListener(aVoid -> Log.i("Issue_update", "success"))
+                                           .addOnFailureListener(e -> Log.i("Issue_update", "failure"));
+
+                                   user_name.setText(documentSnapshot.getString("name"));
+
+                                   Glide.with(Home.context)
+                                           .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
+                                           .load(documentSnapshot.getString("image"))
+                                           .into(user_image);
+                               } else if (!Objects.equals(documentSnapshot.getString("userId"), issue.getUserId())) {
+                                   Map<String, Object> IssueMap = new HashMap<>();
+                                   IssueMap.put("name", documentSnapshot.getString("name"));
+                                   IssueDb.document(issue.getPostId())
+                                           .update(IssueMap)
+                                           .addOnSuccessListener(aVoid -> Log.i("Issue_update", "success"))
+                                           .addOnFailureListener(e -> Log.i("Issue_update", "failure"));
+
+                                   user_name.setText(documentSnapshot.getString("name"));
+
+                               } else if (!Objects.equals(documentSnapshot.getString("image"), issue.getUserimage())) {
+
+                                   Map<String, Object> IssueMap = new HashMap<>();
+                                   IssueMap.put("userimage", documentSnapshot.getString("image"));
+
+                                   IssueDb.document(issue.getPostId())
+                                           .update(IssueMap)
+                                           .addOnSuccessListener(aVoid -> Log.i("Issue_update", "success"))
+                                           .addOnFailureListener(e -> Log.i("Issue_update", "failure"));
+
+                                   Glide.with(Home.context)
+                                           .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
+                                           .load(documentSnapshot.getString("image"))
+                                           .into(user_image);
+
+                               }
+
+                           } catch (Exception e) {
+                               e.printStackTrace();
+                           }
+                       })
+                       .addOnFailureListener(e -> Log.e("Error", e.getMessage()));
+           }
         } catch (Exception ex) {
             Log.w("error", "fastscrolled", ex);
         }
 
-        see_more.setOnClickListener(view -> context.startActivity(new Intent(Home.context, CommentsActivity.class).putExtra("Issue", Issue).putExtra("owner", isOwner).putExtra("approveStatus", approved).putExtra("alreadyLiked", alreadyLiked) , ActivityOptions.makeSceneTransitionAnimation((Activity) context).toBundle()));
 
-        holder.itemView.setOnClickListener(view -> context.startActivity(new Intent(Home.context, CommentsActivity.class).putExtra("Issue", Issue).putExtra("owner", isOwner).putExtra("approveStatus", approved).putExtra("alreadyLiked", alreadyLiked) , ActivityOptions.makeSceneTransitionAnimation((Activity) context).toBundle()));
+        holder.itemView.setOnClickListener(view -> context.startActivity(new Intent(Home.context, IssuesDetailsActivity.class).putExtra("issue", issue).putExtra("owner", isOwner).putExtra("approveStatus", approved).putExtra("alreadyLiked", alreadyLiked) , ActivityOptions.makeSceneTransitionAnimation((Activity) context).toBundle()));
 
     }
 
     @SuppressLint("SetTextI18n")
     private void setupViews(Issue Issue) {
 
-        try {
-            getLikeandFav(Issue);
-        } catch (NullPointerException ignored) {
 
-        }
-        user_name.setText(Issue.getName());
+       if(Issue.isAnonymous()) {
+           user_name.setText("Anonymous from "+Issue.getAddress());
+           user_image.setImageResource(R.drawable.logo_round);
+       }else{
+           Glide.with(Home.context)
+                   .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.placeholder))
+                   .load(Issue.getUserimage())
+                   .into(user_image);
+
+           user_name.setText(Issue.getName());
+       }
+
+        institute_dept.setText(Issue.getTag() + " at " + Issue.getInstitute() );
 
-        institute_dept.setText(Issue.getDept() + ", " + Issue.getInstitute());
 
-        Glide.with(Home.context)
-                .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.placeholder))
-                .load(Issue.getUserimage())
-                .into(user_image);
         String timeAgo = TimeAgo.using(Long.parseLong(Issue.getTimestamp()));
         timestamp.setText(timeAgo);
     }
@@ -610,52 +509,7 @@ private void addToNotification(String admin_id, Notification notification) {
         }
     }
 
-    private void getLikeandFav(Issue Issue) {
-        try {
-            IssueDb.document(Issue.getPostId())
-                    .collection("Liked_Users")
-                    .document(userId)
-                    .get()
-                    .addOnSuccessListener(documentSnapshot -> {
-                        try {
-                            if (documentSnapshot.exists()) {
-                                alreadyLiked = true;
-                                like_btn.setFavorite(true, false);
-                            }
-                        }catch (Exception ignored){
-                            
-                        }
-                        like_btn.setOnFavoriteChangeListener((buttonView, favorite) -> {
-                            Issue.setLike_count(updateLike(Issue.getPostId(), Issue.getUserId()));
-                        });
-                    })
-                    .addOnFailureListener(e -> Log.e("Error Like", e.getMessage()));
-        } catch (NullPointerException ignored) {
-
-        }
-
-        try {
-            IssueDb.document(Issue.getPostId())
-                    .collection("Saved_Users")
-                    .document(mCurrentUser.getUid())
-                    .get()
-                    .addOnSuccessListener(documentSnapshot -> {
-
-                        if (documentSnapshot.exists()) {
-                            boolean fav = documentSnapshot.getBoolean("Saved");
-
-                            sav_button.setFavorite(fav, false);
-                        } else {
-                            Log.e("Fav", "No document found");
 
-                        }
-
-                    })
-                    .addOnFailureListener(e -> Log.e("Error Fav", e.getMessage()));
-        } catch (NullPointerException ignored) {
-        }
-
-    }
 
     private static class SendNotificationAsyncTask extends AsyncTask<Void, Void, Void> {
         final APIService apiService;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/NotificationsAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/NotificationsAdapter.java
index 1f8242d..739c7fd 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/NotificationsAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/NotificationsAdapter.java
@@ -26,10 +26,9 @@
 
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.models.Notification;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.issue.SingleIssueView;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 import com.quantum_guys.dncc_eco_sync.ui.activities.post.SinglePostView;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.QuizBattle;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.ResultActivity;
 
 import java.util.HashMap;
 import java.util.List;
@@ -133,17 +132,14 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
                 case "post":
                     context.startActivity(new Intent(context, SinglePostView.class).putExtra("post_id", notification.getAction_id()));
                     break;
+                case "issue":
+                    context.startActivity(new Intent(context, SingleIssueView.class).putExtra("post_id", notification.getAction_id()));
+                    break;
                 case "friend_req":
                 case "accept_friend_req":
                     FriendProfile.startActivity(context, notification.getAction_id());
                     break;
-                case "play":
-                    context.startActivity(new Intent(context, QuizBattle.class).putExtra("battleId", notification.getAction_id()),  ActivityOptions.makeSceneTransitionAnimation((Activity)context).toBundle());
-                    break;
-                case "play_result":
-                    //ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation((Activity) context, holder.image, "thumbnailTransition");
-                    context.startActivity(new Intent(context, ResultActivity.class).putExtra("resultId", notification.getAction_id()),  ActivityOptions.makeSceneTransitionAnimation((Activity)context).toBundle());
-                    break;
+
             }
             if(!notification.isRead()){
                 notification.setRead(true);
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PlayerAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PlayerAdapter.java
index 303c002..feac6a5 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PlayerAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PlayerAdapter.java
@@ -2,7 +2,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,10 +13,8 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.models.Player;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SelectTopic;
 
 import java.util.List;
 
@@ -78,11 +75,11 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
                 .load(users.getImage())
                 .into(holder.image);
         final String userid = users.getId();
-        holder.mView.setOnClickListener(view -> {
-            Intent goBattle = new Intent(context, SelectTopic.class);
-            goBattle.putExtra("otherUid", userid);
-            context.startActivity(goBattle);
-        });
+//        holder.mView.setOnClickListener(view -> {
+//            Intent goBattle = new Intent(context, SelectTopic.class);
+//            goBattle.putExtra("otherUid", userid);
+//            context.startActivity(goBattle);
+//        });
     }
 
     @Override
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PostViewHolder.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PostViewHolder.java
index 1914507..ae4d842 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PostViewHolder.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/PostViewHolder.java
@@ -1,5 +1,6 @@
 package com.quantum_guys.dncc_eco_sync.adapters;
 
+import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.ADMIN_UID_LIST;
 import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;
 
 import android.annotation.SuppressLint;
@@ -47,8 +48,6 @@
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.storage.FirebaseStorage;
 import com.google.firebase.storage.StorageReference;
-import com.tbuonomo.viewpagerdotsindicator.DotsIndicator;
-
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.models.MultipleImage;
 import com.quantum_guys.dncc_eco_sync.models.Notification;
@@ -57,7 +56,7 @@
 import com.quantum_guys.dncc_eco_sync.notification.Client;
 import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
 import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 import com.quantum_guys.dncc_eco_sync.ui.activities.post.CommentsActivity;
 import com.quantum_guys.dncc_eco_sync.ui.activities.post.WhoLikedActivity;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.Home;
@@ -65,12 +64,12 @@
 import com.quantum_guys.dncc_eco_sync.utils.MathView;
 import com.quantum_guys.dncc_eco_sync.viewmodel.PostViewModel;
 import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
+import com.tbuonomo.viewpagerdotsindicator.DotsIndicator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -91,9 +90,7 @@ public class PostViewHolder extends RecyclerView.ViewHolder {
     CollectionReference postDb = FirebaseFirestore.getInstance().collection("Posts");
     private final MathView post_desc;
     @SuppressLint("NewApi")
-    private final Set<String> ADMIN_UID_LIST = Set.of(
-            "0h9MvJiFvFWRBiOoHzUcGlqJe2m2", "eSW24hxmW6YmbaInd2OlrsWx0Rw1"
-    );
+
     private final MaterialFavoriteButton sav_button;
     private final MaterialFavoriteButton like_btn;
     private final MaterialFavoriteButton stat_btn;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/ResultAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/ResultAdapter.java
deleted file mode 100644
index 058a556..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/ResultAdapter.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.adapters;

import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;

import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ActivityOptions;
import android.content.Context;
import android.content.Intent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.RecyclerView;

import com.afollestad.materialdialogs.MaterialDialog;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.github.marlonlom.utilities.timeago.TimeAgo;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.firestore.FirebaseFirestore;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.QuizBattle;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Result;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.ResultActivity;
import com.quantum_guys.dncc_eco_sync.viewmodel.BattleViewModel;
import com.quantum_guys.dncc_eco_sync.viewmodel.ResultViewModel;
import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;

import java.util.List;
import java.util.Objects;

import de.hdodenhof.circleimageview.CircleImageView;
import es.dmoral.toasty.Toasty;

public class ResultAdapter extends RecyclerView.Adapter<ResultAdapter.MyViewHolder> {

    public static final int JUST_STARTED = -1;
    public static final int OFFLINE_STARTED = -2;
    public static final int JUST_IN = -3;
    public static final int IN_STARTED = -4;
    public static final int COMPLETED = -5;
    private final List<Result> results;
    private final Context context;
    boolean visitor = false;
    int lastPosition = -1;
    boolean canDelete = false;

    public ResultAdapter(List<Result> results, Context context, boolean visitor) {
        this.results = results;
        this.context = context;
        this.visitor = visitor;
    }

    @NonNull
    @Override
    public MyViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_result, viewGroup, false);
        return new MyViewHolder(view);
    }

    @SuppressLint({"SetTextI18n", "UseCompatLoadingForColorStateLists"})
    @Override
    public void onBindViewHolder(@NonNull MyViewHolder holder, int i) {

        Animation animation = AnimationUtils.loadAnimation(context,
                (i > lastPosition) ? R.anim.up_from_bottom
                        : R.anim.down_from_top);
        holder.itemView.startAnimation(animation);
        lastPosition = i;
        //int lastPosition = -1;
        //my - sender
        //other - receiver
        boolean play = false;
        boolean result = false;
        boolean offline = false;

        Result model = results.get(i);
        setUserData(holder.myImg, holder.myName, holder.thisLevel, userId, true);
        String timeAgo = TimeAgo.using(Long.parseLong(model.getTimestamp()));
        if (model.getAction() == JUST_STARTED) {
            result = true;
            holder.linearLayout.setBackgroundTintList(context.getResources().getColorStateList(R.color.your_invites));
            holder.mySc.setText(String.valueOf(model.getMyScore()));
            holder.infoTv.setText("You challenged in " + model.getTopic() + " " + timeAgo);
            holder.othSc.setText("-");
            setUserData(holder.otherImg, holder.otherName, holder.otherLevel, model.getOtherUid(), false);
        } else if (model.getAction() == OFFLINE_STARTED) {
            play = true;
            offline = true;
            holder.linearLayout.setBackgroundTintList(context.getResources().getColorStateList(R.color.pending));
            holder.mySc.setText(String.valueOf(model.getMyScore()));
            holder.infoTv.setText("You started a match in " + model.getTopic() + " " + timeAgo);
            holder.othSc.setText("-");
            setUserData(holder.otherImg, holder.otherName, holder.otherLevel, model.getOtherUid(), false);
        } else if (model.getAction() == COMPLETED) {
            result = true;
            holder.linearLayout.setBackgroundTintList(context.getResources().getColorStateList(R.color.completed));
            holder.mySc.setText(String.valueOf(model.getMyScore()));
            holder.infoTv.setText("Completed a match in " + model.getTopic() + " " + timeAgo);
            holder.othSc.setText(String.valueOf(model.getOtherScore()));
            setUserData(holder.otherImg, holder.otherName, holder.otherLevel, model.getOtherUid(), false);
        } else if (model.getAction() == JUST_IN) {
            play = true;
            holder.linearLayout.setBackgroundTintList(context.getResources().getColorStateList(R.color.invite));
            holder.othSc.setText("?");
            holder.infoTv.setText("Invited you in " + model.getTopic() + " " + timeAgo);
            holder.mySc.setText("-");
            setUserData(holder.otherImg, holder.otherName, holder.otherLevel, model.getOtherUid(), false);
        } else if (model.getAction() == IN_STARTED) {
            play = true;
            offline = true;
            holder.linearLayout.setBackgroundTintList(context.getResources().getColorStateList(R.color.my_pending));
            holder.othSc.setText("?");
            holder.infoTv.setText("Accepted but not Completed " + model.getTopic() + " " + timeAgo);
            holder.mySc.setText(String.valueOf(model.getMyScore()));
            setUserData(holder.otherImg, holder.otherName, holder.otherLevel, model.getMyUid(), false);
        }


        holder.itemView.setOnLongClickListener(view -> {
            ResultViewModel resultViewModel = ViewModelProviders.of((FragmentActivity) context).get(ResultViewModel.class);
            BattleViewModel battleVM = ViewModelProviders.of((FragmentActivity) context).get(BattleViewModel.class);
            new MaterialDialog.Builder(context)
                    .title("Clear this Result")
                    .content("Are you sure do you want to delete this Result?")
                    .positiveText("Yes")
                    .negativeText("No")
                    .onPositive((dialog, which) -> {
                                if (System.currentTimeMillis() - Long.parseLong(model.getTimestamp()) >= 86400000) {
                                    canDelete = true;
                                }
                                if (model.getAction() == COMPLETED || model.getAction() == OFFLINE_STARTED || canDelete) {
                                    FirebaseDatabase.getInstance().getReference().child("Result").child(userId).child(model.getBattleId()).removeValue().addOnCompleteListener(task -> {
                                        resultViewModel.delete(model);
                                        battleVM.delete(model.getBattleId());
                                        Toasty.success(context, "Deleted", Toast.LENGTH_SHORT).show();
                                        notifyDataSetChanged();
                                    });
                                } else {
                                    Toasty.error(context, "You can't delete it right now. Complete the battle first. Or wait at least 24h to get delete access.", Toast.LENGTH_SHORT).show();
                                }
                            }
                    )
                    .show();


            return false;
        });



        boolean finalResult = result;
        boolean finalOffline = offline;
        boolean finalPlay = play;
        holder.itemView.setOnClickListener(view -> {
            if (finalPlay && finalOffline) {
                Intent intent = new Intent(context, QuizBattle.class);
                intent.putExtra("ofo", model.getBattleId());
                context.startActivity(intent,  ActivityOptions.makeSceneTransitionAnimation((Activity)context).toBundle());
            } else if (finalResult) {
                Intent intent = new Intent(context, ResultActivity.class);
                intent.putExtra("resultId", model.getBattleId());
                context.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation((Activity)context).toBundle());
            } else if (finalPlay) {
                Intent intent = new Intent(context, QuizBattle.class);
                intent.putExtra("battleId", model.getBattleId());
                context.startActivity(intent,  ActivityOptions.makeSceneTransitionAnimation((Activity)context).toBundle());
            }
        });
    }

    @Override
    public int getItemCount() {
        return results.size();
    }


    private void setUserData(ImageView proPic, TextView name, TextView level, String uid, boolean me) {
        try {
            if (me) {
                UserViewModel userViewModel = ViewModelProviders.of((FragmentActivity) context).get(UserViewModel.class);
                userViewModel.user.observe((LifecycleOwner) context, me1 -> {
                    name.setText(me1.getUsername());
                    level.setText(String.valueOf(getLevelNum((int) me1.getScore())));
                    Glide.with(context)
                            .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                            .load(me1.getImage())
                            .into(proPic);
                });
            } else {
                FirebaseFirestore.getInstance().collection("Users")
                        .document(uid)
                        .get()
                        .addOnSuccessListener(documentSnapshot -> {
                            try {
                                level.setText(String.valueOf(getLevelNum(Objects.requireNonNull(documentSnapshot.getLong("score")).intValue())));
                                name.setText(documentSnapshot.getString("username"));
                            } catch (Exception ignored) {

                            }
                            Glide.with(context)
                                    .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                                    .load(documentSnapshot.getString("image"))
                                    .into(proPic);
                        });
            }
        } catch (NullPointerException ignored) {

        }
    }

    public int getLevelNum(int score) {
        final int level;
        if (score <= 500) {
            level = 1;
        } else if (score <= 1000) {
            level = 2;
        } else if (score <= 1500) {
            level = 3;
        } else if (score <= 2000) {
            level = 4;
        } else if (score <= 2500) {
            level = 5;
        } else if (score <= 3500) {
            level = 6;
        } else if (score <= 5000) {
            level = 7;
        } else {
            level = -1;
        }
        return level;
    }

    public static class MyViewHolder extends RecyclerView.ViewHolder {
        public final View mView;
        public final CircleImageView myImg;
        public final CircleImageView otherImg;
        public final TextView myName;
        public final TextView otherName;
        public final TextView infoTv;
        public final TextView mySc;
        public final TextView othSc;
        public final TextView thisLevel;
        public final TextView otherLevel;
        final ConstraintLayout linearLayout;

        public MyViewHolder(View itemView) {
            super(itemView);
            mView = itemView;
            myImg = mView.findViewById(R.id.thisUserImage);
            otherImg = mView.findViewById(R.id.otherUserImage);
            thisLevel = mView.findViewById(R.id.ThislevelTv);
            otherLevel = mView.findViewById(R.id.otherlevelTv);
            myName = mView.findViewById(R.id.thisUserName);
            otherName = mView.findViewById(R.id.otherUserName);
            infoTv = mView.findViewById(R.id.ivz);
            mySc = mView.findViewById(R.id.myScore);
            othSc = mView.findViewById(R.id.otherScore);
            linearLayout = mView.findViewById(R.id.linearLayout4);
        }
    }
    /*
     *  -1 -> JUST_STARTED -> Result
     *  -2 -> OFFLINE_STARTED -> Play
     *  -3 -> JUST_IN -> Play
     *  -4 -> IN_STARTED -> Play
     *  -5 -5 COMPLETED -> Result
     * */


}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/SubTopicAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/SubTopicAdapter.java
deleted file mode 100644
index 41d3835..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/SubTopicAdapter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.adapters;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.ActivityOptions;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.chip.Chip;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.models.SubTopicModel;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.QuizBattle;
-
-import java.util.List;
-
-public class SubTopicAdapter extends RecyclerView.Adapter<SubTopicAdapter.MyViewHolder> {
-
-    private final List<SubTopicModel> subTopicNameList;
-    private final String otherUid;
-    private final String type;
-    final Context context;
-    final String topic;
-    int lastPosition = -1;
-
-    public SubTopicAdapter(List<SubTopicModel> subTopicNameList, String topic, Context context, String otherUid, String type) {
-        this.subTopicNameList = subTopicNameList;
-        this.topic = topic;
-        this.otherUid = otherUid;
-        this.context = context;
-        this.type = type;
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_topic, viewGroup, false);
-        return new MyViewHolder(view);
-
-    }
-
-    @Override
-    public void onBindViewHolder(MyViewHolder viewHolder, @SuppressLint("RecyclerView") int i) {
-        Animation animation = AnimationUtils.loadAnimation(context,
-                (i > lastPosition) ? R.anim.up_from_bottom
-                        : R.anim.down_from_top);
-        viewHolder.itemView.startAnimation(animation);
-        lastPosition = i;
-        // int lastPosition = -1;
-        viewHolder.nameTV.setText(subTopicNameList.get(i).name);
-        viewHolder.itemView.setOnClickListener(v -> {
-            ViewDialog alert = new ViewDialog();
-            alert.showDialog((Activity) context, topic, subTopicNameList.get(i).id, otherUid, type);
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return subTopicNameList.size();
-    }
-
-
-    public static class MyViewHolder extends RecyclerView.ViewHolder {
-        final TextView nameTV;
-
-        public MyViewHolder(View itemView) {
-            super(itemView);
-            nameTV = itemView.findViewById(R.id.textView);
-        }
-    }
-
-    public static class ViewDialog {
-
-        public void showDialog(Activity activity, String topic, String subTopic, String otherUid, String type) {
-            final Dialog dialog = new Dialog(activity);
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-            dialog.setCancelable(true);
-            dialog.setContentView(R.layout.dialouge_select_question_count);
-
-            TextView text = dialog.findViewById(R.id.textView7);
-            Chip chip10 = dialog.findViewById(R.id.ten);
-            chip10.setOnClickListener(v -> {
-                Intent intent = new Intent(v.getContext(), QuizBattle.class);
-                intent.putExtra("topic", topic);
-                intent.putExtra("type", type);
-                intent.putExtra("subtopic", subTopic);
-                intent.putExtra("otherUid", otherUid);
-                intent.putExtra("question_number", 10);
-                v.getContext().startActivity(intent,  ActivityOptions.makeSceneTransitionAnimation(activity).toBundle());
-                dialog.dismiss();
-            });
-            Chip chip5 = dialog.findViewById(R.id.five);
-            chip5.setOnClickListener(v -> {
-                Intent intent = new Intent(v.getContext(), QuizBattle.class);
-                intent.putExtra("topic", topic);
-                intent.putExtra("type", type);
-                intent.putExtra("subtopic", subTopic);
-                intent.putExtra("otherUid", otherUid);
-                intent.putExtra("question_number", 5);
-                v.getContext().startActivity(intent, ActivityOptions.makeSceneTransitionAnimation((activity)).toBundle());
-                dialog.dismiss();
-            });
-
-            dialog.show();
-
-        }
-    }
-
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TopicAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TopicAdapter.java
deleted file mode 100644
index a1ac2ac..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TopicAdapter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.adapters;
-
-import android.app.Activity;
-import android.app.ActivityOptions;
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SubTopic;
-
-import java.util.List;
-
-public class TopicAdapter extends RecyclerView.Adapter<TopicAdapter.MyViewHolder> {
-
-    private final List<String> topicNameList;
-    private final String otherUid;
-    private final String type;
-    final Context context;
-    int lastPosition = -1;
-
-    public TopicAdapter(List<String> topicNameList, Context context, String otherUid, String type) {
-        this.topicNameList = topicNameList;
-        this.otherUid = otherUid;
-        this.type = type;
-        this.context = context;
-    }
-
-    @NonNull
-    @Override
-    public MyViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_topic, viewGroup, false);
-        return new MyViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(MyViewHolder viewHolder, int i) {
-        Animation animation = AnimationUtils.loadAnimation(context,
-                (i > lastPosition) ? R.anim.up_from_bottom
-                        : R.anim.down_from_top);
-        viewHolder.itemView.startAnimation(animation);
-        lastPosition = i;
-        // int lastPosition = -1;
-
-        viewHolder.nameTV.setText(topicNameList.get(i));
-        viewHolder.itemView.setOnClickListener(v -> {
-            Intent intent = new Intent(context, SubTopic.class);
-            intent.putExtra("topic", topicNameList.get(i));
-            intent.putExtra("otherUid", otherUid);
-            intent.putExtra("type", type);
-            context.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation((Activity) context).toBundle());
-        });
-
-
-    }
-
-    @Override
-    public int getItemCount() {
-        return topicNameList.size();
-    }
-
-
-    public static class MyViewHolder extends RecyclerView.ViewHolder {
-        final TextView nameTV;
-
-        public MyViewHolder(View itemView) {
-            super(itemView);
-            nameTV = itemView.findViewById(R.id.textView);
-        }
-    }
-
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TripAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TripAdapter.java
index 51458f1..7c34296 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TripAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/TripAdapter.java
@@ -1 +1 @@
-package com.quantum_guys.dncc_eco_sync.adapters;

import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.recyclerview.widget.RecyclerView;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Trip;
import com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity;
import com.quantum_guys.dncc_eco_sync.ui.activities.MapView;

import java.util.List;

public class TripAdapter extends RecyclerView.Adapter<TripAdapter.ViewHolder> {
    private static final String TAG = "AddStationAdapter";
    Activity context;
    List<Trip> tripList;
    ProgressDialog progressDialog;


    public TripAdapter(Activity context, List<Trip> t) {
        this.context = context;
        this.tripList = t;
    }

    @NonNull
    @Override
    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
        View view = LayoutInflater.from(context).inflate(R.layout.item_trip, parent, false);
        return new ViewHolder(view);
    }

    @Override
    public long getItemId(int position) {
        return position;
    }

    @Override
    public int getItemViewType(int position) {
        return position;
    }

    @RequiresApi(api = Build.VERSION_CODES.R)
    @SuppressLint("SetTextI18n")
    @Override
    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
        Trip trip = tripList.get(position);
        holder.name.setText(trip.getVehicleRegNo());
        holder.amount.setText("৳" + trip.getTotalAmount());
        holder.licenceNo.setText("Vehicle: " + trip.getVehicleRegNo());
        holder.time.setText(trip.getStartTime());

        if (!trip.isCompleted()) holder.active.setVisibility(View.VISIBLE);

        try {
            holder.lastStation.setText("Last STS: " + trip.getLastStsName());
        } catch (Exception d) {
            holder.lastStation.setText("Nothing to Show");
        }
        holder.itemView.setOnClickListener(view -> {
            progressDialog.show();
            if (!trip.isCompleted()) {
                context.startActivity(new Intent(context, MapView.class)
                        .putExtra("trip", trip));
            } else {
                context.startActivity(new Intent(context, MainActivity.class)
                        .putExtra("trip", trip));

            }
        });
    }

    @Override
    public int getItemCount() {
        return tripList.size();
    }


    public static class ViewHolder extends RecyclerView.ViewHolder {
        TextView name, amount, lastStation, time, licenceNo;
        LinearLayout active;

        public ViewHolder(View itemView) {
            super(itemView);
            name = itemView.findViewById(R.id.textView54);
            lastStation = itemView.findViewById(R.id.textView314);
            amount = itemView.findViewById(R.id.textView334);
            time = itemView.findViewById(R.id.textView324);
            active = itemView.findViewById(R.id.dds4);
            licenceNo = itemView.findViewById(R.id.textView684);
        }
    }
}
\ No newline at end of file
+package com.quantum_guys.dncc_eco_sync.adapters;

import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.recyclerview.widget.RecyclerView;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Trip;
import com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity;
import com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts.MapView;

import java.util.List;

public class TripAdapter extends RecyclerView.Adapter<TripAdapter.ViewHolder> {
    private static final String TAG = "AddStationAdapter";
    Activity context;
    List<Trip> tripList;
    ProgressDialog progressDialog;


    public TripAdapter(Activity context, List<Trip> t) {
        this.context = context;
        this.tripList = t;
    }

    @NonNull
    @Override
    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
        View view = LayoutInflater.from(context).inflate(R.layout.item_trip, parent, false);
        return new ViewHolder(view);
    }

    @Override
    public long getItemId(int position) {
        return position;
    }

    @Override
    public int getItemViewType(int position) {
        return position;
    }

    @RequiresApi(api = Build.VERSION_CODES.R)
    @SuppressLint("SetTextI18n")
    @Override
    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
        Trip trip = tripList.get(position);
        holder.name.setText(trip.getVehicleRegNo());
        holder.amount.setText("৳" + trip.getTotalAmount());
        holder.licenceNo.setText("Vehicle: " + trip.getVehicleRegNo());
        holder.time.setText(trip.getStartTime());

        if (!trip.isCompleted()) holder.active.setVisibility(View.VISIBLE);

        try {
            holder.lastStation.setText("Last STS: " + trip.getLastStsName());
        } catch (Exception d) {
            holder.lastStation.setText("Nothing to Show");
        }
        holder.itemView.setOnClickListener(view -> {
            progressDialog.show();
            if (!trip.isCompleted()) {
                context.startActivity(new Intent(context, MapView.class)
                        .putExtra("trip", trip));
            } else {
                context.startActivity(new Intent(context, MainActivity.class)
                        .putExtra("trip", trip));

            }
        });
    }

    @Override
    public int getItemCount() {
        return tripList.size();
    }


    public static class ViewHolder extends RecyclerView.ViewHolder {
        TextView name, amount, lastStation, time, licenceNo;
        LinearLayout active;

        public ViewHolder(View itemView) {
            super(itemView);
            name = itemView.findViewById(R.id.textView54);
            lastStation = itemView.findViewById(R.id.textView314);
            amount = itemView.findViewById(R.id.textView334);
            time = itemView.findViewById(R.id.textView324);
            active = itemView.findViewById(R.id.dds4);
            licenceNo = itemView.findViewById(R.id.textView684);
        }
    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/searchFriends/SearchFriendAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/searchFriends/SearchFriendAdapter.java
index 6bfab3d..ec62a57 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/searchFriends/SearchFriendAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/searchFriends/SearchFriendAdapter.java
@@ -21,7 +21,7 @@
 
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.models.Friends;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 
 import java.util.List;
 
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/viewFriends/ViewFriendAdapter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/viewFriends/ViewFriendAdapter.java
index 15cfecc..39c171e 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/viewFriends/ViewFriendAdapter.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/viewFriends/ViewFriendAdapter.java
@@ -25,7 +25,7 @@
 
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.models.ViewFriends;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/dao/DaoAccess.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/dao/DaoAccess.java
index a27f89f..1e11f2e 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/dao/DaoAccess.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/dao/DaoAccess.java
@@ -13,8 +13,6 @@
 import com.quantum_guys.dncc_eco_sync.messege.model.Chatlist;
 import com.quantum_guys.dncc_eco_sync.models.Post;
 import com.quantum_guys.dncc_eco_sync.models.Users;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.BattleModel;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Result;
 
 import java.util.List;
 
@@ -78,45 +76,6 @@ public interface DaoAccess {
     @Query("UPDATE Users SET reward=:score WHERE id = :id")
     void setXp(int score, String id);
 
-    //------------Offline quize result handling
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    void insertResult(BattleModel battleModel);
-
-    @Query("SELECT * FROM BattleModel WHERE battleId =:taskId")
-    LiveData<BattleModel> getResult(String taskId);
-
-
-    @Query("SELECT * FROM BattleModel WHERE battleId =:taskId")
-    BattleModel getBattleOffline(String taskId);
-
-
-    @Query("SELECT * FROM BattleModel ORDER BY timestamp")
-    LiveData<List<BattleModel>> getAllResult();
-
-    @Query("DELETE FROM BattleModel WHERE battleId = :result")
-    void deleteResult(String result);
-
-
-    //------------Offline quize result handling
-
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    void insertBattleResult(Result result);
-
-    @Query("SELECT * FROM Result WHERE battleId =:taskId")
-    LiveData<Result> getResultOfBattle(String taskId);
-
-    @Query("SELECT * FROM Result ORDER BY timestamp")
-    LiveData<List<Result>> getAllResultOfBattle();
-
-    @Query("SELECT * FROM Result WHERE battleId =:id")
-    Result resultExists(String id);
-
-    @Delete
-    void deleteResultOfBattle(Result result);
-
-    @Update
-    void updateResultOfBattle(Result result);
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     void insertPost(Post post);
@@ -130,10 +89,6 @@ public interface DaoAccess {
     @Delete
     void deletePost(Post result);
 
-    @Query("SELECT * FROM Result WHERE `action` =:x ORDER BY timestamp")
-    LiveData<List<Result>> getAllInvites(int x);
-    @Query("SELECT * FROM Result WHERE `battleId` =:battleIdNew")
-    Result getNewResult(String battleIdNew);
 
     @Query("SELECT * FROM Chatlist ORDER BY lastTimestamp DESC")
     LiveData<List<Chatlist>> getAllUser();
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/db/QuizResultDatabase.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/db/QuizResultDatabase.java
index 200826e..fc2d14f 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/db/QuizResultDatabase.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/db/QuizResultDatabase.java
@@ -1 +1 @@
-package com.quantum_guys.dncc_eco_sync.db;

import android.content.Context;

import androidx.room.Database;
import androidx.room.Room;
import androidx.room.RoomDatabase;

import com.quantum_guys.dncc_eco_sync.dao.DaoAccess;
import com.quantum_guys.dncc_eco_sync.messege.model.Chat;
import com.quantum_guys.dncc_eco_sync.messege.model.Chatlist;
import com.quantum_guys.dncc_eco_sync.models.Post;
import com.quantum_guys.dncc_eco_sync.models.Users;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.BattleModel;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Result;

@Database(entities = {Users.class, BattleModel.class, Result.class, Post.class, Chatlist.class, Chat.class}, version = 1, exportSchema = false)
public abstract class QuizResultDatabase extends RoomDatabase {
    private static QuizResultDatabase instance;

    public static synchronized QuizResultDatabase getInstance(Context context) {
        if (instance == null) {
            instance = Room.databaseBuilder(context.getApplicationContext(),
                            QuizResultDatabase.class, "dncc_eco_sync")
                    .allowMainThreadQueries()
                    .fallbackToDestructiveMigration()
                    .build();
        }
        return instance;
    }

    public abstract DaoAccess daoAccess();
}
\ No newline at end of file
+package com.quantum_guys.dncc_eco_sync.db;

import android.content.Context;

import androidx.room.Database;
import androidx.room.Room;
import androidx.room.RoomDatabase;

import com.quantum_guys.dncc_eco_sync.dao.DaoAccess;
import com.quantum_guys.dncc_eco_sync.messege.model.Chat;
import com.quantum_guys.dncc_eco_sync.messege.model.Chatlist;
import com.quantum_guys.dncc_eco_sync.models.Post;
import com.quantum_guys.dncc_eco_sync.models.Users;

@Database(entities = {Users.class, Post.class, Chatlist.class, Chat.class}, version = 1, exportSchema = false)
public abstract class QuizResultDatabase extends RoomDatabase {
    private static QuizResultDatabase instance;

    public static synchronized QuizResultDatabase getInstance(Context context) {
        if (instance == null) {
            instance = Room.databaseBuilder(context.getApplicationContext(),
                            QuizResultDatabase.class, "dncc_eco_sync")
                    .allowMainThreadQueries()
                    .fallbackToDestructiveMigration()
                    .build();
        }
        return instance;
    }

    public abstract DaoAccess daoAccess();
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/messege/activity/MessageActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/messege/activity/MessageActivity.java
index 229e6b1..0210f53 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/messege/activity/MessageActivity.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/messege/activity/MessageActivity.java
@@ -42,8 +42,6 @@
 import com.google.firebase.database.ValueEventListener;
 import com.google.firebase.database.annotations.NotNull;
 import com.google.firebase.firestore.FirebaseFirestore;
-import com.yalantis.ucrop.UCrop;
-
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.messege.Adapter.MessageAdapter;
 import com.quantum_guys.dncc_eco_sync.messege.model.Chat;
@@ -55,10 +53,11 @@
 import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
 import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
 import com.quantum_guys.dncc_eco_sync.service.UploadService;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SelectTopic;
+import com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 import com.quantum_guys.dncc_eco_sync.viewmodel.MessageViewModel;
 import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
+import com.yalantis.ucrop.UCrop;
 
 import java.io.File;
 import java.util.HashMap;
@@ -417,7 +416,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void playQuiz(String userid) {
-        Intent goBattle = new Intent(getApplicationContext(), SelectTopic.class);
+        Intent goBattle = new Intent(getApplicationContext(), MainActivity.class);
         goBattle.putExtra("otherUid", userid);
         startActivity(goBattle);
     }
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Issue.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Issue.java
index ae78611..be37aa0 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Issue.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Issue.java
@@ -11,6 +11,10 @@ public class Issue extends Post{
     String address;
 
 
+
+    public Issue() {
+    }
+
     public Issue(String postId, String userId, String name, String timestamp, String likes, String favourites, String description, String username, String institute, String dept, String userimage, int image_count, String image_url_0, String image_url_1, String image_url_2, String image_url_3, String image_url_4, String image_url_5, String image_url_6, int liked_count, int comment_count, String states, String issueType, boolean isAnonymous, float lat, float lon, String address) {
         super(postId, userId, name, timestamp, likes, favourites, description, username, institute, dept, userimage, image_count, image_url_0, image_url_1, image_url_2, image_url_3, image_url_4, image_url_5, image_url_6, liked_count, comment_count);
         this.states = states;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Notification.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Notification.java
index 7e27792..689e76b 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Notification.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Notification.java
@@ -8,7 +8,7 @@ public class Notification extends DocumentID {
     public Notification() {
     }
 
-    public Notification(String id, String notifyTo, String username, String image, String message, String timestamp, String type, String action_id, Boolean read) {
+    public Notification(String id, String notifyTo, String username, String image, String message, String timestamp, String type, String action_id, boolean read) {
         this.id = id;
         this.notifyTo = notifyTo;
         this.username = username;
@@ -91,8 +91,4 @@ public boolean isRead() {
     public void setRead(boolean read) {
         this.read = read;
     }
-
-    public long getTimeStamp() {
-        return Long.parseLong(timestamp);
-    }
 }
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Post.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Post.java
index 3a0045a..e0e3400 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Post.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/models/Post.java
@@ -92,7 +92,7 @@ public void setInstitute(String institute) {
     }
 
     public String getDept() {
-        return dept;
+        return institute;
     }
 
     public void setDept(String dept) {
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/repository/QuizResultRepository.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/repository/QuizResultRepository.java
deleted file mode 100644
index 55e16ab..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/repository/QuizResultRepository.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.repository;

import android.app.Application;
import android.os.AsyncTask;

import androidx.lifecycle.LiveData;

import com.quantum_guys.dncc_eco_sync.dao.DaoAccess;
import com.quantum_guys.dncc_eco_sync.db.QuizResultDatabase;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.BattleModel;

import java.util.List;

public class QuizResultRepository {
    private final DaoAccess resultDao;
    private final LiveData<List<BattleModel>> allBattles;

    public QuizResultRepository(Application application) {
        QuizResultDatabase database = QuizResultDatabase.getInstance(application);
        resultDao = database.daoAccess();
        allBattles = resultDao.getAllResult();
    }

    public void insertBattle(BattleModel battleModel) {
        new InsertNoteAsyncTask(resultDao).execute(battleModel);
    }

    public LiveData<BattleModel> getBattle(String id) {
        return resultDao.getResult(id);
    }

    public BattleModel getBattleOffline(String id) {
        return resultDao.getBattleOffline(id);
    }

    public void deleteBattle(String battleModel) {
        new DeleteBattleModelAsyncTask(resultDao).execute(battleModel);
    }

    public LiveData<List<BattleModel>> getAllNotes() {
        return allBattles;
    }

    private static class InsertNoteAsyncTask extends AsyncTask<BattleModel, Void, Void> {
        private final DaoAccess resultDao;

        private InsertNoteAsyncTask(DaoAccess resultDao) {
            this.resultDao = resultDao;
        }

        @Override
        protected Void doInBackground(BattleModel... results) {
            resultDao.insertResult(results[0]);
            return null;
        }
    }

    private static class DeleteBattleModelAsyncTask extends AsyncTask<String, Void, Void> {
        private final DaoAccess resultDao;

        private DeleteBattleModelAsyncTask(DaoAccess resultDao) {
            this.resultDao = resultDao;
        }

        @Override
        protected Void doInBackground(String... results) {
            resultDao.deleteResult(results[0]);
            return null;
        }
    }


}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/repository/ResultRepository.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/repository/ResultRepository.java
deleted file mode 100644
index 9815bf9..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/repository/ResultRepository.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.repository;

import android.app.Application;
import android.os.AsyncTask;
import android.util.Log;

import androidx.lifecycle.LiveData;

import com.quantum_guys.dncc_eco_sync.dao.DaoAccess;
import com.quantum_guys.dncc_eco_sync.db.QuizResultDatabase;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Result;

import java.util.List;

public class ResultRepository {
    private final DaoAccess resultDao;
    private final LiveData<List<Result>> allNotes;
    public final int JUST_STARTED = -1;
    public final int OFFLINE_STARTED = -2;
    public final int JUST_IN = -3;
    public final int IN_STARTED = -4;
    public final int COMPLETED = -5;

    public ResultRepository(Application application) {
        QuizResultDatabase database = QuizResultDatabase.getInstance(application);
        resultDao = database.daoAccess();
        allNotes = resultDao.getAllResultOfBattle();
    }

    public void insert(Result result) {
        new InsertNoteAsyncTask(resultDao).execute(result);

    }

    public void update(Result result) {
        new UpdateNoteAsyncTask(resultDao).execute(result);
    }

    public boolean resultExists(String id) {
        boolean exist = false;
        try {
            Result result = resultDao.resultExists(id);
            if (result.getMyScore() >= 0 && result.getOtherScore() >= 0) {
                exist = true;
            }
        } catch (Exception ignored) {
        }
        return exist;
    }

    public boolean resultExistsForSecondPlayer(String id) {
        boolean exist = false;
        try {
            Result result = resultDao.resultExists(id);
            if (result.getOtherScore() >= 0) {
                Log.d("resultExistsForSecond", "resultExistsForSecond:true");
                exist = true;
            }
        } catch (Exception ignored) {
        }
        return exist;
    }

    public void delete(Result result) {
        new DeleteNoteAsyncTask(resultDao).execute(result);
    }

    public LiveData<List<Result>> getAllNotes() {
        return allNotes;
    }

    public LiveData<List<Result>> getAllInvites() {
        return resultDao.getAllInvites(JUST_IN);
    }

    public LiveData<List<Result>> getAllCompleted() {
        return resultDao.getAllInvites(COMPLETED);
    }

    public LiveData<List<Result>> getAllPending() {
        return resultDao.getAllInvites(IN_STARTED);
    }

    public LiveData<List<Result>> getAllMyPending() {
        return resultDao.getAllInvites(OFFLINE_STARTED);
    }

    public LiveData<List<Result>> getAllMyCompleted() {
        return resultDao.getAllInvites(JUST_STARTED);
    }

    public Result getResult(String battleIdNew) {
        return resultDao.getNewResult(battleIdNew);
    }

    private static class InsertNoteAsyncTask extends AsyncTask<Result, Void, Void> {
        private final DaoAccess resultDao;

        private InsertNoteAsyncTask(DaoAccess resultDao) {
            this.resultDao = resultDao;
        }

        @Override
        protected Void doInBackground(Result... results) {
            try {
                resultDao.insertBattleResult(results[0]);
            }catch (Exception d){
                Log.d("Result:", d.getMessage());
            }

            return null;

        }
    }

    private static class UpdateNoteAsyncTask extends AsyncTask<Result, Void, Void> {
        private final DaoAccess resultDao;

        private UpdateNoteAsyncTask(DaoAccess resultDao) {
            this.resultDao = resultDao;
        }

        @Override
        protected Void doInBackground(Result... results) {
            try {
                resultDao.insertBattleResult(results[0]);
            }catch (Exception d){
                Log.d("Result:", d.getMessage());
            }

            return null;
        }
    }

    private static class DeleteNoteAsyncTask extends AsyncTask<Result, Void, Void> {
        private final DaoAccess resultDao;

        private DeleteNoteAsyncTask(DaoAccess resultDao) {
            this.resultDao = resultDao;
        }

        @Override
        protected Void doInBackground(Result... results) {
            resultDao.deleteResultOfBattle(results[0]);
            return null;
        }
    }


}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java
index a99b5dc..9ff58d5 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java
@@ -9,7 +9,6 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.IBinder;
@@ -67,6 +66,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
                 Uri myUri = intent.getParcelableExtra("image");
                 String userid = intent.getStringExtra("userid");
+
+                String posttype = intent.getStringExtra("posttype");
+                boolean isAnonymous = intent.getBooleanExtra("isAnonymous", false);
+                double lat = intent.getDoubleExtra("lat", 0);
+                double lon = intent.getDoubleExtra("lon", 0);
+                String address = intent.getStringExtra("address");
+
+
+
                 String fuserId = intent.getStringExtra("fuser");
                 Log.d("========", String.valueOf(myUri));
 
@@ -75,7 +83,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     sendMessage((int) System.currentTimeMillis(), fuserId, userid, myUri, userid, fuserId);
                 } else if (tag != null && uploadedImagesUrl != null) {
                     Toast.makeText(this, "posting", Toast.LENGTH_SHORT).show();
-                    uploadImages(notification_id, 0, imagesList, current_id, description, uploadedImagesUrl, tag);
+                    uploadImages(notification_id, 0, imagesList, current_id, description, uploadedImagesUrl, tag, posttype, lat, lon, address, isAnonymous);
                 } else {
                     Toast.makeText(this, "not sending", Toast.LENGTH_SHORT).show();
                 }
@@ -126,7 +134,8 @@ private void notifyProgress(int id, String title, String message, Context contex
         startForeground(id, builder.build());
     }
 
-    private void uploadImages(final int notification_id, final int index, final List<Images> imagesList, String currentUser_id, String description, ArrayList<String> uploadedImagesUrl, String tag) {
+    private void uploadImages(final int notification_id, final int index, final List<Images> imagesList, String currentUser_id, String description, ArrayList<String> uploadedImagesUrl, String tag,
+                              String posttype, double lat, double lon, String address, boolean isAnonymous) {
 
         int img_count = index + 1;
         Uri imageUri;
@@ -150,13 +159,13 @@ private void uploadImages(final int notification_id, final int index, final List
                             int next_index = index + 1;
                             try {
                                 if (!TextUtils.isEmpty(imagesList.get(index + 1).getOg_path())) {
-                                    uploadImages(notification_id, next_index, imagesList, currentUser_id, description, uploadedImagesUrl, tag);
+                                    uploadImages(notification_id, next_index, imagesList, currentUser_id, description, uploadedImagesUrl, tag , posttype, lat, lon, address, isAnonymous);
                                 } else {
-                                    uploadPost(notification_id, currentUser_id, description, uploadedImagesUrl, tag);
+                                    uploadPost(notification_id, currentUser_id, description, uploadedImagesUrl, tag, posttype, lat, lon, address, isAnonymous);
                                 }
                             } catch (Exception e) {
                                 e.printStackTrace();
-                                uploadPost(notification_id, currentUser_id, description, uploadedImagesUrl, tag);
+                                uploadPost(notification_id, currentUser_id, description, uploadedImagesUrl, tag, posttype, lat, lon, address, isAnonymous);
                             }
 
                         })
@@ -192,7 +201,7 @@ private void uploadImages(final int notification_id, final int index, final List
 
     }
 
-    private void uploadPost(int notification_id, String currentUser_id, String description, ArrayList<String> uploadedImagesUrl, String tag) {
+    private void uploadPost(int notification_id, String currentUser_id, String description, ArrayList<String> uploadedImagesUrl, String tag, String posttype, double lat, double lon, String address, boolean isAnonymous) {
 
         if (!uploadedImagesUrl.isEmpty()) {
 
@@ -217,6 +226,7 @@ private void uploadPost(int notification_id, String currentUser_id, String descr
 
                         postMap.put("userId", documentSnapshot.getString("id"));
                         postMap.put("username", documentSnapshot.getString("username"));
+                        postMap.put("ward", documentSnapshot.getString("ward"));
                         postMap.put("institute", documentSnapshot.getString("institute"));
                         postMap.put("dept", documentSnapshot.getString("dept"));
                         postMap.put("name", documentSnapshot.getString("name"));
@@ -268,23 +278,56 @@ private void uploadPost(int notification_id, String currentUser_id, String descr
                         Map<String, Object> postMapFinal = new HashMap<>();
                         postMapFinal.put(getSaltString(), postMap);
 
-                        FirebaseFirestore.getInstance().collection("PendingPosts")
-                                .document(idll)
-                                .set(postMap)
-                                .addOnSuccessListener(documentReference -> {
-                                    getSharedPreferences("uploadservice", MODE_PRIVATE)
-                                            .edit()
-                                            .putInt("count", --count).apply();
-                                    // Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/" + R.raw.study_forum))
-                                    Toasty.success(getApplicationContext(), "Post added for Review.", Toasty.LENGTH_SHORT, true).show();
-                                    stopForegroundService();
-
-                                })
-                                .addOnFailureListener(e -> {
-                                    Toasty.error(getApplicationContext(), "Error :" + e.getMessage(), Toasty.LENGTH_SHORT, true).show();
-                                    stopForegroundService();
-                                    e.printStackTrace();
-                                });
+
+                        if(posttype.equals("issue")){
+                            postMapFinal.put("posttype", "issue");
+                            postMap.put("isAnonymous", isAnonymous);
+                            postMap.put("states", "Pending");
+                            postMap.put("lat", lat);
+                            postMap.put("lon", lon);
+                            postMap.put("address", address);
+
+
+                            FirebaseFirestore.getInstance().collection("Issues")
+                                    .document(idll)
+                                    .set(postMap)
+                                    .addOnSuccessListener(documentReference -> {
+                                        getSharedPreferences("uploadservice", MODE_PRIVATE)
+                                                .edit()
+                                                .putInt("count", --count).apply();
+                                        // Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/" + R.raw.study_forum))
+                                        Toasty.success(getApplicationContext(), "Post added for Review.", Toasty.LENGTH_SHORT, true).show();
+                                        stopForegroundService();
+
+                                    })
+                                    .addOnFailureListener(e -> {
+                                        Toasty.error(getApplicationContext(), "Error :" + e.getMessage(), Toasty.LENGTH_SHORT, true).show();
+                                        stopForegroundService();
+                                        e.printStackTrace();
+                                    });
+
+                        }else{
+
+                            FirebaseFirestore.getInstance().collection("PendingPosts")
+                                    .document(idll)
+                                    .set(postMap)
+                                    .addOnSuccessListener(documentReference -> {
+                                        getSharedPreferences("uploadservice", MODE_PRIVATE)
+                                                .edit()
+                                                .putInt("count", --count).apply();
+                                        // Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/" + R.raw.study_forum))
+                                        Toasty.success(getApplicationContext(), "Post added for Review.", Toasty.LENGTH_SHORT, true).show();
+                                        stopForegroundService();
+
+                                    })
+                                    .addOnFailureListener(e -> {
+                                        Toasty.error(getApplicationContext(), "Error :" + e.getMessage(), Toasty.LENGTH_SHORT, true).show();
+                                        stopForegroundService();
+                                        e.printStackTrace();
+                                    });
+                        }
+
+
 
                     }).addOnFailureListener(e -> {
                 Toasty.error(getApplicationContext(), "Error :" + e.getMessage(), Toasty.LENGTH_SHORT, true).show();
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MainActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MainActivity.java
index 03abbad..11d62c4 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MainActivity.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MainActivity.java
@@ -14,7 +14,6 @@
 import android.location.Location;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -58,12 +57,11 @@
 import com.quantum_guys.dncc_eco_sync.notification.Token;
 import com.quantum_guys.dncc_eco_sync.ui.activities.account.EditProfile;
 import com.quantum_guys.dncc_eco_sync.ui.activities.account.LoginActivity;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.SearchUsersActivity;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Ranking;
+import com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts.MapView;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.SearchUsersActivity;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.Ranking;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.Dashboard;
-import com.quantum_guys.dncc_eco_sync.ui.fragment.FriendsFragment;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.ProfileFragment;
-import com.quantum_guys.dncc_eco_sync.ui.fragment.SavedFragment;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.ThemeBottomSheetDialog;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.admin.AdminFragment;
 import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
@@ -85,13 +83,13 @@
 public class MainActivity extends AppCompatActivity implements DrawerAdapter.OnItemSelectedListener, LocationListener  {
     private static final int POS_DASHBOARD = 0;
     private static final int RANKING = 1;
-    private static final int POS_FRIENDS = 2;
-    private static final int SAVED_POST = 3;
-    private static final int WEB = 4;
-    private static final int ABOUT_APP = 5;
-    private static final int THEME = 6;
-    private static final int POS_LOGOUT = 7;
-    private static final int ADMIN = 8;
+    private static final int STS = 2;
+
+    private static final int WEB = 3;
+
+    private static final int THEME = 4;
+    private static final int POS_LOGOUT = 5;
+    private static final int ADMIN = 6;
     public static String userId;
     public static boolean inHome=true;
 
@@ -119,7 +117,7 @@ private void updateStatus() {
             public void run() {
                 try {
                     synchronized (this) {
-                        wait(10000);
+                        wait(1000);
                         try {
                             String refreshToken = FirebaseInstanceId.getInstance().getToken();
                             Token token = new Token(refreshToken);
@@ -132,7 +130,7 @@ public void run() {
                                     .update(scoreMap).addOnSuccessListener(aVoid -> {
                             });
                         } catch (NullPointerException ignored) {
-
+                            Log.d("FCMERROR", "run: FCM Token "+ ignored.getLocalizedMessage());
                         }
                     }
                 } catch (InterruptedException e) {
@@ -275,10 +273,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 adapter = new DrawerAdapter(Arrays.asList(
                         createItemFor(POS_DASHBOARD).setChecked(true),
                         createItemFor(RANKING),
-                        createItemFor(POS_FRIENDS),
-                        createItemFor(SAVED_POST),
+                        createItemFor(STS),
                         createItemFor(WEB),
-                        createItemFor(ABOUT_APP),
                         createItemFor(THEME),
                         createItemFor(POS_LOGOUT),
                         createItemFor(ADMIN)));
@@ -286,10 +282,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 adapter = new DrawerAdapter(Arrays.asList(
                         createItemFor(POS_DASHBOARD).setChecked(true),
                         createItemFor(RANKING),
-                        createItemFor(POS_FRIENDS),
-                        createItemFor(SAVED_POST),
+                        createItemFor(STS),
                         createItemFor(WEB),
-                        createItemFor(ABOUT_APP),
                         createItemFor(THEME),
                         createItemFor(POS_LOGOUT)));
             }
@@ -444,39 +438,26 @@ public void onItemSelected(int position) {
                 slidingRootNav.closeMenu(true);
                 return;
 
-            case POS_FRIENDS:
-                inHome = false;
-                mainToolbar.setSubtitle("Friends");
-                selectedScreen = new FriendsFragment();
-                showFragment(selectedScreen);
-                slidingRootNav.closeMenu(true);
-                return;
-
             case RANKING:
                 inHome = false;
-                mainToolbar.setSubtitle("Ranking");
+                mainToolbar.setSubtitle("Volunteer Ranking");
                 selectedScreen = new Ranking();
                 showFragment(selectedScreen);
                 slidingRootNav.closeMenu(true);
                 return;
 
-            case SAVED_POST:
-                inHome = false;
-                mainToolbar.setSubtitle("Offlined Post");
-                selectedScreen = new SavedFragment();
-                showFragment(selectedScreen);
-                slidingRootNav.closeMenu(true);
+            case WEB:
+                inHome = true;
+//               Call to helpline number
+                Intent intent = new Intent(Intent.ACTION_DIAL);
+                intent.setData(android.net.Uri.parse("tel:999"));
                 return;
 
-            case ABOUT_APP:
+            case STS:
                 inHome = false;
-                startActivity(new Intent(getApplicationContext(), MapView.class).putExtra("post_id", "about_app"));
-                return;
+//                go to MapView
+                startActivity(new Intent(MainActivity.this, MapView.class));
 
-            case WEB:
-                inHome = true;
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://3.208.28.247:3000"));
-                startActivity(browserIntent);
                 return;
 
             case THEME:
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/quiz_history.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/quiz_history.java
deleted file mode 100644
index 3b84eb7..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/quiz_history.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.friends;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

import com.quantum_guys.dncc_eco_sync.R;

public class quiz_history extends Fragment {


    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
    }

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        return inflater.inflate(R.layout.fragment_quiz_history, container, false);
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);


    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/Address.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/Address.java
new file mode 100644
index 0000000..e0eb6e7
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/Address.java
@@ -0,0 +1,46 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"man_made"
+})
+public class Address {
+
+@JsonProperty("man_made")
+private String manMade;
+@JsonIgnore
+private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+@JsonProperty("man_made")
+public String getManMade() {
+return manMade;
+}
+
+@JsonProperty("man_made")
+public void setManMade(String manMade) {
+this.manMade = manMade;
+}
+
+@JsonAnyGetter
+public Map<String, Object> getAdditionalProperties() {
+return this.additionalProperties;
+}
+
+@JsonAnySetter
+public void setAdditionalProperty(String name, Object value) {
+this.additionalProperties.put(name, value);
+}
+
+}
+
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/Example.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/Example.java
new file mode 100644
index 0000000..7ee8bd6
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/Example.java
@@ -0,0 +1,149 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"place_id",
+"licence",
+"osm_type",
+"osm_id",
+"lat",
+"lon",
+"display_name",
+"address",
+"boundingbox"
+}) 
+public class Example {
+
+@JsonProperty("place_id")
+private Integer placeId;
+@JsonProperty("licence")
+private String licence;
+@JsonProperty("osm_type")
+private String osmType;
+@JsonProperty("osm_id")
+private Long osmId;
+@JsonProperty("lat")
+private String lat;
+@JsonProperty("lon")
+private String lon;
+@JsonProperty("display_name")
+private String displayName;
+@JsonProperty("address")
+private Address address;
+@JsonProperty("boundingbox")
+private List<String> boundingbox;
+@JsonIgnore
+private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+@JsonProperty("place_id")
+public Integer getPlaceId() {
+return placeId;
+}
+
+@JsonProperty("place_id")
+public void setPlaceId(Integer placeId) {
+this.placeId = placeId;
+}
+
+@JsonProperty("licence")
+public String getLicence() {
+return licence;
+}
+
+@JsonProperty("licence")
+public void setLicence(String licence) {
+this.licence = licence;
+}
+
+@JsonProperty("osm_type")
+public String getOsmType() {
+return osmType;
+}
+
+@JsonProperty("osm_type")
+public void setOsmType(String osmType) {
+this.osmType = osmType;
+}
+
+@JsonProperty("osm_id")
+public Long getOsmId() {
+return osmId;
+}
+
+@JsonProperty("osm_id")
+public void setOsmId(Long osmId) {
+this.osmId = osmId;
+}
+
+@JsonProperty("lat")
+public String getLat() {
+return lat;
+}
+
+@JsonProperty("lat")
+public void setLat(String lat) {
+this.lat = lat;
+}
+
+@JsonProperty("lon")
+public String getLon() {
+return lon;
+}
+
+@JsonProperty("lon")
+public void setLon(String lon) {
+this.lon = lon;
+}
+
+@JsonProperty("display_name")
+public String getDisplayName() {
+return displayName;
+}
+
+@JsonProperty("display_name")
+public void setDisplayName(String displayName) {
+this.displayName = displayName;
+}
+
+@JsonProperty("address")
+public Address getAddress() {
+return address;
+}
+
+@JsonProperty("address")
+public void setAddress(Address address) {
+this.address = address;
+}
+
+@JsonProperty("boundingbox")
+public List<String> getBoundingbox() {
+return boundingbox;
+}
+
+@JsonProperty("boundingbox")
+public void setBoundingbox(List<String> boundingbox) {
+this.boundingbox = boundingbox;
+}
+
+@JsonAnyGetter
+public Map<String, Object> getAdditionalProperties() {
+return this.additionalProperties;
+}
+
+@JsonAnySetter
+public void setAdditionalProperty(String name, Object value) {
+this.additionalProperties.put(name, value);
+}
+
+}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GeocodingResponse.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GeocodingResponse.java
new file mode 100644
index 0000000..c331a05
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GeocodingResponse.java
@@ -0,0 +1,23 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class GeocodingResponse {
+    @SerializedName("results")
+    private List<Result> results;
+
+    public List<Result> getResults() {
+        return results;
+    }
+
+    public static class Result {
+        @SerializedName("formatted_address")
+        private String formattedAddress;
+
+        public String getFormattedAddress() {
+            return formattedAddress;
+        }
+    }
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GoogleMapsApiClient.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GoogleMapsApiClient.java
new file mode 100644
index 0000000..06d9a3a
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GoogleMapsApiClient.java
@@ -0,0 +1,32 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+import java.io.IOException;
+
+import retrofit2.Call;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class GoogleMapsApiClient {
+    private static final String BASE_URL = "https://maps.googleapis.com/";
+    private GoogleMapsApiService service;
+
+    public GoogleMapsApiClient() {
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+
+        service = retrofit.create(GoogleMapsApiService.class);
+    }
+
+    public String reverseGeocode(String latlng, String apiKey) throws IOException {
+        Call<GeocodingResponse> call = service.reverseGeocode(latlng, apiKey);
+        GeocodingResponse response = call.execute().body();
+
+        if (response != null && response.getResults().size() > 0) {
+            return response.getResults().get(0).getFormattedAddress();
+        } else {
+            return "No results found";
+        }
+    }
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GoogleMapsApiService.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GoogleMapsApiService.java
new file mode 100644
index 0000000..7db317d
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/GoogleMapsApiService.java
@@ -0,0 +1,13 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface GoogleMapsApiService {
+    @GET("maps/api/geocode/json")
+    Call<GeocodingResponse> reverseGeocode(
+            @Query("latlng") String latlng,
+            @Query("key") String apiKey
+    );
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/IssuesDetailsActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/IssuesDetailsActivity.java
index 4d494e9..611e28b 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/IssuesDetailsActivity.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/IssuesDetailsActivity.java
@@ -19,11 +19,14 @@
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -38,7 +41,6 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.github.ivbaranov.mfb.MaterialFavoriteButton;
 import com.github.marlonlom.utilities.timeago.TimeAgo;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
@@ -54,17 +56,16 @@
 import com.quantum_guys.dncc_eco_sync.adapters.CommentsAdapter;
 import com.quantum_guys.dncc_eco_sync.adapters.PostPhotosAdapter;
 import com.quantum_guys.dncc_eco_sync.models.Comment;
+import com.quantum_guys.dncc_eco_sync.models.Issue;
 import com.quantum_guys.dncc_eco_sync.models.MultipleImage;
 import com.quantum_guys.dncc_eco_sync.models.Notification;
-import com.quantum_guys.dncc_eco_sync.models.Post;
 import com.quantum_guys.dncc_eco_sync.models.Users;
 import com.quantum_guys.dncc_eco_sync.notification.APIService;
 import com.quantum_guys.dncc_eco_sync.notification.Client;
 import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
 import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
 import com.quantum_guys.dncc_eco_sync.repository.UserRepository;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
-import com.quantum_guys.dncc_eco_sync.ui.activities.post.WhoLikedActivity;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.Home;
 import com.quantum_guys.dncc_eco_sync.utils.AnimationUtil;
 import com.quantum_guys.dncc_eco_sync.utils.MathView;
@@ -72,9 +73,9 @@
 import com.tbuonomo.viewpagerdotsindicator.DotsIndicator;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -92,21 +93,21 @@ public class IssuesDetailsActivity extends AppCompatActivity {
     String user_id, post_id;
     MathView post_desc;
     TextView likeCount, saveCount;
-    int likCo, saveCo, comCo;
+
     ProgressBar mProgress;
     String userId;
     boolean owner;
-    Post post;
+    Issue issue;
     CollectionReference postDb;
     Users me;
     ImageView myImage;
     List<Comment> commentList = new ArrayList<>();
-    TextView CommentCount;
+
     RecyclerView mCommentsRecycler;
     private FirebaseFirestore mFirestore;
     private FirebaseUser mCurrentUser;
     private CircleImageView user_image;
-    private MaterialFavoriteButton sav_button, like_btn;
+
     private FrameLayout pager_layout;
     private RelativeLayout indicator_holder;
     private ViewPager pager;
@@ -118,8 +119,7 @@ public class IssuesDetailsActivity extends AppCompatActivity {
     boolean alreadyLiked;
     FrameLayout mImageholder;
     LinearLayout adminActivity;
-    View vBgLike;
-    ImageView ivLike;
+
     @SuppressLint({"SetTextI18n", "RtlHardcoded"})
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -127,7 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
         getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
         getWindow().setEnterTransition(new Explode());
         getWindow().setExitTransition(new Explode());
-
+        mFirestore = FirebaseFirestore.getInstance();
         super.onCreate(savedInstanceState);
         SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
         String themeName = sharedPreferences.getString("ThemeName", "Default");
@@ -147,8 +147,8 @@ protected void onCreate(Bundle savedInstanceState) {
         } else {
             setTheme(R.style.AppTheme);
         }
-        setContentView(R.layout.activity_post_comments);
-        mFirestore = FirebaseFirestore.getInstance();
+        setContentView(R.layout.activity_issue_details);
+
         mCurrentUser = FirebaseAuth.getInstance().getCurrentUser();
         userId=FirebaseAuth.getInstance().getCurrentUser().getUid();
         user_image = findViewById(R.id.comment_admin);
@@ -157,35 +157,71 @@ protected void onCreate(Bundle savedInstanceState) {
         p_instTV = findViewById(R.id.dept_institute);
         postDb = FirebaseFirestore.getInstance().collection("Issues");
         timestampTV = findViewById(R.id.post_timestamp);
-        likeCount = findViewById(R.id.like_count);
-        saveCount = findViewById(R.id.save_count);
-        CommentCount = findViewById(R.id.textView8);
+
         mCommentsRecycler = findViewById(R.id.coments);
         adminActivity = findViewById(R.id.adminActivity);
-        like_btn = findViewById(R.id.like_button);
-        vBgLike = findViewById(R.id.vBgLike);
-        ivLike = findViewById(R.id.ivLike);
+
         pager = findViewById(R.id.pager);
         pager_layout = findViewById(R.id.pager_layout);
-        sav_button = findViewById(R.id.save_button);
+
         me = new UserRepository(getApplication()).getStaticUser();
         mImageholder = findViewById(R.id.image_holder);
         indicator2 = findViewById(R.id.indicator);
         indicator_holder = findViewById(R.id.indicator_holder);
 
 
-        approved = getIntent().getBooleanExtra("approveStatus", true);
-        alreadyLiked = getIntent().getBooleanExtra("alreadyLiked", false);
+
+        List<String> states = Arrays.asList(getResources().getStringArray(R.array.states));
 
 
+        Spinner spinner_states = findViewById(R.id.spinner_states);
+
+        ArrayAdapter<String> spinnerArrayAdapter_type = new ArrayAdapter<>(this,
+                android.R.layout.simple_spinner_dropdown_item, states);
+        spinner_states.setAdapter(spinnerArrayAdapter_type);
+
+        spinner_states.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                issue.setStates(states.get(i));
+
+                FirebaseFirestore.getInstance().collection("Issues")
+                        .document(issue.getPostId())
+                        .update("states", states.get(i))
+                        .addOnSuccessListener(aVoid -> {
+                            Notification notification = new Notification(issue.getPostId(),issue.getUserId(), me.getName(), me.getImage(), "Your issue status has been changed to "+ states.get(i), String.valueOf(System.currentTimeMillis()), "issue", issue.getPostId(), false);
+                            mFirestore.collection("Users")
+                                    .document(issue.getUserId())
+                                    .collection("Info_Notifications")
+                                    .document(notification.getId()).set(notification)
+                                    .addOnSuccessListener(documentReference -> new SendNotificationAsyncTask(notification).execute())
+                                    .addOnFailureListener(e -> Log.e("Error", e.getLocalizedMessage()));
 
-        post = (Post) getIntent().getSerializableExtra("post");
+                            Toast.makeText(getApplicationContext(), "State updated", Toast.LENGTH_SHORT).show();
+
+                        })
+                        .addOnFailureListener(e -> {
+                            Toast.makeText( getApplicationContext(), "Error updating state", Toast.LENGTH_SHORT).show();
+                        });
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        }
+        );
+
+
+
+
+        issue = (Issue) getIntent().getSerializableExtra("issue");
         if(userId==null) finish();
-        if(post != null) {
-            setUpData(post);
+        if(issue != null) {
+            setUpData(issue);
         }else{
             ProgressDialog mDialog = new ProgressDialog(this);
-            mDialog.setMessage("Please wait. Loading post...");
+            mDialog.setMessage("Please wait. Loading issue...");
             mDialog.setIndeterminate(true);
             mDialog.setCanceledOnTouchOutside(false);
             mDialog.setCancelable(false);
@@ -193,74 +229,73 @@ protected void onCreate(Bundle savedInstanceState) {
             String link = getIntent().getData().toString();
             String id = link.substring(link.lastIndexOf("/") + 1);
 
-            FirebaseFirestore.getInstance().collection("Posts")
+            FirebaseFirestore.getInstance().collection("Issues")
                     .document(id)
                     .get()
                     .addOnSuccessListener(documentSnapshot -> {
                         mDialog.dismiss();
                         try {
-                            post = documentSnapshot.toObject(Post.class);
-                            if(post!=null) setUpData(post);
+                            issue = documentSnapshot.toObject(Issue.class);
+                            if(issue!=null) setUpData(issue);
                             else{
                                 Log.d("ErrorPost", id);
-                                Toast.makeText(this, "Error Post", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(this, "Error Issue", Toast.LENGTH_SHORT).show();
                                 finish();
                             }
                         }catch (Exception a){
                             Log.d("ErrorPost", a.getLocalizedMessage());
-                            Toast.makeText(this, "Error Post", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(this, "Error Issue", Toast.LENGTH_SHORT).show();
                             finish();
                         }
                 }).addOnFailureListener(e -> {
                 mDialog.dismiss();
-                    Toast.makeText(IssuesDetailsActivity.this, "Post not found", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(IssuesDetailsActivity.this, "Issue not found", Toast.LENGTH_SHORT).show();
                     finish();
                 });
+
         }
     }
 
     @SuppressLint("SetTextI18n")
-    void setUpData(Post post){
+    void setUpData(Issue issue){
         if (!approved && ADMIN_UID_LIST.contains(userId)) {
-            Toast.makeText(this, "Approve or Delete this Post", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "Approve or Delete this Issue", Toast.LENGTH_SHORT).show();
             adminActivity.setVisibility(View.VISIBLE);
-            findViewById(R.id.approvePost).setOnClickListener(view -> approvePost(post));
-            findViewById(R.id.deletePost).setOnClickListener(view -> deletePost(post.getPostId()));
+            findViewById(R.id.approvePost).setOnClickListener(view -> approvePost(issue));
+            findViewById(R.id.deletePost).setOnClickListener(view -> deletePost(issue.getPostId()));
         } else {
             adminActivity.setVisibility(View.GONE);
         }
 
-        if (post.getImage_count() > 0) {
+        if (issue.getImage_count() > 0) {
             mImageholder.setVisibility(View.VISIBLE);
         } else {
             mImageholder.setVisibility(View.GONE);
         }
 
 
-        user_id = post.getUserId();
-        post_desc.setDisplayText(post.getDescription());
-        // p_instTV.setText(post.getDept() + ", " + post.getInstitute());
+
+        user_id = issue.getUserId();
+        post_desc.setDisplayText(issue.getDescription());
+        // p_instTV.setText(issue.getDept() + ", " + issue.getInstitute());
 
 
         try {
-            if (post.getInstitute() == null) {
-                p_instTV.setText(post.getDept());
-            } else if (post.getDept() == null) {
-                p_instTV.setText(post.getInstitute());
+            if (issue.getInstitute() == null) {
+                p_instTV.setText(issue.getDept());
+            } else if (issue.getDept() == null) {
+                p_instTV.setText(issue.getInstitute());
             } else {
-                p_instTV.setText(post.getDept() + ", " + post.getInstitute());
+                p_instTV.setText(issue.getDept() + ", " + issue.getInstitute());
             }
         }catch (Exception j){
-            p_instTV.setText(post.getDept());
+            p_instTV.setText(issue.getDept());
         }
 
-        p_nameTV.setText(post.getName());
-        timestampTV.setText(TimeAgo.using(Long.parseLong(Objects.requireNonNull(post.getTimestamp()))));
+        p_nameTV.setText(issue.getName());
+        timestampTV.setText(TimeAgo.using(Long.parseLong(Objects.requireNonNull(issue.getTimestamp()))));
         setupCommentView();
-        getLikeandFav(post);
-        setStatData(post);
 
-        likeCount.setOnClickListener(view -> view.getContext().startActivity(new Intent(view.getContext(), WhoLikedActivity.class).putExtra("postId", post.getPostId()).putExtra("type", "Liked_Users")));
 
 
 
@@ -272,7 +307,7 @@ void setUpData(Post post){
         myImage = findViewById(R.id.imageView7);
 
         commentList = new ArrayList<>();
-        mAdapter = new CommentsAdapter(commentList, this, owner, post.getComment_count());
+        mAdapter = new CommentsAdapter(commentList, this, owner, issue.getComment_count());
         mCommentsSend.setOnClickListener(view -> {
             String comment = mCommentText.getHtml();
             if (!TextUtils.isEmpty(comment))
@@ -294,8 +329,8 @@ void setUpData(Post post){
                 .into(myImage);
     }
 
-    private void approvePost(Post post) {
-        post.setLike_count(0);
+    private void approvePost(Issue issue) {
+        issue.setLike_count(0);
         final ProgressDialog mDialog = new ProgressDialog(this);
         mDialog.setMessage("Approving...");
         mDialog.setIndeterminate(true);
@@ -303,11 +338,11 @@ private void approvePost(Post post) {
         mDialog.setCanceledOnTouchOutside(false);
         mDialog.show();
         postDb
-                .document(post.getPostId())
-                .set(post).addOnSuccessListener(aVoid -> {
-            addToNotification("An Admin Approved Your Post", "post");
-            mFirestore.collection("PendingPosts")
-                    .document(post.getPostId()).delete();
+                .document(issue.getPostId())
+                .set(issue).addOnSuccessListener(aVoid -> {
+            addToNotification("An Admin Approved Your Issue", "issue");
+            mFirestore.collection("Issues")
+                    .document(issue.getPostId()).delete();
             mDialog.dismiss();
             Toasty.success(getApplicationContext(), "Approved", Toasty.LENGTH_SHORT, true).show();
             finish();
@@ -322,9 +357,9 @@ private void deletePost(String Id) {
         mDialog.setCancelable(false);
         mDialog.setCanceledOnTouchOutside(false);
         mDialog.show();
-        mFirestore.collection("PendingPosts")
+        mFirestore.collection("Issues")
                 .document(Id).delete().addOnSuccessListener(aVoid -> {
-                    addToNotification("An Admin Deleted Your Post, Try posting good contents only.", "");
+                    addToNotification("An Admin Deleted Your Issue, Try posting good contents only.", "");
                     mDialog.dismiss();
                     Toasty.success(getApplicationContext(), "Done", Toasty.LENGTH_SHORT, true).show();
                     finish();
@@ -334,21 +369,21 @@ private void deletePost(String Id) {
 
     @SuppressLint("SetTextI18n")
     private void setupCommentView() {
-        if (post.getImage_count() == 0) {
+        if (issue.getImage_count() == 0) {
             pager_layout.setVisibility(View.GONE);
-        } else if (post.getImage_count() == 1) {
+        } else if (issue.getImage_count() == 1) {
             pager_layout.setVisibility(View.VISIBLE);
             ArrayList<MultipleImage> multipleImages = new ArrayList<>();
-            PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, this, multipleImages, false, post.getPostId(), like_btn, post.getUserId(), true);
-            setUrls(multipleImages, photosAdapter, post);
+            PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, this, multipleImages, false, issue.getPostId(), null, issue.getUserId(), true);
+            setUrls(multipleImages, photosAdapter, issue);
             pager.setAdapter(photosAdapter);
             indicator_holder.setVisibility(View.GONE);
             photosAdapter.notifyDataSetChanged();
             pager_layout.setVisibility(View.VISIBLE);
         } else {
             ArrayList<MultipleImage> multipleImages = new ArrayList<>();
-            PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, this, multipleImages, false, post.getPostId(), like_btn, post.getUserId(), true);
-            setUrls(multipleImages, photosAdapter, post);
+            PostPhotosAdapter photosAdapter = new PostPhotosAdapter(Home.context, this, multipleImages, false, issue.getPostId(), null, issue.getUserId(), true);
+            setUrls(multipleImages, photosAdapter, issue);
 
             pager.setAdapter(photosAdapter);
             photosAdapter.notifyDataSetChanged();
@@ -384,10 +419,10 @@ public void run() {
                         .into(user_image))
                 .addOnFailureListener(e -> Log.e("error", e.getLocalizedMessage()));
         p_nameTV.setOnClickListener(view -> {
-            startActivity(new Intent(getApplicationContext(), FriendProfile.class).putExtra("f_id", post.getUserId()));
+            startActivity(new Intent(getApplicationContext(), FriendProfile.class).putExtra("f_id", issue.getUserId()));
         });
         p_instTV.setOnClickListener(view -> {
-            startActivity(new Intent(getApplicationContext(), FriendProfile.class).putExtra("f_id", post.getUserId()));
+            startActivity(new Intent(getApplicationContext(), FriendProfile.class).putExtra("f_id", issue.getUserId()));
         });
 
     }
@@ -412,16 +447,16 @@ protected void overridePendingTransitionExit() {
         overridePendingTransition(R.anim.slide_from_left, R.anim.slide_to_right);
     }
 
-    private void setUrls(ArrayList<MultipleImage> multipleImages, PostPhotosAdapter photosAdapter, Post post) {
+    private void setUrls(ArrayList<MultipleImage> multipleImages, PostPhotosAdapter photosAdapter, Issue issue) {
         String url0, url1, url2, url3, url4, url5, url6;
 
-        url0 = post.getImage_url_0();
-        url1 = post.getImage_url_1();
-        url2 = post.getImage_url_2();
-        url3 = post.getImage_url_3();
-        url4 = post.getImage_url_4();
-        url5 = post.getImage_url_5();
-        url6 = post.getImage_url_6();
+        url0 = issue.getImage_url_0();
+        url1 = issue.getImage_url_1();
+        url2 = issue.getImage_url_2();
+        url3 = issue.getImage_url_3();
+        url4 = issue.getImage_url_4();
+        url5 = issue.getImage_url_5();
+        url6 = issue.getImage_url_6();
 
         if (!TextUtils.isEmpty(url0)) {
             MultipleImage image = new MultipleImage(url0);
@@ -482,215 +517,29 @@ public boolean isOnline() {
         return netInfo != null && netInfo.isConnectedOrConnecting();
     }
 
-    private void getLikeandFav(Post post) {
-        like_btn.setFavorite(alreadyLiked);
-        like_btn.setOnFavoriteChangeListener((buttonView, favorite) -> {
-            updateLike(post.getPostId());
-        });
+  
 
 
-        try {
-            postDb.document(post.getPostId())
-                    .collection("Saved_Users")
-                    .document(mCurrentUser.getUid())
-                    .get()
-                    .addOnSuccessListener(documentSnapshot -> {
-
-                        if (documentSnapshot.exists()) {
-                            boolean fav = documentSnapshot.getBoolean("Saved");
-
-                            sav_button.setFavorite(fav, false);
-                        } else {
-                            Log.e("Fav", "No document found");
-
-                        }
-
-                        if (isOnline()) {
-                            sav_button.setOnFavoriteChangeListener((buttonView, favorite) -> {
-                                Map<String, Object> favMap = new HashMap<>();
-                                if (favorite) {
-                                    favMap.put("Saved", true);
-
-                                    try {
-
-                                        mFirestore.collection("Posts")
-                                                .document(post.getPostId())
-                                                .collection("Saved_Users")
-                                                .document(mCurrentUser.getUid())
-                                                .set(favMap)
-                                                .addOnSuccessListener(aVoid -> {
-                                                    saveCo++;
-                                                    saveCount.setText(String.valueOf(saveCo));
-
-                                                    Map<String, Object> postMap = new HashMap<>();
-                                                    postMap.put("postId", post.getPostId());
-                                                    postMap.put("userId", post.getUserId());
-                                                    postMap.put("name", post.getName());
-                                                    postMap.put("username", post.getUsername());
-                                                    postMap.put("institute", post.getInstitute());
-                                                    postMap.put("dept", post.getDept());
-                                                    postMap.put("timestamp", post.getTimestamp());
-                                                    postMap.put("image_count", post.getImage_count());
-                                                    postMap.put("description", post.getDescription());
-
-                                                    try {
-                                                        postMap.put("image_url_0", post.getImage_url_0());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-                                                    try {
-                                                        postMap.put("image_url_1", post.getImage_url_1());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-                                                    try {
-                                                        postMap.put("image_url_2", post.getImage_url_2());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-                                                    try {
-                                                        postMap.put("image_url_3", post.getImage_url_3());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-                                                    try {
-                                                        postMap.put("image_url_4", post.getImage_url_4());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-                                                    try {
-                                                        postMap.put("image_url_5", post.getImage_url_5());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-                                                    try {
-                                                        postMap.put("image_url_6", post.getImage_url_6());
-                                                    } catch (Exception e) {
-                                                        e.printStackTrace();
-                                                    }
-
-                                                    mFirestore.collection("Users")
-                                                            .document(mCurrentUser.getUid())
-                                                            .collection("Saved_Posts")
-                                                            .document(post.getPostId())
-                                                            .set(postMap)
-                                                            .addOnSuccessListener(aVoid12 -> {
-                                                                // Toast.makeText(context, "Added to Saved_Posts, post '" + post.postId, Toast.LENGTH_SHORT).show();
-                                                            }).addOnFailureListener(e -> Log.e("Error add fav", e.getMessage()));
-                                                })
-                                                .addOnFailureListener(e -> Log.e("Error fav", e.getMessage()));
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                } else {
-                                    favMap.put("Saved", false);
-                                    try {
-                                        mFirestore.collection("Posts")
-                                                .document(post.getPostId())
-                                                .collection("Saved_Users")
-                                                .document(mCurrentUser.getUid())
-                                                //.set(favMap)
-                                                .delete()
-                                                .addOnSuccessListener(aVoid -> {
-                                                    saveCo--;
-                                                    saveCount.setText(String.valueOf(saveCo));
-                                                    mFirestore.collection("Users")
-                                                            .document(mCurrentUser.getUid())
-                                                            .collection("Saved_Posts")
-                                                            .document(post.getPostId())
-                                                            .delete()
-                                                            .addOnSuccessListener(aVoid1 -> {
-                                                                // Toast.makeText(context, "Removed from Saved_Posts, post '" + post.postId, Toast.LENGTH_SHORT).show();
-                                                            })
-                                                            .addOnFailureListener(e -> Log.e("Error remove fav", e.getMessage()));
-
-                                                })
-                                                .addOnFailureListener(e -> Log.e("Error fav", e.getMessage()));
-
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-                            });
-                        }
-                    })
-                    .addOnFailureListener(e -> Log.e("Error Fav", e.getMessage()));
-        } catch (NullPointerException ignored) {
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    void setStatData(Post post) {
-        likeCount.setText(String.valueOf(post.getLiked_count()));
-    }
-
-    @SuppressLint("SetTextI18n")
-    public void updateLike(String postId) {
-        int postLikes = post.getLiked_count();
-        if(!alreadyLiked){
-            postLikes++;
-            try {
-                Map<String, Boolean> likeMap = new HashMap<>();
-                likeMap.put("liked", true);
-                postDb.document(postId)
-                        .collection("Liked_Users")
-                        .document(mCurrentUser.getUid())
-                        .set(likeMap)
-                        .addOnSuccessListener(aVoid -> {
-                            alreadyLiked=true;
-                                addToNotification("Liked your post", "like");
-                        })
-                        .addOnFailureListener(e -> Log.e("Error like", e.getMessage()));
-            } catch (Exception ignored) {
-            }
-        }else{
-            postLikes--;
-            try {
-                mFirestore.collection("Posts")
-                        .document(postId)
-                        .collection("Liked_Users")
-                        .document(mCurrentUser.getUid())
-                        //.set(likeMap)
-                        .delete()
-                        .addOnSuccessListener(aVoid -> {
-                            alreadyLiked=true;
-                            //holder.like_count.setText(String.valueOf(Integer.parseInt(holder.like_count.getText().toString())-1));
-                            //Toast.makeText(context, "Unliked post '" + post.postId, Toast.LENGTH_SHORT).show();
-                        })
-                        .addOnFailureListener(e -> Log.e("Error unlike", e.getMessage()));
-            } catch (Exception ignored) {
-            }
-        }
-        likeCount.setText(String.valueOf(postLikes));
-        HashMap<String, Object> scoreMap = new HashMap<>();
-        scoreMap.put("liked_count", postLikes);
-        mFirestore
-                .collection("Posts")
-                .document(postId)
-                .update(scoreMap).addOnSuccessListener(aVoid -> {
-        });
-    }
-
     @SuppressLint("SetTextI18n")
     public void updateComment() {
         try {
-            int com_count = post.getComment_count()+1;
+            int com_count = issue.getComment_count()+1;
             HashMap<String, Object> scoreMap = new HashMap<>();
             scoreMap.put("comment_count", com_count);
             mFirestore.collection("Posts")
-                    .document(post.getPostId())
+                    .document(issue.getPostId())
                     .update(scoreMap).addOnSuccessListener(aVoid -> {
-                        CommentCount.setText("   "+com_count);
+
             });
         } catch (NullPointerException ignored) {
 
         }
     }
     private void addToNotification(String message, String type) {
-        if (!post.getUserId().equals(me.getId())) {
-            Notification notification = new Notification(post.getPostId(),post.getUserId(), me.getName(), me.getImage(), message, String.valueOf(System.currentTimeMillis()), type, post.getPostId(), false);
+        if (!issue.getUserId().equals(me.getId())) {
+            Notification notification = new Notification(issue.getPostId(),issue.getUserId(), me.getName(), me.getImage(), message, String.valueOf(System.currentTimeMillis()), type, issue.getPostId(), false);
             mFirestore.collection("Users")
-                    .document(post.getUserId())
+                    .document(issue.getUserId())
                     .collection("Info_Notifications")
                     .document(notification.getId()).set(notification)
                     .addOnSuccessListener(documentReference -> new SendNotificationAsyncTask(notification).execute())
@@ -706,17 +555,17 @@ public void finishThis(View v) {
     @SuppressLint("NotifyDataSetChanged")
     private void sendComment(final String comment, final ProgressBar mProgress) {
         mProgress.setVisibility(View.VISIBLE);
-        String commentId = getSaltString();
-        Comment comment1 = new Comment(me.getId(), me.getName(), me.getImage(), post.getPostId(), comment, String.valueOf(System.currentTimeMillis()), commentId);
+        String commentId =  getSaltString();
+        Comment comment1 = new Comment(me.getId(), me.getName(), me.getImage(), issue.getPostId(), comment, String.valueOf(System.currentTimeMillis()), commentId);
         mCommentText.setHtml("");
         mFirestore.collection("Posts")
-                .document(post.getPostId())
+                .document(issue.getPostId())
                 .collection("Comments")
                 .document(commentId)
                 .set(comment1)
                 .addOnSuccessListener(documentReference -> {
                     mProgress.setVisibility(View.GONE);
-                    addToNotification("Commented on your post", "comment");
+                    addToNotification("Commented on your issue", "comment");
                     updateComment();
                     Toasty.success(IssuesDetailsActivity.this, "Comment added", Toasty.LENGTH_SHORT, true).show();
                     mAdapter.notifyDataSetChanged();
@@ -733,10 +582,10 @@ private void sendComment(final String comment, final ProgressBar mProgress) {
 
     @SuppressLint({"SetTextI18n", "NotifyDataSetChanged"})
     private void getComments(final ProgressBar mProgress) {
-        CommentCount.setText("   " + post.getComment_count());
+
         mProgress.setVisibility(View.VISIBLE);
         mFirestore.collection("Posts")
-                .document(post.getPostId())
+                .document(issue.getPostId())
                 .collection("Comments")
                 .orderBy("timestamp", Query.Direction.DESCENDING).limit(15)
                 .addSnapshotListener(this, (querySnapshot, e) -> {
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/OpenMapsApiClient.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/OpenMapsApiClient.java
new file mode 100644
index 0000000..00f8d49
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/OpenMapsApiClient.java
@@ -0,0 +1,32 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+import java.io.IOException;
+
+import retrofit2.Call;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class OpenMapsApiClient {
+    private static final String BASE_URL = "https://geocode.maps.co/";
+    private OpenMapsApiService service;
+
+    public OpenMapsApiClient() {
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+
+        service = retrofit.create(OpenMapsApiService.class);
+    }
+
+    public String reverseGeocode(String lat, String lon, String apiKey) throws IOException {
+        Call<Address> call = service.reverseGeocode(lat, lon, apiKey);
+        Address response = call.execute().body();
+
+        if (response != null) {
+            return response.getAdditionalProperties().get("display_name").toString();
+        } else {
+            return "No results found";
+        }
+    }
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/OpenMapsApiService.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/OpenMapsApiService.java
new file mode 100644
index 0000000..9de9466
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/OpenMapsApiService.java
@@ -0,0 +1,14 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.issue;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface OpenMapsApiService {
+    @GET("reverse")
+    Call<Address> reverseGeocode(
+            @Query("lat") String lat,
+            @Query("lon") String lon,
+            @Query("api_key") String apiKey
+    );
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/PostIssue.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/PostIssue.java
index 2ded5f4..8c417b0 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/PostIssue.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/issue/PostIssue.java
@@ -2,12 +2,15 @@
 
 import static android.view.View.GONE;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.location.Location;
+import android.location.LocationListener;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -39,6 +42,11 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
+import com.karumi.dexter.Dexter;
+import com.karumi.dexter.MultiplePermissionsReport;
+import com.karumi.dexter.PermissionToken;
+import com.karumi.dexter.listener.PermissionRequest;
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener;
 import com.marcoscg.dialogsheet.DialogSheet;
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.adapters.PagerPhotosAdapter;
@@ -50,6 +58,7 @@
 import com.yalantis.ucrop.UCrop;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -58,7 +67,7 @@
 import es.dmoral.toasty.Toasty;
 
 @SuppressWarnings("UnusedAssignment")
-public class PostIssue extends AppCompatActivity {
+public class PostIssue extends AppCompatActivity implements LocationListener {
 
     List<Images> imagesList;
     ViewPager pager;
@@ -67,6 +76,7 @@ public class PostIssue extends AppCompatActivity {
     final ArrayList<String> uploadedImagesUrl = new ArrayList<>();
     String tag;
     RichEditor mRichEd;
+    String address;
     private FirebaseUser mCurrentUser;
     private DotsIndicator indicator;
     private RelativeLayout indicator_holder;
@@ -75,6 +85,9 @@ public class PostIssue extends AppCompatActivity {
     private int serviceCount;
     private ConstraintLayout codeLayout;
     EditText latexText, codeText;
+    EditText addressView;
+
+    double lat, lon;
     public static void startActivity(Context context) {
         Intent intent = new Intent(context, PostIssue.class);
         context.startActivity(intent);
@@ -126,7 +139,7 @@ public void onBackPressed() {
     }
 
     Switch postAnnounimasentSwitch;
-    
+
     Boolean isAnonymous;
 
     @Override
@@ -135,6 +148,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setTheme(R.style.AppTheme);
         setContentView(R.layout.activity_issue_image);
         imagesList = getIntent().getParcelableArrayListExtra("imagesList");
+
+        askPermission();
+
         if (imagesList.isEmpty()) {
             finish();
         }
@@ -148,8 +164,9 @@ protected void onCreate(Bundle savedInstanceState) {
         latexText = findViewById(R.id.latex_equation);
         codeText = findViewById(R.id.code);
         type = findViewById(R.id.spinner_type);
+        addressView = findViewById(R.id.address);
         postAnnounimasentSwitch = findViewById(R.id.switch1);
-        ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getApplicationContext(), android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.item_type_x));
+        ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getApplicationContext(), android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.issues));
         arrayAdapter.setDropDownViewResource(android.R.layout.simple_expandable_list_item_1);
         type.setAdapter(arrayAdapter);
         type.setOnItemSelectedListener(new TypeXSpinnerClass());
@@ -295,9 +312,6 @@ public void onClick(View view) {
         });
 
 
-
-
-
         findViewById(R.id.action_heading1).setOnClickListener(v ->{
             if(!isHead){
                 findViewById(R.id.action_heading1).setBackgroundColor(getResources().getColor(R.color.selectted));
@@ -617,6 +631,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
                             intent.putParcelableArrayListExtra("imagesList", (ArrayList<? extends Parcelable>) imagesList);
                             intent.putExtra("notification_id", (int) System.currentTimeMillis());
                             intent.putExtra("current_id", mCurrentUser.getUid());
+                            intent.putExtra("isAnonymous", isAnonymous);
+                            intent.putExtra("address", addressView.getText().toString());
+                            intent.putExtra("lat", lat);
+                            intent.putExtra("lon", lon);
+
+                            intent.putExtra("posttype", "issue");
+
                             try {
                                 intent.putExtra("description", mRichEd.getHtml());
                             } catch (NullPointerException h) {
@@ -766,6 +787,32 @@ public void openCropItem(View view) {
                 .start(this);
     }
 
+    @Override
+    public void onLocationChanged(@NonNull Location location) {
+        Toast.makeText(this, "Fetching Location...", Toast.LENGTH_SHORT).show();
+        lat = location.getLatitude();
+        lon = location.getLongitude();
+
+
+        OpenMapsApiClient client = new OpenMapsApiClient();
+        String latlng = lat  + ", " + lon; // "40.714224,-73.961452"; // Sample latitude and longitude la
+        String apiKey = getString(R.string.google_api_key);
+
+        try {
+            address = client.reverseGeocode(String.valueOf(lat), String.valueOf(lon) , "663e63f38c3ea151466018jwcc4155c");
+            System.out.println("Address: " + address);
+
+            addressView.setText(address);
+        } catch (IOException e) {
+            addressView.setText(e.toString());
+            e.printStackTrace();
+        }
+
+
+
+//        call place api to get Place
+    }
+
 
     class TypeXSpinnerClass implements AdapterView.OnItemSelectedListener {
         public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
@@ -783,4 +830,28 @@ private void addExtraCode(EditText codeText) {
         codeText.getText().replace(Math.min(start, end), Math.max(start, end),
                 "    ", 0, "    ".length());
     }
+
+    private void askPermission() {
+
+
+
+        Dexter.withActivity(this)
+                .withPermissions(
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        Manifest.permission.READ_EXTERNAL_STORAGE
+                )
+                .withListener(new MultiplePermissionsListener() {
+                    @Override
+                    public void onPermissionsChecked(MultiplePermissionsReport report) {
+                        // Toasty.info(RegisterActivity.this, "You have denied some permissions permanently, if the app force close try granting permission from settings.", Toasty.LENGTH_LONG, true).show();
+                    }
+
+                    @Override
+                    public void onPermissionRationaleShouldBeShown(List<PermissionRequest> permissions, PermissionToken token) {
+                        token.continuePermissionRequest();
+                    }
+                })
+                .check();
+    }
 }
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MapView.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/MapView.java
similarity index 90%
rename from android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MapView.java
rename to android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/MapView.java
index f2077a5..be22508 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/MapView.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/MapView.java
@@ -1,4 +1,4 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities;
+package com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts;
 
 
 import android.Manifest;
@@ -18,7 +18,6 @@
 import android.util.Log;
 import android.view.View;
 import android.view.Window;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -70,6 +69,10 @@
 import java.util.Objects;
 
 import es.dmoral.toasty.Toasty;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
 
 
 public class MapView extends AppCompatActivity implements ConnectionCallbacks,
@@ -80,6 +83,10 @@ public class MapView extends AppCompatActivity implements ConnectionCallbacks,
     private List<Polyline> polyLines = new ArrayList<>();
 
 
+    private static final String BASE_URL = "http://3.12.32.123:5000/";
+    private NearbyStsService nearbyStsService;
+
+
     Trip trip = new Trip();
 
     // Populate the trip object
@@ -131,7 +138,9 @@ protected void onCreate(Bundle savedInstanceState) {
                 new LatLng( 23.72866, 90.396453) // CSE DU
         );
 
-        Button qr_btn = findViewById(R.id.scan_button);
+
+
+
 
 
 
@@ -334,7 +343,7 @@ public void onMapReady(@NonNull GoogleMap googleMap) {
         map = googleMap;
         map.setTrafficEnabled(false);
         map.setBuildingsEnabled(true);
-        updateCamera(new LatLng(23.72866, 90.396453), 0);
+//        updateCamera(new LatLng(23.72866, 90.396453), 0);
     }
 
     @Override
@@ -432,16 +441,42 @@ public void onLocationChanged(@NonNull Location location) {
         mapUpdate.put("velocity", velocity);
         mapUpdate.put("bearing", location.getBearing());
 
-        Toasty.info(
-                this,
-                "Location Updated:" +
-                        " Lat: " + lat
-                        + " Lon: " + lon
-                        + " Bearing: " + location.getBearing()
-                        + " Velocity: " + velocity,
-                Toast.LENGTH_SHORT,
-                true
-        ).show();
+        updateCamera(new LatLng(lat, lon), location.getBearing());
+
+        Retrofit retrofit = RetrofitClient.getClient(BASE_URL);
+
+        // Create an instance of the service
+        nearbyStsService = retrofit.create(NearbyStsService.class);
+
+        // Make the API call
+        Call<STSResponse> call = nearbyStsService.getNearbySts( String.valueOf(lat), String.valueOf(lon));
+        call.enqueue(new Callback<STSResponse>() {
+            @Override
+            public void onResponse(Call<STSResponse> call, Response<STSResponse> response) {
+                if (response.isSuccessful()) {
+                    STSResponse response1 = response.body();
+
+//                    Add Marker for each STS
+                    for (NearbySts sts : response1.sts) {
+                        stsList.add(new LatLng(sts.getLat(), sts.getLon()));
+                        MarkerOptions options = new MarkerOptions();
+                        options.position(new LatLng(sts.getLat(), sts.getLon()) );
+                        options.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED));
+//                        add a text to the marker
+                        options.title(sts.getName());
+                        map.addMarker(options);
+                    }
+
+                } else {
+                    // Handle error
+                }
+            }
+
+            @Override
+            public void onFailure(Call<STSResponse> call, Throwable t) {
+                // Handle failure
+            }
+        });
         //We will Update the mapMetaData object to the server
         if (!trip.getVehicleEntries().isEmpty()) {
             float[] results = new float[1];
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/NearbySts.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/NearbySts.java
new file mode 100644
index 0000000..8a9e5e5
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/NearbySts.java
@@ -0,0 +1,147 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts;
+
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+
+
+public class NearbySts implements Serializable
+{
+
+@SerializedName("id")
+@Expose
+private Integer id;
+@SerializedName("name")
+@Expose
+private String name;
+@SerializedName("wardNumber")
+@Expose
+private String wardNumber;
+@SerializedName("capacity")
+@Expose
+private Integer capacity;
+@SerializedName("currentWasteVolume")
+@Expose
+private Integer currentWasteVolume;
+@SerializedName("lat")
+@Expose
+private Double lat;
+@SerializedName("lon")
+@Expose
+private Double lon;
+@SerializedName("address")
+@Expose
+private String address;
+@SerializedName("logo")
+@Expose
+private String logo;
+@SerializedName("fine")
+@Expose
+private Integer fine;
+@SerializedName("startTime")
+@Expose
+private Integer startTime;
+@SerializedName("endTime")
+@Expose
+private Integer endTime;
+private final static long serialVersionUID = 4238233360176200559L;
+
+public Integer getId() {
+return id;
+}
+
+public void setId(Integer id) {
+this.id = id;
+}
+
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
+public String getWardNumber() {
+return wardNumber;
+}
+
+public void setWardNumber(String wardNumber) {
+this.wardNumber = wardNumber;
+}
+
+public Integer getCapacity() {
+return capacity;
+}
+
+public void setCapacity(Integer capacity) {
+this.capacity = capacity;
+}
+
+public Integer getCurrentWasteVolume() {
+return currentWasteVolume;
+}
+
+public void setCurrentWasteVolume(Integer currentWasteVolume) {
+this.currentWasteVolume = currentWasteVolume;
+}
+
+public Double getLat() {
+return lat;
+}
+
+public void setLat(Double lat) {
+this.lat = lat;
+}
+
+public Double getLon() {
+return lon;
+}
+
+public void setLon(Double lon) {
+this.lon = lon;
+}
+
+public String getAddress() {
+return address;
+}
+
+public void setAddress(String address) {
+this.address = address;
+}
+
+public String getLogo() {
+return logo;
+}
+
+public void setLogo(String logo) {
+this.logo = logo;
+}
+
+public Integer getFine() {
+return fine;
+}
+
+public void setFine(Integer fine) {
+this.fine = fine;
+}
+
+public Integer getStartTime() {
+return startTime;
+}
+
+public void setStartTime(Integer startTime) {
+this.startTime = startTime;
+}
+
+public Integer getEndTime() {
+return endTime;
+}
+
+public void setEndTime(Integer endTime) {
+this.endTime = endTime;
+}
+
+}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/NearbyStsService.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/NearbyStsService.java
new file mode 100644
index 0000000..6006a6d
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/NearbyStsService.java
@@ -0,0 +1,13 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts;
+
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+public interface NearbyStsService {
+    @GET("nearbysts")
+    Call<STSResponse> getNearbySts(
+        @Query("lat") String latitude,
+        @Query("lon") String longitude
+    );
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/RetrofitClient.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/RetrofitClient.java
new file mode 100644
index 0000000..e8e07b0
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/RetrofitClient.java
@@ -0,0 +1,18 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts;
+
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class RetrofitClient {
+    private static Retrofit retrofit = null;
+
+    public static Retrofit getClient(String baseUrl) {
+        if (retrofit == null) {
+            retrofit = new Retrofit.Builder()
+                    .baseUrl(baseUrl)
+                    .addConverterFactory(GsonConverterFactory.create())
+                    .build();
+        }
+        return retrofit;
+    }
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/STSResponse.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/STSResponse.java
new file mode 100644
index 0000000..3045f3e
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/nearbysts/STSResponse.java
@@ -0,0 +1,6 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.nearbysts;
+
+public class STSResponse {
+    public NearbySts[] sts;
+
+}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/CommentsActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/CommentsActivity.java
index 5b8d724..5e9deef 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/CommentsActivity.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/CommentsActivity.java
@@ -65,7 +65,7 @@
 import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
 import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
 import com.quantum_guys.dncc_eco_sync.repository.UserRepository;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 import com.quantum_guys.dncc_eco_sync.ui.fragment.Home;
 import com.quantum_guys.dncc_eco_sync.utils.AnimationUtil;
 import com.quantum_guys.dncc_eco_sync.utils.MathView;
@@ -76,7 +76,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/WhoLikedActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/WhoLikedActivity.java
index 69c3ddd..0e0f3fc 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/WhoLikedActivity.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/post/WhoLikedActivity.java
@@ -1 +1 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.post;

import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.transition.Explode;
import android.transition.Fade;
import android.util.AndroidRuntimeException;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.google.firebase.firestore.DocumentChange;
import com.google.firebase.firestore.FirebaseFirestore;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Player;
import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;

import java.util.ArrayList;
import java.util.List;

import es.dmoral.toasty.Toasty;

public class WhoLikedActivity extends AppCompatActivity {

    @SuppressLint({"CheckResult", "NotifyDataSetChanged"})
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        requestWindowFeature(Window.FEATURE_NO_TITLE);
        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
        getWindow().setEnterTransition(new Explode());
        getWindow().setExitTransition(new Fade());

        super.onCreate(savedInstanceState);
        SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
        String themeName = sharedPreferences.getString("ThemeName", "Default");
        if (themeName.equalsIgnoreCase("TealTheme")) {
            setTheme(R.style.TealTheme);
        } else if (themeName.equalsIgnoreCase("VioleteTheme")) {
            setTheme(R.style.VioleteTheme);
        } else if (themeName.equalsIgnoreCase("PinkTheme")) {
            setTheme(R.style.PinkTheme);
        } else if (themeName.equalsIgnoreCase("DelRio")) {
            setTheme(R.style.DelRio);
        } else if (themeName.equalsIgnoreCase("DarkTheme")) {
            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
            setTheme(R.style.Dark);
        } else if (themeName.equalsIgnoreCase("Lynch")) {
            setTheme(R.style.Lynch);
        } else {
            setTheme(R.style.AppTheme);
        }
        setContentView(R.layout.activity_who_liked);
        Toolbar toolbar = findViewById(R.id.toolbar3);

        ProgressBar loading = findViewById(R.id.progressBar4);
        RecyclerView recyclerView = findViewById(R.id.liked_list);
        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getApplicationContext());
        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
        recyclerView.setLayoutManager(layoutManager);
        recyclerView.setHasFixedSize(true);
        String postId = getIntent().getStringExtra("postId");
        String type = getIntent().getStringExtra("type");
        List<Player> playerList = new ArrayList<>();
        if (type.equals("Liked_Users")) {
            toolbar.setTitle("people who Liked this post");
        } else {
            toolbar.setTitle("people who Saved this post");
        }
        try {
            FirebaseFirestore.getInstance().collection("Posts")
                    .document(postId)
                    .collection(type)
                    .get()
                    .addOnSuccessListener(queryDocumentSnapshots -> {
                        for (final DocumentChange doc : queryDocumentSnapshots.getDocumentChanges()) {
                            FirebaseFirestore.getInstance().collection("Users")
                                    .document(doc.getDocument().getId())
                                    .get()
                                    .addOnSuccessListener(documentSnapshot -> {
                                        try {
                                            Player player = new Player(doc.getDocument().getId(), documentSnapshot.getString("name"), documentSnapshot.getString("image"), documentSnapshot.getLong("score"),  documentSnapshot.getLong("lastTimestamp"));
                                            playerList.add(player);
                                            UserAdapterw jhu = new UserAdapterw(playerList, getApplicationContext());
                                            recyclerView.setAdapter(jhu);
                                            jhu.notifyDataSetChanged();
                                            loading.setVisibility(View.GONE);
                                        } catch (NullPointerException ignored) {

                                        }
                                    });
                        }
                    });
        } catch (NullPointerException ignored) {
            Toasty.error(getApplicationContext(), "Failed to load", Toasty.LENGTH_LONG, false);
        }
    }

}

class UserAdapterw extends RecyclerView.Adapter<UserAdapterw.MyViewHolder> {
    private final List<Player> playerList;
    private final Context context;
    private String check, otherUid;

    public UserAdapterw(List<Player> playerList, Context context) {
        this.playerList = playerList;
        this.context = context;
    }

    @NonNull
    @Override
    public MyViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_user_liked, viewGroup, false);
        return new MyViewHolder(view);
    }

    @SuppressLint("SetTextI18n")
    @Override
    public void onBindViewHolder(@NonNull MyViewHolder viewHolder, int i) {
        try {
            final Player player = playerList.get(i);
            if (!player.getId().equals(userId)) {
                viewHolder.nameTV.setText(player.getName());
            } else {
                viewHolder.nameTV.setText("You");
            }
            viewHolder.levelTv.setText(String.valueOf(getLevelNum((int) player.getScore())));
            viewHolder.itemView.setOnClickListener(view -> {
                if (!player.getId().equals(userId)) {
                    context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", player.getId()).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                }
            });

            Glide.with(context)
                    .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                    .load(player.getImage())
                    .into(viewHolder.image);
        } catch (AndroidRuntimeException ignored) {

        }

    }

    @Override
    public int getItemCount() {
        return playerList.size();
    }

    public Integer getLevelNum(int score) {
        final int level;
        if (score <= 500) {
            level = 1;
        } else if (score <= 1000) {
            level = 2;
        } else if (score <= 1500) {
            level = 3;
        } else if (score <= 2000) {
            level = 4;
        } else if (score <= 2500) {
            level = 5;
        } else if (score <= 3500) {
            level = 6;
        } else if (score <= 5000) {
            level = 7;
        } else {
            level = -1;
        }
        return level;
    }

    public static class MyViewHolder extends RecyclerView.ViewHolder {
        final TextView nameTV;
        final ImageView image;
        final TextView levelTv;


        public MyViewHolder(View itemView) {
            super(itemView);
            nameTV = itemView.findViewById(R.id.name);
            image = itemView.findViewById(R.id.image);
            levelTv = itemView.findViewById(R.id.levelTv);
        }
    }
}
\ No newline at end of file
+package com.quantum_guys.dncc_eco_sync.ui.activities.post;

import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.transition.Explode;
import android.transition.Fade;
import android.util.AndroidRuntimeException;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.google.firebase.firestore.DocumentChange;
import com.google.firebase.firestore.FirebaseFirestore;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Player;
import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;

import java.util.ArrayList;
import java.util.List;

import es.dmoral.toasty.Toasty;

public class WhoLikedActivity extends AppCompatActivity {

    @SuppressLint({"CheckResult", "NotifyDataSetChanged"})
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        requestWindowFeature(Window.FEATURE_NO_TITLE);
        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
        getWindow().setEnterTransition(new Explode());
        getWindow().setExitTransition(new Fade());

        super.onCreate(savedInstanceState);
        SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
        String themeName = sharedPreferences.getString("ThemeName", "Default");
        if (themeName.equalsIgnoreCase("TealTheme")) {
            setTheme(R.style.TealTheme);
        } else if (themeName.equalsIgnoreCase("VioleteTheme")) {
            setTheme(R.style.VioleteTheme);
        } else if (themeName.equalsIgnoreCase("PinkTheme")) {
            setTheme(R.style.PinkTheme);
        } else if (themeName.equalsIgnoreCase("DelRio")) {
            setTheme(R.style.DelRio);
        } else if (themeName.equalsIgnoreCase("DarkTheme")) {
            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
            setTheme(R.style.Dark);
        } else if (themeName.equalsIgnoreCase("Lynch")) {
            setTheme(R.style.Lynch);
        } else {
            setTheme(R.style.AppTheme);
        }
        setContentView(R.layout.activity_who_liked);
        Toolbar toolbar = findViewById(R.id.toolbar3);

        ProgressBar loading = findViewById(R.id.progressBar4);
        RecyclerView recyclerView = findViewById(R.id.liked_list);
        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getApplicationContext());
        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
        recyclerView.setLayoutManager(layoutManager);
        recyclerView.setHasFixedSize(true);
        String postId = getIntent().getStringExtra("postId");
        String type = getIntent().getStringExtra("type");
        List<Player> playerList = new ArrayList<>();
        if (type.equals("Liked_Users")) {
            toolbar.setTitle("people who Liked this post");
        } else {
            toolbar.setTitle("people who Saved this post");
        }
        try {
            FirebaseFirestore.getInstance().collection("Posts")
                    .document(postId)
                    .collection(type)
                    .get()
                    .addOnSuccessListener(queryDocumentSnapshots -> {
                        for (final DocumentChange doc : queryDocumentSnapshots.getDocumentChanges()) {
                            FirebaseFirestore.getInstance().collection("Users")
                                    .document(doc.getDocument().getId())
                                    .get()
                                    .addOnSuccessListener(documentSnapshot -> {
                                        try {
                                            Player player = new Player(doc.getDocument().getId(), documentSnapshot.getString("name"), documentSnapshot.getString("image"), documentSnapshot.getLong("score"),  documentSnapshot.getLong("lastTimestamp"));
                                            playerList.add(player);
                                            UserAdapterw jhu = new UserAdapterw(playerList, getApplicationContext());
                                            recyclerView.setAdapter(jhu);
                                            jhu.notifyDataSetChanged();
                                            loading.setVisibility(View.GONE);
                                        } catch (NullPointerException ignored) {

                                        }
                                    });
                        }
                    });
        } catch (NullPointerException ignored) {
            Toasty.error(getApplicationContext(), "Failed to load", Toasty.LENGTH_LONG, false);
        }
    }

}

class UserAdapterw extends RecyclerView.Adapter<UserAdapterw.MyViewHolder> {
    private final List<Player> playerList;
    private final Context context;
    private String check, otherUid;

    public UserAdapterw(List<Player> playerList, Context context) {
        this.playerList = playerList;
        this.context = context;
    }

    @NonNull
    @Override
    public MyViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_user_liked, viewGroup, false);
        return new MyViewHolder(view);
    }

    @SuppressLint("SetTextI18n")
    @Override
    public void onBindViewHolder(@NonNull MyViewHolder viewHolder, int i) {
        try {
            final Player player = playerList.get(i);
            if (!player.getId().equals(userId)) {
                viewHolder.nameTV.setText(player.getName());
            } else {
                viewHolder.nameTV.setText("You");
            }
            viewHolder.levelTv.setText(String.valueOf(getLevelNum((int) player.getScore())));
            viewHolder.itemView.setOnClickListener(view -> {
                if (!player.getId().equals(userId)) {
                    context.startActivity(new Intent(context, FriendProfile.class).putExtra("f_id", player.getId()).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
                }
            });

            Glide.with(context)
                    .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                    .load(player.getImage())
                    .into(viewHolder.image);
        } catch (AndroidRuntimeException ignored) {

        }

    }

    @Override
    public int getItemCount() {
        return playerList.size();
    }

    public Integer getLevelNum(int score) {
        final int level;
        if (score <= 500) {
            level = 1;
        } else if (score <= 1000) {
            level = 2;
        } else if (score <= 1500) {
            level = 3;
        } else if (score <= 2000) {
            level = 4;
        } else if (score <= 2500) {
            level = 5;
        } else if (score <= 3500) {
            level = 6;
        } else if (score <= 5000) {
            level = 7;
        } else {
            level = -1;
        }
        return level;
    }

    public static class MyViewHolder extends RecyclerView.ViewHolder {
        final TextView nameTV;
        final ImageView image;
        final TextView levelTv;


        public MyViewHolder(View itemView) {
            super(itemView);
            nameTV = itemView.findViewById(R.id.name);
            image = itemView.findViewById(R.id.image);
            levelTv = itemView.findViewById(R.id.levelTv);
        }
    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/AnimatorListener.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/AnimatorListener.java
deleted file mode 100644
index 82b7935..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/AnimatorListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import android.animation.Animator;
-
-public class AnimatorListener implements Animator.AnimatorListener {
-    @Override
-    public void onAnimationStart(Animator animator) {
-    }
-
-    @Override
-    public void onAnimationEnd(Animator animator) {
-    }
-
-    @Override
-    public void onAnimationCancel(Animator animator) {
-    }
-
-    @Override
-    public void onAnimationRepeat(Animator animator) {
-    }
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/BattleModel.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/BattleModel.java
deleted file mode 100644
index 6a53e5f..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/BattleModel.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-import androidx.room.PrimaryKey;
-import androidx.room.TypeConverters;
-
-import com.quantum_guys.dncc_eco_sync.models.Question;
-import com.quantum_guys.dncc_eco_sync.utils.BooleanLiatConverter;
-import com.quantum_guys.dncc_eco_sync.utils.DataTypeConverterQuestion;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("NotNullFieldNotInitialized")
-@Entity
-public class BattleModel implements Serializable {
-
-    public String topic;
-    @TypeConverters(BooleanLiatConverter.class)
-    public
-    ArrayList<Boolean> receiverList;
-    @TypeConverters(BooleanLiatConverter.class)
-    public ArrayList<Boolean> senderAnswerList;
-    String senderUid, receiverUid;
-    String timestamp;
-    String winner;
-    Boolean scoreUpdated;
-    @TypeConverters(DataTypeConverterQuestion.class)
-    List<Question> questionList;
-    @PrimaryKey
-    @NonNull
-    String battleId;
-
-    @Ignore
-    public BattleModel() {
-    }
-
-    public BattleModel(String senderUid, String receiverUid, List<Question> questionList, ArrayList<Boolean> senderAnswerList, ArrayList<Boolean> receiverList, String timestamp, String winner, @NonNull String battleId, String topic, Boolean scoreUpdated) {
-        this.senderUid = senderUid;
-        this.receiverUid = receiverUid;
-        this.questionList = questionList;
-        this.senderAnswerList = senderAnswerList;
-        this.receiverList = receiverList;
-        this.timestamp = timestamp;
-        this.winner = winner;
-        this.battleId = battleId;
-        this.topic = topic;
-        this.scoreUpdated = scoreUpdated;
-    }
-
-    public String getSenderUid() {
-        return senderUid;
-    }
-
-    public void setSenderUid(String senderUid) {
-        this.senderUid = senderUid;
-    }
-
-    public String getReceiverUid() {
-        return receiverUid;
-    }
-
-    public void setReceiverUid(String receiverUid) {
-        this.receiverUid = receiverUid;
-    }
-
-    public List<Question> getQuestionList() {
-        return questionList;
-    }
-
-    public void setQuestionList(List<Question> questionList) {
-        this.questionList = questionList;
-    }
-
-    public ArrayList<Boolean> getSenderAnswerList() {
-        return senderAnswerList;
-    }
-
-    public void setSenderAnswerList(ArrayList<Boolean> senderAnswerList) {
-        this.senderAnswerList = senderAnswerList;
-    }
-
-    public List<Boolean> getReceiverList() {
-        return receiverList;
-    }
-
-    public void setReceiverList(ArrayList<Boolean> receiverList) {
-        this.receiverList = receiverList;
-    }
-
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getWinner() {
-        return winner;
-    }
-
-    public void setWinner(String winner) {
-        this.winner = winner;
-    }
-
-    @SuppressWarnings("NullableProblems")
-    public String getBattleId() {
-        return battleId;
-    }
-
-    public void setBattleId(@NonNull String battleId) {
-        this.battleId = battleId;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public Boolean getScoreUpdated() {
-        return scoreUpdated;
-    }
-
-    public void setScoreUpdated(Boolean scoreUpdated) {
-        this.scoreUpdated = scoreUpdated;
-    }
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/PlayQuiz.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/PlayQuiz.java
deleted file mode 100644
index 4e8cd91..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/PlayQuiz.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.inHome;
-
-import android.annotation.SuppressLint;
-import android.app.ActivityOptions;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-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 androidx.lifecycle.ViewModelProviders;
-import androidx.paging.PagedList;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.firebase.ui.firestore.paging.FirestorePagingAdapter;
-import com.firebase.ui.firestore.paging.FirestorePagingOptions;
-import com.firebase.ui.firestore.paging.LoadingState;
-import com.github.marlonlom.utilities.timeago.TimeAgo;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.firestore.FirebaseFirestore;
-import com.google.firebase.firestore.Query;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.adapters.PlayerAdapter;
-import com.quantum_guys.dncc_eco_sync.models.Player;
-import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import es.dmoral.toasty.Toasty;
-
-/**
- * Created by jhm69
- */
-
-public class PlayQuiz extends Fragment {
-    List<String> usersId;
-    UserViewModel userViewModel;
-    long myType;
-    private FirebaseFirestore firestore;
-    private RecyclerView mRecyclerView;
-    private SwipeRefreshLayout refreshLayout;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.send_message_fragment, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        firestore = FirebaseFirestore.getInstance();
-
-        usersId = new ArrayList<>();
-        mRecyclerView = view.findViewById(R.id.messageList);
-        refreshLayout = view.findViewById(R.id.refreshLayout);
-
-        userViewModel = ViewModelProviders.of(requireActivity()).get(UserViewModel.class);
-
-        myType = userViewModel.getUser().getType();
-
-        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));
-
-        refreshLayout.setOnRefreshListener(this::setupAdapter);
-        setupAdapter();
-    }
-
-    @Override
-    public void onDestroy() {
-        inHome = true;
-        super.onDestroy();
-    }
-
-    private void setupAdapter() {
-        PagedList.Config config = new PagedList.Config.Builder()
-                .setEnablePlaceholders(false)
-                .setPrefetchDistance(5)
-                .setPageSize(20)
-                .build();
-        Query mQuery = firestore.collection("Users").whereEqualTo("type", myType)
-                .orderBy("lastTimestamp", Query.Direction.DESCENDING);
-
-        FirestorePagingOptions<Player> options = new FirestorePagingOptions.Builder<Player>()
-                .setLifecycleOwner(this)
-                .setQuery(mQuery, config, Player.class)
-                .build();
-        // Instantiate Paging Adapter
-
-        //holder.bind(post, holder, position,  mmBottomSheetDialog, statsheetView);
-        FirestorePagingAdapter<Player, PlayerAdapter.ViewHolder> mAdapter = new FirestorePagingAdapter<Player, PlayerAdapter.ViewHolder>(options) {
-            @NonNull
-            @Override
-            public PlayerAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-                View view = getLayoutInflater().inflate(R.layout.item_quiz_profile, parent, false);
-                return new PlayerAdapter.ViewHolder(view);
-            }
-
-            @SuppressLint({"SetTextI18n", "CheckResult"})
-            @Override
-            protected void onBindViewHolder(@NonNull PlayerAdapter.ViewHolder holder, int position, @NonNull Player user) {
-                usersId.add(user.getId());
-                Objects.requireNonNull(getView()).findViewById(R.id.default_item).setVisibility(View.GONE);
-                holder.name.setText(user.getName());
-                holder.institute.setText(user.getDept() + ", " + user.getInstitute());
-                if (user.getDept().equals("")) {
-                    holder.institute.setText(user.getInstitute());
-                } else if (user.getInstitute().equals("")) {
-                    holder.institute.setText(user.getDept());
-                } else {
-                    holder.institute.setText(user.getDept() + ", " + user.getInstitute());
-                }
-                int score = (int) user.getScore();
-                holder.level.setText(String.valueOf(score));
-                Glide.with(Objects.requireNonNull(getContext()))
-                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                        .load(user.getImage())
-                        .into(holder.image);
-
-                holder.time.setText(getTimeText(user.getLastTimestamp()));
-
-                holder.mView.setOnClickListener(view -> {
-                    if (Objects.equals(FirebaseAuth.getInstance().getUid(), user.getId())) {
-                        Toasty.error(requireActivity(), "You can't play with yourself. Select someone else", Toasty.LENGTH_SHORT, true);
-                    } else {
-                        Intent goBattle = new Intent(getContext(), SelectTopic.class);
-                        goBattle.putExtra("otherUid", user.getId());
-                        getContext().startActivity(goBattle, ActivityOptions.makeSceneTransitionAnimation(getActivity()).toBundle());
-                    }
-                });
-            }
-
-            private String getTimeText(long lastTimestamp) {
-                String time = TimeAgo.using(lastTimestamp);
-                time = time.replaceAll("just now", "now")
-                        .replaceAll(" minutes", "m")
-                        .replaceAll(" minute", "1m")
-                        .replaceAll("about", "")
-                        .replaceAll(" hours", "h")
-                        .replaceAll(" hour", "1h")
-                        .replaceAll(" an", "")
-                        .replaceAll("a ", "1 ")
-                        .replaceAll(" ago", "")
-                        .replaceAll("yesterday", "1d")
-                        .replaceAll(" days", "d")
-                        .replaceAll(" day", "1d");
-                return time;
-            }
-
-            @Override
-            protected void onError(@NonNull Exception e) {
-                super.onError(e);
-                Log.e("MainActivity", e.getMessage());
-            }
-
-            @Override
-            protected void onLoadingStateChanged(@NonNull LoadingState state) {
-                switch (state) {
-                    case LOADING_INITIAL:
-                    case LOADING_MORE:
-                        refreshLayout.setRefreshing(true);
-                        break;
-
-                    case LOADED:
-                        if (getItemCount() == 0) {
-                            Objects.requireNonNull(getView()).findViewById(R.id.default_item).setVisibility(View.VISIBLE);
-                        }
-                        refreshLayout.setRefreshing(false);
-                        break;
-
-                    case ERROR:
-                        Toast.makeText(
-                                getActivity(),
-                                "Error Occurred!",
-                                Toast.LENGTH_SHORT
-                        ).show();
-
-                        refreshLayout.setRefreshing(false);
-                        break;
-                    case FINISHED:
-                        refreshLayout.setRefreshing(false);
-                        break;
-                }
-            }
-
-        };
-        mRecyclerView.setAdapter(mAdapter);
-
-    }
-
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Player.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Player.java
deleted file mode 100644
index f1cfbbf..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Player.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;

import com.quantum_guys.dncc_eco_sync.models.Users;

public class Player extends Users {
    String name, uid, image;

    public Player() {
    }

    public Player(String name, String uid, String image) {
        this.name = name;
        this.uid = uid;
        this.image = image;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getUid() {
        return uid;
    }

    public void setUid(String uid) {
        this.uid = uid;
    }

    public String getImage() {
        return image;
    }

    public void setImage(String image) {
        this.image = image;
    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/QuizBattle.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/QuizBattle.java
deleted file mode 100644
index b913d54..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/QuizBattle.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;
-import static com.quantum_guys.dncc_eco_sync.ui.activities.quiz.StepView.stepAnsList;
-
-import android.animation.Animator;
-import android.annotation.SuppressLint;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.CountDownTimer;
-import android.transition.Explode;
-import android.util.Log;
-import android.view.View;
-import android.view.Window;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.lifecycle.ViewModelProviders;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.google.firebase.database.ChildEventListener;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.MutableData;
-import com.google.firebase.database.Query;
-import com.google.firebase.database.Transaction;
-import com.google.firebase.database.ValueEventListener;
-import com.google.firebase.firestore.FirebaseFirestore;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.models.Notification;
-import com.quantum_guys.dncc_eco_sync.models.Question;
-import com.quantum_guys.dncc_eco_sync.models.Users;
-import com.quantum_guys.dncc_eco_sync.notification.APIService;
-import com.quantum_guys.dncc_eco_sync.notification.Client;
-import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
-import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
-import com.quantum_guys.dncc_eco_sync.repository.UserRepository;
-import com.quantum_guys.dncc_eco_sync.utils.MathView;
-import com.quantum_guys.dncc_eco_sync.viewmodel.BattleViewModel;
-import com.quantum_guys.dncc_eco_sync.viewmodel.ResultViewModel;
-import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-import es.dmoral.toasty.Toasty;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class QuizBattle extends AppCompatActivity {
-
-    public ArrayList<Boolean> SenderAnsList;
-    public ArrayList<Boolean> reciverAnsList;
-    public int position;
-    boolean destroy=false;
-    public final int JUST_STARTED = -1;
-    public final int OFFLINE_STARTED = -2;
-    public final int JUST_IN = -3;
-    public final int IN_STARTED = -4;
-    public final int COMPLETED = -5;
-    BattleViewModel battleViewModel;
-    ImageView otherUserImage, thisUserImage;
-    TextView thisUserName, thisUserLevel, otherUserName, otherUserLevel, thisScore, otherScore, topicTV;
-    String battleIdNew, offlideID;
-    String thisUid, otherUid;
-    String MyName, MyImage;
-    String topic, subtopic;
-    int question_number;
-    BattleModel realBattle;
-    final String timestamp = String.valueOf(System.currentTimeMillis());
-    final String battleId = Long.toHexString(Double.doubleToLongBits(Math.random()));
-    BattleModel offlineBattleSaving;
-    ResultViewModel viewModel;
-    UserViewModel userViewModel;
-    private LinearLayout optionsContainer;
-    private Button next;
-    private int count = 0;
-    long timeLeftInMillis=0;
-    private LinearLayout question;
-    private ImageView mcqImg;
-    private List<Question> list;
-    private int score;
-    private DatabaseReference mainDB;
-    FirebaseFirestore mFirestore;
-    private StepView stepView;
-    private ProgressDialog mDialog;
-    private String hisName, hisImage;
-    private CountDownTimer countDownTimer;
-
-    Users user;
-    private TextView textViewCountDown;
-
-    /*  public boolean isPanelShown(View view) {
-          return view.getVisibility() == View.VISIBLE;
-      }
-      public void hideSolution(final View view, Context context) {
-          TranslateAnimation animate = new TranslateAnimation(
-                  0,                 // fromXDelta
-                  0,                   // toXDelta
-                  0,                 // fromYDelta
-                  view.getHeight());           // toYDelta
-          animate.setDuration(500);
-          animate.setFillAfter(true);
-          view.startAnimation(animate);
-          view.setVisibility(View.GONE);
-      }
-      public void playSolution(final View view, Context context) {
-          view.setVisibility(View.VISIBLE);
-          TranslateAnimation animate = new TranslateAnimation(
-                  0,                // fromXDelta
-                  0,                  // toXDelta
-                  view.getHeight(),            // fromYDelta
-                  0);                // toYDelta
-          animate.setDuration(500);
-          animate.setFillAfter(true);
-          view.startAnimation(animate);
-      }
-  */
-    public void randomiseQuestions(DatabaseReference mainDB) {
-        try {
-            AsyncTask.execute(() -> mainDB.runTransaction(new Transaction.Handler() {
-                @NonNull
-                @Override
-                public Transaction.Result doTransaction(@NonNull MutableData mutableData) {
-                    long max = mutableData.getChildrenCount();
-                    for (MutableData data : mutableData.getChildren()) {
-                        Question node = data.getValue(Question.class);
-                        if (node != null) {
-                            node.setIndex((int) (Math.random() * max + 1));
-                            data.setValue(node);
-                        }
-                    }
-                    return Transaction.success(mutableData);
-                }
-
-                @Override
-                public void onComplete(DatabaseError databaseError, boolean b, DataSnapshot dataSnapshot) {
-
-                }
-            }));
-
-        } catch (Exception ignored) {
-
-        }
-    }
-
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private void playQuestion(final View view, final int value, final String data) {
-        try {
-            next.setEnabled(false);
-            if (list.get(position).getImg().length() > 10) {
-                mcqImg.setVisibility(View.VISIBLE);
-                Glide.with(getApplicationContext())
-                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                        .load(list.get(position).getImg())
-                        .into(mcqImg);
-            } else {
-                mcqImg.setVisibility(View.GONE);
-            }
-        } catch (NullPointerException ignored) {
-
-        }
-        changeColor();
-        view.animate().alpha(value).scaleX(value).scaleY(value).setDuration(500).setStartDelay(100)
-                .setInterpolator(new DecelerateInterpolator()).setListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                if (value == 0 && count < 4) {
-                    String option = "";
-                    if (count == 0) {
-                        option = list.get(position).getA();
-                    } else if (count == 1) {
-                        option = list.get(position).getB();
-                    } else if (count == 2) {
-                        option = list.get(position).getC();
-                    } else if (count == 3) {
-                        option = list.get(position).getD();
-                    }
-                    LinearLayout linearLayout = (LinearLayout) optionsContainer.getChildAt(count);
-                    playQuestion(linearLayout, 0, option);
-                    count++;
-                }
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                if (value == 0) {
-                    LinearLayout layout = (LinearLayout) view;
-                    ((MathView) layout.getChildAt(0)).setDisplayText(data);
-                    view.setTag(data);
-                    playQuestion(view, 1, data);
-                }
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-
-            }
-        });
-    }
-
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private void playAnim(final View view, int time, final String data) {
-       // timeLeft(time);
-        Log.d("showResult", "weds");
-        startCountDown(time);
-        elableOption(true);
-        playQuestion(view, 0,data);
-    }
-
-
-    private void startCountDown(int t) {
-        if(countDownTimer!=null){
-            countDownTimer.cancel();
-        }
-        countDownTimer = new CountDownTimer(t*1000, 1000) {
-            @Override
-            public void onTick(long millisUntilFinished) {
-                if((millisUntilFinished)<(t*1000*0.4)) destroy=true;
-                timeLeftInMillis = millisUntilFinished;
-                updateCountDownText();
-            }
-            @Override
-            public void onFinish() {
-                timeLeftInMillis = 0;
-                countDownTimer.cancel();
-                updateCountDownText();
-                Toasty.error(getApplicationContext(), "Time over", Toasty.LENGTH_SHORT, true).show();
-                next.setEnabled(true);
-                elableOption(false);
-                LinearLayout CorrectLayout;
-                CorrectLayout = (LinearLayout) optionsContainer.getChildAt(list.get(position).getAns());
-                CorrectLayout.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#4BBB4F")));
-                stepAnsList.add(position, false);
-                showResult();
-            }
-        }.start();
-    }
-
-    @SuppressLint("ResourceAsColor")
-    private void updateCountDownText() {
-        int seconds = (int) (timeLeftInMillis / 1000) % 60;
-        String timeFormatted = String.format(Locale.getDefault(), "%02d", seconds);
-        textViewCountDown.setText(timeFormatted);
-        if (timeLeftInMillis < 10000) {
-            textViewCountDown.setTextColor(Color.RED);
-        } else {
-            textViewCountDown.setTextColor(R.color.Timewhite);
-        }
-    }
-
-
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    @SuppressLint("ResourceAsColor")
-    private void changeColor() {
-        LinearLayout op1 = (LinearLayout) optionsContainer.getChildAt(0);
-        op1.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#575757")));
-
-        LinearLayout op2 = (LinearLayout) optionsContainer.getChildAt(1);
-        op2.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#575757")));
-
-        LinearLayout op3 = (LinearLayout) optionsContainer.getChildAt(2);
-        op3.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#575757")));
-
-        LinearLayout op4 = (LinearLayout) optionsContainer.getChildAt(3);
-        op4.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#575757")));
-
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private void elableOption(boolean enable) {
-        for (int i = 0; i < 4; i++) {
-            LinearLayout linearLayout = (LinearLayout) optionsContainer.getChildAt(i);
-            linearLayout.setEnabled(enable);
-            if (enable) {
-                LinearLayout layout = (LinearLayout) optionsContainer.getChildAt(i);
-                layout.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#575757")));
-            }
-        }
-    }
-
-    @SuppressLint("CheckResult")
-    private void loadQuestionData() {
-        try {
-            mDialog.show();
-            if (battleIdNew != null) {
-                try {
-                    realBattle = battleViewModel.getBattle(battleIdNew);
-                    topic = realBattle.topic;
-                    topicTV.setText(topic);
-                    mDialog.hide();
-                    Result result = viewModel.getResult(battleIdNew);
-                    if (result.getAction() == IN_STARTED) {
-                        Intent intent = new Intent(this, QuizBattle.class);
-                        intent.putExtra("ofo", battleIdNew);
-                        startActivity(intent);
-                    } else if (result.getAction() == COMPLETED) {
-                        Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                        intent.putExtra("resultId", battleIdNew);
-                        startActivity(intent);
-                    }
-                    list = Objects.requireNonNull(realBattle).questionList;
-                    question_number = realBattle.questionList.size();
-                    if (realBattle.getWinner().length() > 4) {
-                        Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                        intent.putExtra("resultId", realBattle.battleId);
-                        Toasty.warning(getApplicationContext(), "You have already completed this Challenge", Toasty.LENGTH_SHORT, true);
-                        startActivity(intent);
-                        finish();
-                    }
-
-                    try {
-                        playAnim(question, list.get(position).getTime(), list.get(position).getQuestion());
-                    } catch (Exception ignored) {
-                        Toasty.error(getApplicationContext(), "It seems you have already completed.xml this match", Toasty.LENGTH_SHORT, true);
-                        finish();
-                    }
-                    try {
-                        stepView.getState()
-                                .animationType(StepView.ANIMATION_ALL)
-                                .nextStepCircleEnabled(true)
-                                .stepsNumber(list.size())
-                                .commit();
-                    } catch (Exception ignored) {
-                        Toasty.error(getBaseContext(), "It seems you have already completed.xml this match", Toasty.LENGTH_SHORT, true);
-                        finish();
-                    }
-                    for (int i = 0; i < question_number; i++) {
-                        stepAnsList.add(false);
-                    }
-                    setUserData(otherUserImage, otherUserName, otherUserLevel, realBattle.senderUid, false);
-                    SenderAnsList = realBattle.getSenderAnswerList();
-                    otherUid = realBattle.getSenderUid();
-                    offlineBattleSaving = realBattle;
-                    offlineBattleSaving.setWinner("3");
-
-                } catch (Exception h) {
-                    Query query = mainDB.child("Play").orderByChild("battleId").equalTo(battleIdNew);
-                    query.addListenerForSingleValueEvent(new ValueEventListener() {
-                        @SuppressLint("CheckResult")
-                        @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-                        @Override
-                        public void onDataChange(@NonNull DataSnapshot snapshot) {
-                            if(snapshot.exists()) {
-                                try {
-                                    for (DataSnapshot data : snapshot.getChildren()) {
-                                        realBattle = data.getValue(BattleModel.class);
-                                    }
-                                    list = Objects.requireNonNull(realBattle).questionList;
-                                    question_number = realBattle.questionList.size();
-                                    if (!realBattle.getWinner().equals("0")) {
-                                        Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                                        intent.putExtra("resultId", realBattle.battleId);
-                                        Toasty.warning(getApplicationContext(), "You have already completed this Challenge", Toasty.LENGTH_SHORT, true);
-                                        startActivity(intent);
-                                        finish();
-                                    }
-                                    setUserData(otherUserImage, otherUserName, otherUserLevel, realBattle.senderUid, false);
-                                    try {
-                                        playAnim(question, list.get(position).getTime(), list.get(position).getQuestion());
-                                    } catch (NullPointerException ignored) {
-                                        Toasty.error(getApplicationContext(), "It seems you have already completed.xml this match", Toasty.LENGTH_SHORT, true);
-                                        finish();
-                                    }
-                                    try {
-                                        stepView.getState()
-                                                .animationType(StepView.ANIMATION_ALL)
-                                                .nextStepCircleEnabled(true)
-                                                .stepsNumber(list.size())
-                                                .commit();
-                                    } catch (Exception ignored) {
-                                        Toasty.error(getBaseContext(), "It seems you have already completed.xml this match", Toasty.LENGTH_SHORT, true);
-                                        finish();
-                                    }
-                                    SenderAnsList = realBattle.senderAnswerList;
-                                    otherUid = realBattle.getSenderUid();
-                                    offlineBattleSaving = realBattle;
-                                    offlineBattleSaving.setWinner("3");
-                                } catch (Exception h) {
-                                    Toasty.error(getApplicationContext(), "Select this battle from main Quiz dashboard, Error Occurs", Toasty.LENGTH_SHORT, true);
-                                    finish();
-                                }
-                            }else{
-                                Toasty.error(getApplicationContext(), "No battle found, start from Quiz Dashboard page", Toasty.LENGTH_SHORT, true);
-                                finish();
-                            }
-                        }
-
-                        @Override
-                        public void onCancelled(@NonNull DatabaseError error) {
-
-                        }
-                    });
-                    for (int i = 0; i < question_number; i++) {
-                        stepAnsList.add(false);
-                    }
-                }
-
-            } else if (offlideID != null) {
-                try {
-                    Toast.makeText(this, "Resuming battle...", Toast.LENGTH_SHORT).show();
-                    realBattle = battleViewModel.getBattle(offlideID);
-                    mDialog.hide();
-                    topic = realBattle.topic;
-                    topicTV.setText(topic);
-                    if (realBattle.getWinner().equals("3")) {
-                        position = realBattle.getReceiverList().size();
-                        score = getScoreCount(realBattle.getReceiverList());
-                        thisScore.setText(String.valueOf(score));
-                        otherScore.setText("-");
-                        list = Objects.requireNonNull(realBattle).questionList;
-                        question_number = realBattle.questionList.size();
-                        setUserData(otherUserImage, otherUserName, otherUserLevel, realBattle.getSenderUid(), false);
-
-                        try {
-                            playAnim(question, list.get(position).getTime(), list.get(position).getQuestion());
-                        } catch (Exception vhjkj) {
-                            Toasty.error(getApplicationContext(), "Error", Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
-                        try {
-                            stepView.getState()
-                                    .animationType(StepView.ANIMATION_ALL)
-                                    .nextStepCircleEnabled(true)
-                                    .stepsNumber(list.size())
-                                    .commit();
-                        } catch (Exception xcz) {
-                            Toasty.error(getApplicationContext(), "Error", Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
-                        SenderAnsList = realBattle.senderAnswerList;
-                        reciverAnsList = realBattle.receiverList;
-                        for (int i = 0; i < question_number; i++) {
-                            stepAnsList.add(false);
-                        }
-                        for (int i = 0; i < position; i++) {
-                            stepAnsList.add(i, realBattle.getReceiverList().get(i));
-                        }
-                        stepView.go(position, true, true);
-                        otherUid = realBattle.getSenderUid();
-                        offlineBattleSaving = realBattle;
-                        offlineBattleSaving.setWinner("3");
-
-                    } else if (realBattle.getWinner().equals("2")) {
-                        position = realBattle.getSenderAnswerList().size();
-                        score = getScoreCount(realBattle.getSenderAnswerList());
-                        thisScore.setText(String.valueOf(score));
-                        list = Objects.requireNonNull(realBattle).questionList;
-                        question_number = realBattle.questionList.size();
-                        setUserData(otherUserImage, otherUserName, otherUserLevel, realBattle.receiverUid, false);
-
-                        try {
-                            playAnim(question, list.get(position).getTime(), list.get(position).getQuestion());
-                        } catch (Exception dc) {
-                            Toasty.error(getApplicationContext(), "Error", Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
-                        try {
-                            stepView.getState()
-                                    .animationType(StepView.ANIMATION_ALL)
-                                    .nextStepCircleEnabled(true)
-                                    .stepsNumber(list.size())
-                                    .commit();
-                        } catch (Exception ignored) {
-                            Toasty.error(getApplicationContext(), "Error", Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
-                        SenderAnsList = realBattle.senderAnswerList;
-                        for (int i = 0; i < question_number; i++) {
-                            stepAnsList.add(false);
-                        }
-                        for (int i = 0; i < position; i++) {
-                            stepAnsList.add(i, realBattle.getSenderAnswerList().get(i));
-                        }
-                        stepView.go(position, true, true);
-                        otherUid = realBattle.getReceiverUid();
-                        offlineBattleSaving = realBattle;
-                        offlineBattleSaving.setWinner("2");
-                    }
-                } catch (Exception fd) {
-                    Toasty.error(getApplicationContext(), "Error", Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            } else {
-                try {
-                    String type = "bcs";
-                    type = getIntent().getStringExtra("type");
-                    Query query = mainDB.child("Topics").child(type).child(topic).child(subtopic)
-                            .orderByChild("index")
-                            .limitToFirst(question_number);
-                    query.addChildEventListener(new ChildEventListener() {
-                        @Override
-                        public void onChildAdded(@NonNull DataSnapshot snapshot, @Nullable String previousChildName) {
-                            list.add(snapshot.getValue(Question.class));
-                            Collections.shuffle(list);
-                            stepAnsList.add(false);
-                            mDialog.dismiss();
-                            playAnim(question, list.get(position).getTime(), list.get(position).getQuestion());
-                            stepView.getState()
-                                    .animationType(StepView.ANIMATION_ALL)
-                                    .nextStepCircleEnabled(true)
-                                    .stepsNumber(list.size())
-                                    .commit();
-                        }
-
-                        @Override
-                        public void onChildChanged(@NonNull DataSnapshot snapshot, @Nullable String previousChildName) {
-
-                        }
-
-                        @Override
-                        public void onChildRemoved(@NonNull DataSnapshot snapshot) {
-
-                        }
-
-                        @Override
-                        public void onChildMoved(@NonNull DataSnapshot snapshot, @Nullable String previousChildName) {
-
-                        }
-
-                        @Override
-                        public void onCancelled(@NonNull DatabaseError error) {
-
-                        }
-                    });
-                    otherUid = getIntent().getStringExtra("otherUid");
-                    setUserData(otherUserImage, otherUserName, otherUserLevel, otherUid, false);
-                    offlineBattleSaving = new BattleModel(thisUid, otherUid, list, SenderAnsList, reciverAnsList, timestamp, "0", battleId, topic, false);
-                } catch (NullPointerException jj) {
-                    Log.d("SSSF", jj.getMessage());
-                    finish();
-                    Toast.makeText(this, "Error", Toast.LENGTH_SHORT).show();
-                }
-            }
-        }catch (Exception h){
-            Toasty.error(getApplicationContext(), "Error", Toast.LENGTH_SHORT).show();
-            finish();
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private void goToNext(int which) {
-        try {
-            if (battleIdNew == null) {
-                stepView.go(which, true, SenderAnsList.get(which - 1));
-            } else {
-                stepView.go(which, true, reciverAnsList.get(which - 1));
-            }
-            next.setEnabled(false);
-            elableOption(true);
-            if (which >= list.size()) {
-                mDialog.show();
-                addToNotification();
-            } else {
-                playAnim(question, list.get(which).getTime(), list.get(which).getQuestion());
-            }
-            count = 0;
-        }catch (Exception d){
-            Log.d("Errorrr", d.getMessage());
-            finish();
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private void showResult() {
-        AsyncTask.execute(() -> {
-            if (battleIdNew != null) {
-                reciverAnsList.add(position, false);
-                realBattle.setReceiverList(reciverAnsList);
-                realBattle.setWinner("3");
-                battleViewModel.insert(realBattle);
-                Result myResult = new Result(realBattle.battleId, otherUid, userId, score, -2, topic, timestamp, IN_STARTED);
-                myResult.setBattleId(realBattle.battleId);
-                if (position + 1 == question_number) {
-                    myResult.setAction(COMPLETED);
-                    myResult.setOtherUid(realBattle.senderUid);
-                    myResult.setOtherScore(getScoreCount(realBattle.senderAnswerList));
-                }
-                viewModel.insert(myResult);
-            } else if (offlideID != null) {
-                if (realBattle.getWinner().equals("2")) {
-                    SenderAnsList.add(position, false);
-                    offlineBattleSaving.setSenderAnswerList(SenderAnsList);
-                    battleViewModel.insert(offlineBattleSaving);
-                    Result myResult = new Result(offlideID, userId, otherUid, score, -2, topic, timestamp, OFFLINE_STARTED);
-                    if (position + 1 == question_number)
-                        myResult.setAction(JUST_STARTED);
-                    viewModel.insert(myResult);
-                } else if (realBattle.getWinner().equals("3")) {
-                    reciverAnsList.add(position, false);
-                    offlineBattleSaving.setSenderAnswerList(reciverAnsList);
-                    battleViewModel.insert(offlineBattleSaving);
-                    Result myResult = new Result(offlideID, otherUid, userId, score, -2, topic, timestamp, IN_STARTED);
-                    if (position + 1 == question_number) {
-                        myResult.setAction(COMPLETED);
-                        myResult.setOtherUid(realBattle.senderUid);
-                        myResult.setOtherScore(getScoreCount(offlineBattleSaving.senderAnswerList));
-                    }
-                    viewModel.insert(myResult);
-                }
-            } else {
-                SenderAnsList.add(position, false);
-                offlineBattleSaving.setSenderAnswerList(SenderAnsList);
-                offlineBattleSaving.setWinner("2");
-                battleViewModel.insert(offlineBattleSaving);
-                Result myResult = new Result(battleId, userId, otherUid, score, -2, topic, timestamp, OFFLINE_STARTED);
-                if (position + 1 == question_number)
-                    myResult.setAction(JUST_STARTED);
-                viewModel.insert(myResult);
-            }
-
-        });
-    }
-
-    private Drawable getDrawableWithRadius() {
-        int[] colors = {Color.parseColor("#8342ED"), Color.parseColor("#5570A0")};
-        GradientDrawable gradientDrawable = new GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, colors);
-        gradientDrawable.setCornerRadii(new float[]{20, 20, 20, 20, 20, 20, 20, 20});
-        return gradientDrawable;
-    }
-
-
-
-    public void onPause() {
-        super.onPause();
-    }
-
-    @SuppressLint("SetTextI18n")
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
-        getWindow().setEnterTransition(new Explode());
-        getWindow().setExitTransition(new Explode());
-        super.onCreate(savedInstanceState);
-        SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
-        String themeName = sharedPreferences.getString("ThemeName", "Default");
-        if (themeName.equalsIgnoreCase("TealTheme")) {
-            setTheme(R.style.TealTheme);
-        } else if (themeName.equalsIgnoreCase("VioleteTheme")) {
-            setTheme(R.style.VioleteTheme);
-        } else if (themeName.equalsIgnoreCase("PinkTheme")) {
-            setTheme(R.style.PinkTheme);
-        } else if (themeName.equalsIgnoreCase("DelRio")) {
-            setTheme(R.style.DelRio);
-        } else if (themeName.equalsIgnoreCase("DarkTheme")) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            setTheme(R.style.Dark);
-        } else if (themeName.equalsIgnoreCase("Lynch")) {
-            setTheme(R.style.Lynch);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-        setContentView(R.layout.activity_quiz_battle);
-        stepAnsList = new ArrayList<>();
-        thisUid = userId;
-        offlideID = getIntent().getStringExtra("ofo");
-        battleIdNew = getIntent().getStringExtra("battleId");
-        topic = getIntent().getStringExtra("topic");
-        subtopic = getIntent().getStringExtra("subtopic");
-        question_number = getIntent().getIntExtra("question_number", 5);
-        mainDB = FirebaseDatabase.getInstance().getReference();
-        user = new UserRepository(getApplication()).getUser();
-
-        reciverAnsList = new ArrayList<>();
-        thisUserName = findViewById(R.id.thisUserName);
-        viewModel = ViewModelProviders.of(this).get(ResultViewModel.class);
-        userViewModel = ViewModelProviders.of(this).get(UserViewModel.class);
-        thisUserLevel = findViewById(R.id.thisUserLevel);
-        textViewCountDown = findViewById(R.id.textView3);
-        thisUserImage = findViewById(R.id.thisUserImage);
-        thisScore = findViewById(R.id.myScore);
-        otherUserName = findViewById(R.id.otherUserName);
-        otherUserLevel = findViewById(R.id.otherUserLevel);
-        otherUserImage = findViewById(R.id.otherUserImage);
-        otherScore = findViewById(R.id.otherScore);
-        topicTV = findViewById(R.id.topic);
-        question = findViewById(R.id.questionQ);
-        stepView = findViewById(R.id.step_view);
-        mcqImg = findViewById(R.id.mcq_img);
-        list = new ArrayList<>();
-        SenderAnsList = new ArrayList<>();
-        next = findViewById(R.id.next);
-        optionsContainer = findViewById(R.id.contaner);
-        mDialog = new ProgressDialog(this);
-        mDialog.setMessage("Please wait..");
-        mDialog.setIndeterminate(true);
-        mDialog.setCanceledOnTouchOutside(false);
-        mDialog.setCancelable(false);
-        mFirestore = FirebaseFirestore.getInstance();
-        setUserData(thisUserImage, thisUserName, thisUserLevel, thisUid, true);
-        //mcqAnsList = new ArrayList<>();
-        position = 0;
-        thisScore.setText(String.valueOf(0));
-        topicTV.setText(topic);
-        otherScore.setText("-");
-        battleViewModel = ViewModelProviders.of(this).get(BattleViewModel.class);
-        if (list.size() != 4) {
-            loadQuestionData();
-        } else {
-            try {
-                playAnim(question, list.get(position).getTime(), list.get(position).getQuestion());
-            } catch (ClassCastException svs) {
-                Toast.makeText(this, "error", Toast.LENGTH_SHORT).show();
-            }
-        }
-      /*  expBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (isPanelShown(expCard)) {
-                    hideSolution(expCard, getApplicationContext());
-                    expBtn.setText("Hint");
-                } else {
-                    expTV.setDisplayText(list.get(position).getHint());
-                    playSolution(expCard, getApplicationContext());
-                    expBtn.setText("Hide");
-                }
-            }
-        });*/
-        for (int i = 0; i < 4; i++) {
-            final int selected = i;
-            optionsContainer.getChildAt(i).setOnClickListener(v -> {
-                LinearLayout selectedLayout = (LinearLayout) v;
-                elableOption(false);
-                next.setEnabled(true);
-                if (selected == list.get(position).getAns()) {
-                    score++;
-                    thisScore.setText(String.valueOf(score));
-                    Toasty.success(getApplicationContext(), "Correct", Toasty.LENGTH_SHORT, true).show();
-                    selectedLayout.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#4BBB4F")));
-                    stepAnsList.add(position, true);
-                    AsyncTask.execute(() -> {
-                        if (battleIdNew != null) {
-                            reciverAnsList.add(position, true);
-                            realBattle.setReceiverList(reciverAnsList);
-                            realBattle.setWinner("3");
-                            battleViewModel.insert(realBattle);
-                            Result myResult = new Result(realBattle.battleId, otherUid, userId, score, -2, topic, timestamp, IN_STARTED);
-                            myResult.setBattleId(realBattle.battleId);
-                            if (position + 1 == question_number) {
-                                myResult.setAction(COMPLETED);
-                                myResult.setOtherUid(realBattle.senderUid);
-                                myResult.setOtherScore(getScoreCount(realBattle.senderAnswerList));
-                            }
-                            viewModel.insert(myResult);
-                        } else if (offlideID != null) {
-                            if (realBattle.getWinner().equals("2")) {
-                                SenderAnsList.add(position, true);
-                                offlineBattleSaving.setSenderAnswerList(SenderAnsList);
-                                battleViewModel.insert(offlineBattleSaving);
-                                Result myResult = new Result(offlideID, userId, otherUid, score, -2, topic, timestamp, OFFLINE_STARTED);
-                                if (position + 1 == question_number)
-                                    myResult.setAction(JUST_STARTED);
-                                viewModel.insert(myResult);
-                            } else if (realBattle.getWinner().equals("3")) {
-                                reciverAnsList.add(position, true);
-                                offlineBattleSaving.setSenderAnswerList(reciverAnsList);
-                                battleViewModel.insert(offlineBattleSaving);
-                                Result myResult = new Result(offlideID, otherUid, userId, score, -2, topic, timestamp, IN_STARTED);
-                                if (position + 1 == question_number) {
-                                    myResult.setAction(COMPLETED);
-                                    myResult.setOtherUid(realBattle.senderUid);
-                                    myResult.setOtherScore(getScoreCount(offlineBattleSaving.senderAnswerList));
-                                }
-                                viewModel.insert(myResult);
-                            }
-                        } else {
-                            SenderAnsList.add(position, true);
-                            offlineBattleSaving.setSenderAnswerList(SenderAnsList);
-                            offlineBattleSaving.setWinner("2");
-                            battleViewModel.insert(offlineBattleSaving);
-                            Result myResult = new Result(battleId, userId, otherUid, score, -2, topic, timestamp, OFFLINE_STARTED);
-                            if (position + 1 == question_number)
-                                myResult.setAction(JUST_STARTED);
-                            viewModel.insert(myResult);
-                        }
-
-                    });
-                } else {
-                    Toasty.error(getApplicationContext(), "Wrong", Toasty.LENGTH_SHORT, true).show();
-                    selectedLayout.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#D32F2F")));
-                    LinearLayout CorrectLayout = (LinearLayout) optionsContainer.getChildAt(list.get(position).getAns());
-                    CorrectLayout.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#4BBB4F")));
-                    stepAnsList.add(position, false);
-                    AsyncTask.execute(() -> {
-                        if (battleIdNew != null) {
-                            reciverAnsList.add(position, false);
-                            realBattle.setReceiverList(reciverAnsList);
-                            realBattle.setWinner("3");
-                            battleViewModel.insert(realBattle);
-                            Result myResult = new Result(realBattle.battleId, otherUid, userId, score, -2, topic, timestamp, IN_STARTED);
-                            myResult.setBattleId(realBattle.battleId);
-                            if (position + 1 == question_number) {
-                                myResult.setAction(COMPLETED);
-                                myResult.setOtherUid(realBattle.senderUid);
-                                myResult.setOtherScore(getScoreCount(realBattle.senderAnswerList));
-                            }
-                            viewModel.insert(myResult);
-                        } else if (offlideID != null) {
-                            if (realBattle.getWinner().equals("2")) {
-                                SenderAnsList.add(position, false);
-                                offlineBattleSaving.setSenderAnswerList(SenderAnsList);
-                                battleViewModel.insert(offlineBattleSaving);
-                                Result myResult = new Result(offlideID, userId, otherUid, score, -2, topic, timestamp, OFFLINE_STARTED);
-                                if (position + 1 == question_number)
-                                    myResult.setAction(JUST_STARTED);
-                                viewModel.insert(myResult);
-                            } else if (realBattle.getWinner().equals("3")) {
-                                reciverAnsList.add(position, false);
-                                offlineBattleSaving.setSenderAnswerList(reciverAnsList);
-                                battleViewModel.insert(offlineBattleSaving);
-                                Result myResult = new Result(offlideID, otherUid, userId, score, -2, topic, timestamp, IN_STARTED);
-                                if (position + 1 == question_number) {
-                                    myResult.setAction(COMPLETED);
-                                    myResult.setOtherUid(realBattle.senderUid);
-                                    myResult.setOtherScore(getScoreCount(offlineBattleSaving.senderAnswerList));
-                                }
-                                viewModel.insert(myResult);
-                            }
-                        } else {
-                            SenderAnsList.add(position, false);
-                            offlineBattleSaving.setSenderAnswerList(SenderAnsList);
-                            offlineBattleSaving.setWinner("2");
-                            battleViewModel.insert(offlineBattleSaving);
-                            Result myResult = new Result(battleId, userId, otherUid, score, -2, topic, timestamp, OFFLINE_STARTED);
-                            if (position + 1 == question_number)
-                                myResult.setAction(JUST_STARTED);
-                            viewModel.insert(myResult);
-                        }
-
-                    });
-                }
-            });
-        }
-        next.setOnClickListener(v -> {
-            if (position < 1) {
-                updateXP(false);
-                Toast.makeText(getApplicationContext(), "5 XP reduced", Toast.LENGTH_SHORT).show();
-            }
-            position++;
-            goToNext(position);
-        });
-
-    }
-
-    @Override
-    protected void onDestroy() {
-        try{
-           if(destroy) showResult();
-        }catch (Exception ignored){
-
-        }
-        if (countDownTimer != null) {
-            countDownTimer.cancel();
-        }
-        super.onDestroy();
-    }
-
-    private void addScore(int score, String uid, String what, boolean me) {
-        if(me) {
-            int newScores = score;
-            if (what.equals("win")) {
-                newScores = (int) user.getWin();
-                newScores += score;
-                userViewModel.setWin(newScores);
-            }
-            if (what.equals("lose")) {
-                newScores = (int) user.getLose();
-                newScores += score;
-                userViewModel.setLose(newScores);
-            }
-            if (what.equals("draw")) {
-                newScores = (int) user.getDraw();
-                newScores += score;
-                userViewModel.setDraw(newScores);
-            }
-            if (what.equals("score")) {
-                newScores = (int) user.getScore();
-                newScores += score;
-                userViewModel.setScore(newScores);
-            }
-            HashMap<String, Object> scoreMap = new HashMap<>();
-            scoreMap.put(what, newScores);
-            mFirestore.collection("Users")
-                    .document(uid)
-                    .update(scoreMap).addOnSuccessListener(aVoid -> {
-            });
-        }else{
-            FirebaseFirestore.getInstance().collection("Users")
-                    .document(uid)
-                    .get()
-                    .addOnSuccessListener(documentSnapshot -> {
-                        int scoreOld = Objects.requireNonNull(documentSnapshot.getLong(what)).intValue();
-                        int newScore = scoreOld + (score);
-                        HashMap<String, Object> scoreMap = new HashMap<>();
-                        scoreMap.put(what, newScore);
-                        FirebaseFirestore.getInstance()
-                                .collection("Users")
-                                .document(uid)
-                                .update(scoreMap).addOnSuccessListener(aVoid -> {
-                        });
-                    });
-        }
-    }
-
-    private void setUserData(ImageView proPic, TextView name, TextView level, String uid, boolean me) {
-        try {
-            if (me) {
-                    MyName = user.getUsername();
-                    MyImage = user.getImage();
-                    name.setText(MyName);
-                    setLevelByScore(level, (int) user.getScore());
-                    Glide.with(getApplicationContext())
-                            .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                            .load(MyImage)
-                            .into(proPic);
-            } else {
-                mFirestore.collection("Users")
-                        .document(uid)
-                        .get()
-                        .addOnSuccessListener(documentSnapshot -> {
-                            hisName = documentSnapshot.getString("username");
-                            name.setText(hisName);
-                            setLevelByScore(level, Integer.parseInt(String.valueOf(documentSnapshot.getLong("score"))));
-                            hisImage = documentSnapshot.getString("image");
-                            Glide.with(getApplicationContext())
-                                    .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                                    .load(hisImage)
-                                    .into(proPic);
-                        });
-            }
-        } catch (NullPointerException ignored) {
-
-        }
-    }
-
-    private void addToNotification() {
-        if (battleIdNew != null) {
-            Notification notification = new Notification(realBattle.getBattleId(),realBattle.senderUid, MyName, MyImage,
-                    "accepted your challenge in " + realBattle.topic,
-                    String.valueOf(System.currentTimeMillis()),
-                    "play_result"
-                    , realBattle.battleId, false);
-            new SendNotificationAsyncTask(notification).execute();
-            //realBattle means data with including second player
-            FirebaseFirestore.getInstance().collection("Users")
-                    .document(otherUid)
-                    .collection("Info_Notifications").document(notification.getId())
-                    .set(notification)
-                    .addOnSuccessListener(documentReference -> {
-                        //declaring ultimate/final battleResult
-                        thisUid = realBattle.senderUid;
-                        otherUid = userId;
-                        BattleModel battle = new BattleModel(thisUid, otherUid, list, SenderAnsList, reciverAnsList, timestamp, "0", realBattle.battleId, realBattle.getTopic(), true);
-                        //here thisUid (who invited to play) and other is player 2 who got invited and playing now
-                        //none of SenderAnsList(inviter) and receiverAnsList(this) is null
-                        mainDB = FirebaseDatabase.getInstance().getReference();
-                        //Result senderResult = new Result(battleId, battle.senderUid, userId, getScoreCount(SenderAnsList), getScoreCount(reciverAnsList), topic, timestamp, COMPLETED);
-                        //FirebaseDatabase.getInstance().getReference().child("Result").child(battle.senderUid).child(battle.battleId).setValue(senderResult);
-                        mainDB.child("Play").child(realBattle.battleId).setValue(battle).addOnSuccessListener(aVoid -> {
-                            Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                            UpdateFinalResult(battle);
-                            intent.putExtra("FinalResult", battle);
-                            startActivity(intent);
-                            mDialog.dismiss();
-                            finish();
-                        });
-                    });
-
-        } else if (offlideID != null) {
-            if (offlineBattleSaving.getWinner().equals("2")) {
-                Notification notification = new Notification(offlineBattleSaving.getBattleId() ,otherUid, MyName, MyImage,
-                        "challenged you in " + topic,
-                        String.valueOf(System.currentTimeMillis()),
-                        "play"
-                        , battleId, false);
-                new SendNotificationAsyncTask(notification).execute();
-                mFirestore.collection("Users")
-                        .document(otherUid)
-                        .collection("Info_Notifications").document(notification.getId())
-                        .set(notification)
-                        .addOnSuccessListener(documentReference -> {
-                            thisUid = userId;
-                            BattleModel battleModel;
-                            battleModel = offlineBattleSaving;
-                            battleModel.setSenderAnswerList(SenderAnsList);
-                            battleModel.setWinner("0");
-                            battleViewModel.insert(battleModel);
-                            Result hisResult = new Result(offlineBattleSaving.battleId, battleModel.getReceiverUid(), userId, getScoreCount(SenderAnsList), -1, topic, timestamp, JUST_IN);
-                            mainDB.child("Result").child(otherUid).child(battleId).setValue(hisResult);
-                            //here thisUid is player who sending invitations and other uid is whom he sending invite
-                            //so senderResult is NonNull and reciverAnsList is Null as he still not able to play.
-                            mainDB = FirebaseDatabase.getInstance().getReference();
-                            mainDB.child("Play").child(battleId).setValue(battleModel).addOnSuccessListener(aVoid -> {
-                                Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                                intent.putExtra("start", battleModel);
-                                startActivity(intent);
-                                mDialog.dismiss();
-                                finish();
-                            });
-                        });
-            } else if (offlineBattleSaving.getWinner().equals("3")) {
-                Notification notification = new Notification(realBattle.getBattleId(),realBattle.senderUid, MyName, MyImage,
-                        "accepted your challenge in " + realBattle.topic,
-                        String.valueOf(System.currentTimeMillis()),
-                        "play_result"
-                        , realBattle.battleId, false);
-                new SendNotificationAsyncTask(notification).execute();
-                mFirestore.collection("Users")
-                        .document(otherUid)
-                        .collection("Info_Notifications").document(notification.getId())
-                        .set(notification)
-                        .addOnSuccessListener(documentReference -> {
-                            //declaring ultimate/final battleResult
-                            thisUid = realBattle.senderUid;
-                            otherUid = userId;
-                            BattleModel battle = new BattleModel(thisUid, otherUid, list, SenderAnsList, reciverAnsList, timestamp, "0", realBattle.battleId, realBattle.topic, true);
-                            //here thisUid (who invited to play) and other is player 2 who got invited and playing now
-                            //none of SenderAnsList(inviter) and receiverAnsList(this) is null
-
-                            // Result senderResult = new Result(realBattle.battleId, realBattle.senderUid, userId, getScoreCount(realBattle.getSenderAnswerList()), getScoreCount(reciverAnsList), topic, timestamp, COMPLETED);
-                            // FirebaseDatabase.getInstance().getReference().child("Result").child(realBattle.senderUid).child(realBattle.battleId).setValue(senderResult);
-                            mainDB.child("Play").child(realBattle.battleId).setValue(battle).addOnSuccessListener(aVoid -> {
-                                Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                                UpdateFinalResult(battle);
-                                intent.putExtra("FinalResult", battle);
-                                startActivity(intent);
-                                mDialog.dismiss();
-                                finish();
-                            });
-                        })
-                        .addOnFailureListener(e -> Log.e("Error", Objects.requireNonNull(e.getLocalizedMessage())));
-            }
-
-        } else {
-            Notification notification = new Notification(battleId,otherUid, MyName, MyImage,
-                    "challenged you in " + topic,
-                    String.valueOf(System.currentTimeMillis()),
-                    "play"
-                    , battleId, false);
-            new SendNotificationAsyncTask(notification).execute();
-            mFirestore.collection("Users")
-                    .document(otherUid)
-                    .collection("Info_Notifications").document(notification.getId())
-                    .set(notification)
-                    .addOnSuccessListener(documentReference -> {
-                        Result hisResult = new Result(offlineBattleSaving.battleId, offlineBattleSaving.getReceiverUid(), userId, getScoreCount(SenderAnsList), -1, topic, timestamp, JUST_IN);
-                        FirebaseDatabase.getInstance().getReference().child("Result").child(offlineBattleSaving.getReceiverUid()).child(battleId).setValue(hisResult);
-                        mainDB.child("Play").child(offlineBattleSaving.battleId).setValue(offlineBattleSaving).addOnSuccessListener(aVoid -> {
-                            Intent intent = new Intent(getApplicationContext(), ResultActivity.class);
-                            intent.putExtra("start", offlineBattleSaving);
-                            randomiseQuestions(mainDB.child("Topics").child(topic).child(subtopic));
-                            startActivity(intent);
-                            mDialog.dismiss();
-                            finish();
-                        });
-                    });
-        }
-    }
-
-    private int getScoreCount(List<Boolean> scoreList) {
-        int score = 0;
-        for (int i = 0; i < scoreList.size(); i++) {
-            if (scoreList.get(i)) {
-                score++;
-            }
-        }
-        return score;
-    }
-
-
-    @SuppressLint("CheckResult")
-    private void UpdateFinalResult(BattleModel battlePlay) {
-        int reScore, seScore;
-        try {
-            topic = battlePlay.topic;
-        } catch (NullPointerException ignored) {
-
-        }
-        reScore = getScoreCount(battlePlay.receiverList); //me 2nd player
-        seScore = getScoreCount(battlePlay.senderAnswerList); //inviter- 1st player
-        thisScore.setText(String.valueOf(reScore));
-        otherScore.setText(String.valueOf(seScore));
-        if (reScore > seScore) {
-            updateXP(true);
-            Toasty.success(QuizBattle.this, "Congo, you got 20 XP and 5 point", Toasty.LENGTH_LONG);
-            addScore(5, battlePlay.receiverUid, "score", true);
-            addScore(1, battlePlay.receiverUid, "win", true);
-            addScore(1, battlePlay.senderUid, "lose", false);
-            Map<String, Object> winner = new HashMap<>();
-            winner.put("winner", battlePlay.receiverUid);
-            battleViewModel.insert(battlePlay);
-            mainDB.child("Play").child(battlePlay.battleId).updateChildren(winner);
-        } else if (seScore > reScore) {
-            Toasty.error(getApplicationContext(), "Damn, you lost", Toasty.LENGTH_LONG);
-            addScore(1, battlePlay.senderUid, "win", false);
-            addScore(5, battlePlay.senderUid, "score", false);
-            addScore(1, battlePlay.receiverUid, "lose", true);
-            Map<String, Object> winner = new HashMap<>();
-            winner.put("winner", battlePlay.senderUid);
-            battleViewModel.insert(battlePlay);
-            mainDB.child("Play").child(battlePlay.battleId).updateChildren(winner);
-        } else {
-            addScore(2, battlePlay.receiverUid, "score", true);
-            addScore(2, battlePlay.senderUid, "score", false);
-            Toasty.info(getApplicationContext(), "Match Drawn", Toasty.LENGTH_LONG);
-            addScore(1, battlePlay.receiverUid, "draw", true);
-            addScore(1, battlePlay.senderUid, "draw", false);
-            Map<String, Object> winner = new HashMap<>();
-            winner.put("winner", "draw");
-            battleViewModel.insert(battlePlay);
-            mainDB.child("Play").child(battlePlay.battleId).updateChildren(winner);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        new MaterialDialog.Builder(this)
-                .title("Quite?")
-                .content("Are you sure want to quite and go back, if question time is less than 15s, this question will be count as wrong")
-                .positiveText("Yes")
-                .canceledOnTouchOutside(false)
-                .cancelable(false)
-                .onPositive((dialog, which) -> {
-                    int seconds = (int) (timeLeftInMillis / 1000) % 60;
-                    if(seconds<15){
-                        timeLeftInMillis = 0;
-                        countDownTimer.cancel();
-                        updateCountDownText();
-                        stepAnsList.add(position, false);
-                        showResult();
-                    }else{
-                        countDownTimer.cancel();
-                    }
-                    finish();
-                })
-                .negativeText("No")
-                .show();
-    }
-
-    @SuppressLint("SetTextI18n")
-    public void setLevelByScore(TextView levelTV, int score) {
-        if (score <= 500) {
-            levelTV.setText("Level: 1");
-        } else if (score <= 1000) {
-            levelTV.setText("Level: 2");
-        } else if (score <= 1500) {
-            levelTV.setText("Level: 3");
-        } else if (score <= 2000) {
-            levelTV.setText("Level: 4");
-        } else if (score <= 2500) {
-            levelTV.setText("Level: 5");
-        } else if (score <= 3500) {
-            levelTV.setText("Level: 6");
-        } else if (score <= 5000) {
-            levelTV.setText("Level: 7");
-        } else {
-            levelTV.setText("Level: unknown");
-        }
-    }
-
-    private void updateXP( boolean increment) {
-        int reward = (int) user.getReward();
-        if(increment){
-            reward+=20;
-        }else{
-            reward-=5;
-        }
-        userViewModel.setReward(reward);
-        HashMap<String, Object> scoreMap = new HashMap<>();
-        scoreMap.put("reward", reward);
-        mFirestore.collection("Users")
-                .document(userId)
-                .update(scoreMap).addOnSuccessListener(aVoid -> {
-        });
-
-    }
-
-    private static class SendNotificationAsyncTask extends AsyncTask<Void, Void, Void> {
-        final APIService apiService;
-        final Notification notification;
-
-        private SendNotificationAsyncTask(Notification notification) {
-            this.notification = notification;
-            apiService = Client.getClient("https://fcm.googleapis.com/").create(APIService.class);
-        }
-
-        @Override
-        protected Void doInBackground(Void... jk) {
-            FirebaseDatabase.getInstance().getReference().child("Tokens").child(notification.getNotifyTo()).child("token").addListenerForSingleValueEvent(new ValueEventListener() {
-                @Override
-                public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                    String usertoken = dataSnapshot.getValue(String.class);
-                    NotificationSender sender = new NotificationSender(notification, usertoken);
-                    apiService.sendNotifcation(sender).enqueue(new Callback<MyResponse>() {
-                        @Override
-                        public void onResponse(@NonNull Call<MyResponse> call, @NonNull Response<MyResponse> response) {
-                        }
-
-                        @Override
-                        public void onFailure(@NonNull Call<MyResponse> call, @NonNull Throwable t) {
-
-                        }
-                    });
-                }
-
-                @Override
-                public void onCancelled(@NonNull DatabaseError databaseError) {
-
-                }
-            });
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Ranking.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Ranking.java
deleted file mode 100644
index ff9c362..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Ranking.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;

import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;

import android.annotation.SuppressLint;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
import androidx.paging.PagedList;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.firebase.ui.firestore.paging.FirestorePagingAdapter;
import com.firebase.ui.firestore.paging.FirestorePagingOptions;
import com.firebase.ui.firestore.paging.LoadingState;
import com.github.marlonlom.utilities.timeago.TimeAgo;
import com.google.android.material.chip.Chip;
import com.google.android.material.chip.ChipGroup;
import com.google.firebase.firestore.FirebaseFirestore;
import com.google.firebase.firestore.Query;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;

import java.util.Objects;

import de.hdodenhof.circleimageview.CircleImageView;

/**
 * Created by jhm69
 */

public class Ranking extends Fragment {
    String institu, area, sub, typ;
    String tag = "All";
    private FirebaseFirestore firestore;
    long t;
    private RecyclerView mRecyclerView;
    private SwipeRefreshLayout refreshLayout;

    @Nullable
    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        return inflater.inflate(R.layout.ranking, container, false);
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

        firestore = FirebaseFirestore.getInstance();
        mRecyclerView = view.findViewById(R.id.messageList);
        refreshLayout = view.findViewById(R.id.refreshLayout);
        UserViewModel userViewModel = ViewModelProviders.of(requireActivity()).get(UserViewModel.class);
        Chip location = view.findViewById(R.id.location);
        Chip institute = view.findViewById(R.id.sub);
        Chip subject = view.findViewById(R.id.institute);
        Chip type = view.findViewById(R.id.type);
        userViewModel.user.observe(getActivity(), users -> {
            area = users.getLocation();
            t = users.getType();
            typ = getType(t);
            institu = users.getInstitute();
            sub = users.getDept();
            if (area.equals("")) {
                location.setVisibility(View.GONE);
            } else {
                location.setText(area);
            }
            if (sub.equals("")) {
                subject.setVisibility(View.GONE);
            } else {
                subject.setText(sub);
            }
            if (institu.equals("")) {
                institute.setVisibility(View.GONE);
            } else {
                institute.setText(institu);
            }
            if (typ.equals("")) {
                type.setVisibility(View.GONE);
            } else {
                type.setText(typ);
            }

        });

        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
        mRecyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
        mRecyclerView.setHasFixedSize(true);
        mRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));
        setupAdapter(tag);
        ChipGroup chipGroup = view.findViewById(R.id.filter_chip_SS_group);
        chipGroup.setOnCheckedChangeListener((group, checkedId) -> {
            try {
                Chip c = view.findViewById(checkedId);
                tag = c.getText().toString();
                setupAdapter(tag);
            } catch (NullPointerException ignored) {
            }
        });
        refreshLayout.setOnRefreshListener(() -> setupAdapter(tag));



    }


    private void setupAdapter(String tag) {
        PagedList.Config config = new PagedList.Config.Builder()
                .setEnablePlaceholders(false)
                .setPrefetchDistance(5)
                .setPageSize(10)
                .build();
        Query mQuery = firestore.collection("Users")
                .orderBy("score", Query.Direction.DESCENDING);
        if (tag.equals("All")) {
            mQuery = firestore.collection("Users")
                    .orderBy("score", Query.Direction.DESCENDING);
        } else if (tag.equals(typ)) {
            mQuery = firestore.collection("Users").whereEqualTo("type", t)
                    .orderBy("score", Query.Direction.DESCENDING);
        } else if (tag.equals(area)) {
            mQuery = firestore.collection("Users")
                    .orderBy("score", Query.Direction.DESCENDING).whereEqualTo("location", area);
        } else if (tag.equals(institu)) {
            mQuery = firestore.collection("Users")
                    .orderBy("score", Query.Direction.DESCENDING).whereEqualTo("institute", institu);
        } else if (tag.equals(sub)) {
            mQuery = firestore.collection("Users")
                    .orderBy("score", Query.Direction.DESCENDING).whereEqualTo("dept", sub);
        }


        FirestorePagingOptions<Player> options = new FirestorePagingOptions.Builder<Player>()
                .setLifecycleOwner(this)
                .setQuery(mQuery, config, Player.class)
                .build();

        FirestorePagingAdapter<Player, ViewHolder> mAdapter = new FirestorePagingAdapter<Player, ViewHolder>(options) {
            @NonNull
            @Override
            public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                View view = getLayoutInflater().inflate(R.layout.item_quiz_profile, parent, false);
                return new ViewHolder(view);
            }

            @SuppressLint({"SetTextI18n", "UseCompatLoadingForColorStateLists"})
            @Override
            protected void onBindViewHolder(@NonNull ViewHolder holder, int position, @NonNull Player user) {
                requireView().findViewById(R.id.default_item).setVisibility(View.GONE);
                holder.name.setText(user.getName());

//                if(user.getDept().length() > 1 && user.getInstitute().length() > 1) {
//                    holder.institute.setText(user.getDept() + ", " + user.getInstitute());
//                }else if (user.getDept().length()<2) {
//                    holder.institute.setText(user.getInstitute());
//                } else if (user.getInstitute().length()<2) {
//                    holder.institute.setText(user.getDept());
//                }
//                if(user.getDept().length()<1 && user.getInstitute().length() < 1){
//                    holder.institute.setVisibility(View.GONE);
//                }

                int score = (int) user.getScore();
                holder.rank.setVisibility(View.VISIBLE);
                holder.level.setText(String.valueOf(score));
                if (user.getId().equals(userId)) {
                    holder.name.setText("You");
                    holder.back.setBackgroundColor(Color.parseColor("#DCDCFB"));
                }else{
                    holder.back.setBackgroundColor(Color.parseColor("#ffffff"));
                }

                holder.time.setText(getTimeText(user.getLastTimestamp()));

                holder.rank.setText(String.valueOf(position + 1));

                Glide.with(requireContext())
                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                        .load(user.getImage())
                        .into(holder.image);
                holder.mView.setOnClickListener(view -> FriendProfile.startActivity(getContext(), user.getId()));
            }

            @Override
            protected void onError(@NonNull Exception e) {
                super.onError(e);
                Log.e("MainActivity", e.getMessage());
            }

            @Override
            protected void onLoadingStateChanged(@NonNull LoadingState state) {
                switch (state) {
                    case LOADING_INITIAL:
                    case LOADING_MORE:
                        refreshLayout.setRefreshing(true);
                        break;

                    case LOADED:
                        if (getItemCount() == 0) {
                            requireView().findViewById(R.id.default_item).setVisibility(View.VISIBLE);
                        }
                        refreshLayout.setRefreshing(false);
                        break;

                    case ERROR:
                        Toast.makeText(
                                getActivity(),
                                "Error Occurred!",
                                Toast.LENGTH_SHORT
                        ).show();

                        refreshLayout.setRefreshing(false);
                        break;
                    case FINISHED:
                        refreshLayout.setRefreshing(false);
                        break;
                }
            }

        };
        mRecyclerView.setAdapter(mAdapter);

    }

    private String getTimeText(long lastTimestamp) {
        String time = TimeAgo.using(lastTimestamp);
        time = time.replaceAll("just now", "now")
                .replaceAll(" minutes", "m")
                .replaceAll(" minute", "1m")
                .replaceAll("about", "")
                .replaceAll(" hours", "h")
                .replaceAll(" hour", "1h")
                .replaceAll(" an", "")
                .replaceAll("a ", "1 ")
                .replaceAll(" ago", "")
                .replaceAll("yesterday", "1d")
                .replaceAll(" days", "d")
                .replaceAll(" day", "1d");
        return time;
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
        final View mView;
        final CircleImageView image;
        final TextView name;
        final TextView institute;
        final TextView level;
        final TextView rank, time;
        final ConstraintLayout back;

        public ViewHolder(View itemView) {
            super(itemView);
            mView = itemView;
            image = mView.findViewById(R.id.image);
            name = mView.findViewById(R.id.name);
            institute = mView.findViewById(R.id.institute);
            level = mView.findViewById(R.id.levelCount);
            rank = mView.findViewById(R.id.rank);
            back = mView.findViewById(R.id.back);
            time = mView.findViewById(R.id.textView4);
        }
    }
    String getType(long t) {
        if (t == 0) return "bsc";
        if (t == 1) return "hsc";
        if (t == 2) return "ssc";
        else return "bsc";
    }


}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Result.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Result.java
deleted file mode 100644
index c81d05a..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/Result.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import androidx.annotation.NonNull;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-import androidx.room.PrimaryKey;
-
-import java.io.Serializable;
-
-@SuppressWarnings("NotNullFieldNotInitialized")
-@Entity
-public class Result implements Serializable {
-    @PrimaryKey
-    @NonNull
-    String battleId;
-    String myUid;
-    String otherUid;
-    int myScore, otherScore;
-    String topic;
-    String timestamp;
-    int action;
-
-    @Ignore
-    public Result() {
-    }
-
-    public Result(@NonNull String battleId, String myUid, String otherUid, int myScore, int otherScore, String topic, String timestamp, int action) {
-        this.battleId = battleId;
-        this.myUid = myUid;
-        this.otherUid = otherUid;
-        this.myScore = myScore;
-        this.otherScore = otherScore;
-        this.topic = topic;
-        this.timestamp = timestamp;
-        this.action = action;
-    }
-
-    @NonNull
-    public String getBattleId() {
-        return battleId;
-    }
-
-    public void setBattleId(@NonNull String battleId) {
-        this.battleId = battleId;
-    }
-
-    public String getMyUid() {
-        return myUid;
-    }
-
-    public void setMyUid(String senderUid) {
-        this.myUid = senderUid;
-    }
-
-    public String getOtherUid() {
-        return otherUid;
-    }
-
-    public void setOtherUid(String otherUid) {
-        this.otherUid = otherUid;
-    }
-
-    public int getMyScore() {
-        return myScore;
-    }
-
-    public void setMyScore(int myScore) {
-        this.myScore = myScore;
-    }
-
-    public int getOtherScore() {
-        return otherScore;
-    }
-
-    public void setOtherScore(int otherScore) {
-        this.otherScore = otherScore;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public int getAction() {
-        return action;
-    }
-
-    public void setAction(int action) {
-        this.action = action;
-    }
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/ResultActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/ResultActivity.java
deleted file mode 100644
index caa28d4..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/ResultActivity.java
+++ /dev/null
@@ -1,417 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;
-import static java.util.Objects.requireNonNull;
-
-import android.annotation.SuppressLint;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.Query;
-import com.google.firebase.database.ValueEventListener;
-import com.google.firebase.firestore.FirebaseFirestore;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.adapters.ResultEachQuestionAdapter;
-import com.quantum_guys.dncc_eco_sync.models.QuestionEachResult;
-import com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
-import com.quantum_guys.dncc_eco_sync.viewmodel.BattleViewModel;
-import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import es.dmoral.toasty.Toasty;
-
-public class ResultActivity extends AppCompatActivity {
-    public ProgressDialog mDialog;
-    String winnerId = "draw";
-    Button playAgain;
-    final List<QuestionEachResult> questionEachResultList = new ArrayList<>();
-    RecyclerView mRecyclerView;
-    ResultEachQuestionAdapter resultEachQuestionAdapter;
-    private BattleModel battlep;
-    private TextView thisUserName, thisUserLevel, otherUserName, otherUserLevel, thisScore, otherScore, topic, resultText, pointText;
-    private ImageView otherUserImage, thisUserImage;
-
-    @SuppressLint({"SetTextI18n", "InflateParams"})
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
-        String themeName = sharedPreferences.getString("ThemeName", "Default");
-        if (themeName.equalsIgnoreCase("TealTheme")) {
-            setTheme(R.style.TealTheme);
-        } else if (themeName.equalsIgnoreCase("VioleteTheme")) {
-            setTheme(R.style.VioleteTheme);
-        } else if (themeName.equalsIgnoreCase("PinkTheme")) {
-            setTheme(R.style.PinkTheme);
-        } else if (themeName.equalsIgnoreCase("DelRio")) {
-            setTheme(R.style.DelRio);
-        } else if (themeName.equalsIgnoreCase("DarkTheme")) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            setTheme(R.style.Dark);
-        } else if (themeName.equalsIgnoreCase("Lynch")) {
-            setTheme(R.style.Lynch);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-        setContentView(R.layout.activity_result);
-        Toolbar toolbar = findViewById(R.id.toolbar2);
-
-
-        setSupportActionBar(toolbar);
-        requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-        resultText = findViewById(R.id.resultText);
-        pointText = findViewById(R.id.textView12);
-        playAgain = findViewById(R.id.playAgain);
-        thisUserName = findViewById(R.id.thisUserName);
-        thisUserLevel = findViewById(R.id.thisUserLevel);
-        thisUserImage = findViewById(R.id.thisUserImage);
-        thisScore = findViewById(R.id.myScore);
-        otherUserName = findViewById(R.id.otherUserName);
-
-        mDialog = new ProgressDialog(this);
-        mDialog.setMessage("Please wait..");
-        mDialog.setIndeterminate(true);
-        mDialog.setCanceledOnTouchOutside(false);
-        mDialog.setCancelable(false);
-        BattleModel battleResult = (BattleModel) getIntent().getSerializableExtra("FinalResult");
-        otherUserLevel = findViewById(R.id.otherUserLevel);
-        otherUserImage = findViewById(R.id.otherUserImage);
-        otherScore = findViewById(R.id.otherScore);
-        topic = findViewById(R.id.topic);
-        BattleViewModel battleViewModel = ViewModelProviders.of(this).get(BattleViewModel.class);
-        mRecyclerView = findViewById(R.id.jhm69);
-        String battleIdNew = getIntent().getStringExtra("resultId");
-        thisScore.setText(String.valueOf(0));
-        resultEachQuestionAdapter = new ResultEachQuestionAdapter(questionEachResultList, ResultActivity.this);
-        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
-        mRecyclerView.setHasFixedSize(true);
-        thisScore.setText(String.valueOf(0));
-        if (battleIdNew == null && battleResult == null) {
-            battlep = (BattleModel) getIntent().getSerializableExtra("start");
-            try {
-                for (int i = 0; i < requireNonNull(battlep).questionList.size(); i++) {
-                    QuestionEachResult questionEachResult = new QuestionEachResult(battlep.senderAnswerList.get(i), battlep.questionList.get(i));
-                    questionEachResultList.add(questionEachResult);
-                    mRecyclerView.setAdapter(resultEachQuestionAdapter);
-                    resultEachQuestionAdapter.notifyDataSetChanged();
-                }
-            } catch (Exception h) {
-                finish();
-            }
-
-            thisScore.setText(String.valueOf(getScoreCount(requireNonNull(battlep).senderAnswerList)));
-            setUserData(thisUserImage, thisUserName, thisUserLevel, battlep.senderUid, true);
-            setUserData(otherUserImage, otherUserName, otherUserLevel, battlep.getReceiverUid(), false);
-            resultText.setTextColor(Color.parseColor("#5570A0"));
-            playAgain.setText("Go Back to home");
-            resultText.setText("Waiting for opponent to play");
-            pointText.setText("");
-            otherScore.setText("-");
-            playAgain.setOnClickListener(view -> startActivity(new Intent(getApplication(), MainActivity.class)));
-        } else if (battleResult != null) {
-            try {
-                doThings(battleResult);
-            }catch (Exception f){
-                Toasty.error(getApplicationContext(), "Battle Result not found", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-        } else {
-            try {
-                battleViewModel.get(battleIdNew).observe(this, battlep -> {
-                    if(battlep!=null){
-                        Log.d("TBUG", "fromElse");
-                        doThingsForMe(requireNonNull(battlep));
-                    }else{
-                        Toasty.error(getApplicationContext(), "Battle Result not found", Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                });
-            } catch (Exception j) {
-                if (battlep == null && questionEachResultList.size()==0) {
-                    mDialog.show();
-                    DatabaseReference mDb = FirebaseDatabase.getInstance().getReference();
-                    Query query = mDb.child("Play").orderByChild("battleId").equalTo(battleIdNew);
-                    query.addListenerForSingleValueEvent(new ValueEventListener() {
-                        @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-                        @Override
-                        public void onDataChange(@NonNull DataSnapshot snapshot) {
-                            for (DataSnapshot data : snapshot.getChildren()) {
-                                battlep = data.getValue(BattleModel.class);
-                            }
-                            doThingsForMe(requireNonNull(battlep));
-                            mDialog.dismiss();
-                        }
-
-                        @Override
-                        public void onCancelled(@NonNull DatabaseError error) {
-                        }
-                    });
-                }
-            }
-        }
-    }
-
-
-    private void setUserData(ImageView proPic, TextView name, TextView level, String uid, boolean me) {
-        try {
-            if (me) {
-                UserViewModel userViewModel = ViewModelProviders.of(this).get(UserViewModel.class);
-                userViewModel.user.observe(this, me1 -> {
-                    name.setText(me1.getUsername());
-                    setLevelByScore(level, (int) me1.getScore());
-                    Glide.with(getApplicationContext())
-                            .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                            .load(me1.getImage())
-                            .into(proPic);
-                });
-            } else {
-                FirebaseFirestore.getInstance().collection("Users")
-                        .document(uid)
-                        .get()
-                        .addOnSuccessListener(documentSnapshot -> {
-                            name.setText(documentSnapshot.getString("username"));
-                            try {
-                                setLevelByScore(level, Integer.parseInt(String.valueOf(documentSnapshot.getLong("score"))));
-                                Glide.with(getApplicationContext())
-                                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                                        .load(documentSnapshot.getString("image"))
-                                        .into(proPic);
-                            }catch (Exception ignored){
-
-                            }
-                        });
-            }
-        } catch (NullPointerException ignored) {
-
-        }
-        name.setOnClickListener(v ->{
-            startActivity(new Intent(getApplicationContext(), FriendProfile.class).putExtra("f_id", uid));
-        });
-        proPic.setOnClickListener(v -> {
-            startActivity(new Intent(getApplicationContext(), FriendProfile.class).putExtra("f_id", uid));
-        });
-    }
-
-    private int getScoreCount(List<Boolean> scoreList) {
-        int score = 0;
-        try {
-            for (int i = 0; i < scoreList.size(); i++) {
-                if (scoreList.get(i)) {
-                    score++;
-                }
-            }
-        }catch (Exception ignored){
-
-        }
-        return score;
-    }
-
-
-    @SuppressLint("SetTextI18n")
-    private void doThings(BattleModel battlePlay) {
-        int reScore, seScore;
-        reScore = getScoreCount(battlePlay.receiverList); //me
-        seScore = getScoreCount(battlePlay.senderAnswerList); //other
-        topic.setText(battlePlay.getTopic());
-        if (battlePlay.receiverUid.equals(userId)) {
-            thisScore.setText(String.valueOf(reScore));
-            otherScore.setText(String.valueOf(seScore));
-            try {
-                questionEachResultList.clear();
-                for (int i = 0; i < battlePlay.questionList.size(); i++) {
-                    QuestionEachResult questionEachResult = new QuestionEachResult(battlePlay.receiverList.get(i), battlePlay.senderAnswerList.get(i), battlePlay.questionList.get(i));
-                    questionEachResultList.add(questionEachResult);
-                    mRecyclerView.setAdapter(resultEachQuestionAdapter);
-                    resultEachQuestionAdapter.notifyDataSetChanged();
-                }
-            } catch (Exception ignored) {
-
-            }
-            setUserData(thisUserImage, thisUserName, thisUserLevel, battlePlay.receiverUid, true);
-            setUserData(otherUserImage, otherUserName, otherUserLevel, battlePlay.senderUid, false);
-            if (reScore > seScore) {
-                resultText.setText("Congratulations, You Won!");
-                winnerId = battlePlay.receiverUid;
-                resultText.setTextColor(Color.parseColor("#4BBB4F"));
-                pointText.setText("you have got 5 point");
-            } else if (seScore > reScore) {
-                winnerId = battlePlay.senderUid;
-                resultText.setText("Damn, You Lost!");
-                resultText.setTextColor(Color.parseColor("#D32F2F"));
-                pointText.setText("Better luck next time");
-            } else {
-                resultText.setText("Match Drawn!");
-                resultText.setTextColor(Color.parseColor("#5570A0"));
-                pointText.setText("You were too close winning. got 2 point");
-            }
-            playAgain.setOnClickListener(view -> {
-                Intent goBattle = new Intent(getApplicationContext(), SelectTopic.class);
-                goBattle.putExtra("otherUid", battlePlay.senderUid);
-                startActivity(goBattle);
-            });
-        }
-        topic.setText(battlePlay.topic);
-    }
-
-    @SuppressLint("SetTextI18n")
-    private void doThingsForMe(BattleModel battlePlay) {
-        if (battlePlay.receiverUid.equals(userId)) {
-            try {
-                int reScore, seScore;
-                reScore = getScoreCount(battlePlay.receiverList); //me
-                seScore = getScoreCount(battlePlay.senderAnswerList); //other
-                topic.setText(battlePlay.getTopic());
-                thisScore.setText(String.valueOf(reScore));
-                otherScore.setText(String.valueOf(seScore));
-                try {
-                    questionEachResultList.clear();
-                    for (int i = 0; i < battlePlay.questionList.size(); i++) {
-                        QuestionEachResult questionEachResult = new QuestionEachResult(battlePlay.receiverList.get(i), battlePlay.senderAnswerList.get(i), battlePlay.questionList.get(i));
-                        questionEachResultList.add(questionEachResult);
-                        mRecyclerView.setAdapter(resultEachQuestionAdapter);
-                        resultEachQuestionAdapter.notifyDataSetChanged();
-                    }
-                } catch (Exception ignored) {
-
-                }
-                setUserData(thisUserImage, thisUserName, thisUserLevel, battlePlay.receiverUid, true);
-                setUserData(otherUserImage, otherUserName, otherUserLevel, battlePlay.senderUid, false);
-                if (reScore > seScore) {
-                    resultText.setText("Congratulations, You Won!");
-                    winnerId = battlePlay.receiverUid;
-                    resultText.setTextColor(Color.parseColor("#4BBB4F"));
-                    pointText.setText("you have got 5 point");
-                } else if (seScore > reScore) {
-                    winnerId = battlePlay.senderUid;
-                    resultText.setText("Damn, You Lost!");
-                    resultText.setTextColor(Color.parseColor("#D32F2F"));
-                    pointText.setText("Better luck next time");
-                } else {
-                    resultText.setText("Match Drawn!");
-                    resultText.setTextColor(Color.parseColor("#5570A0"));
-                    pointText.setText("You were too close winning, Still 2 point");
-                }
-                playAgain.setOnClickListener(view -> {
-                    Intent goBattle = new Intent(getApplicationContext(), SelectTopic.class);
-                    goBattle.putExtra("otherUid", battlePlay.senderUid);
-                    startActivity(goBattle);
-                });
-            }catch (Exception ignored){
-
-            }
-        } else {
-            int reScore, seScore;
-            reScore = getScoreCount(battlePlay.receiverList);
-            seScore = getScoreCount(battlePlay.senderAnswerList);
-            topic.setText(battlePlay.topic);
-            thisScore.setText(String.valueOf(seScore));
-            otherScore.setText(String.valueOf(reScore));
-            setUserData(thisUserImage, thisUserName, thisUserLevel, battlePlay.senderUid, true);
-            setUserData(otherUserImage, otherUserName, otherUserLevel, battlePlay.receiverUid, false);
-            try {
-                questionEachResultList.clear();
-                for (int i = 0; i < battlePlay.questionList.size(); i++) {
-                    QuestionEachResult questionEachResult = new QuestionEachResult(battlePlay.senderAnswerList.get(i), battlePlay.receiverList.get(i), battlePlay.questionList.get(i));
-                    questionEachResultList.add(questionEachResult);
-                    mRecyclerView.setAdapter(resultEachQuestionAdapter);
-                    resultEachQuestionAdapter.notifyDataSetChanged();
-                }
-                if (seScore > reScore) {
-                    resultText.setText("Congratulations, You Won!");
-                    winnerId = battlePlay.senderUid;
-                    resultText.setTextColor(Color.parseColor("#4BBB4F"));
-                    pointText.setText("you have got 5 point");
-                } else if (reScore > seScore) {
-                    winnerId = battlePlay.receiverUid;
-                    resultText.setText("Damn, You Lost!");
-                    resultText.setTextColor(Color.parseColor("#D32F2F"));
-                    pointText.setText("Better luck next time");
-                } else {
-                    resultText.setText("Match Drawn!");
-                    resultText.setTextColor(Color.parseColor("#5570A0"));
-                    pointText.setText("You were too close winning, Still 2 point");
-                }
-                playAgain.setOnClickListener(view -> {
-                    Intent goBattle = new Intent(getApplicationContext(), SelectTopic.class);
-                    goBattle.putExtra("otherUid", battlePlay.receiverUid);
-                    startActivity(goBattle);
-                });
-            } catch (Exception k) {
-                questionEachResultList.clear();
-                for (int i = 0; i < battlePlay.questionList.size(); i++) {
-                    QuestionEachResult questionEachResult = new QuestionEachResult(battlePlay.senderAnswerList.get(i), null, battlePlay.questionList.get(i));
-                    questionEachResultList.add(questionEachResult);
-                    mRecyclerView.setAdapter(resultEachQuestionAdapter);
-                    resultEachQuestionAdapter.notifyDataSetChanged();
-                }
-                otherScore.setText("-");
-                resultText.setText("Waiting...");
-                resultText.setTextColor(Color.parseColor("#4BBB4F"));
-                pointText.setText("Waiting for opponent to play");
-            }
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private void setLevelByScore(TextView levelTV, int score) {
-        if (score <= 500) {
-            levelTV.setText("Level: 1");
-        } else if (score <= 1000) {
-            levelTV.setText("Level: 2");
-        } else if (score <= 1500) {
-            levelTV.setText("Level: 3");
-        } else if (score <= 2000) {
-            levelTV.setText("Level: 4");
-        } else if (score <= 2500) {
-            levelTV.setText("Level: 5");
-        } else if (score <= 3500) {
-            levelTV.setText("Level: 6");
-        } else if (score <= 5000) {
-            levelTV.setText("Level: 7");
-        } else {
-            levelTV.setText("Level: unknown");
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-        super.onBackPressed();
-    }
-    @Override
-    public boolean onSupportNavigateUp() {
-        onBackPressed();
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/SelectTopic.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/SelectTopic.java
deleted file mode 100644
index 32338b2..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/SelectTopic.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.Window;
-import android.widget.ProgressBar;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.database.ValueEventListener;
-import com.google.firebase.firestore.DocumentChange;
-import com.google.firebase.firestore.FirebaseFirestore;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.adapters.TopicAdapter;
-import com.quantum_guys.dncc_eco_sync.models.Friends;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import es.dmoral.toasty.Toasty;
-
-public class SelectTopic extends AppCompatActivity {
-    final List<String> topics = new ArrayList<>();
-    long ty;
-    private RecyclerView recyclerView;
-    //  private RecyclerView.LayoutManager layoutManager;
-    private TopicAdapter capterAdapter;
-    private String otherUid;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
-
-        super.onCreate(savedInstanceState);
-        SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
-        String themeName = sharedPreferences.getString("ThemeName", "Default");
-        if (themeName.equalsIgnoreCase("TealTheme")) {
-            setTheme(R.style.TealTheme);
-        } else if (themeName.equalsIgnoreCase("VioleteTheme")) {
-            setTheme(R.style.VioleteTheme);
-        } else if (themeName.equalsIgnoreCase("PinkTheme")) {
-            setTheme(R.style.PinkTheme);
-        } else if (themeName.equalsIgnoreCase("DelRio")) {
-            setTheme(R.style.DelRio);
-        } else if (themeName.equalsIgnoreCase("DarkTheme")) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            setTheme(R.style.Dark);
-        } else if (themeName.equalsIgnoreCase("Lynch")) {
-            setTheme(R.style.Lynch);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-        setContentView(R.layout.activity_all_parent_topic);
-        ProgressBar loading = findViewById(R.id.progressBar2);
-        recyclerView = findViewById(R.id.rcv);
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
-        recyclerView.setLayoutManager(gridLayoutManager);
-        recyclerView.setAdapter(capterAdapter);//set adapter to recyclerview
-        //recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
-        //recyclerView.setLayoutManager(layoutManager);
-        //layoutManager = new LinearLayoutManager(getApplicationContext());
-        // toolbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.colorAccentt));
-        recyclerView.setHasFixedSize(true);
-
-
-        otherUid = getIntent().getStringExtra("otherUid");
-        ty = getIntent().getLongExtra("type", 99);
-        if (ty == 99) {
-            Toasty.info(this, "Wait some time...", Toast.LENGTH_SHORT).show();
-            FirebaseFirestore firestore = FirebaseFirestore.getInstance();
-            firestore.collection("Users").whereEqualTo("id", otherUid)
-                    .get()
-                    .addOnSuccessListener(queryDocumentSnapshots -> {
-                        if (!queryDocumentSnapshots.getDocuments().isEmpty()) {
-                            for (final DocumentChange doc : queryDocumentSnapshots.getDocumentChanges()) {
-                                Friends friends = doc.getDocument().toObject(Friends.class).withId(Objects.requireNonNull(doc.getDocument().getString("id")));
-                                ty = friends.getType();
-                            }
-
-                            String type = getType(ty);
-                            Log.d("Typee-SelectTopic", type);
-                            DatabaseReference itemsRef = FirebaseDatabase.getInstance().getReference().child("Topics").child(type);
-                            ValueEventListener eventListener = new ValueEventListener() {
-                                @Override
-                                public void onDataChange(DataSnapshot dataSnapshot) {
-                                    for (DataSnapshot ds : dataSnapshot.getChildren()) {
-                                        String name = ds.getKey();
-                                        topics.add(name);
-                                        capterAdapter = new TopicAdapter(topics, SelectTopic.this, otherUid, type);
-                                        recyclerView.setAdapter(capterAdapter);
-                                        capterAdapter.notifyDataSetChanged();
-                                        loading.setVisibility(View.GONE);
-                                    }
-                                }
-
-                                @Override
-                                public void onCancelled(@NonNull DatabaseError databaseError) {
-                                }
-                            };
-                            itemsRef.addListenerForSingleValueEvent(eventListener);
-                        }
-                    })
-                    .addOnFailureListener(e -> {
-
-                    });
-        } else {
-            String type = getType(ty);
-            DatabaseReference itemsRef = FirebaseDatabase.getInstance().getReference().child("Topics").child(type);
-            ValueEventListener eventListener = new ValueEventListener() {
-                @Override
-                public void onDataChange(DataSnapshot dataSnapshot) {
-                    for (DataSnapshot ds : dataSnapshot.getChildren()) {
-                        String name = ds.getKey();
-                        topics.add(name);
-                        capterAdapter = new TopicAdapter(topics, SelectTopic.this, otherUid, type);
-                        recyclerView.setAdapter(capterAdapter);
-                        capterAdapter.notifyDataSetChanged();
-                        loading.setVisibility(View.GONE);
-                    }
-                }
-
-                @Override
-                public void onCancelled(@NonNull DatabaseError databaseError) {
-                }
-            };
-            itemsRef.addListenerForSingleValueEvent(eventListener);
-        }
-    }
-
-    String getType(long t) {
-        if (t == 0) return "bsc";
-        if (t == 1) return "hsc";
-        if (t == 2) return "ssc";
-        else return "bsc";
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-    }
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/StepView.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/StepView.java
deleted file mode 100644
index 24166fc..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/StepView.java
+++ /dev/null
@@ -1,996 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import android.animation.Animator;
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.Dimension;
-import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.view.ViewCompat;
-
-import com.quantum_guys.dncc_eco_sync.R;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("IntegerDivisionInFloatingPointContext")
-public class StepView extends View {
-
-    public static final int ANIMATION_LINE = 0;
-    public static final int ANIMATION_CIRCLE = 1;
-    public static final int ANIMATION_ALL = 2;
-    public static final int ANIMATION_NONE = 3;
-    public static final int DISPLAY_MODE_WITH_TEXT = 0;
-    public static final int DISPLAY_MODE_NO_TEXT = 1;
-    private static final int ANIMATE_STEP_TRANSITION = 0;
-    private static final int IDLE = 1;
-    private static final int START_STEP = 0;
-    public static List<Boolean> stepAnsList = new ArrayList<>();
-    private final List<String> steps = new ArrayList<>();
-    private final Paint paint;
-    private final TextPaint textPaint;
-    private final Rect bounds = new Rect();
-    private OnStepClickListener onStepClickListener;
-    @DisplayMode
-    private int displayMode = DISPLAY_MODE_WITH_TEXT;
-    // for display mode DISPLAY_MODE_NO_TEXT
-    private int stepsNumber = 0;
-    private int currentStep = START_STEP;
-    private int nextAnimatedStep;
-    private int state = IDLE;
-    @AnimationType
-    private int animationType;
-    @ColorInt
-    private int selectedCircleColor;
-    @Dimension
-    private int selectedCircleRadius;
-    @ColorInt
-    private int selectedTextColor;
-    @ColorInt
-    private int doneCircleColor;
-    @Dimension
-    private int doneCircleRadius;
-    @ColorInt
-    private int doneTextColor;
-    @ColorInt
-    private int nextTextColor;
-    @Dimension
-    private int stepPadding;
-    @ColorInt
-    private int nextStepLineColor;
-    @ColorInt
-    private int doneStepLineColor;
-    @Dimension
-    private int stepLineWidth;
-    @Dimension(unit = Dimension.SP)
-    private float textSize;
-    @Dimension
-    private int textPadding;
-    private int selectedStepNumberColor;
-    @Dimension(unit = Dimension.SP)
-    private float stepNumberTextSize;
-    @ColorInt
-    private int doneStepMarkColor;
-    private int animationDuration;
-    private boolean nextStepCircleEnabled;
-    @ColorInt
-    private int nextStepCircleColor;
-    private ValueAnimator animator;
-    private int[] circlesX;
-    private int[] startLinesX;
-    private int[] endLinesX;
-    private float[] constraints;
-    private int circlesY;
-    private int textY;
-    private float animatedFraction;
-    private boolean done;
-    private StaticLayout[] textLayouts;
-
-    public StepView(Context context) {
-        this(context, null);
-    }
-
-    public StepView(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.sv_stepViewStyle);
-    }
-
-    public StepView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        paint.setTextAlign(Paint.Align.CENTER);
-        textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
-        textPaint.setTextAlign(Paint.Align.CENTER);
-        applyStyles(context, attrs, defStyleAttr);
-        drawEditMode();
-    }
-
-    private void applyStyles(Context context, AttributeSet attrs, int defStyleAttr) {
-        TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.StepView, defStyleAttr, R.style.StepView);
-        selectedCircleColor = ta.getColor(R.styleable.StepView_sv_selectedCircleColor, 0);
-        selectedCircleRadius = ta.getDimensionPixelSize(R.styleable.StepView_sv_selectedCircleRadius, 0);
-        selectedTextColor = ta.getColor(R.styleable.StepView_sv_selectedTextColor, 0);
-        selectedStepNumberColor = ta.getColor(R.styleable.StepView_sv_selectedStepNumberColor, 0);
-        doneStepMarkColor = ta.getColor(R.styleable.StepView_sv_doneStepMarkColor, 0);
-        doneCircleColor = ta.getColor(R.styleable.StepView_sv_doneCircleColor, 0);
-        doneCircleRadius = ta.getDimensionPixelSize(R.styleable.StepView_sv_doneCircleRadius, 0);
-        doneTextColor = ta.getColor(R.styleable.StepView_sv_doneTextColor, 0);
-        nextTextColor = ta.getColor(R.styleable.StepView_sv_nextTextColor, 0);
-        stepPadding = ta.getDimensionPixelSize(R.styleable.StepView_sv_stepPadding, 0);
-        nextStepLineColor = ta.getColor(R.styleable.StepView_sv_nextStepLineColor, 0);
-        doneStepLineColor = ta.getColor(R.styleable.StepView_sv_doneStepLineColor, 0);
-        stepLineWidth = ta.getDimensionPixelSize(R.styleable.StepView_sv_stepLineWidth, 0);
-        textPadding = ta.getDimensionPixelSize(R.styleable.StepView_sv_textPadding, 0);
-        stepNumberTextSize = ta.getDimension(R.styleable.StepView_sv_stepNumberTextSize, 0);
-        textSize = ta.getDimension(R.styleable.StepView_sv_textSize, 0);
-        animationDuration = ta.getInteger(R.styleable.StepView_sv_animationDuration, 0);
-        animationType = ta.getInteger(R.styleable.StepView_sv_animationType, 0);
-        stepsNumber = ta.getInteger(R.styleable.StepView_sv_stepsNumber, 0);
-        nextStepCircleEnabled = ta.getBoolean(R.styleable.StepView_sv_nextStepCircleEnabled, false);
-        nextStepCircleColor = ta.getColor(R.styleable.StepView_sv_nextStepCircleColor, 0);
-        CharSequence[] descriptions = ta.getTextArray(R.styleable.StepView_sv_steps);
-        if (descriptions != null) {
-            for (CharSequence description : descriptions) {
-                steps.add(description.toString());
-            }
-            displayMode = DISPLAY_MODE_WITH_TEXT;
-        } else {
-            displayMode = DISPLAY_MODE_NO_TEXT;
-        }
-        Drawable background = ta.getDrawable(R.styleable.StepView_sv_background);
-        if (background != null) {
-            setBackgroundDrawable(background);
-        }
-        int fontId = ta.getResourceId(R.styleable.StepView_sv_typeface, 0);
-        if (fontId != 0) {
-            Typeface typeface = ResourcesCompat.getFont(context, fontId);
-            setTypeface(typeface);
-        }
-        textPaint.setTextSize(textSize);
-        ta.recycle();
-    }
-
-    private void setTypeface(Typeface typeface) {
-        if (typeface != null) {
-            textPaint.setTypeface(typeface);
-            paint.setTypeface(typeface);
-        }
-    }
-
-    private void drawEditMode() {
-        if (isInEditMode()) {
-            if (displayMode == DISPLAY_MODE_WITH_TEXT) {
-                if (steps.isEmpty()) {
-                    steps.add("Step 1");
-                    steps.add("Step 2");
-                    steps.add("Step 3");
-                }
-                setSteps(steps);
-            } else {
-                if (stepsNumber == 0) {
-                    stepsNumber = 4;
-                }
-                setStepsNumber(stepsNumber);
-            }
-        }
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        final boolean superResult = super.onTouchEvent(event);
-        if (onStepClickListener != null && isEnabled()) {
-            final int action = event.getActionMasked();
-            if (action == MotionEvent.ACTION_UP) {
-                float x = event.getX();
-                float y = event.getY();
-                int step = getStepByPointer(x);
-                onStepClickListener.onStepClick(step);
-            }
-        }
-        return superResult;
-    }
-
-    protected int getStepByPointer(float x) {
-        int count = getStepCount();
-        for (int i = 0; i < constraints.length; i++) {
-            float constraint = constraints[i];
-            if (x <= constraint) {
-                return i;
-            }
-        }
-        return count - 1;
-    }
-
-    public void setOnStepClickListener(OnStepClickListener listener) {
-        setClickable(listener != null);
-        onStepClickListener = listener;
-    }
-
-    public void setSteps(List<String> steps) {
-        stepsNumber = 0;
-        displayMode = DISPLAY_MODE_WITH_TEXT;
-        this.steps.clear();
-        this.steps.addAll(steps);
-        requestLayout();
-        go(START_STEP, false, false);
-    }
-
-    public void setStepsNumber(int number) {
-        steps.clear();
-        displayMode = DISPLAY_MODE_NO_TEXT;
-        stepsNumber = number;
-        requestLayout();
-        go(START_STEP, false, false);
-    }
-
-    public State getState() {
-        return new State();
-    }
-
-    public void go(int step, boolean animate, boolean correct) {
-        stepAnsList.add(step, correct);
-        if (step >= START_STEP && step < getStepCount()) {
-            if (animate && animationType != ANIMATION_NONE && startLinesX != null) {
-                if (Math.abs(step - currentStep) > 1) {
-                    endAnimation();
-                    currentStep = step;
-                    invalidate();
-                } else {
-                    nextAnimatedStep = step;
-                    state = ANIMATE_STEP_TRANSITION;
-                    animate(step);
-                    invalidate();
-                }
-            } else {
-                currentStep = step;
-                invalidate();
-            }
-        }
-    }
-
-    public void done(boolean isDone) {
-        done = isDone;
-        invalidate();
-    }
-
-    private void endAnimation() {
-        if (animator != null && animator.isRunning()) {
-            animator.end();
-        }
-    }
-
-    private void animate(final int step) {
-        endAnimation();
-        animator = getAnimator(step);
-        if (animator == null) {
-            return;
-        }
-        animator.addUpdateListener(valueAnimator -> {
-            animatedFraction = valueAnimator.getAnimatedFraction();
-            invalidate();
-        });
-        animator.addListener(new AnimatorListener() {
-            @Override
-            public void onAnimationEnd(Animator animator) {
-                state = IDLE;
-                currentStep = step;
-                invalidate();
-            }
-        });
-        animator.setDuration(animationDuration);
-        animator.start();
-    }
-
-    @Nullable
-    private ValueAnimator getAnimator(int step) {
-        ValueAnimator animator = null;
-        final int i;
-        if (step > currentStep) {
-            if (animationType == ANIMATION_LINE) {
-                i = step - 1;
-                animator = ValueAnimator.ofInt(startLinesX[i], endLinesX[i]);
-            } else if (animationType == ANIMATION_CIRCLE) {
-                animator = ValueAnimator.ofInt(0, selectedCircleRadius);
-            } else if (animationType == ANIMATION_ALL) {
-                i = step - 1;
-                animator = ValueAnimator.ofInt(0, (endLinesX[i] - startLinesX[i] + selectedCircleRadius) / 2);
-            }
-        } else if (step < currentStep) {
-            if (animationType == ANIMATION_LINE) {
-                i = step;
-                animator = ValueAnimator.ofInt(endLinesX[i], startLinesX[i]);
-            } else if (animationType == ANIMATION_CIRCLE) {
-                animator = ValueAnimator.ofInt(0, selectedCircleRadius);
-            } else if (animationType == ANIMATION_ALL) {
-                i = step;
-                animator = ValueAnimator.ofInt(0, (endLinesX[i] - startLinesX[i] + selectedCircleRadius) / 2);
-            }
-        }
-        return animator;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (animator != null && animator.isRunning()) {
-            animator.cancel();
-        }
-    }
-
-    public int getCurrentStep() {
-        return currentStep;
-    }
-
-    public int getStepCount() {
-        return displayMode == DISPLAY_MODE_WITH_TEXT ? steps.size() : stepsNumber;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int width = measureWidth(widthMeasureSpec);
-        if (getStepCount() == 0) {
-            setMeasuredDimension(width, 0);
-            return;
-        }
-        if (width == 0) {
-            setMeasuredDimension(width, 0);
-            return;
-        }
-        measureConstraints(width);
-        int height = measureHeight(heightMeasureSpec);
-        setMeasuredDimension(width, height);
-        measureAttributes();
-    }
-
-    private int measureWidth(int widthMeasureSpec) {
-        return MeasureSpec.getSize(widthMeasureSpec);
-    }
-
-    private void measureConstraints(int width) {
-        constraints = new float[getStepCount()];
-        constraints[0] = width / getStepCount();
-        for (int i = 1; i < constraints.length; i++) {
-            constraints[i] = constraints[0] * (i + 1);
-        }
-    }
-
-    private int measureHeight(int heightMeasureSpec) {
-        int specSize = MeasureSpec.getSize(heightMeasureSpec);
-        int specMode = MeasureSpec.getMode(heightMeasureSpec);
-        int desiredSize = getPaddingTop()
-                + getPaddingBottom()
-                + (Math.max(selectedCircleRadius, doneCircleRadius)) * 2
-                + (displayMode == DISPLAY_MODE_WITH_TEXT ? textPadding : 0);
-        if (!steps.isEmpty()) {
-            desiredSize += measureStepsHeight();
-        }
-        int result = 0;
-
-        switch (specMode) {
-            case MeasureSpec.UNSPECIFIED:
-                // Parent says we can be as big as we want.
-                result = desiredSize;
-                break;
-            case MeasureSpec.AT_MOST:
-                // Parent says we can be as big as we want, up to specSize.
-                // Don't be larger than specSize
-                result = Math.min(desiredSize, specSize);
-                break;
-            case MeasureSpec.EXACTLY:
-                // No choice. Do what we are told.
-                result = specSize;
-                break;
-        }
-
-        return result;
-    }
-
-    private int measureStepsHeight() {
-        textLayouts = new StaticLayout[steps.size()];
-        textPaint.setTextSize(textSize);
-        int max = 0;
-        for (int i = 0; i < steps.size(); i++) {
-            String text = steps.get(i);
-            Layout.Alignment alignment =
-                    isRtl() ? Layout.Alignment.ALIGN_OPPOSITE : Layout.Alignment.ALIGN_NORMAL;
-            textLayouts[i] = new StaticLayout(
-                    text,
-                    textPaint,
-                    getMeasuredWidth() / steps.size(),
-                    alignment,
-                    1,
-                    0,
-                    true
-            );
-            int height = textLayouts[i].getHeight();
-            max = Math.max(height, max);
-        }
-        return max;
-    }
-
-    @SuppressLint("WrongConstant")
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    private boolean isRtl() {
-        return ViewCompat.getLayoutDirection(this) == View.LAYOUT_DIRECTION_RTL;
-    }
-
-    private void measureAttributes() {
-        circlesY = getCircleY();
-        if (displayMode == DISPLAY_MODE_NO_TEXT) {
-            circlesY += getPaddingTop();
-        }
-        circlesX = getCirclePositions();
-        if (displayMode == DISPLAY_MODE_NO_TEXT) {
-            paint.setTextSize(stepNumberTextSize);
-        } else {
-            paint.setTextSize(stepNumberTextSize);
-            paint.setTextSize(textSize);
-            textY = circlesY + selectedCircleRadius + textPadding;
-        }
-        measureLines();
-    }
-
-    private int getCircleY() {
-        int availableHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
-        if (displayMode == DISPLAY_MODE_NO_TEXT) {
-            return availableHeight / 2;
-        }
-        int maxItemHeight = getMaxTextHeight() + Math.max(selectedCircleRadius, doneCircleRadius) + textPadding;
-        int additionalPadding = (availableHeight - maxItemHeight) / 2;
-        return getPaddingTop() + additionalPadding + selectedCircleRadius;
-    }
-
-    private int getMaxTextHeight() {
-        int max = 0;
-        if (textLayouts == null || textLayouts.length == 0) {
-            return max;
-        }
-        for (StaticLayout tl : textLayouts) {
-            max = Math.max(tl.getHeight(), max);
-        }
-        return max;
-    }
-
-    private int[] getCirclePositions() {
-        int stepsCount = getStepCount();
-        int[] result = new int[stepsCount];
-
-        if (result.length == 0) {
-            return result;
-        }
-
-        result[0] = getStartCirclePosition();
-
-        if (result.length == 1) {
-            return result;
-        }
-
-        result[stepsCount - 1] = getEndCirclePosition();
-
-        if (result.length < 3) {
-            return result;
-        }
-
-        float spaceLeft = isRtl() ? result[0] - result[stepsCount - 1] : result[stepsCount - 1] - result[0];
-        int margin = (int) (spaceLeft / (stepsCount - 1));
-
-        if (isRtl()) {
-            for (int i = 1; i < stepsCount - 1; i++) {
-                result[i] = result[i - 1] - margin;
-            }
-        } else {
-            for (int i = 1; i < stepsCount - 1; i++) {
-                result[i] = result[i - 1] + margin;
-            }
-        }
-
-        return result;
-    }
-
-    private int getStartCirclePosition() {
-        int result;
-        if (displayMode == DISPLAY_MODE_WITH_TEXT) {
-            if (isRtl()) {
-                result = getMeasuredWidth() - getPaddingRight() -
-                        Math.max(getMaxLineWidth(textLayouts[0]) / 2, selectedCircleRadius);
-            } else {
-                result = getPaddingLeft() + Math.max(getMaxLineWidth(textLayouts[0]) / 2, selectedCircleRadius);
-            }
-        } else {
-            if (isRtl()) {
-                result = getMeasuredWidth() - getPaddingRight() - selectedCircleRadius;
-            } else {
-                result = getPaddingLeft() + selectedCircleRadius;
-            }
-        }
-        return result;
-    }
-
-    private int getMaxLineWidth(StaticLayout layout) {
-        int lineCount = layout.getLineCount();
-        int max = 0;
-        for (int i = 0; i < lineCount; i++) {
-            max = (int) Math.max(layout.getLineWidth(i), max);
-        }
-        return max;
-    }
-
-    private int getEndCirclePosition() {
-        int result;
-        if (displayMode == DISPLAY_MODE_WITH_TEXT) {
-            if (isRtl()) {
-                result = getPaddingLeft() +
-                        Math.max(getMaxLineWidth(last(textLayouts)) / 2, selectedCircleRadius);
-            } else {
-                result = getMeasuredWidth() - getPaddingRight() -
-                        Math.max(getMaxLineWidth(last(textLayouts)) / 2, selectedCircleRadius);
-            }
-        } else {
-            if (isRtl()) {
-                result = getPaddingLeft() + selectedCircleRadius;
-            } else {
-                result = getMeasuredWidth() - getPaddingRight() - selectedCircleRadius;
-            }
-        }
-        return result;
-    }
-
-    private <T> T last(T[] array) {
-        return array[array.length - 1];
-    }
-
-    private void measureLines() {
-        startLinesX = new int[getStepCount() - 1];
-        endLinesX = new int[getStepCount() - 1];
-        int padding = stepPadding + selectedCircleRadius;
-
-        for (int i = 1; i < getStepCount(); i++) {
-            if (isRtl()) {
-                startLinesX[i - 1] = circlesX[i - 1] - padding;
-                endLinesX[i - 1] = circlesX[i] + padding;
-            } else {
-                startLinesX[i - 1] = circlesX[i - 1] + padding;
-                endLinesX[i - 1] = circlesX[i] - padding;
-            }
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (getHeight() == 0) return;
-
-        final int stepSize = getStepCount();
-
-        if (stepSize == 0) {
-            return;
-        }
-
-        for (int i = 0; i < stepSize; i++) {
-            drawStep(canvas, i, circlesX[i], circlesY, stepAnsList.get(i));
-        }
-
-        for (int i = 0; i < startLinesX.length; i++) {
-            if (state == ANIMATE_STEP_TRANSITION && i == nextAnimatedStep - 1
-                    && nextAnimatedStep > currentStep && (animationType == ANIMATION_LINE || animationType == ANIMATION_ALL)) {
-                int animatedX = (int) (startLinesX[i] + animatedFraction * (endLinesX[i] - startLinesX[i]));
-                drawLine(canvas, startLinesX[i], animatedX, circlesY, true);
-                drawLine(canvas, animatedX, endLinesX[i], circlesY, false);
-            } else if (state == ANIMATE_STEP_TRANSITION && i == nextAnimatedStep
-                    && nextAnimatedStep < currentStep && (animationType == ANIMATION_LINE || animationType == ANIMATION_ALL)) {
-                int animatedX = (int) (endLinesX[i] - animatedFraction * (endLinesX[i] - startLinesX[i]));
-                drawLine(canvas, startLinesX[i], animatedX, circlesY, true);
-                drawLine(canvas, animatedX, endLinesX[i], circlesY, false);
-            } else drawLine(canvas, startLinesX[i], endLinesX[i], circlesY, i < currentStep);
-        }
-    }
-
-    private void drawStep(Canvas canvas, int step, int circleCenterX, int circleCenterY, boolean hoiche_naki) {
-        final String text = displayMode == DISPLAY_MODE_WITH_TEXT ? steps.get(step) : "";
-        final boolean isSelected = step == currentStep;
-        final boolean isDone = done ? step <= currentStep : step < currentStep;
-        final String number = String.valueOf(step + 1);
-
-        if (isSelected && !isDone) {
-            paint.setColor(selectedCircleColor);
-            int radius;
-            if (state == ANIMATE_STEP_TRANSITION && (animationType == ANIMATION_CIRCLE || animationType == ANIMATION_ALL)
-                    && nextAnimatedStep < currentStep) {
-                if (!nextStepCircleEnabled || nextStepCircleColor == 0) {
-                    radius = (int) (selectedCircleRadius - selectedCircleRadius * animatedFraction);
-                } else {
-                    radius = selectedCircleRadius;
-                }
-                if (nextStepCircleEnabled && nextStepCircleColor != 0) {
-                    paint.setColor(ColorUtils.blendARGB(
-                            selectedCircleColor,
-                            nextStepCircleColor,
-                            animatedFraction)
-                    );
-                }
-            } else {
-                radius = selectedCircleRadius;
-            }
-
-            canvas.drawCircle(circleCenterX, circleCenterY, radius, paint);
-            paint.setColor(selectedStepNumberColor);
-            paint.setTextSize(stepNumberTextSize);
-            drawNumber(canvas, number, circleCenterX, paint);
-            textPaint.setTextSize(textSize);
-            textPaint.setColor(selectedTextColor);
-            drawText(canvas, text, textY, step);
-        } else if (isDone) {
-            if (hoiche_naki) {
-                paint.setColor(ContextCompat.getColor(getContext(), R.color.green));
-                canvas.drawCircle(circleCenterX, circleCenterY, doneCircleRadius, paint);
-                drawCheckMark(canvas, circleCenterX, circleCenterY);
-            } else {
-                paint.setColor(ContextCompat.getColor(getContext(), R.color.red));
-                canvas.drawCircle(circleCenterX, circleCenterY, doneCircleRadius, paint);
-                drawUnCheckMark(canvas, circleCenterX, circleCenterY);
-            }
-
-            if (state == ANIMATE_STEP_TRANSITION && step == nextAnimatedStep && nextAnimatedStep < currentStep) {
-                paint.setColor(selectedTextColor);
-                int alpha = Math.max(Color.alpha(doneTextColor), (int) (animatedFraction * 255));
-                paint.setAlpha(alpha);
-            } else {
-                paint.setColor(doneTextColor);
-            }
-            textPaint.setTextSize(textSize);
-            textPaint.setColor(doneTextColor);
-            //drawText(canvas, text, textY, step);
-        } else {
-            if (state == ANIMATE_STEP_TRANSITION && step == nextAnimatedStep && nextAnimatedStep > currentStep) {
-                if (animationType == ANIMATION_CIRCLE || animationType == ANIMATION_ALL) {
-                    if (nextStepCircleEnabled && nextStepCircleColor != 0) {
-                        paint.setColor(ColorUtils.blendARGB(
-                                nextStepCircleColor,
-                                selectedCircleColor,
-                                animatedFraction)
-                        );
-                        canvas.drawCircle(circleCenterX, circleCenterY, selectedCircleRadius, paint);
-                    } else {
-                        int animatedRadius = (int) (selectedCircleRadius * animatedFraction);
-                        paint.setColor(selectedCircleColor);
-                        canvas.drawCircle(circleCenterX, circleCenterY, animatedRadius, paint);
-                    }
-                }
-                if (animationType != ANIMATION_NONE) {
-                    if (animationType == ANIMATION_CIRCLE || animationType == ANIMATION_ALL) {
-                        paint.setColor(selectedStepNumberColor);
-                        int alpha = (int) (animatedFraction * 255);
-                        paint.setAlpha(alpha);
-                        paint.setTextSize(stepNumberTextSize * animatedFraction);
-                    } else {
-                        paint.setTextSize(stepNumberTextSize);
-                        paint.setColor(nextTextColor);
-                    }
-                } else {
-                    paint.setTextSize(stepNumberTextSize);
-                    paint.setColor(nextTextColor);
-                }
-                drawNumber(canvas, number, circleCenterX, paint);
-
-                textPaint.setTextSize(textSize);
-                textPaint.setColor(nextTextColor);
-                int alpha = (int) Math.max(Color.alpha(nextTextColor), animatedFraction * 255);
-                textPaint.setAlpha(alpha);
-            } else {
-                if (nextStepCircleEnabled && nextStepCircleColor != 0) {
-                    paint.setColor(nextStepCircleColor);
-                    canvas.drawCircle(circleCenterX, circleCenterY, selectedCircleRadius, paint);
-                }
-
-                paint.setColor(nextTextColor);
-
-                paint.setTextSize(stepNumberTextSize);
-                drawNumber(canvas, number, circleCenterX, paint);
-
-                textPaint.setTextSize(textSize);
-                textPaint.setColor(nextTextColor);
-            }
-            drawText(canvas, text, textY, step);
-        }
-    }
-
-    private void drawNumber(Canvas canvas, String number, int circleCenterX, Paint paint) {
-        paint.getTextBounds(number, 0, number.length(), bounds);
-        float y = circlesY + bounds.height() / 2f - bounds.bottom;
-        canvas.drawText(number, circleCenterX, y, paint);
-    }
-
-    private void drawText(Canvas canvas, String text, int y, int step) {
-        if (text.isEmpty()) {
-            return;
-        }
-        StaticLayout layout = textLayouts[step];
-        canvas.save();
-        canvas.translate(circlesX[step], y);
-        layout.draw(canvas);
-        canvas.restore();
-    }
-
-    private void drawCheckMark(Canvas canvas, int circleCenterX, int circleCenterY) {
-        paint.setColor(doneStepMarkColor);
-        float width = stepNumberTextSize * 0.1f;
-        paint.setStrokeWidth(width);
-        Rect bounds = new Rect(
-                (int) (circleCenterX - width * 4.5),
-                (int) (circleCenterY - width * 3.5),
-                (int) (circleCenterX + width * 4.5),
-                (int) (circleCenterY + width * 3.5));
-        canvas.drawLine(
-                bounds.left + 0.5f * width,
-                bounds.bottom - 3.25f * width,
-                bounds.left + 3.25f * width,
-                bounds.bottom - 0.75f * width, paint);
-        canvas.drawLine(
-                bounds.left + 2.75f * width,
-                bounds.bottom - 0.75f * width,
-                bounds.right - 0.375f * width,
-                bounds.top + 0.75f * width, paint);
-    }
-
-    private void drawUnCheckMark(Canvas canvas, int circleCenterX, int circleCenterY) {
-        paint.setColor(doneStepMarkColor);
-        float width = stepNumberTextSize * 0.1f;
-        paint.setStrokeWidth(width);
-        Rect bounds = new Rect(
-                (int) (circleCenterX - width * 0.5),
-                (int) (circleCenterY - width * 3.5),
-                (int) (circleCenterX + width * 0.5),
-                (int) (circleCenterY + width * 5.5));
-
-        canvas.drawLine(
-                bounds.right + 2.75f * width,
-                bounds.top - 0.75f * width,
-                bounds.left - 3.375f * width,
-                bounds.bottom + 0.75f * width
-                , paint);
-        canvas.drawLine(
-                bounds.left + 2.75f * width,
-                bounds.bottom - 0.75f * width,
-                bounds.right - 3.375f * width,
-                bounds.top + 0.75f * width
-                , paint);
-    }
-
-    private void drawLine(Canvas canvas, int startX, int endX, int centerY, boolean highlight) {
-        if (highlight) {
-            paint.setColor(doneStepLineColor);
-        } else {
-            paint.setColor(nextStepLineColor);
-        }
-        paint.setStrokeWidth(stepLineWidth);
-        canvas.drawLine(startX, centerY, endX, centerY, paint);
-    }
-
-    public interface OnStepClickListener {
-        void onStepClick(int step);
-    }
-
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({ANIMATION_LINE, ANIMATION_CIRCLE, ANIMATION_ALL, ANIMATION_NONE})
-    public @interface AnimationType {
-    }
-
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({DISPLAY_MODE_WITH_TEXT, DISPLAY_MODE_NO_TEXT})
-    public @interface DisplayMode {
-    }
-
-    public class State {
-        private List<String> steps;
-        private int stepsNumber;
-        @AnimationType
-        private int animationType = StepView.this.animationType;
-        @ColorInt
-        private int selectedCircleColor = StepView.this.selectedCircleColor;
-        @Dimension
-        private int selectedCircleRadius = StepView.this.selectedCircleRadius;
-        @ColorInt
-        private int selectedTextColor = StepView.this.selectedTextColor;
-        @ColorInt
-        private int doneCircleColor = StepView.this.doneCircleColor;
-        @Dimension
-        private int doneCircleRadius = StepView.this.doneCircleRadius;
-        @ColorInt
-        private int doneTextColor = StepView.this.doneTextColor;
-        @ColorInt
-        private int nextTextColor = StepView.this.nextTextColor;
-        @Dimension
-        private int stepPadding = StepView.this.stepPadding;
-        @ColorInt
-        private int nextStepLineColor = StepView.this.nextStepLineColor;
-        @ColorInt
-        private int doneStepLineColor = StepView.this.doneStepLineColor;
-        @Dimension
-        private int stepLineWidth = StepView.this.stepLineWidth;
-        @Dimension(unit = Dimension.SP)
-        private float textSize = StepView.this.textSize;
-        @Dimension
-        private int textPadding = StepView.this.textPadding;
-        @ColorInt
-        private int selectedStepNumberColor = StepView.this.selectedStepNumberColor;
-        @Dimension(unit = Dimension.SP)
-        private float stepNumberTextSize = StepView.this.stepNumberTextSize;
-        @ColorInt
-        private int doneStepMarkColor = StepView.this.doneStepMarkColor;
-        private int animationDuration = StepView.this.animationDuration;
-        private boolean nextStepCircleEnabled = StepView.this.nextStepCircleEnabled;
-        @ColorInt
-        private int nextStepCircleColor = StepView.this.nextStepCircleColor;
-        private Typeface typeface = paint.getTypeface();
-
-        public State animationType(@AnimationType int animationType) {
-            this.animationType = animationType;
-            return this;
-        }
-
-        public State selectedCircleColor(@ColorInt int selectedCircleColor) {
-            this.selectedCircleColor = selectedCircleColor;
-            return this;
-        }
-
-        public State selectedCircleRadius(@Dimension int selectedCircleRadius) {
-            this.selectedCircleRadius = selectedCircleRadius;
-            return this;
-        }
-
-        public State selectedTextColor(@ColorInt int selectedTextColor) {
-            this.selectedTextColor = selectedTextColor;
-            return this;
-        }
-
-        public State doneCircleColor(@ColorInt int doneCircleColor) {
-            this.doneCircleColor = doneCircleColor;
-            return this;
-        }
-
-        public State doneCircleRadius(@Dimension int doneCircleRadius) {
-            this.doneCircleRadius = doneCircleRadius;
-            return this;
-        }
-
-        public State doneTextColor(@ColorInt int doneTextColor) {
-            this.doneTextColor = doneTextColor;
-            return this;
-        }
-
-        public State nextTextColor(@ColorInt int nextTextColor) {
-            this.nextTextColor = nextTextColor;
-            return this;
-        }
-
-        public State stepPadding(@Dimension int stepPadding) {
-            this.stepPadding = stepPadding;
-            return this;
-        }
-
-        public State nextStepLineColor(@ColorInt int nextStepLineColor) {
-            this.nextStepLineColor = nextStepLineColor;
-            return this;
-        }
-
-        public State doneStepLineColor(@ColorInt int doneStepLineColor) {
-            this.doneStepLineColor = doneStepLineColor;
-            return this;
-        }
-
-        public State stepLineWidth(@Dimension int stepLineWidth) {
-            this.stepLineWidth = stepLineWidth;
-            return this;
-        }
-
-        public State textSize(@Dimension(unit = Dimension.SP) int textSize) {
-            this.textSize = textSize;
-            return this;
-        }
-
-        public State textPadding(@Dimension int textPadding) {
-            this.textPadding = textPadding;
-            return this;
-        }
-
-        public State selectedStepNumberColor(@ColorInt int selectedStepNumberColor) {
-            this.selectedStepNumberColor = selectedStepNumberColor;
-            return this;
-        }
-
-        public State stepNumberTextSize(@Dimension(unit = Dimension.SP) int stepNumberTextSize) {
-            this.stepNumberTextSize = stepNumberTextSize;
-            return this;
-        }
-
-        public State doneStepMarkColor(@ColorInt int doneStepMarkColor) {
-            this.doneStepMarkColor = doneStepMarkColor;
-            return this;
-        }
-
-        public State animationDuration(int animationDuration) {
-            this.animationDuration = animationDuration;
-            return this;
-        }
-
-        public State steps(List<String> steps) {
-            this.steps = steps;
-            return this;
-        }
-
-        public State stepsNumber(int stepsNumber) {
-            this.stepsNumber = stepsNumber;
-            return this;
-        }
-
-        public State typeface(Typeface typeface) {
-            this.typeface = typeface;
-            return this;
-        }
-
-        public State nextStepCircleEnabled(boolean enabled) {
-            this.nextStepCircleEnabled = enabled;
-            return this;
-        }
-
-        public State nextStepCircleColor(@ColorInt int color) {
-            this.nextStepCircleColor = color;
-            return this;
-        }
-
-        public void commit() {
-            StepView.this.animationType = animationType;
-            StepView.this.selectedTextColor = selectedTextColor;
-            StepView.this.selectedCircleRadius = selectedCircleRadius;
-            StepView.this.selectedCircleColor = selectedCircleColor;
-            StepView.this.doneCircleColor = doneCircleColor;
-            StepView.this.doneCircleRadius = doneCircleRadius;
-            StepView.this.doneTextColor = doneTextColor;
-            StepView.this.nextTextColor = nextTextColor;
-            StepView.this.stepPadding = stepPadding;
-            StepView.this.nextStepLineColor = nextStepLineColor;
-            StepView.this.doneStepLineColor = doneStepLineColor;
-            StepView.this.stepLineWidth = stepLineWidth;
-            StepView.this.textSize = textSize;
-            StepView.this.textPadding = textPadding;
-            StepView.this.selectedStepNumberColor = selectedStepNumberColor;
-            StepView.this.stepNumberTextSize = stepNumberTextSize;
-            StepView.this.doneStepMarkColor = doneStepMarkColor;
-            StepView.this.animationDuration = animationDuration;
-            setTypeface(typeface);
-            StepView.this.nextStepCircleEnabled = nextStepCircleEnabled;
-            StepView.this.nextStepCircleColor = nextStepCircleColor;
-            if (steps != null && !StepView.this.steps.equals(steps)) {
-                StepView.this.setSteps(steps);
-            } else if (stepsNumber != 0 && stepsNumber != StepView.this.stepsNumber) {
-                StepView.this.setStepsNumber(stepsNumber);
-            } else {
-                StepView.this.invalidate();
-            }
-        }
-    }
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/SubTopic.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/SubTopic.java
deleted file mode 100644
index 99b379c..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/quiz/SubTopic.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.quiz;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.transition.Explode;
-import android.util.Log;
-import android.view.View;
-import android.view.Window;
-import android.widget.ProgressBar;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.firebase.database.ChildEventListener;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.FirebaseDatabase;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.adapters.SubTopicAdapter;
-import com.quantum_guys.dncc_eco_sync.models.SubTopicModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SubTopic extends AppCompatActivity {
-    final List<SubTopicModel> subTopics = new ArrayList<>();
-    String topic, otherUid, type;
-    private RecyclerView recyclerView;
-    private RecyclerView.LayoutManager layoutManager;
-    private SubTopicAdapter capterAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
-        getWindow().setEnterTransition(new Explode());
-        getWindow().setExitTransition(new Explode());
-
-        super.onCreate(savedInstanceState);
-        SharedPreferences sharedPreferences = getSharedPreferences("Theme", Context.MODE_PRIVATE);
-        String themeName = sharedPreferences.getString("ThemeName", "Default");
-        if (themeName.equalsIgnoreCase("TealTheme")) {
-            setTheme(R.style.TealTheme);
-        } else if (themeName.equalsIgnoreCase("VioleteTheme")) {
-            setTheme(R.style.VioleteTheme);
-        } else if (themeName.equalsIgnoreCase("PinkTheme")) {
-            setTheme(R.style.PinkTheme);
-        } else if (themeName.equalsIgnoreCase("DelRio")) {
-            setTheme(R.style.DelRio);
-        } else if (themeName.equalsIgnoreCase("DarkTheme")) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            setTheme(R.style.Dark);
-        } else if (themeName.equalsIgnoreCase("Lynch")) {
-            setTheme(R.style.Lynch);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-        setContentView(R.layout.activity_all_parent_topic);
-        ProgressBar loading = findViewById(R.id.progressBar2);
-        topic = getIntent().getStringExtra("topic");
-        type = getIntent().getStringExtra("type");
-        otherUid = getIntent().getStringExtra("otherUid");
-        recyclerView = findViewById(R.id.rcv);
-
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2);
-        recyclerView.setLayoutManager(gridLayoutManager);
-        recyclerView.setAdapter(capterAdapter);
-        recyclerView.setHasFixedSize(true);
-        Log.d("Typee-SubTopic", type);
-        FirebaseDatabase.getInstance().getReference().child("Topics").child(type).child(topic).child("all_totpics").addChildEventListener(new ChildEventListener() {
-            @Override
-            public void onChildAdded(@NonNull DataSnapshot snapshot, @Nullable String previousChildName) {
-                SubTopicModel subTopic = snapshot.getValue(SubTopicModel.class);
-                subTopics.add(subTopic);
-                capterAdapter = new SubTopicAdapter(subTopics, topic, SubTopic.this, otherUid, type);
-                recyclerView.setAdapter(capterAdapter);
-                capterAdapter.notifyDataSetChanged();
-                loading.setVisibility(View.GONE);
-            }
-
-            @Override
-            public void onChildChanged(@NonNull DataSnapshot snapshot, @Nullable String previousChildName) {
-
-            }
-
-            @Override
-            public void onChildRemoved(@NonNull DataSnapshot snapshot) {
-
-            }
-
-            @Override
-            public void onChildMoved(@NonNull DataSnapshot snapshot, @Nullable String previousChildName) {
-
-            }
-
-            @Override
-            public void onCancelled(@NonNull DatabaseError error) {
-
-            }
-        });
-    }
-
-
-}
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/FriendProfile.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/FriendProfile.java
similarity index 99%
rename from android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/FriendProfile.java
rename to android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/FriendProfile.java
index 0b44018..c922220 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/FriendProfile.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/FriendProfile.java
@@ -1,4 +1,4 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.friends;
+package com.quantum_guys.dncc_eco_sync.ui.activities.volunteer;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;
@@ -67,7 +67,7 @@
 import com.quantum_guys.dncc_eco_sync.notification.Client;
 import com.quantum_guys.dncc_eco_sync.notification.MyResponse;
 import com.quantum_guys.dncc_eco_sync.notification.NotificationSender;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SelectTopic;
+import com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity;
 
 import java.util.HashMap;
 import java.util.List;
@@ -387,7 +387,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
 
             playMatchs.setOnClickListener(view -> {
-                Intent goBattle = new Intent(getActivity(), SelectTopic.class);
+                Intent goBattle = new Intent(getActivity(), MainActivity.class);
                 goBattle.putExtra("otherUid", id);
                 goBattle.putExtra("type", type);
                 requireActivity().startActivity(goBattle);
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/Ranking.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/Ranking.java
new file mode 100644
index 0000000..6eec6e6
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/Ranking.java
@@ -0,0 +1 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.volunteer;

import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;

import android.annotation.SuppressLint;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.Fragment;
import androidx.paging.PagedList;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.firebase.ui.firestore.paging.FirestorePagingAdapter;
import com.firebase.ui.firestore.paging.FirestorePagingOptions;
import com.firebase.ui.firestore.paging.LoadingState;
import com.github.marlonlom.utilities.timeago.TimeAgo;
import com.google.firebase.firestore.FirebaseFirestore;
import com.google.firebase.firestore.Query;
import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.models.Users;

import java.util.Arrays;
import java.util.List;

import de.hdodenhof.circleimageview.CircleImageView;

/**
 * Created by jhm69
 */

public class Ranking extends Fragment {
    String institu, area, sub, typ;
    String ward = "All";
    private FirebaseFirestore firestore;
    long t;
    private RecyclerView mRecyclerView;
    private SwipeRefreshLayout refreshLayout;

    @Nullable
    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        return inflater.inflate(R.layout.ranking, container, false);
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

        firestore = FirebaseFirestore.getInstance();
        mRecyclerView = view.findViewById(R.id.messageList);
        refreshLayout = view.findViewById(R.id.refreshLayout);

        List<String> wards = Arrays.asList(getResources().getStringArray(R.array.wards));

        Spinner spinner_wards = view.findViewById(R.id.spinner_class_level);

        ArrayAdapter<String> spinnerArrayAdapter_type = new ArrayAdapter<>(requireActivity(),
                android.R.layout.simple_spinner_dropdown_item, wards);
        spinner_wards.setAdapter(spinnerArrayAdapter_type);





        spinner_wards.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                ward = wards.get(position);
                setupAdapter(ward);
            }

            public void onNothingSelected(AdapterView<?> parent) {
                ward = "All";
            }
        });





        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
        mRecyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
        mRecyclerView.setHasFixedSize(true);
        mRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));

        refreshLayout.setOnRefreshListener(() -> setupAdapter(ward));



    }


    private void setupAdapter(String ward) {
        PagedList.Config config = new PagedList.Config.Builder()
                .setEnablePlaceholders(false)
                .setPrefetchDistance(5)
                .setPageSize(10)
                .build();
        Query mQuery = firestore.collection("Users")
                .orderBy("score", Query.Direction.DESCENDING);

        if (!ward.equals("All")) {
            mQuery = mQuery.whereEqualTo("ward", ward);
        }


        FirestorePagingOptions<Users> options = new FirestorePagingOptions.Builder<Users>()
                .setLifecycleOwner(this)
                .setQuery(mQuery, config, Users.class)
                .build();

        FirestorePagingAdapter<Users, ViewHolder> mAdapter = new FirestorePagingAdapter<Users, ViewHolder>(options) {
            @NonNull
            @Override
            public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                View view = getLayoutInflater().inflate(R.layout.item_quiz_profile, parent, false);
                return new ViewHolder(view);
            }

            @SuppressLint({"SetTextI18n", "UseCompatLoadingForColorStateLists"})
            @Override
            protected void onBindViewHolder(@NonNull ViewHolder holder, int position, @NonNull Users user) {
                requireView().findViewById(R.id.default_item).setVisibility(View.GONE);
                holder.name.setText(user.getName());

//                if(user.getDept().length() > 1 && user.getInstitute().length() > 1) {
//                    holder.institute.setText(user.getDept() + ", " + user.getInstitute());
//                }else if (user.getDept().length()<2) {
//                    holder.institute.setText(user.getInstitute());
//                } else if (user.getInstitute().length()<2) {
//                    holder.institute.setText(user.getDept());
//                }
//                if(user.getDept().length()<1 && user.getInstitute().length() < 1){
//                    holder.institute.setVisibility(View.GONE);
//                }

                int score = (int) user.getScore();
                holder.rank.setVisibility(View.VISIBLE);
                holder.level.setText(String.valueOf(score));
                if (user.getId().equals(userId)) {
                    holder.name.setText("You");
                    holder.back.setBackgroundColor(Color.parseColor("#DCDCFB"));
                }else{
                    holder.back.setBackgroundColor(Color.parseColor("#ffffff"));
                }

                holder.time.setText(getTimeText(user.getLastTimestamp()));

                holder.rank.setText(String.valueOf(position + 1));

                Glide.with(requireContext())
                        .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
                        .load(user.getImage())
                        .into(holder.image);
                holder.mView.setOnClickListener(view -> FriendProfile.startActivity(getContext(), user.getId()));
            }

            @Override
            protected void onError(@NonNull Exception e) {
                super.onError(e);
                Log.e("MainActivity", e.getMessage());
            }

            @Override
            protected void onLoadingStateChanged(@NonNull LoadingState state) {
                switch (state) {
                    case LOADING_INITIAL:
                    case LOADING_MORE:
                        refreshLayout.setRefreshing(true);
                        break;

                    case LOADED:
                        if (getItemCount() == 0) {
                            requireView().findViewById(R.id.default_item).setVisibility(View.VISIBLE);
                        }
                        refreshLayout.setRefreshing(false);
                        break;

                    case ERROR:
                        Toast.makeText(
                                getActivity(),
                                "Error Occurred!",
                                Toast.LENGTH_SHORT
                        ).show();

                        refreshLayout.setRefreshing(false);
                        break;
                    case FINISHED:
                        refreshLayout.setRefreshing(false);
                        break;
                }
            }

        };
        mRecyclerView.setAdapter(mAdapter);

    }

    private String getTimeText(long lastTimestamp) {
        String time = TimeAgo.using(lastTimestamp);
        time = time.replaceAll("just now", "now")
                .replaceAll(" minutes", "m")
                .replaceAll(" minute", "1m")
                .replaceAll("about", "")
                .replaceAll(" hours", "h")
                .replaceAll(" hour", "1h")
                .replaceAll(" an", "")
                .replaceAll("a ", "1 ")
                .replaceAll(" ago", "")
                .replaceAll("yesterday", "1d")
                .replaceAll(" days", "d")
                .replaceAll(" day", "1d");
        return time;
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
        final View mView;
        final CircleImageView image;
        final TextView name;
        final TextView institute;
        final TextView level;
        final TextView rank, time;
        final ConstraintLayout back;

        public ViewHolder(View itemView) {
            super(itemView);
            mView = itemView;
            image = mView.findViewById(R.id.image);
            name = mView.findViewById(R.id.name);
            institute = mView.findViewById(R.id.institute);
            level = mView.findViewById(R.id.levelCount);
            rank = mView.findViewById(R.id.rank);
            back = mView.findViewById(R.id.back);
            time = mView.findViewById(R.id.textView4);
        }
    }
    String getType(long t) {
        if (t == 0) return "bsc";
        if (t == 1) return "hsc";
        if (t == 2) return "ssc";
        else return "bsc";
    }


}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/SearchUsersActivity.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/SearchUsersActivity.java
similarity index 99%
rename from android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/SearchUsersActivity.java
rename to android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/SearchUsersActivity.java
index f358b38..989fae0 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/friends/SearchUsersActivity.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/SearchUsersActivity.java
@@ -1,4 +1,4 @@
-package com.quantum_guys.dncc_eco_sync.ui.activities.friends;
+package com.quantum_guys.dncc_eco_sync.ui.activities.volunteer;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/quiz_history.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/quiz_history.java
new file mode 100644
index 0000000..066a2e7
--- /dev/null
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/activities/volunteer/quiz_history.java
@@ -0,0 +1 @@
+package com.quantum_guys.dncc_eco_sync.ui.activities.volunteer;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

import com.quantum_guys.dncc_eco_sync.R;

public class quiz_history extends Fragment {


    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
    }

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        return inflater.inflate(R.layout.fragment_quiz_history, container, false);
    }

    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);


    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Dashboard.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Dashboard.java
index 7e17e9e..7aa762c 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Dashboard.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Dashboard.java
@@ -1,21 +1,17 @@
 package com.quantum_guys.dncc_eco_sync.ui.fragment;
 
-import static com.quantum_guys.dncc_eco_sync.adapters.ResultAdapter.COMPLETED;
 import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.inHome;
 import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;
 
 import android.annotation.SuppressLint;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.viewpager.widget.ViewPager;
@@ -23,7 +19,6 @@
 import com.google.android.material.tabs.TabLayout;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
-import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 import com.google.firebase.firestore.DocumentChange;
@@ -33,14 +28,8 @@
 import com.quantum_guys.dncc_eco_sync.messege.model.Chat;
 import com.quantum_guys.dncc_eco_sync.models.Notification;
 import com.quantum_guys.dncc_eco_sync.ui.activities.notification.NotificationFragment;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.BattleModel;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Result;
-import com.quantum_guys.dncc_eco_sync.viewmodel.BattleViewModel;
-import com.quantum_guys.dncc_eco_sync.viewmodel.ResultViewModel;
 import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
 
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -57,8 +46,7 @@ public class Dashboard extends Fragment {
     };
     private TabAdapter adapter;
     private TabLayout tabLayout;
-    private BattleViewModel battleViewModel;
-    private ResultViewModel viewModel;
+
     private int nSize;
     private FirebaseFirestore firestore;
     int count = 0, chatCount=0;
@@ -113,8 +101,7 @@ public void onPageScrollStateChanged(int state) {
             }
         });
 
-        viewModel = ViewModelProviders.of(getActivity()).get(ResultViewModel.class);
-        battleViewModel = ViewModelProviders.of(getActivity()).get(BattleViewModel.class);
+
         firestore = FirebaseFirestore.getInstance();
 
         updateBattle();
@@ -171,22 +158,14 @@ private void updateBattle(){
                                Notification notification = documentChange.getDocument().toObject(Notification.class).withId(documentChange.getDocument().getId());
                                if (!notification.isRead()) count++;
 
-                               if (notification.getType().equals("play")) {
-                                   if (!viewModel.resultExistsForSecondPlayer(notification.getAction_id())) {
-                                       new PlayAsyncTask(viewModel, battleViewModel, notification.getAction_id()).execute("play");
-                                   }
-                               } else if (notification.getType().equals("play_result")) {
-                                   if (!viewModel.resultExists(notification.getAction_id())) {
-                                       new PlayResultAsyncTask(viewModel, battleViewModel, notification.getAction_id()).execute("play_result");
-                                   }
-                               }
+
                            }
                        }
-                       if(count!=0) {
-                           TabLayout.Tab tab = tabLayout.getTabAt(3);
-                           Objects.requireNonNull(tab).setCustomView(null);
-                           tab.setCustomView(adapter.setNotifications(count/2));
-                       }
+//                       if(count!=0) {
+//                           TabLayout.Tab tab = tabLayout.getTabAt(0);
+//                           tab.setCustomView(null);
+//                           tab.setCustomView(adapter.setNotifications(count/2));
+//                       }
                    }
                }));
    }
@@ -236,107 +215,7 @@ private void updateScore() {
         }
     }
 
-    @SuppressLint("StaticFieldLeak")
-    private static class PlayAsyncTask extends AsyncTask<String, Void, Void> {
-        final ResultViewModel viewModel;
-        final BattleViewModel battleViewModel;
-        final String id;
-
-        public PlayAsyncTask(ResultViewModel viewModel, BattleViewModel battleViewModel, String id) {
-            this.viewModel = viewModel;
-            this.battleViewModel = battleViewModel;
-            this.id = id;
-        }
-
-        @Override
-        protected Void doInBackground(String... type) {
-            final BattleModel[] battlep = {null};
-            DatabaseReference mDb = FirebaseDatabase.getInstance().getReference();
-            com.google.firebase.database.Query query = mDb.child("Play").orderByChild("battleId").equalTo(id);
-            query.addListenerForSingleValueEvent(new ValueEventListener() {
-                @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-                @Override
-                public void onDataChange(@NonNull DataSnapshot snapshot) {
-                    for (DataSnapshot data : snapshot.getChildren()) {
-                        battlep[0] = data.getValue(BattleModel.class);
-                    }
-                    if (battlep[0] != null) {
-                        com.google.firebase.database.Query query = mDb.child("Result").child(userId).orderByChild("battleId").equalTo(id);
-                        query.addListenerForSingleValueEvent(new ValueEventListener() {
-                            @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-                            @Override
-                            public void onDataChange(@NonNull DataSnapshot snapshot) {
-                                Result result = null;
-                                for (DataSnapshot data : snapshot.getChildren()) {
-                                    result = data.getValue(Result.class);
-                                }
-                                battleViewModel.insert(battlep[0]);
-                                viewModel.insert(result);
-                            }
-
-                            @Override
-                            public void onCancelled(@NonNull DatabaseError error) {
-                            }
-                        });
-                    }
-                }
 
-                @Override
-                public void onCancelled(@NonNull DatabaseError error) {
-                }
-            });
-            return null;
-        }
-    }
-
-    @SuppressLint("StaticFieldLeak")
-    private class PlayResultAsyncTask extends AsyncTask<String, Void, Void> {
-        final ResultViewModel viewModel;
-        final BattleViewModel battleViewModel;
-        final String id;
-
-        public PlayResultAsyncTask(ResultViewModel viewModel, BattleViewModel battleViewModel, String id) {
-            this.viewModel = viewModel;
-            this.battleViewModel = battleViewModel;
-            this.id = id;
-        }
-
-        @Override
-        protected Void doInBackground(String... type) {
-            final BattleModel[] battlep = {null};
-            DatabaseReference mDb = FirebaseDatabase.getInstance().getReference();
-            com.google.firebase.database.Query query = mDb.child("Play").orderByChild("battleId").equalTo(id);
-            query.addListenerForSingleValueEvent(new ValueEventListener() {
-                @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-                @Override
-                public void onDataChange(@NonNull DataSnapshot snapshot) {
-                    for (DataSnapshot data : snapshot.getChildren()) {
-                        battlep[0] = data.getValue(BattleModel.class);
-                    }
-                    Log.d("Reesult: ", "Downloaded Battle");
-                    if (battlep[0] != null) {
-                        try {
-                            Result result = new Result(battlep[0].getBattleId(), battlep[0].getSenderUid(), battlep[0].getReceiverUid(), getScoreCount(battlep[0].getSenderAnswerList()), getScoreCount(battlep[0].getReceiverList()), battlep[0].topic, battlep[0].getTimestamp(), COMPLETED);
-                            Log.d("Reesult: ", "Downloaded Result");
-                            battleViewModel.insert(battlep[0]);
-                            Log.d("Reesult: ", "Inserted Battle and Inserting Result also updating score");
-                            Log.d("Reesult: ", ReflectionToStringBuilder.toString(result));
-                            viewModel.insert(result);
-                            updateScore();
-                            Log.d("Reesult: ", "Score updated and inserting Result");
-                        }catch (Exception ignored){
-
-                        }
-                    }
-                }
-
-                @Override
-                public void onCancelled(@NonNull DatabaseError error) {
-                }
-            });
-            return null;
-        }
-    }
 
     @Override
     public void onDestroy() {
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Issue.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Issue.java
index bbbc199..72632b9 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Issue.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Issue.java
@@ -33,14 +33,14 @@
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
+import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
 import com.google.firebase.firestore.Query;
 import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.adapters.PostViewHolder;
+import com.quantum_guys.dncc_eco_sync.adapters.IssueViewHolder;
 import com.quantum_guys.dncc_eco_sync.models.Images;
-import com.quantum_guys.dncc_eco_sync.models.Post;
-import com.quantum_guys.dncc_eco_sync.ui.activities.post.PostImage;
+import com.quantum_guys.dncc_eco_sync.ui.activities.issue.PostIssue;
 import com.quantum_guys.dncc_eco_sync.ui.activities.post.PostText;
 
 import java.util.ArrayList;
@@ -124,27 +124,25 @@ private void setupAdapter(String tag) {
                 .setPageSize(15)
                 .build();
         Query mQuery;
-        if (tag.equals("All")) {
-            mQuery = mFirestore.collection("Issues").orderBy("timestamp", Query.Direction.DESCENDING);
-        } else {
-            mQuery = mFirestore.collection("Issues").orderBy("timestamp", Query.Direction.DESCENDING).whereEqualTo("tag", tag);
-        }
+
+        mQuery = mFirestore.collection("Issues").orderBy("timestamp", Query.Direction.DESCENDING).whereEqualTo("userId", FirebaseAuth.getInstance().getCurrentUser().getUid());
+
 
         FirestorePagingOptions<com.quantum_guys.dncc_eco_sync.models.Issue> options = new FirestorePagingOptions.Builder<com.quantum_guys.dncc_eco_sync.models.Issue>()
                 .setLifecycleOwner(this)
                 .setQuery(mQuery, config, com.quantum_guys.dncc_eco_sync.models.Issue.class)
                 .build();
 
-        FirestorePagingAdapter<com.quantum_guys.dncc_eco_sync.models.Issue, PostViewHolder> mAdapter = new FirestorePagingAdapter<com.quantum_guys.dncc_eco_sync.models.Issue, PostViewHolder>(options) {
+        FirestorePagingAdapter<com.quantum_guys.dncc_eco_sync.models.Issue, IssueViewHolder> mAdapter = new FirestorePagingAdapter<com.quantum_guys.dncc_eco_sync.models.Issue, IssueViewHolder>(options) {
             @NonNull
             @Override
-            public PostViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-                View view = getLayoutInflater().inflate(R.layout.item_feed_post, parent, false);
-                return new PostViewHolder(view);
+            public IssueViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+                View view = getLayoutInflater().inflate(R.layout.item_issue, parent, false);
+                return new IssueViewHolder(view);
             }
 
             @Override
-            protected void onBindViewHolder(@NonNull PostViewHolder holder, int position, @NonNull com.quantum_guys.dncc_eco_sync.models.Issue post) {
+            protected void onBindViewHolder(@NonNull IssueViewHolder holder, @SuppressLint("RecyclerView") int position, @NonNull com.quantum_guys.dncc_eco_sync.models.Issue post) {
                 Animation animation = AnimationUtils.loadAnimation(getActivity(),
                         (position > lastPosition) ? R.anim.up_from_bottom
                                 : R.anim.down_from_top);
@@ -217,7 +215,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 for (Image image : pickedImages) {
                     imagesList.add(new Images(image.getName(), image.getPath(), image.getPath(), image.getId()));
                 }
-                Intent intent = new Intent(getActivity(), PostImage.class);
+                Intent intent = new Intent(getActivity(), PostIssue.class);
                 intent.putParcelableArrayListExtra("imagesList", (ArrayList<? extends Parcelable>) imagesList);
                 startActivity(intent);
             }
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Quiz.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Quiz.java
deleted file mode 100644
index 69bfa68..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/Quiz.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.ui.fragment;
-
-import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.inHome;
-import static com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity.userId;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions; 
-import com.google.android.material.chip.Chip;
-import com.google.android.material.chip.ChipGroup;
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
-import com.google.firebase.firestore.DocumentChange;
-import com.google.firebase.firestore.FirebaseFirestore;
-import com.marcoscg.dialogsheet.DialogSheet;
-
-import com.quantum_guys.dncc_eco_sync.R;
-import com.quantum_guys.dncc_eco_sync.adapters.ResultAdapter;
-import com.quantum_guys.dncc_eco_sync.models.Friends;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.PlayQuiz;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.SelectTopic;
-import com.quantum_guys.dncc_eco_sync.viewmodel.ResultViewModel;
-import com.quantum_guys.dncc_eco_sync.viewmodel.UserViewModel;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
-
-import es.dmoral.toasty.Toasty;
-
-/**
- * Created by jhm69
- */
-
-public class Quiz extends Fragment {
-    ResultViewModel mViewModel;
-    UserViewModel userViewModel;
-    ExtendedFloatingActionButton button;
-    ImageView pro_pic, cover;
-    TextView nameTV, scoreTV, levelTV, coverTxt;
-    String string;
-    String tag = "All";
-    private RecyclerView mRecyclerView;
-    private ResultAdapter resultAdapter;
-    private List<Friends> usersList;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_quiz, container, false);
-    }
-
-    @SuppressLint({"CheckResult", "UseCompatLoadingForDrawables"})
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mViewModel = ViewModelProviders.of(requireActivity())
-                .get(ResultViewModel.class);
-        userViewModel = ViewModelProviders.of(requireActivity())
-                .get(UserViewModel.class);
-        pro_pic = view.findViewById(R.id.profile_picture);
-        nameTV = view.findViewById(R.id.name);
-        cover = view.findViewById(R.id.imageView8);
-        coverTxt = view.findViewById(R.id.textView15);
-
-        scoreTV = view.findViewById(R.id.score);
-        levelTV = view.findViewById(R.id.level);
-        button = view.findViewById(R.id.soihefawiw);
-        mRecyclerView = view.findViewById(R.id.res);
-
-        mRecyclerView.setItemAnimator(new DefaultItemAnimator());
-        ChipGroup chipGroup = view.findViewById(R.id.filter_chip_SS_group);
-        chipGroup.setOnCheckedChangeListener((group, checkedId) -> {
-            try {
-                Chip c = view.findViewById(checkedId);
-                tag = c.getText().toString();
-                setupAdapter(tag);
-            } catch (NullPointerException ignored) {
-
-            }
-        });
-
- 
-
-        userViewModel.user.observe(getActivity(), users -> {
-            RandomiseListAsyncTask mAsyncTask = new RandomiseListAsyncTask(users.getType());
-            Log.d("UsersList:", String.valueOf(users.getType()));
-            try {
-                usersList = mAsyncTask.execute().get();
-            } catch (ExecutionException | InterruptedException e) {
-                Log.d("UsersList:", String.valueOf(usersList.size()));
-                e.printStackTrace();
-            }
-
-            button.setOnClickListener(view1 ->
-                    new DialogSheet(requireActivity())
-                            .setTitle("Chose the opponent")
-                            .setMessage("You can play with random players or you can select on your own.")
-                            .setRoundedCorners(true)
-                            .setColoredNavigationBar(true)
-                            .setCancelable(true)
-                            .setPositiveButton("Random Player", v -> {
-                                inHome = false;
-                                if (usersList.size() > 0) {
-                                    try {
-                                        Friends friends = usersList.get(0);
-                                        Collections.shuffle(usersList);
-                                        Toasty.info(getActivity(), "You are playing with " + friends.getName() + ", from " + friends.getDept() + ", " + friends.getInstitute() + ". Level: " + getLevelNum(friends.getScore()), Toasty.LENGTH_LONG).show();
-                                        Intent goBattle = new Intent(getActivity(), SelectTopic.class);
-                                        goBattle.putExtra("otherUid", friends.userId);
-                                        goBattle.putExtra("type", friends.getType());
-                                        startActivity(goBattle);
-                                    } catch (Exception j) {
-                                        Toasty.error(requireContext(), "Error getting random player, Try other option.", Toasty.LENGTH_SHORT);
-                                    }
-                                } else {
-                                    Toasty.error(requireContext(), "Error getting random player, Try custom selection", Toasty.LENGTH_SHORT);
-                                    loadFragment(new PlayQuiz());
-                                }
-                            })
-                            .setNegativeButton("Custom Selection", v ->{
-                                inHome = false;
-                            loadFragment(new PlayQuiz());
-                            })
-                            .show());
-
-            mRecyclerView.setItemAnimator(new DefaultItemAnimator());
-            LinearLayoutManager layoutManager = new LinearLayoutManager(view.getContext());
-            mRecyclerView.setHasFixedSize(true);
-            layoutManager.setReverseLayout(true);
-            layoutManager.setStackFromEnd(true);
-            mRecyclerView.setLayoutManager(layoutManager);
-            mRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));
-            mViewModel.results.observe(requireActivity(), result -> {
-                resultAdapter = new ResultAdapter(result, getActivity(), false);
-                mRecyclerView.setAdapter(resultAdapter);
-                resultAdapter.notifyDataSetChanged();
-            });
-            loadProfileData();
-        });
-    }
-
-
-
-    @SuppressLint({"UseCompatLoadingForDrawables", "SetTextI18n"})
-    private void setupAdapter(String tag) {
-        switch (tag) {
-            case "Invites":
-                mViewModel.getInvites().observe(requireActivity(), result -> {
-                    if (result.size() < 1) {
-                        string = "No battle invite Found, Ask your friend to invite you.";
-                        cover.setVisibility(View.VISIBLE);
-                        coverTxt.setText(string);
-                        coverTxt.setVisibility(View.VISIBLE);
-                        Toasty.info(requireContext(), string, Toast.LENGTH_LONG).show();
-                    }else{
-                        cover.setVisibility(View.GONE);
-                        coverTxt.setVisibility(View.GONE);
-                    }
-                    resultAdapter = new ResultAdapter(result, getActivity(), false);
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter.notifyDataSetChanged();
-                });
-                break;
-            case "Completed":
-                mViewModel.getCompleted().observe(requireActivity(), result -> {
-                    if (result.size() < 1) {
-                        string = "No battle Completed yet";
-                        cover.setVisibility(View.VISIBLE);
-                        coverTxt.setVisibility(View.VISIBLE);
-                        coverTxt.setText(string);
-                        Toasty.info(requireContext(), string, Toast.LENGTH_LONG).show();
-                    }else{
-                        cover.setVisibility(View.GONE);
-                        coverTxt.setVisibility(View.GONE);
-                    }
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter = new ResultAdapter(result, getActivity(), false);
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter.notifyDataSetChanged();
-                });
-                break;
-            case "Pending":
-                mViewModel.getPending().observe(requireActivity(), result -> {
-                    if (result.size() < 1) {
-                        string = "No Pending battle history found";
-                        cover.setVisibility(View.VISIBLE);
-                        coverTxt.setVisibility(View.VISIBLE);
-                        coverTxt.setText(string);
-                        Toasty.info(requireContext(), string, Toast.LENGTH_LONG).show();
-                    }else{
-                        cover.setVisibility(View.GONE);
-                        coverTxt.setVisibility(View.GONE);
-                    }
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter = new ResultAdapter(result, getActivity(), false);
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter.notifyDataSetChanged();
-                });
-                break;
-            case "Your Invites":
-                mViewModel.getMyCompleted().observe(requireActivity(), result -> {
-                    if (result.size() < 1) {
-                        string = "No 'Your Invite' battle history found. Start battle with others first.";
-                        cover.setVisibility(View.VISIBLE);
-                        coverTxt.setVisibility(View.VISIBLE);
-                        coverTxt.setText(string);
-                        Toasty.info(requireContext(), string, Toast.LENGTH_LONG).show();
-                    }else{
-                        cover.setVisibility(View.GONE);
-                        coverTxt.setVisibility(View.GONE);
-                    }
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter = new ResultAdapter(result, getActivity(), false);
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter.notifyDataSetChanged();
-                });
-                break;
-            case "My Pending":
-                mViewModel.getMyPending().observe(requireActivity(), result -> {
-                    if (result.size() < 1) {
-                        string = "No 'My Pending' battle history found";
-                        cover.setVisibility(View.VISIBLE);
-                        coverTxt.setVisibility(View.VISIBLE);
-                        coverTxt.setText(string);
-                        Toasty.info(requireContext(), string, Toast.LENGTH_LONG).show();
-                    }else{
-                        cover.setVisibility(View.GONE);
-                        coverTxt.setVisibility(View.GONE);
-                    }
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter = new ResultAdapter(result, getActivity(), false);
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter.notifyDataSetChanged();
-
-                });
-                break;
-            case "All":
-                mViewModel.results.observe(requireActivity(), result -> {
-                    if (result.size() < 1) {
-                        string = Objects.requireNonNull(getContext()).getString(R.string.let_s_challenge_others_in_battle_of_quiz);
-                        Toasty.info(getContext(), string, Toast.LENGTH_LONG).show();
-                        cover.setVisibility(View.VISIBLE);
-                        coverTxt.setVisibility(View.VISIBLE);
-                        coverTxt.setText(string);
-                    }else{
-                        cover.setVisibility(View.GONE);
-                        coverTxt.setVisibility(View.GONE);
-                    }
-                    resultAdapter = new ResultAdapter(result, getActivity(), false);
-                    mRecyclerView.setAdapter(resultAdapter);
-                    resultAdapter.notifyDataSetChanged();
-                });
-                break;
-        }
-
-    }
-
-    @SuppressLint("SetTextI18n")
-    private void loadProfileData() {
-        try {
-            userViewModel.user.observe(requireActivity(), user -> {
-                try {
-                    String name = user.getName();
-                    String image = user.getImage();
-                    int score = (int) user.getScore();
-
-                    //  setUpChartData(pieChart, win, lose, draw);
-                    nameTV.setText(name);
-                    Glide.with(requireActivity())
-                            .setDefaultRequestOptions(new RequestOptions().placeholder(R.drawable.logo_round))
-                            .load(image)
-                            .into(pro_pic);
-                    scoreTV.setText("Score: " + score);
-                    setLevelByScore(levelTV, score);
-                } catch (Exception ignored) {
-
-                }
-
-            });
-
-        } catch (NullPointerException ignored) {
-
-        }
-    }
-
-    private void loadFragment(Fragment fragment) {
-        requireFragmentManager()
-                .beginTransaction()
-                .replace(R.id.container, fragment)
-                .commit();
-    }
-
-
-    @SuppressLint("SetTextI18n")
-    private void setLevelByScore(TextView levelTV, int score) {
-        if (score <= 500) {
-            levelTV.setText("Level: 1");
-        } else if (score <= 1000) {
-            levelTV.setText("Level: 2");
-        } else if (score <= 1500) {
-            levelTV.setText("Level: 3");
-        } else if (score <= 2000) {
-            levelTV.setText("Level: 4");
-        } else if (score <= 2500) {
-            levelTV.setText("Level: 5");
-        } else if (score <= 3500) {
-            levelTV.setText("Level: 6");
-        } else if (score <= 5000) {
-            levelTV.setText("Level: 7");
-        } else {
-            levelTV.setText("Level: unknown");
-        }
-    }
-
-    public Integer getLevelNum(int score) {
-        final int level;
-        if (score <= 500) {
-            level = 1;
-        } else if (score <= 1000) {
-            level = 2;
-        } else if (score <= 1500) {
-            level = 3;
-        } else if (score <= 2000) {
-            level = 4;
-        } else if (score <= 2500) {
-            level = 5;
-        } else if (score <= 3500) {
-            level = 6;
-        } else if (score <= 5000) {
-            level = 7;
-        } else {
-            level = -1;
-        }
-        return level;
-    }
-
-
-    private static class RandomiseListAsyncTask extends AsyncTask<Void, Void, List<Friends>> {
-        final List<Friends> usersList = new ArrayList<>();
-        final long type;
-
-        public RandomiseListAsyncTask(long type) {
-            this.type = type;
-        }
-
-        @Override
-        protected List<Friends> doInBackground(Void... voids) {
-            FirebaseFirestore firestore = FirebaseFirestore.getInstance();
-            firestore.collection("Users").whereEqualTo("type", type)
-                    .orderBy("lastTimestamp").limit(8)
-                    .get()
-                    .addOnSuccessListener(queryDocumentSnapshots -> {
-                        if (!queryDocumentSnapshots.getDocuments().isEmpty()) {
-                            for (final DocumentChange doc : queryDocumentSnapshots.getDocumentChanges()) {
-                                if (doc.getType() == DocumentChange.Type.ADDED) {
-                                    if (!doc.getDocument().getId().equals(Objects.requireNonNull(userId))) {
-                                        Friends friends = doc.getDocument().toObject(Friends.class).withId(Objects.requireNonNull(doc.getDocument().getString("id")));
-                                        usersList.add(friends);
-                                    }
-                                }
-                            }
-                            try {
-                                Collections.shuffle(usersList);
-                            } catch (Exception ignored) {
-
-                            }
-                        }
-                    })
-                    .addOnFailureListener(e -> {
-
-                    });
-            return usersList;
-        }
-    }
-}
-
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/admin/AdminFragment.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/admin/AdminFragment.java
index 1951f57..a040200 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/admin/AdminFragment.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/ui/fragment/admin/AdminFragment.java
@@ -1 +1 @@
-package com.quantum_guys.dncc_eco_sync.ui.fragment.admin;

import static android.content.Context.MODE_PRIVATE;

import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
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 androidx.paging.PagedList;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import com.firebase.ui.firestore.paging.FirestorePagingAdapter;
import com.firebase.ui.firestore.paging.FirestorePagingOptions;
import com.firebase.ui.firestore.paging.LoadingState;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.firestore.FirebaseFirestore;
import com.google.firebase.firestore.Query;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.adapters.PostViewHolder;
import com.quantum_guys.dncc_eco_sync.models.Post;

import java.util.ArrayList;
import java.util.List;

public class AdminFragment extends Fragment {

    public static AdminFragment newInstance() {
        return new AdminFragment();
    }

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
    }

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        return inflater.inflate(R.layout.fragment_admin, container, false);
    }

    @SuppressLint("NonConstantResourceId")
    @Override
    public void onViewCreated(@NonNull final View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

        loadFragmentAdminPage(new ApprovePostFragment());

        BottomNavigationView bottomNavigationView = view.findViewById(R.id.bottom_nav);
        bottomNavigationView.setOnNavigationItemSelectedListener(item -> {
            if (item.getItemId() == R.id.action_report) {
                Toast.makeText(getContext(), "Will be added later.", Toast.LENGTH_SHORT).show();
            }
            loadFragmentAdminPage(new ApprovePostFragment());
            return true;
        });
    }

    private void loadFragmentAdminPage(Fragment fragment) {
        assert getFragmentManager() != null;
        getFragmentManager()
                .beginTransaction()
                .replace(R.id.frame_containerfed, fragment)
                .commit();
    }

    public static class ApprovePostFragment extends Fragment {

        @SuppressLint("StaticFieldLeak")
        public static Context context;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private final List<String> mFriendIdList = new ArrayList<>();
        ExtendedFloatingActionButton button;
        private RecyclerView mPostsRecyclerView;
        private FirebaseFirestore mFirestore;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private View statsheetView;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):p// --Commented out by Inspection (09-Apr-21 12:34 PM):rivate BottomSheetDialog mmBottomSheetDialog;
        private SwipeRefreshLayout refreshLayout;

        @Nullable
        @Override
        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
            return inflater.inflate(R.layout.frag_home, container, false);
        }

        @Override
        public void onStart() {
            super.onStart();
            setupAdapter();
        }

        @Override
        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
            mPostsRecyclerView = view.findViewById(R.id.posts_recyclerview);
            mFirestore = FirebaseFirestore.getInstance();
            FirebaseAuth mAuth = FirebaseAuth.getInstance();
            FirebaseUser currentUser = mAuth.getCurrentUser();
            context = getContext();
            //refreshLayout = view.findViewById(R.id.refreshLayout);
            button = view.findViewById(R.id.soihefawiw);


            List<Post> mPostsList = new ArrayList<>();

            mPostsRecyclerView.setItemAnimator(new DefaultItemAnimator());
            mPostsRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
            mPostsRecyclerView.setHasFixedSize(true);
//          mPostsRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));

            button.setOnClickListener(view1 -> Toast.makeText(getActivity(), "Nothing", Toast.LENGTH_SHORT).show());
        }

        private void setupAdapter() {

            PagedList.Config config = new PagedList.Config.Builder()
                    .setEnablePlaceholders(false)
                    .setPrefetchDistance(2)
                    .setPageSize(3)
                    .build();
            Query mQuery = mFirestore.collection("PendingPosts")
                    .orderBy("timestamp", Query.Direction.DESCENDING);

            FirestorePagingOptions<Post> options = new FirestorePagingOptions.Builder<Post>()
                    .setLifecycleOwner(this)
                    .setQuery(mQuery, config, Post.class)
                    .build();
            // Instantiate Paging Adapter

            // refreshLayout.setRefreshing(true);
            //refreshLayout.setRefreshing(false);
            // refreshLayout.setRefreshing(false);
            //refreshLayout.setRefreshing(false);
            FirestorePagingAdapter<Post, PostViewHolder> mAdapter = new FirestorePagingAdapter<Post, PostViewHolder>(options) {
                @NonNull
                @Override
                public PostViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                    View view = getLayoutInflater().inflate(R.layout.item_feed_post, parent, false);
                    return new PostViewHolder(view);
                }

                @Override
                protected void onBindViewHolder(@NonNull PostViewHolder holder, int position, @NonNull Post post) {
                    holder.bind(post, holder, position, null, null, false);
                }

                @Override
                protected void onError(@NonNull Exception e) {
                    super.onError(e);
                    Log.e("MainActivity", e.getMessage());
                }

                @Override
                protected void onLoadingStateChanged(@NonNull LoadingState state) {
                    switch (state) {
                        case LOADING_INITIAL:
                        case LOADING_MORE:
                            // refreshLayout.setRefreshing(true);
                            break;

                        case LOADED:
                            //refreshLayout.setRefreshing(false);
                            context.getSharedPreferences("Posts", MODE_PRIVATE).edit().putInt("num", getItemCount()).apply();
                            break;

                        case ERROR:
                            Toast.makeText(
                                    getActivity(),
                                    "Error Occurred!",
                                    Toast.LENGTH_SHORT
                            ).show();

                            // refreshLayout.setRefreshing(false);
                            break;

                        case FINISHED:
                            //refreshLayout.setRefreshing(false);
                            break;
                    }
                }

            };
            mPostsRecyclerView.setAdapter(mAdapter);

        }

    }

}

\ No newline at end of file
+package com.quantum_guys.dncc_eco_sync.ui.fragment.admin;

import static android.content.Context.MODE_PRIVATE;

import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
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 androidx.paging.PagedList;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import com.firebase.ui.firestore.paging.FirestorePagingAdapter;
import com.firebase.ui.firestore.paging.FirestorePagingOptions;
import com.firebase.ui.firestore.paging.LoadingState;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.firestore.FirebaseFirestore;
import com.google.firebase.firestore.Query;

import com.quantum_guys.dncc_eco_sync.R;
import com.quantum_guys.dncc_eco_sync.adapters.IssueViewHolder;
import com.quantum_guys.dncc_eco_sync.adapters.PostViewHolder;
import com.quantum_guys.dncc_eco_sync.models.Issue;
import com.quantum_guys.dncc_eco_sync.models.Post;

import java.util.ArrayList;
import java.util.List;

public class AdminFragment extends Fragment {

    public static AdminFragment newInstance() {
        return new AdminFragment();
    }

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
    }

    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        return inflater.inflate(R.layout.fragment_admin, container, false);
    }

    @SuppressLint("NonConstantResourceId")
    @Override
    public void onViewCreated(@NonNull final View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);

        loadFragmentAdminPage(new ApprovePostFragment());

        BottomNavigationView bottomNavigationView = view.findViewById(R.id.bottom_nav);
        bottomNavigationView.setOnNavigationItemSelectedListener(item -> {
            if (item.getItemId() == R.id.action_report) {
                loadFragmentAdminPage(new ApprovePostFragment());
            }else if (item.getItemId() == R.id.action_report) {
                loadFragmentAdminPage(new ReportPostFragment());
            }else if (item.getItemId() == R.id.action_issue) {
                loadFragmentAdminPage(new IssuePostFragment());
            }
            return true;
        });
    }

    private void loadFragmentAdminPage(Fragment fragment) {
        assert getFragmentManager() != null;
        getFragmentManager()
                .beginTransaction()
                .replace(R.id.frame_containerfed, fragment)
                .commit();
    }

    public static class ApprovePostFragment extends Fragment {

        @SuppressLint("StaticFieldLeak")
        public static Context context;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private final List<String> mFriendIdList = new ArrayList<>();
        ExtendedFloatingActionButton button;
        private RecyclerView mPostsRecyclerView;
        private FirebaseFirestore mFirestore;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private View statsheetView;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):p// --Commented out by Inspection (09-Apr-21 12:34 PM):rivate BottomSheetDialog mmBottomSheetDialog;
        private SwipeRefreshLayout refreshLayout;

        @Nullable
        @Override
        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
            return inflater.inflate(R.layout.frag_admin, container, false);
        }

        @Override
        public void onStart() {
            super.onStart();
            setupAdapter();
        }

        @Override
        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
            mPostsRecyclerView = view.findViewById(R.id.posts_recyclerview);
            mFirestore = FirebaseFirestore.getInstance();
            FirebaseAuth mAuth = FirebaseAuth.getInstance();
            FirebaseUser currentUser = mAuth.getCurrentUser();
            context = getContext();
            //refreshLayout = view.findViewById(R.id.refreshLayout);
            button = view.findViewById(R.id.soihefawiw);


            List<Post> mPostsList = new ArrayList<>();

            mPostsRecyclerView.setItemAnimator(new DefaultItemAnimator());
            mPostsRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
            mPostsRecyclerView.setHasFixedSize(true);
//          mPostsRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));

            button.setOnClickListener(view1 -> Toast.makeText(getActivity(), "Nothing", Toast.LENGTH_SHORT).show());


        }

        private void setupAdapter() {

            PagedList.Config config = new PagedList.Config.Builder()
                    .setEnablePlaceholders(false)
                    .setPrefetchDistance(2)
                    .setPageSize(3)
                    .build();
            Query mQuery = mFirestore.collection("PendingPosts")
                    .orderBy("timestamp", Query.Direction.DESCENDING);

            FirestorePagingOptions<Post> options = new FirestorePagingOptions.Builder<Post>()
                    .setLifecycleOwner(this)
                    .setQuery(mQuery, config, Post.class)
                    .build();
            // Instantiate Paging Adapter

            // refreshLayout.setRefreshing(true);
            //refreshLayout.setRefreshing(false);
            // refreshLayout.setRefreshing(false);
            //refreshLayout.setRefreshing(false);
            FirestorePagingAdapter<Post, PostViewHolder> mAdapter = new FirestorePagingAdapter<Post, PostViewHolder>(options) {
                @NonNull
                @Override
                public PostViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                    View view = getLayoutInflater().inflate(R.layout.item_feed_post, parent, false);
                    return new PostViewHolder(view);
                }

                @Override
                protected void onBindViewHolder(@NonNull PostViewHolder holder, int position, @NonNull Post post) {
                    holder.bind(post, holder, position, null, null, false);
                }

                @Override
                protected void onError(@NonNull Exception e) {
                    super.onError(e);
                    Log.e("MainActivity", e.getMessage());
                }

                @Override
                protected void onLoadingStateChanged(@NonNull LoadingState state) {
                    switch (state) {
                        case LOADING_INITIAL:
                        case LOADING_MORE:
                            // refreshLayout.setRefreshing(true);
                            break;

                        case LOADED:
                            //refreshLayout.setRefreshing(false);
                            context.getSharedPreferences("Posts", MODE_PRIVATE).edit().putInt("num", getItemCount()).apply();
                            break;

                        case ERROR:
                            Toast.makeText(
                                    getActivity(),
                                    "Error Occurred!",
                                    Toast.LENGTH_SHORT
                            ).show();

                            // refreshLayout.setRefreshing(false);
                            break;

                        case FINISHED:
                            //refreshLayout.setRefreshing(false);
                            break;
                    }
                }

            };
            mPostsRecyclerView.setAdapter(mAdapter);

        }

    }

    public static class ReportPostFragment extends Fragment {

        @SuppressLint("StaticFieldLeak")
        public static Context context;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private final List<String> mFriendIdList = new ArrayList<>();
        ExtendedFloatingActionButton button;
        private RecyclerView mPostsRecyclerView;
        private FirebaseFirestore mFirestore;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private View statsheetView;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):p// --Commented out by Inspection (09-Apr-21 12:34 PM):rivate BottomSheetDialog mmBottomSheetDialog;
        private SwipeRefreshLayout refreshLayout;

        @Nullable
        @Override
        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
            return inflater.inflate(R.layout.frag_admin, container, false);
        }

        @Override
        public void onStart() {
            super.onStart();
            setupAdapter();
        }

        @Override
        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
            mPostsRecyclerView = view.findViewById(R.id.posts_recyclerview);
            mFirestore = FirebaseFirestore.getInstance();
            FirebaseAuth mAuth = FirebaseAuth.getInstance();
            FirebaseUser currentUser = mAuth.getCurrentUser();
            context = getContext();
            //refreshLayout = view.findViewById(R.id.refreshLayout);
            button = view.findViewById(R.id.soihefawiw);


            List<Post> mPostsList = new ArrayList<>();

            mPostsRecyclerView.setItemAnimator(new DefaultItemAnimator());
            mPostsRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
            mPostsRecyclerView.setHasFixedSize(true);
//          mPostsRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));

            button.setOnClickListener(view1 -> Toast.makeText(getActivity(), "Nothing", Toast.LENGTH_SHORT).show());


        }

        private void setupAdapter() {

            PagedList.Config config = new PagedList.Config.Builder()
                    .setEnablePlaceholders(false)
                    .setPrefetchDistance(2)
                    .setPageSize(3)
                    .build();
            Query mQuery = mFirestore.collection("PendingPosts")
                    .orderBy("timestamp", Query.Direction.DESCENDING);

            FirestorePagingOptions<Post> options = new FirestorePagingOptions.Builder<Post>()
                    .setLifecycleOwner(this)
                    .setQuery(mQuery, config, Post.class)
                    .build();
            // Instantiate Paging Adapter

            // refreshLayout.setRefreshing(true);
            //refreshLayout.setRefreshing(false);
            // refreshLayout.setRefreshing(false);
            //refreshLayout.setRefreshing(false);
            FirestorePagingAdapter<Post, PostViewHolder> mAdapter = new FirestorePagingAdapter<Post, PostViewHolder>(options) {
                @NonNull
                @Override
                public PostViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                    View view = getLayoutInflater().inflate(R.layout.item_feed_post, parent, false);
                    return new PostViewHolder(view);
                }

                @Override
                protected void onBindViewHolder(@NonNull PostViewHolder holder, int position, @NonNull Post post) {
                    holder.bind(post, holder, position, null, null, false);
                }

                @Override
                protected void onError(@NonNull Exception e) {
                    super.onError(e);
                    Log.e("MainActivity", e.getMessage());
                }

                @Override
                protected void onLoadingStateChanged(@NonNull LoadingState state) {
                    switch (state) {
                        case LOADING_INITIAL:
                        case LOADING_MORE:
                            // refreshLayout.setRefreshing(true);
                            break;

                        case LOADED:
                            //refreshLayout.setRefreshing(false);
                            context.getSharedPreferences("Posts", MODE_PRIVATE).edit().putInt("num", getItemCount()).apply();
                            break;

                        case ERROR:
                            Toast.makeText(
                                    getActivity(),
                                    "Error Occurred!",
                                    Toast.LENGTH_SHORT
                            ).show();

                            // refreshLayout.setRefreshing(false);
                            break;

                        case FINISHED:
                            //refreshLayout.setRefreshing(false);
                            break;
                    }
                }

            };
            mPostsRecyclerView.setAdapter(mAdapter);

        }

    }


    public static class IssuePostFragment extends Fragment {

        @SuppressLint("StaticFieldLeak")
        public static Context context;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private final List<String> mFriendIdList = new ArrayList<>();
        ExtendedFloatingActionButton button;
        private RecyclerView mPostsRecyclerView;
        private FirebaseFirestore mFirestore;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):private View statsheetView;
        // --Commented out by Inspection (09-Apr-21 12:34 PM):p// --Commented out by Inspection (09-Apr-21 12:34 PM):rivate BottomSheetDialog mmBottomSheetDialog;
        private SwipeRefreshLayout refreshLayout;

        @Nullable
        @Override
        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
            return inflater.inflate(R.layout.frag_admin, container, false);
        }

        @Override
        public void onStart() {
            super.onStart();
            setupAdapter();
        }

        @Override
        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
            mPostsRecyclerView = view.findViewById(R.id.posts_recyclerview);
            mFirestore = FirebaseFirestore.getInstance();
            FirebaseAuth mAuth = FirebaseAuth.getInstance();
            FirebaseUser currentUser = mAuth.getCurrentUser();
            context = getContext();
            //refreshLayout = view.findViewById(R.id.refreshLayout);
            button = view.findViewById(R.id.soihefawiw);


            List<Post> mPostsList = new ArrayList<>();

            mPostsRecyclerView.setItemAnimator(new DefaultItemAnimator());
            mPostsRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
            mPostsRecyclerView.setHasFixedSize(true);
//          mPostsRecyclerView.addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));

            button.setOnClickListener(view1 -> Toast.makeText(getActivity(), "Nothing", Toast.LENGTH_SHORT).show());


        }

        private void setupAdapter() {

            PagedList.Config config = new PagedList.Config.Builder()
                    .setEnablePlaceholders(false)
                    .setPrefetchDistance(2)
                    .setPageSize(3)
                    .build();
            Query mQuery = mFirestore.collection("Issues")
                    .orderBy("timestamp", Query.Direction.DESCENDING);

            FirestorePagingOptions<Issue> options = new FirestorePagingOptions.Builder<Issue>()
                    .setLifecycleOwner(this)
                    .setQuery(mQuery, config, Issue.class)
                    .build();
            // Instantiate Paging Adapter

            // refreshLayout.setRefreshing(true);
            //refreshLayout.setRefreshing(false);
            // refreshLayout.setRefreshing(false);
            //refreshLayout.setRefreshing(false);
            FirestorePagingAdapter<Issue, IssueViewHolder> mAdapter = new FirestorePagingAdapter<Issue, IssueViewHolder>(options) {
                @NonNull
                @Override
                public IssueViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
                    View view = getLayoutInflater().inflate(R.layout.item_issue, parent, false);
                    return new IssueViewHolder(view);
                }

                @Override
                protected void onBindViewHolder(@NonNull IssueViewHolder holder, int position, @NonNull Issue i) {
                    holder.bind(i, holder, position, null, null, false);
                }

                @Override
                protected void onError(@NonNull Exception e) {
                    super.onError(e);
                    Log.e("MainActivity", e.getMessage());
                }

                @Override
                protected void onLoadingStateChanged(@NonNull LoadingState state) {
                    switch (state) {
                        case LOADING_INITIAL:
                        case LOADING_MORE:
                            // refreshLayout.setRefreshing(true);
                            break;

                        case LOADED:
                            //refreshLayout.setRefreshing(false);
                            context.getSharedPreferences("Posts", MODE_PRIVATE).edit().putInt("num", getItemCount()).apply();
                            break;

                        case ERROR:
                            Toast.makeText(
                                    getActivity(),
                                    "Error Occurred!",
                                    Toast.LENGTH_SHORT
                            ).show();

                            // refreshLayout.setRefreshing(false);
                            break;

                        case FINISHED:
                            //refreshLayout.setRefreshing(false);
                            break;
                    }
                }

            };
            mPostsRecyclerView.setAdapter(mAdapter);

        }

    }

}

\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/NotificationUtil.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/NotificationUtil.java
index ab1b613..ecd7eba 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/NotificationUtil.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/NotificationUtil.java
@@ -23,8 +23,7 @@
 
 import com.quantum_guys.dncc_eco_sync.R;
 import com.quantum_guys.dncc_eco_sync.ui.activities.MainActivity;
-import com.quantum_guys.dncc_eco_sync.ui.activities.friends.FriendProfile;
-import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.QuizBattle;
+import com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.FriendProfile;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -114,9 +113,7 @@ public Intent getIntent(String click_action) {
             case "com.quantum_guys.dncc_eco_sync.TARGET_FORUM":
                 //resultIntent = new Intent(mContext, AnswersActivity.class);
                 break; //TARGET_COMMENT
-            case "com.quantum_guys.dncc_eco_sync.TARGET_PLAY":
-                resultIntent = new Intent(mContext, QuizBattle.class);
-                break; //TARGET_PLAY
+
             default:
                 resultIntent = new Intent(mContext, MainActivity.class);
                 break;
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/PlayerConverter.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/PlayerConverter.java
deleted file mode 100644
index 3ea8025..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/utils/PlayerConverter.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.utils;

import androidx.room.TypeConverter;

import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;

import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Player;

import java.lang.reflect.Type;

public class PlayerConverter {
    private static final Gson gson = new Gson();

    @TypeConverter
    public static Player stringToList(String data) {
        if (data == null) {
            return null;
        }

        Type listType = new TypeToken<Player>() {
        }.getType();

        return gson.fromJson(data, listType);
    }

    @TypeConverter
    public static String ListToString(Player someObjects) {
        return gson.toJson(someObjects);
    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/viewmodel/BattleViewModel.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/viewmodel/BattleViewModel.java
deleted file mode 100644
index 2f757c6..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/viewmodel/BattleViewModel.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.viewmodel;

import android.app.Application;

import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;

import com.quantum_guys.dncc_eco_sync.repository.QuizResultRepository;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.BattleModel;

import java.util.List;

public class BattleViewModel extends AndroidViewModel {
    public final LiveData<List<BattleModel>> battles;
    final QuizResultRepository repository;

    public BattleViewModel(@NonNull Application application) {
        super(application);
        repository = new QuizResultRepository(application);
        battles = repository.getAllNotes();
    }

    public void insert(BattleModel result) {
        repository.insertBattle(result);
    }

    public LiveData<BattleModel> get(String id) {
        return repository.getBattle(id);
    }


    public BattleModel getBattle(String id) {
        return repository.getBattleOffline(id);
    }


    public void delete(String result) {
        repository.deleteBattle(result);
    }

}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/viewmodel/ResultViewModel.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/viewmodel/ResultViewModel.java
deleted file mode 100644
index 8844950..0000000
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/viewmodel/ResultViewModel.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.quantum_guys.dncc_eco_sync.viewmodel;

import android.app.Application;

import androidx.annotation.NonNull;
import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;

import com.quantum_guys.dncc_eco_sync.repository.ResultRepository;
import com.quantum_guys.dncc_eco_sync.ui.activities.quiz.Result;

import java.util.List;

public class ResultViewModel extends AndroidViewModel {
    public final LiveData<List<Result>> results;
    final ResultRepository repository;

    public ResultViewModel(@NonNull Application application) {
        super(application);
        repository = new ResultRepository(application);
        results = repository.getAllNotes();
    }

    public void insert(Result result) {
        repository.insert(result);
    }

    public LiveData<List<Result>> getInvites() {
        return repository.getAllInvites();
    }

    public LiveData<List<Result>> getCompleted() {
        return repository.getAllCompleted();
    }

    public LiveData<List<Result>> getPending() {
        return repository.getAllPending();
    }

    public LiveData<List<Result>> getMyPending() {
        return repository.getAllMyPending();
    }

    public LiveData<List<Result>> getMyCompleted() {
        return repository.getAllMyCompleted();
    }


    public boolean resultExists(String id) {
        return repository.resultExists(id);
    }

    public boolean resultExistsForSecondPlayer(String id) {
        return repository.resultExistsForSecondPlayer(id);
    }

    public void update(Result result) {
        repository.update(result);
    }

    public void delete(Result result) {
        repository.delete(result);
    }

    public Result getResult(String battleIdNew) {
        return repository.getResult(battleIdNew);
    }
}
\ No newline at end of file
diff --git a/android-app/app/src/main/res/drawable/border_background.xml b/android-app/app/src/main/res/drawable/border_background.xml
new file mode 100644
index 0000000..35b50e7
--- /dev/null
+++ b/android-app/app/src/main/res/drawable/border_background.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="2dp"
+         android:color="#CCCCCC" />
+    <solid android:color="#FFFFFF" />
+</shape>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/activity_issue_details.xml b/android-app/app/src/main/res/layout/activity_issue_details.xml
new file mode 100644
index 0000000..22d9583
--- /dev/null
+++ b/android-app/app/src/main/res/layout/activity_issue_details.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="4dp"
+    android:orientation="vertical"
+    tools:context=".ui.activities.issue.IssuesDetailsActivity">
+
+
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:background="@drawable/round_background"
+        android:onClick="finishThis"
+        android:padding="4dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ef_ic_arrow_back"
+        tools:ignore="ContentDescription" />
+
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/comment_admin"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:src="@drawable/logo_round"
+        app:layout_constraintBottom_toTopOf="@+id/sdsw"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/post_username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="16dp"
+        android:fontFamily="@font/regular"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toBottomOf="@+id/comment_admin"
+        app:layout_constraintStart_toEndOf="@+id/comment_admin"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.913"
+        tools:ignore="HardcodedText,MissingPrefix" />
+
+    <ImageView
+        android:id="@+id/delete_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:padding="5dp"
+        android:src="@drawable/ic_delete_black_24dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/post_timestamp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="#989898"
+        android:contentDescription="TODO"
+        tools:ignore="ContentDescription,HardcodedText" />
+
+    <TextView
+        android:id="@+id/post_timestamp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="8dp"
+        android:layout_toStartOf="@+id/delete_button"
+        android:layout_toEndOf="@id/post_username"
+        android:gravity="end"
+        app:layout_constraintBottom_toTopOf="@+id/sdsw"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="HardcodedText,MissingPrefix" />
+
+    <TextView
+        android:id="@+id/dept_institute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:textSize="10sp"
+        app:layout_constraintBottom_toBottomOf="@+id/comment_admin"
+        app:layout_constraintStart_toEndOf="@+id/comment_admin"
+        app:layout_constraintTop_toBottomOf="@+id/post_username"
+        app:layout_constraintVertical_bias="0.0"
+        tools:ignore="SmallSp" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/sdsw"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="5dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/comment_section"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dept_institute">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/react_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:elevation="8dp"
+                app:cardCornerRadius="5dp"
+                app:layout_constraintBottom_toTopOf="@+id/coments"
+                app:layout_constraintEnd_toEndOf="@+id/comment_post_desc"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="@+id/comment_post_desc"
+                app:layout_constraintTop_toBottomOf="@+id/divider">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/onushod"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <LinearLayout
+                            android:id="@+id/onu"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="8"
+                            android:background="@drawable/edit_text_bg"
+                            android:orientation="horizontal"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:ignore="UselessParent">
+
+                            <Spinner
+                                android:id="@+id/spinner_states"
+                                android:layout_width="match_parent"
+                                android:layout_height="55dp"
+                                android:backgroundTint="#FFFFFF"
+                                android:overlapAnchor="false"
+                                android:spinnerMode="dropdown" />
+
+                        </LinearLayout>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:background="?android:windowBackground"
+                            android:paddingLeft="3dp"
+                            android:paddingRight="3dp"
+                            android:text="Status"
+                            android:textColor="?customColorValue"
+                            android:textCursorDrawable="?customColorValue"
+                            app:layout_constraintBottom_toTopOf="@+id/onu"
+                            app:layout_constraintStart_toStartOf="@+id/onu"
+                            app:layout_constraintTop_toTopOf="@+id/onu" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.cardview.widget.CardView>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/coments"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/react_layout" />
+
+            <com.quantum_guys.dncc_eco_sync.utils.MathView
+                android:id="@+id/comment_post_desc"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:clickable="true"
+                app:setTextSize="10sp"
+                android:focusable="true"
+                android:padding="2dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:setTextColor="?android:textColorSecondary">
+
+            </com.quantum_guys.dncc_eco_sync.utils.MathView>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_gravity="center|top"
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:background="@drawable/bg_like_circle_background"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toBottomOf="@+id/image_holder"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/comment_post_desc" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|top"
+                android:layout_marginBottom="32dp"
+                android:padding="10dp"
+                android:src="@drawable/ic_batti"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toTopOf="@+id/divider"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/image_holder"
+                tools:ignore="ContentDescription" />
+
+
+            <FrameLayout
+                android:id="@+id/image_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/comment_post_desc">
+
+                <FrameLayout
+                    android:id="@+id/pager_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="300dp"
+                    android:visibility="visible"
+                    tools:ignore="UselessParent">
+
+                    <androidx.viewpager.widget.ViewPager
+                        android:id="@+id/pager"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top">
+
+                    </androidx.viewpager.widget.ViewPager>
+
+                    <RelativeLayout
+                        android:id="@+id/indicator_holder"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:background="#30000000"
+                        android:padding="9dp"
+                        android:visibility="visible">
+
+                        <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
+                            android:id="@+id/indicator"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerHorizontal="true"
+                            app:dotsColor="@color/white"
+                            app:dotsCornerRadius="8dp"
+                            app:dotsSize="6dp"
+                            app:dotsSpacing="4dp"
+                            app:dotsWidthFactor="2.5" />
+
+                    </RelativeLayout>
+
+                </FrameLayout>
+
+            </FrameLayout>
+
+            <View
+                android:id="@+id/divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_below="@+id/comment_post_desc"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="#777777"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/image_holder"
+                tools:visibility="visible" />
+
+            <ProgressBar
+                android:id="@+id/progressBar5"
+                style="?android:attr/progressBarStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:visibility="invisible"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/coments" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <LinearLayout
+        android:id="@+id/adminActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/deletePost"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginEnd="20dp"
+            android:backgroundTint="#C84441"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:text="Delete"
+            android:textColor="#FCFCFC"
+            tools:ignore="HardcodedText" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/approvePost"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="20dp"
+            android:backgroundTint="@color/colorAccentt"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:text="Approve"
+            android:textColor="#FCFCFC"
+            tools:ignore="HardcodedText" />
+
+
+    </LinearLayout>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/comment_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:visibility="visible"
+        app:cardCornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/adminActivity"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="4dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            tools:ignore="UnusedAttribute"
+            tools:targetApi="m">
+
+
+            <ImageView
+                android:id="@+id/send"
+                style="@style/Widget.AppCompat.Button.Small"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerInParent="true"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="4dp"
+                android:background="@drawable/grad_uu"
+                android:backgroundTint="@color/colorSec"
+                android:padding="8dp"
+                android:singleLine="true"
+                android:src="@drawable/ic_send_blue_24dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:ignore="ContentDescription" />
+
+            <com.quantum_guys.dncc_eco_sync.utils.RichEditor
+                android:id="@+id/text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:paddingStart="10dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/send"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView7"
+                app:layout_constraintTop_toTopOf="@+id/imageView7"
+                tools:ignore="RtlSymmetry" />
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/imageView7"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="4dp"
+                android:layout_marginBottom="4dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/text"
+                android:src="@drawable/logo_round"
+                app:layout_constraintStart_toStartOf="parent"
+                app:srcCompat="@drawable/logo_round" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/activity_issue_image.xml b/android-app/app/src/main/res/layout/activity_issue_image.xml
index 7dfee6c..9f6dd59 100644
--- a/android-app/app/src/main/res/layout/activity_issue_image.xml
+++ b/android-app/app/src/main/res/layout/activity_issue_image.xml
@@ -41,12 +41,27 @@
                             android:id="@+id/switch1"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
                             android:text="Post Annonimously"
                             android:textColor="#DC5E5E"
                             android:textSize="20sp"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/address" />
+
+                        <EditText
+                            android:id="@+id/address"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginEnd="8dp"
+
+                            android:text="Mokkarram Bhaban, Dhaka University"
+                            android:textSize="20sp"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/onushod" />
 
                         <androidx.constraintlayout.widget.ConstraintLayout
@@ -54,10 +69,11 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="8dp"
+                            android:layout_marginTop="2dp"
                             android:layout_marginEnd="8dp"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            tools:layout_editor_absoluteY="303dp">
+                            app:layout_constraintTop_toBottomOf="@+id/relativeLayout4">
 
                             <LinearLayout
                                 android:id="@+id/onu"
@@ -72,7 +88,7 @@
                                 app:layout_constraintTop_toTopOf="parent">
 
                                 <Spinner
-                                    android:id="@+id/spinner_type"
+                                    android:id="@+id/spinner_class_level"
                                     android:layout_width="match_parent"
                                     android:layout_height="50dp"
                                     android:backgroundTint="#FFFFFF"
@@ -82,11 +98,12 @@
                             </LinearLayout>
 
                             <TextView
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="16dp"
                                 android:background="?android:windowBackground"
                                 android:paddingLeft="3dp"
+
                                 android:paddingRight="3dp"
                                 android:text="Select Tag"
                                 android:textFontWeight="700"
@@ -105,10 +122,13 @@
                             android:layout_marginStart="8dp"
                             android:layout_marginTop="16dp"
                             android:layout_marginEnd="8dp"
+                            android:background="@drawable/border_background"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="0.0"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/switch1" />
+                            app:layout_constraintTop_toBottomOf="@+id/switch1"
+                            app:layout_constraintVertical_bias="0.0" />
 
                         <FrameLayout
                             android:id="@+id/pager_layout"
diff --git a/android-app/app/src/main/res/layout/activity_search_users.xml b/android-app/app/src/main/res/layout/activity_search_users.xml
index 5ba9d27..01d783c 100644
--- a/android-app/app/src/main/res/layout/activity_search_users.xml
+++ b/android-app/app/src/main/res/layout/activity_search_users.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layoutDescription="@xml/activity_search_users_scene"
-    tools:context="com.quantum_guys.dncc_eco_sync.ui.activities.friends.SearchUsersActivity">
+    tools:context="com.quantum_guys.dncc_eco_sync.ui.activities.volunteer.SearchUsersActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/usersList"
diff --git a/android-app/app/src/main/res/layout/frag_admin.xml b/android-app/app/src/main/res/layout/frag_admin.xml
new file mode 100644
index 0000000..7733d40
--- /dev/null
+++ b/android-app/app/src/main/res/layout/frag_admin.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:windowBackground"
+     >
+
+    <LinearLayout
+        android:id="@+id/default_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="5dp"
+            tools:ignore="ContentDescription"
+            tools:srcCompat="@drawable/logo_round" />
+
+        <TextView
+            android:id="@+id/default_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="No posts yet"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="19sp"
+            tools:ignore="HardcodedText,MissingPrefix" />
+
+        <TextView
+            android:id="@+id/default_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:gravity="center"
+            android:text="Add some friends to see their posts here"
+            tools:ignore="HardcodedText" />
+
+    </LinearLayout>
+
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/soihefawiw"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="?colorPrimary"
+        android:clickable="true"
+        android:fontFamily="@font/regular"
+        android:src="@drawable/ic_notifications_black_24dp"
+        android:text="Create Notification"
+        android:textColor="@color/white"
+        app:icon="@drawable/ic_notifications_black_24dp"
+        app:iconTint="@color/white"
+        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swf"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/posts_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/frag_issue.xml b/android-app/app/src/main/res/layout/frag_issue.xml
index 3c9487a..cdd84b1 100644
--- a/android-app/app/src/main/res/layout/frag_issue.xml
+++ b/android-app/app/src/main/res/layout/frag_issue.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="?android:windowBackground"
    app:layoutDescription="@xml/frag_home_xml_framelayout3_scene">

    <LinearLayout
        android:id="@+id/default_item"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:gravity="center"
        android:orientation="vertical"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <ImageView
            android:layout_width="100dp"
            android:layout_height="100dp"
            android:layout_marginBottom="5dp"
            tools:ignore="ContentDescription"
            tools:srcCompat="@drawable/logo_round" />

        <TextView
            android:id="@+id/default_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:text="No posts yet"
            android:textColor="?android:textColorPrimary"
            android:textSize="19sp"
            tools:ignore="HardcodedText,MissingPrefix" />

        <TextView
            android:id="@+id/default_text"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="10dp"
            android:layout_marginEnd="10dp"
            android:gravity="center"
            android:text="Add some friends to see their posts here"
            tools:ignore="HardcodedText" />

    </LinearLayout>

    <HorizontalScrollView
        android:id="@+id/ghujiko"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:scrollbars="none"
        app:layout_constraintBottom_toTopOf="@+id/posts_recyclerview"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_chainStyle="packed">

        <com.google.android.material.chip.ChipGroup
            android:id="@+id/filter_chip_SS_group"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="4dp"
            android:layout_marginTop="4dp"
            android:layout_marginEnd="4dp"
            app:singleSelection="true">

            <com.google.android.material.chip.Chip
                style="@style/Widget.MaterialComponents.Chip.Filter"
                android:layout_width="wrap_content"
                android:layout_height="50dp"
                android:text="All"
                tools:ignore="HardcodedText" />

            <com.google.android.material.chip.Chip
                style="@style/Widget.MaterialComponents.Chip.Filter"
                android:layout_width="wrap_content"
                android:layout_height="50dp"
                android:text="Pending"
                tools:ignore="HardcodedText" />

            <com.google.android.material.chip.Chip
                style="@style/Widget.MaterialComponents.Chip.Filter"
                android:layout_width="wrap_content"
                android:layout_height="50dp"
                android:text="Resoulved"
                tools:ignore="HardcodedText" />




        </com.google.android.material.chip.ChipGroup>
    </HorizontalScrollView>

    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
        android:id="@+id/soihefawiw"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginEnd="16dp"
        android:layout_marginBottom="16dp"
        android:backgroundTint="?colorPrimary"
        android:clickable="true"
        android:fontFamily="@font/regular"
        android:src="@drawable/ic_add_24dp"
        android:text="Post"
        android:textColor="@color/white"
        app:icon="@drawable/ic_add_24dp"
        app:iconTint="@color/white"
        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />


    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/swf"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/ghujiko">


        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/posts_recyclerview"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />

    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="?android:windowBackground"
    app:layoutDescription="@xml/frag_home_xml_framelayout3_scene">

    <LinearLayout
        android:id="@+id/default_item"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:gravity="center"
        android:orientation="vertical"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <ImageView
            android:layout_width="100dp"
            android:layout_height="100dp"
            android:layout_marginBottom="5dp"
            tools:ignore="ContentDescription"
            tools:srcCompat="@drawable/logo_round" />

        <TextView
            android:id="@+id/default_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:text="No posts yet"
            android:textColor="?android:textColorPrimary"
            android:textSize="19sp"
            tools:ignore="HardcodedText,MissingPrefix" />

        <TextView
            android:id="@+id/default_text"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="10dp"
            android:layout_marginEnd="10dp"
            android:gravity="center"
            android:text="Add some friends to see their posts here"
            tools:ignore="HardcodedText" />

    </LinearLayout>

    <HorizontalScrollView
        android:id="@+id/ghujiko"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:scrollbars="none"
        android:visibility="gone"
        app:layout_constraintBottom_toTopOf="@+id/posts_recyclerview"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_chainStyle="packed">

        <com.google.android.material.chip.ChipGroup
            android:id="@+id/filter_chip_SS_group"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="4dp"
            android:layout_marginTop="4dp"
            android:layout_marginEnd="4dp"
            app:singleSelection="true">

            <com.google.android.material.chip.Chip
                style="@style/Widget.MaterialComponents.Chip.Filter"
                android:layout_width="wrap_content"
                android:layout_height="50dp"
                android:text="All"
                tools:ignore="HardcodedText" />

            <com.google.android.material.chip.Chip
                style="@style/Widget.MaterialComponents.Chip.Filter"
                android:layout_width="wrap_content"
                android:layout_height="50dp"
                android:text="Pending"
                tools:ignore="HardcodedText" />

            <com.google.android.material.chip.Chip
                style="@style/Widget.MaterialComponents.Chip.Filter"
                android:layout_width="wrap_content"
                android:layout_height="50dp"
                android:text="Resoulved"
                tools:ignore="HardcodedText" />


        </com.google.android.material.chip.ChipGroup>
    </HorizontalScrollView>

    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
        android:id="@+id/soihefawiw"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginEnd="16dp"
        android:layout_marginBottom="16dp"
        android:backgroundTint="?colorPrimary"
        android:clickable="true"
        android:fontFamily="@font/regular"
        android:src="@drawable/ic_add_24dp"
        android:text="Issue"
        android:textColor="@color/white"
        app:icon="@drawable/ic_add_24dp"
        app:iconTint="@color/white"
        app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        tools:ignore="HardcodedText,KeyboardInaccessibleWidget" />


    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/swf"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/ghujiko">


        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/posts_recyclerview"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />

    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/fragment_quiz_history.xml b/android-app/app/src/main/res/layout/fragment_quiz_history.xml
index cc8892c..e93aa63 100644
--- a/android-app/app/src/main/res/layout/fragment_quiz_history.xml
+++ b/android-app/app/src/main/res/layout/fragment_quiz_history.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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"
    tools:context=".ui.activities.friends.quiz_history" />
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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"
    tools:context=".ui.activities.volunteer.quiz_history" />
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/latex_editor_toolbar.xml b/android-app/app/src/main/res/layout/latex_editor_toolbar.xml
index a589054..7b2281f 100644
--- a/android-app/app/src/main/res/layout/latex_editor_toolbar.xml
+++ b/android-app/app/src/main/res/layout/latex_editor_toolbar.xml
@@ -1 +1 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/gradient_1"
    android:backgroundTint="?colorPrimary"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/code_editor"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:visibility="gone"
        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView2"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <EditText
            android:id="@+id/code"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            android:height="100dp"
            android:background="@drawable/rounded"
            android:gravity="start"
            android:hint="Paste or write your code here..."
            android:minWidth="300dp"
            android:padding="10dp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />

        <Button
            android:id="@+id/submit_code"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:text="DONE"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@+id/code"
            app:layout_constraintEnd_toEndOf="@+id/code"
            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/tab"
            android:layout_width="35dp"
            android:layout_height="33dp"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:paddingLeft="2dp"
            android:paddingTop="2dp"
            android:paddingRight="2dp"
            android:paddingBottom="2dp"
            android:text="TAB"
            android:visibility="gone"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="8sp"
            app:iconPadding="0dp"
            app:layout_constraintEnd_toEndOf="@+id/code"
            app:layout_constraintTop_toTopOf="@+id/code"
            tools:ignore="HardcodedText,SmallSp" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/video_editor"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:background="?android:windowBackground"
        android:visibility="gone"
        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView2"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <EditText
            android:id="@+id/video"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            android:height="100dp"
            android:background="@drawable/rounded"
            android:gravity="start"
            android:hint="Paste video link here...eg: https://www.youtube.com/watch?v=1OEron4rXfk"
            android:minWidth="300dp"
            android:padding="10dp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />

        <Button
            android:id="@+id/submit_video"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:text="DONE"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@+id/video"
            app:layout_constraintEnd_toEndOf="@+id/video"
            tools:ignore="HardcodedText" />

    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/latext_editor"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?android:windowBackground"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="@+id/code_editor"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <HorizontalScrollView
            android:id="@+id/linearLayout6"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="3dp"
            android:background="@color/colorPrimary"
            android:orientation="horizontal"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent">

            <LinearLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:background="@color/colorAccentt"
                android:orientation="horizontal">

                <ImageView
                    android:id="@+id/action_frac"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:padding="5dp"
                    android:src="@drawable/ic_frac"
                    app:tint="@color/white"
                    tools:ignore="ContentDescription" />

                <ImageView
                    android:id="@+id/action_power"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="9dp"
                    android:src="@drawable/ic_power"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_sub"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_sub"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_space"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_baseline_space_bar_24"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_enter"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_baseline_keyboard_return_24"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_root"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_root"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_alpha"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_alpha"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_diff"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="5dp"
                    android:src="@drawable/ic_diff"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_int"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="4dp"
                    android:src="@drawable/ic_int"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_theta"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="11dp"
                    android:src="@drawable/ic_theta"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_therefore"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_therefore"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_hat"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_hat"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_mu"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_mu"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_omega"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_omega"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_pi"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_pi"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_lanbda"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_lanbda"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_ohm"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_ohm"
                    app:tint="@color/white" />

                <ImageView
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_prop"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_over"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="9dp"
                    android:src="@drawable/ic_over"
                    app:tint="@color/white" />
            </LinearLayout>
        </HorizontalScrollView>

        <com.quantum_guys.dncc_eco_sync.utils.MathView
            android:id="@+id/mathView"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            app:layout_constraintBottom_toTopOf="@+id/latex_equation"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHeight_max="300dp"
            app:layout_constraintStart_toStartOf="@+id/latex_equation"
            app:layout_constraintTop_toTopOf="parent"
            app:setTextColor="?android:textColorPrimary" />

        <EditText
            android:id="@+id/latex_equation"
            android:layout_width="0dp"
            android:layout_height="100dp"
            android:layout_marginStart="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            android:background="@drawable/edit_text_bg"
            android:backgroundTint="@color/colorAccentt"
            android:gravity="start"
            android:hint="@string/sdf"
            android:minWidth="300dp"
            android:paddingStart="5dp"
            android:textAlignment="textStart"
            app:layout_constraintBottom_toTopOf="@+id/linearLayout6"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/mathView"
            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />

        <Button
            android:id="@+id/submit_latex"
            android:layout_width="67dp"
            android:layout_height="45dp"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:text="Done"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@+id/latex_equation"
            app:layout_constraintEnd_toEndOf="@+id/latex_equation"
            tools:ignore="HardcodedText" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <HorizontalScrollView
        android:id="@+id/horizontalScrollView2"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?colorPrimary"
        android:scrollbarSize="0.5dp"
        android:visibility="visible"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:background="?colorPrimary"
            android:orientation="horizontal">

            <ImageView
                android:id="@+id/action_undo"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:focusable="true"
                android:padding="15dp"
                android:rotationX="180"
                android:rotationY="180"
                android:src="@drawable/redo"
                tools:ignore="ContentDescription" />

            <ImageView
                android:id="@+id/action_redo"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/redo" />

            <ImageView
                android:id="@+id/action_bold"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/bold"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_italic"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/italic"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/insert_latex"
                android:layout_width="70dp"
                android:layout_height="48dp"
                android:layout_marginTop="2dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/ic_latex_logo"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/insert_code"
                android:layout_width="58dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/code" />

            <ImageView
                android:id="@+id/insert_video"
                android:layout_width="58dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/ic_play_circle_outline_black_24dp" />

            <ImageView
                android:id="@+id/action_subscript"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="13dp"
                android:src="@drawable/subscript"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_superscript"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="13dp"
                android:src="@drawable/superscript"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_strikethrough"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/strikethrough"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_underline"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/underline"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_heading1"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h1"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_heading2"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h2"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_heading3"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h3" />

            <ImageView
                android:id="@+id/action_heading4"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h4" />

            <ImageView
                android:id="@+id/action_heading5"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h5" />

            <ImageView
                android:id="@+id/action_heading6"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h6" />

            <ImageView
                android:id="@+id/action_txt_color"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/txt_color"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_bg_color"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/bg_color"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_indent"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/indent"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_outdent"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/outdent" />

            <ImageView
                android:id="@+id/action_align_left"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_left" />

            <ImageView
                android:id="@+id/action_align_center"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_center" />

            <ImageView
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_full" />

            <ImageView
                android:id="@+id/action_align_right"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_right" />

            <ImageView
                android:id="@+id/action_insert_bullets"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/list_bulleted" />

            <ImageView
                android:id="@+id/action_insert_numbers"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/list_numbered" />

            <ImageView
                android:id="@+id/action_blockquote"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/blockquote" />




            <ImageView
                android:id="@+id/action_insert_checkbox"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/ic_baseline_check_circle_24"
                app:tint="@color/white" />

        </LinearLayout>

    </HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/gradient_1"
    android:backgroundTint="?colorPrimary"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/code_editor"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:visibility="gone"
        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView2"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <EditText
            android:id="@+id/code"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            android:height="100dp"
            android:background="@drawable/rounded"
            android:gravity="start"
            android:hint="Paste or write your code here..."
            android:minWidth="300dp"
            android:padding="10dp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />

        <Button
            android:id="@+id/submit_code"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:text="DONE"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@+id/code"
            app:layout_constraintEnd_toEndOf="@+id/code"
            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/tab"
            android:layout_width="35dp"
            android:layout_height="33dp"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:paddingLeft="2dp"
            android:paddingTop="2dp"
            android:paddingRight="2dp"
            android:paddingBottom="2dp"
            android:text="TAB"
            android:visibility="gone"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="8sp"
            app:iconPadding="0dp"
            app:layout_constraintEnd_toEndOf="@+id/code"
            app:layout_constraintTop_toTopOf="@+id/code"
            tools:ignore="HardcodedText,SmallSp" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/video_editor"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:background="?android:windowBackground"
        android:visibility="gone"
        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView2"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <EditText
            android:id="@+id/video"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            android:height="100dp"
            android:background="@drawable/rounded"
            android:gravity="start"
            android:hint="Paste video link here...eg: https://www.youtube.com/watch?v=1OEron4rXfk"
            android:minWidth="300dp"
            android:padding="10dp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />

        <Button
            android:id="@+id/submit_video"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:text="DONE"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@+id/video"
            app:layout_constraintEnd_toEndOf="@+id/video"
            tools:ignore="HardcodedText" />

    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/latext_editor"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?android:windowBackground"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="@+id/code_editor"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <HorizontalScrollView
            android:id="@+id/linearLayout6"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="3dp"
            android:background="@color/colorPrimary"
            android:orientation="horizontal"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent">

            <LinearLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:background="@color/colorAccentt"
                android:orientation="horizontal">

                <ImageView
                    android:id="@+id/action_frac"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:padding="5dp"
                    android:src="@drawable/ic_frac"
                    app:tint="@color/white"
                    tools:ignore="ContentDescription" />

                <ImageView
                    android:id="@+id/action_power"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="9dp"
                    android:src="@drawable/ic_power"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_sub"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_sub"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_space"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_baseline_space_bar_24"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_enter"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_baseline_keyboard_return_24"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_root"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_root"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_alpha"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_alpha"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_diff"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="5dp"
                    android:src="@drawable/ic_diff"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_int"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="4dp"
                    android:src="@drawable/ic_int"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_theta"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="11dp"
                    android:src="@drawable/ic_theta"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_therefore"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_therefore"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_hat"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_hat"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_mu"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_mu"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_omega"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_omega"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_pi"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_pi"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_lanbda"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_lanbda"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_ohm"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="13dp"
                    android:src="@drawable/ic_ohm"
                    app:tint="@color/white" />

                <ImageView
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="10dp"
                    android:src="@drawable/ic_prop"
                    app:tint="@color/white" />

                <ImageView
                    android:id="@+id/action_over"
                    android:layout_width="48dp"
                    android:layout_height="48dp"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:backgroundTint="#FFFFFF"
                    android:clickable="true"
                    android:contentDescription="@null"
                    android:focusable="true"
                    android:padding="9dp"
                    android:src="@drawable/ic_over"
                    app:tint="@color/white" />
            </LinearLayout>
        </HorizontalScrollView>

        <com.quantum_guys.dncc_eco_sync.utils.MathView
            android:id="@+id/mathView"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            app:layout_constraintBottom_toTopOf="@+id/latex_equation"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHeight_max="300dp"
            app:layout_constraintStart_toStartOf="@+id/latex_equation"
            app:layout_constraintTop_toTopOf="parent"
            app:setTextColor="?android:textColorPrimary" />

        <EditText
            android:id="@+id/latex_equation"
            android:layout_width="0dp"
            android:layout_height="100dp"
            android:layout_marginStart="8dp"
            android:layout_marginTop="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="8dp"
            android:background="@drawable/edit_text_bg"
            android:backgroundTint="@color/colorAccentt"
            android:gravity="start"
            android:hint="@string/sdf"
            android:minWidth="300dp"
            android:paddingStart="5dp"
            android:textAlignment="textStart"
            app:layout_constraintBottom_toTopOf="@+id/linearLayout6"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/mathView"
            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />

        <Button
            android:id="@+id/submit_latex"
            android:layout_width="67dp"
            android:layout_height="45dp"
            android:layout_marginEnd="5dp"
            android:backgroundTint="@color/colorAccentt"
            android:text="Done"
            android:textAllCaps="false"
            android:textColor="#FFF"
            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@+id/latex_equation"
            app:layout_constraintEnd_toEndOf="@+id/latex_equation"
            tools:ignore="HardcodedText" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <HorizontalScrollView
        android:id="@+id/horizontalScrollView2"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?colorPrimary"
        android:scrollbarSize="0.5dp"
        android:visibility="visible"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:background="?colorPrimary"
            android:orientation="horizontal">

            <ImageView
                android:id="@+id/action_undo"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:focusable="true"
                android:padding="15dp"
                android:rotationX="180"
                android:rotationY="180"
                android:src="@drawable/redo"
                tools:ignore="ContentDescription" />

            <ImageView
                android:id="@+id/action_redo"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/redo" />

            <ImageView
                android:id="@+id/action_bold"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/bold"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_italic"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/italic"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/insert_latex"
                android:layout_width="70dp"
                android:layout_height="48dp"
                android:layout_marginTop="2dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:visibility="gone"
                android:src="@drawable/ic_latex_logo"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/insert_code"
                android:layout_width="58dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/code" />

            <ImageView
                android:id="@+id/insert_video"
                android:layout_width="58dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/ic_play_circle_outline_black_24dp" />

            <ImageView
                android:id="@+id/action_subscript"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="13dp"
                android:src="@drawable/subscript"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_superscript"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="13dp"
                android:src="@drawable/superscript"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_strikethrough"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/strikethrough"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_underline"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/underline"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_heading1"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h1"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_heading2"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h2"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_heading3"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h3" />

            <ImageView
                android:id="@+id/action_heading4"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h4" />

            <ImageView
                android:id="@+id/action_heading5"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h5" />

            <ImageView
                android:id="@+id/action_heading6"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/h6" />

            <ImageView
                android:id="@+id/action_txt_color"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/txt_color"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_bg_color"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="15dp"
                android:src="@drawable/bg_color"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_indent"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/indent"
                app:tint="@color/white" />

            <ImageView
                android:id="@+id/action_outdent"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/outdent" />

            <ImageView
                android:id="@+id/action_align_left"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_left" />

            <ImageView
                android:id="@+id/action_align_center"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_center" />

            <ImageView
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_full" />

            <ImageView
                android:id="@+id/action_align_right"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/justify_right" />

            <ImageView
                android:id="@+id/action_insert_bullets"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/list_bulleted" />

            <ImageView
                android:id="@+id/action_insert_numbers"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/list_numbered" />

            <ImageView
                android:id="@+id/action_blockquote"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/blockquote" />




            <ImageView
                android:id="@+id/action_insert_checkbox"
                android:layout_width="48dp"
                android:layout_height="48dp"
                android:background="?attr/selectableItemBackgroundBorderless"
                android:clickable="true"
                android:contentDescription="@null"
                android:focusable="true"
                android:padding="10dp"
                android:src="@drawable/ic_baseline_check_circle_24"
                app:tint="@color/white" />

        </LinearLayout>

    </HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/ranking.xml b/android-app/app/src/main/res/layout/ranking.xml
index d401ecf..764af7b 100644
--- a/android-app/app/src/main/res/layout/ranking.xml
+++ b/android-app/app/src/main/res/layout/ranking.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:background="?android:windowBackground"
    android:layout_height="match_parent">

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/refreshLayout"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent">

            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent">


                <HorizontalScrollView
                    android:id="@+id/ghujiko"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:scrollbars="none"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintHorizontal_bias="0.5"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintVertical_chainStyle="packed"
                    tools:ignore="UnknownIdInLayout">

                    <com.google.android.material.chip.ChipGroup
                        android:id="@+id/filter_chip_SS_group"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginStart="4dp"
                        android:layout_marginTop="4dp"
                        android:layout_marginEnd="4dp"
                        app:singleSelection="true">

                        <com.google.android.material.chip.Chip
                            style="@style/Widget.MaterialComponents.Chip.Filter"
                            android:layout_width="wrap_content"
                            android:layout_height="50dp"
                            android:layout_marginStart="10dp"
                            android:checked="true"
                            android:text="All"
                            app:checkedIconTint="?android:textColorPrimary"
                            tools:ignore="HardcodedText" />

                        <com.google.android.material.chip.Chip
                            android:id="@+id/type"
                            style="@style/Widget.MaterialComponents.Chip.Filter"
                            android:layout_width="wrap_content"
                            android:layout_height="50dp"
                            android:text=""
                            app:checkedIconTint="?android:textColorPrimary"
                            tools:ignore="HardcodedText" />


                        <com.google.android.material.chip.Chip
                            android:id="@+id/sub"
                            style="@style/Widget.MaterialComponents.Chip.Filter"
                            android:layout_width="wrap_content"
                            android:layout_height="50dp"
                            android:text="Your Group"
                            app:checkedIconTint="?android:textColorPrimary"
                            tools:ignore="HardcodedText" />

                        <com.google.android.material.chip.Chip
                            android:id="@+id/institute"
                            style="@style/Widget.MaterialComponents.Chip.Filter"
                            android:layout_width="wrap_content"
                            android:layout_height="50dp"
                            android:text="Your Institute"
                            app:checkedIconTint="?android:textColorPrimary"
                            tools:ignore="HardcodedText" />


                        <com.google.android.material.chip.Chip
                            android:id="@+id/location"
                            style="@style/Widget.MaterialComponents.Chip.Filter"
                            android:layout_width="wrap_content"
                            android:layout_height="50dp"
                            android:layout_marginEnd="10dp"
                            android:text="Your Area"
                            app:checkedIconTint="?android:textColorPrimary"
                            tools:ignore="HardcodedText" />


                    </com.google.android.material.chip.ChipGroup>
                </HorizontalScrollView>

                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/messageList"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    app:layout_constraintBottom_toTopOf="@+id/adView"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@+id/ghujiko" />

            </androidx.constraintlayout.widget.ConstraintLayout>

            <LinearLayout
                android:id="@+id/default_item"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:orientation="vertical"
                android:visibility="invisible">

                <ImageView
                    android:layout_width="200dp"
                    android:layout_height="200dp"
                    android:layout_marginBottom="5dp"
                    android:src="@drawable/logo_round"
                    tools:ignore="ContentDescription" />

                <TextView
                    android:id="@+id/default_title"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:gravity="center"
                    android:text="Nothing found"
                    android:textColor="?android:textColorPrimary"
                    android:textSize="19sp"
                    tools:ignore="HardcodedText,MissingPrefix" />

                <TextView
                    android:id="@+id/default_text"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="10dp"
                    android:layout_marginEnd="10dp"
                    android:gravity="center" />

            </LinearLayout>

        </FrameLayout>

    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

</RelativeLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:background="?android:windowBackground"
    android:layout_height="match_parent">

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/refreshLayout"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <FrameLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent">

            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent">


                <androidx.constraintlayout.widget.ConstraintLayout
                    android:id="@+id/onushod"
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="8dp"
                    android:layout_marginTop="2dp"
                    android:layout_marginEnd="8dp"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@+id/relativeLayout4">

                    <LinearLayout
                        android:id="@+id/onu"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_weight="8"
                        android:background="@drawable/edit_text_bg"
                        android:orientation="horizontal"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toTopOf="parent">

                        <Spinner
                            android:id="@+id/spinner_class_level"
                            android:layout_width="match_parent"
                            android:layout_height="50dp"
                            android:backgroundTint="#FFFFFF"
                            android:overlapAnchor="false"
                            android:spinnerMode="dropdown" />

                    </LinearLayout>

                    <TextView
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginStart="16dp"
                        android:background="?android:windowBackground"
                        android:paddingLeft="3dp"
                        android:paddingRight="3dp"
                        android:text="Filter Volunteer by  Ward"
                        android:textFontWeight="700"
                        app:layout_constraintBottom_toTopOf="@+id/onu"
                        app:layout_constraintStart_toStartOf="@+id/onu"
                        app:layout_constraintTop_toTopOf="@+id/onu"
                        tools:ignore="HardcodedText"
                        tools:targetApi="p" />

                </androidx.constraintlayout.widget.ConstraintLayout>

                <HorizontalScrollView
                    android:id="@+id/ghujiko"
                    android:layout_width="200dp"
                    android:layout_height="wrap_content"
                    android:scrollbars="none"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintHorizontal_bias="0.5"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintVertical_chainStyle="packed"
                    tools:ignore="UnknownIdInLayout">


                </HorizontalScrollView>

                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/messageList"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@+id/onushod" />

            </androidx.constraintlayout.widget.ConstraintLayout>

            <LinearLayout
                android:id="@+id/default_item"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:orientation="vertical"
                android:visibility="invisible">

                <ImageView
                    android:layout_width="200dp"
                    android:layout_height="200dp"
                    android:layout_marginBottom="5dp"
                    android:src="@drawable/logo_round"
                    tools:ignore="ContentDescription" />

                <TextView
                    android:id="@+id/default_title"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:gravity="center"
                    android:text="Nothing found"
                    android:textColor="?android:textColorPrimary"
                    android:textSize="19sp"
                    tools:ignore="HardcodedText,MissingPrefix" />

                <TextView
                    android:id="@+id/default_text"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="10dp"
                    android:layout_marginEnd="10dp"
                    android:gravity="center" />

            </LinearLayout>

        </FrameLayout>

    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

</RelativeLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/menu/menu_admin.xml b/android-app/app/src/main/res/menu/menu_admin.xml
index aded6c0..1d9b170 100644
--- a/android-app/app/src/main/res/menu/menu_admin.xml
+++ b/android-app/app/src/main/res/menu/menu_admin.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

    <item
        android:icon="@drawable/ic_trending_down_24px"
        android:orderInCategory="100"
        android:title="Pending Post"
        tools:ignore="HardcodedText" />

    <item
        android:id="@+id/action_report"
        android:icon="@drawable/ic_comment_blue"
        android:orderInCategory="200"
        android:title="Reports"
        tools:ignore="HardcodedText" />

</menu>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

    <item
        android:icon="@drawable/ic_trending_down_24px"
        android:orderInCategory="100"
        android:title="Pending Post"
        tools:ignore="HardcodedText" />

    <item
        android:id="@+id/action_issue"
        android:icon="@drawable/ic_baseline_check_circle_24"
        android:orderInCategory="200"
        android:title="Reports"
        tools:ignore="HardcodedText" />


    <item
        android:id="@+id/action_report"
        android:icon="@drawable/baseline_arrow_circle_up_24"
        android:orderInCategory="200"
        android:title="Reports"
        tools:ignore="HardcodedText" />

</menu>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/values/arrays.xml b/android-app/app/src/main/res/values/arrays.xml
index 020533d..4acee25 100644
--- a/android-app/app/src/main/res/values/arrays.xml
+++ b/android-app/app/src/main/res/values/arrays.xml
@@ -4,17 +4,15 @@
 
     <string-array name="ld_activityScreenTitles">
         <item>Home</item>
-        <item>Volunteer</item>
-        <item>STS</item>
-        <item>Offline Post</item>
-        <item>Visit DNCC Web</item>
+        <item>Volunteer Rank</item>
         <item>Nearby STS</item>
+        <item>Call DNCC Helpline</item>
         <item>Theme</item>
         <item>Log Out</item>
         <item>Admin</item>
     </string-array>
 
-    <string-array name="item_type_x" translatable="false">
+    <string-array name="item_type_x" translatable="true">
         <item>Idea</item>
         <item>Guideline</item>
         <item>Event</item>
@@ -24,13 +22,19 @@
         <item>Infographic</item>
     </string-array>
 
+
+    <string-array name="issues" translatable="true">
+        <item>Illegal Dumping</item>
+        <item>Overflow Bil</item>
+        <item>Damaged Infrastructure</item>
+        <item>Littering</item>
+    </string-array>
+
     <array name="ld_activityScreenIcons">
         <item>@drawable/ic_baseline_home_24</item>
-        <item>@drawable/ic_person_add_yellow_24dp</item>
         <item>@drawable/ic_baseline_people_outline_24</item>
-        <item>@drawable/ic_baseline_bookmark_border_24</item>
+        <item>@drawable/ic_outline_nature_people_24</item>
         <item>@drawable/ic_open_in_new_black_24dp</item>
-        <item>@drawable/ic_code_black_24dp</item>
         <item>@drawable/ic_palette_black_24dp</item>
         <item>@drawable/ic_exit_to_app_black_24dp</item>
         <item>@drawable/user_icon</item>
@@ -152,4 +156,13 @@
 
     </string-array>
 
+
+    <string-array name="states">
+        <item>Pending</item>
+        <item>Processing</item>
+        <item>Resolved</item>
+        <item>Declined</item>
+
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/values/strings.xml b/android-app/app/src/main/res/values/strings.xml
index 3a1bc19..c83ab8a 100644
--- a/android-app/app/src/main/res/values/strings.xml
+++ b/android-app/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">স্বচ্ছ ঢাকা</string>
+    <string name="app_name">স্বচ্ছ ঢাকা (クリーンダッカ)</string>
     <string name="play_quiz">Start Trip</string>
     <string name="previous_quiz">Previous Quiz</string>
     <string name="hometask_by_jahangir_hossain">EcoSync by Quantum Guys</string>
diff --git a/android-app/app/src/main/res/xml/frag_home_xml_framelayout3_scene.xml b/android-app/app/src/main/res/xml/frag_home_xml_framelayout3_scene.xml
index 0ae0dc1..72fa86b 100644
--- a/android-app/app/src/main/res/xml/frag_home_xml_framelayout3_scene.xml
+++ b/android-app/app/src/main/res/xml/frag_home_xml_framelayout3_scene.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:motion="http://schemas.android.com/apk/res-auto">

    <Transition
        motion:constraintSetEnd="@+id/end"
        motion:constraintSetStart="@id/start"
        motion:duration="1000">
        <KeyFrameSet />
        <OnSwipe
            motion:dragDirection="dragUp"
            motion:touchAnchorId="@+id/swf"
            motion:touchAnchorSide="top" />

    </Transition>

    <ConstraintSet android:id="@+id/start">
        <Constraint
            android:id="@+id/soihefawiw"
            android:layout_width="wrap_content"
            android:layout_height="50dp"
            android:layout_marginEnd="16dp"
            android:layout_marginBottom="16dp"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent">
            <CustomAttribute
                motion:attributeName="text"
                motion:customStringValue="Post" />
        </Constraint>
        <Constraint
            android:id="@+id/posts_recyclerview"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_marginTop="0dp"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent"
            motion:layout_constraintHorizontal_bias="0.5"
            motion:layout_constraintStart_toStartOf="parent"
            motion:layout_constraintTop_toBottomOf="@+id/ghujiko" />
    </ConstraintSet>

    <ConstraintSet android:id="@+id/end">
        <Constraint
            android:id="@+id/ghujiko"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"
            motion:layout_constraintBottom_toTopOf="@+id/posts_recyclerview"
            motion:layout_constraintEnd_toEndOf="parent"
            motion:layout_constraintHorizontal_bias="0.5"
            motion:layout_constraintStart_toStartOf="parent"
            motion:layout_constraintTop_toTopOf="parent"
            motion:layout_constraintVertical_chainStyle="packed" />
        <Constraint
            android:id="@+id/posts_recyclerview"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_marginTop="4dp"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent"
            motion:layout_constraintHorizontal_bias="0.5"
            motion:layout_constraintStart_toStartOf="parent"
            motion:layout_constraintTop_toTopOf="parent" />
        <Constraint
            android:id="@+id/soihefawiw"
            android:layout_width="50dp"
            android:layout_height="50dp"
            android:layout_marginEnd="16dp"
            android:layout_marginBottom="16dp"
            android:alpha="0.5"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent">
            <CustomAttribute
                motion:attributeName="text"
                motion:customStringValue="" />
        </Constraint>
    </ConstraintSet>
</MotionScene>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:motion="http://schemas.android.com/apk/res-auto">

    <Transition
        motion:constraintSetEnd="@+id/end"
        motion:constraintSetStart="@id/start"
        motion:duration="1000">
        <KeyFrameSet />
        <OnSwipe
            motion:dragDirection="dragUp"
            motion:touchAnchorId="@+id/swf"
            motion:touchAnchorSide="top" />

    </Transition>

    <ConstraintSet android:id="@+id/start">
        <Constraint
            android:id="@+id/soihefawiw"
            android:layout_width="wrap_content"
            android:layout_height="50dp"
            android:layout_marginEnd="16dp"
            android:layout_marginBottom="16dp"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent">
            <CustomAttribute
                motion:attributeName="text"
                motion:customStringValue="Add Post" />
        </Constraint>
        <Constraint
            android:id="@+id/posts_recyclerview"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_marginTop="0dp"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent"
            motion:layout_constraintHorizontal_bias="0.5"
            motion:layout_constraintStart_toStartOf="parent"
            motion:layout_constraintTop_toBottomOf="@+id/ghujiko" />
    </ConstraintSet>

    <ConstraintSet android:id="@+id/end">
        <Constraint
            android:id="@+id/ghujiko"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"
            motion:layout_constraintBottom_toTopOf="@+id/posts_recyclerview"
            motion:layout_constraintEnd_toEndOf="parent"
            motion:layout_constraintHorizontal_bias="0.5"
            motion:layout_constraintStart_toStartOf="parent"
            motion:layout_constraintTop_toTopOf="parent"
            motion:layout_constraintVertical_chainStyle="packed" />
        <Constraint
            android:id="@+id/posts_recyclerview"
            android:layout_width="0dp"
            android:layout_height="0dp"
            android:layout_marginTop="4dp"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent"
            motion:layout_constraintHorizontal_bias="0.5"
            motion:layout_constraintStart_toStartOf="parent"
            motion:layout_constraintTop_toTopOf="parent" />
        <Constraint
            android:id="@+id/soihefawiw"
            android:layout_width="50dp"
            android:layout_height="50dp"
            android:layout_marginEnd="16dp"
            android:layout_marginBottom="16dp"
            android:alpha="0.5"
            motion:layout_constraintBottom_toBottomOf="parent"
            motion:layout_constraintEnd_toEndOf="parent">
            <CustomAttribute
                motion:attributeName="text"
                motion:customStringValue="" />
        </Constraint>
    </ConstraintSet>
</MotionScene>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/xml/issue.xml b/android-app/app/src/main/res/xml/issue.xml
new file mode 100644
index 0000000..f8b919d
--- /dev/null
+++ b/android-app/app/src/main/res/xml/issue.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto">
+
+    <Transition
+        motion:constraintSetEnd="@+id/end"
+        motion:constraintSetStart="@id/start"
+        motion:duration="1000">
+        <KeyFrameSet />
+        <OnSwipe
+            motion:dragDirection="dragUp"
+            motion:touchAnchorId="@+id/swf"
+            motion:touchAnchorSide="top" />
+
+    </Transition>
+
+    <ConstraintSet android:id="@+id/start">
+        <Constraint
+            android:id="@+id/soihefawiw"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent">
+            <CustomAttribute
+                motion:attributeName="text"
+                motion:customStringValue="Add Issue" />
+        </Constraint>
+        <Constraint
+            android:id="@+id/posts_recyclerview"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="0dp"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/ghujiko" />
+    </ConstraintSet>
+
+    <ConstraintSet android:id="@+id/end">
+        <Constraint
+            android:id="@+id/ghujiko"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            motion:layout_constraintBottom_toTopOf="@+id/posts_recyclerview"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toTopOf="parent"
+            motion:layout_constraintVertical_chainStyle="packed" />
+        <Constraint
+            android:id="@+id/posts_recyclerview"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="4dp"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toTopOf="parent" />
+        <Constraint
+            android:id="@+id/soihefawiw"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:alpha="0.5"
+            motion:layout_constraintBottom_toBottomOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent">
+            <CustomAttribute
+                motion:attributeName="text"
+                motion:customStringValue="" />
+        </Constraint>
+    </ConstraintSet>
+</MotionScene>
\ No newline at end of file
diff --git a/express-server/src/controllers/contractor.controller.ts b/express-server/src/controllers/contractor.controller.ts
index c291315..1af3a86 100644
--- a/express-server/src/controllers/contractor.controller.ts
+++ b/express-server/src/controllers/contractor.controller.ts
@@ -146,6 +146,23 @@ router.get('/contractor/:id', auth.required, async (req: Request, res: Response)
     }
 });
 
+router.get('/contractor2/:id', auth.required, async (req: Request, res: Response) => {
+    try {
+        const contractor = await prisma.contractor.findUnique({
+            where: {
+                id: Number(req.params.id)
+            },
+            include: {
+                managers: true,
+                employees: true,
+            }
+        });
+        res.status(200).json(contractor);
+    } catch (error) {
+        res.status(400).json({ message: error.message });
+    }
+});
+
 // delete a contractor by id
 router.delete('/contractor/:id', auth.required,auth.isSystemAdmin, async (req: Request, res: Response) => {
     try {