Merge pull request #93 from jmsherrier/yitian

Temp check style fix

Author: jmsherrier

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/adapter/BudgetAdapter.java

@@ -4,7 +4,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/adapter/CircleAdapter.java

@@ -14,7 +14,6 @@
 
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 /**

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/model/ThresholdNotification.java

@@ -1,17 +1,43 @@
 package com.example.sprintproject.model;
 
+/**
+ * Represents a budget threshold notification, including the budget info,
+ * the threshold percentage, and the current spending progress.
+ */
 public class ThresholdNotification {
-    public final String id;
-    public final String budgetId;
-    public final String budgetTitle;
-    public final int thresholdPercent;
-    public final double progress;
+    private final String id;
+    private final String budgetId;
+    private final String budgetTitle;
+    private final int thresholdPercent;
+    private final double progress;
 
-    public ThresholdNotification(String budgetId, String budgetTitle, int thresholdPercent, double progress) {
+    public ThresholdNotification(
+            String budgetId, String budgetTitle,
+            int thresholdPercent, double progress) {
         this.budgetId = budgetId;
         this.budgetTitle = budgetTitle;
         this.thresholdPercent = thresholdPercent;
         this.progress = progress;
         this.id = budgetId + "_" + thresholdPercent;
     }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getBudgetId() {
+        return budgetId;
+    }
+
+    public String getBudgetTitle() {
+        return budgetTitle;
+    }
+
+    public int getThresholdPercent() {
+        return thresholdPercent;
+    }
+
+    public double getProgress() {
+        return progress;
+    }
 }

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/repository/SavingsCircleRepository.java

@@ -12,6 +12,7 @@
 import com.google.firebase.firestore.ListenerRegistration;
 import com.google.firebase.firestore.Query;
 import com.google.firebase.firestore.QueryDocumentSnapshot;
+import com.google.firebase.firestore.QuerySnapshot;
 
 
 import java.util.ArrayList;
@@ -132,7 +133,7 @@ public void loadUserCircles(String userId, RepositoryCallback<List<SavingsCircle
                         e -> callback.onError("Error loading circles: " + e.getMessage()));
     }
 
-    private List<String> extractCircleIds(com.google.firebase.firestore.QuerySnapshot querySnapshot) {
+    private List<String> extractCircleIds(QuerySnapshot querySnapshot) {
         List<String> circleIds = new ArrayList<>();
         for (QueryDocumentSnapshot circleDoc : querySnapshot) {
             circleIds.add(circleDoc.getId());
@@ -146,13 +147,16 @@ private void checkMembershipAndLoadCircles(String userId, List<String> circleIds
         final int[] completed = {0};
 
         for (String circleId : circleIds) {
-            checkMembershipForCircle(userId, circleId, userCircles, completed, circleIds.size(), callback);
+            checkMembershipForCircle(
+                    userId, circleId, userCircles,
+                    completed, circleIds.size(), callback);
         }
     }
 
     private void checkMembershipForCircle(String userId, String circleId,
                                          List<SavingsCircle> userCircles, int[] completed,
-                                         int totalCircles, RepositoryCallback<List<SavingsCircle>> callback) {
+                                         int totalCircles,
+                                          RepositoryCallback<List<SavingsCircle>> callback) {
         db.collection(COLLECTION_SAVINGS_CIRCLES)
                 .document(circleId)
                 .collection(COLLECTION_MEMBERS)
@@ -167,7 +171,7 @@ private void checkMembershipForCircle(String userId, String circleId,
                 })
                 .addOnFailureListener(e ->
                     incrementCompleted(completed, totalCircles, userCircles, callback)
-                );
+            );
     }
 
     private void loadCircleForUser(String circleId, List<SavingsCircle> userCircles,
@@ -413,7 +417,7 @@ private void processInvitationAcceptance(String invitationId,
                 )
                 .addOnFailureListener(e ->
                     callback.onError("Error updating invitation: " + e.getMessage())
-                );
+            );
     }
 
     private void loadCircleAndAddMember(String circleId, String userId,
@@ -474,7 +478,7 @@ public void declineInvitation(String invitationId,
                             .addOnSuccessListener(aVoid -> callback.onSuccess(null))
                             .addOnFailureListener(e -> callback.onError(
                                 "Error declining invitation: " + e.getMessage())
-                            );
+                        );
                 })
                 .addOnFailureListener(e -> callback.onError(
                     "Error loading invitation: " + e.getMessage()));

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/utils/NotificationQueue.java

@@ -17,13 +17,17 @@ public NotificationQueue(OnShow onShow) {
         this.onShow = onShow;
     }
     public synchronized void enqueue(ThresholdNotification item) {
-        if (item == null) return;
+        if (item == null) {
+            return;
+        }
         queue.offer(item);
         run();
     }
 
     private synchronized void run() {
-        if (running) return;
+        if (running) {
+            return;
+        }
         running = true;
         processNext();
     }

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/view/ExpenseLogFragment.java

@@ -67,7 +67,8 @@ public View onCreateView(@NonNull LayoutInflater inflater,
                              @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.activity_expense_log, container, false);
 
-        TimeViewModel timeViewModel = new ViewModelProvider(requireActivity()).get(TimeViewModel.class);
+        TimeViewModel timeViewModel =
+                new ViewModelProvider(requireActivity()).get(TimeViewModel.class);
 
         timeViewModel.getCurrentDate().observe(getViewLifecycleOwner(), date -> {
             SimpleDateFormat fmt =
@@ -368,11 +369,11 @@ public int compare(Expense e1, Expense e2) {
                     })
                     .addOnFailureListener(e ->
                         Log.e("ExpenseLog", "Error creating seed expense 2", e)
-                    );
+                );
             })
             .addOnFailureListener(e ->
                 Log.e("ExpenseLog", "Error creating seed expense 1", e)
-            );
+        );
     }
 
     private void updateUI() {

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/view/SavingsCirclesFragment.java

@@ -128,7 +128,8 @@ private void observeData() {
         });
 
         // Observe pending invitations
-        viewModel.getPendingInvitations().observe(getViewLifecycleOwner(), this::updateInvitationsList);
+        viewModel.getPendingInvitations().observe(
+                getViewLifecycleOwner(), this::updateInvitationsList);
     }
 
     private void updateInvitationsList(List<CircleInvitation> invitations) {

Project/Sprint0.5-main/app/src/main/java/com/example/sprintproject/viewmodel/DashboardViewModel.java

@@ -178,13 +178,21 @@ private void addBudgetBarEntry(List<BarEntry> barEntries, List<String> labels,
     }
 
     private static class BarChartData {
-        final List<BarEntry> barEntries;
-        final List<String> labels;
+        private List<BarEntry> barEntries;
+        private List<String> labels;
 
         BarChartData(List<BarEntry> barEntries, List<String> labels) {
             this.barEntries = barEntries;
             this.labels = labels;
         }
+
+        public List<BarEntry> getBarEntries() {
+            return barEntries;
+        }
+
+        public List<String> getLabels() {
+            return labels;
+        }
     }
 
     public void checkExpenseReminder() {
@@ -212,7 +220,9 @@ public void checkExpenseReminder() {
 
             // prevent repeated pop-ups in the same day
             if (lastReminderShownDate != null) {
-                long diffSinceReminder = (System.currentTimeMillis() - lastReminderShownDate.getTime()) / (1000L * 60 * 60 * 24);
+                long diffSinceReminder =
+                        (System.currentTimeMillis() - lastReminderShownDate.getTime())
+                                / (1000L * 60 * 60 * 24);
                 if (diffSinceReminder < 1) {
                     Log.d("REMINDER_DEBUG", "Reminder already shown today → skipping");
                     return;