Merge branch 'main' of https://github.com/JHM69/CS24-p2-quantum_guys

Author: asfi50

android-app/.idea/deploymentTargetSelector.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,26 +62,17 @@
                     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" />
         <activity android:name="com.quantum_guys.dncc_eco_sync.ui.activities.issue.IssuesDetailsActivity" />
         <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">

android-app/app/src/main/AndroidManifest.xml

@@ -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;

android-app/app/src/main/assets/video_loading_bg.svg

@@ -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);

android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/CommentsAdapter.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

android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/adapters/FriendRequestAdapter.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,20 +56,20 @@
 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;
 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.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;