From 73308f2accf0467c30ab3d401430626c458e8693 Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Wed, 8 Oct 2025 20:23:11 -0600
Subject: [PATCH] Fix TBA Event coloring

---
 .../ridgescout/ui/scouting/ScoutingFragment.java            | 4 +++-
 .../ridgescout/ui/transfer/TBASelectorFragment.java         | 6 +++---
 .../java/com/ridgebotics/ridgescout/utility/Colors.java     | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/ScoutingFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/ScoutingFragment.java
index e18241c..e988bc8 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/ScoutingFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/ScoutingFragment.java
@@ -164,6 +164,9 @@ public class ScoutingFragment extends Fragment {
         } else {
             int teamNum = SettingsManager.getTeamNum();
             int curMatchNum = SettingsManager.getMatchNum();
+
+            binding.textMatchAlliance.setText("Match: " + (curMatchNum+1) + ", " + SettingsManager.getAllyPos());
+
             int nextMatch;
             try {
                 nextMatch = event.getNextTeamMatch(teamNum, curMatchNum).matchIndex;
@@ -172,7 +175,6 @@ public class ScoutingFragment extends Fragment {
                 return;
             }
 
-            binding.textMatchAlliance.setText("Match: " + (curMatchNum+1) + ", " + SettingsManager.getAllyPos());
 
             binding.infoBox.addView(new TextViewBuilder(getContext(), "Our next match: Match " + nextMatch)
                     .body1()
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBASelectorFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBASelectorFragment.java
index 15c5918..f2cb7f5 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBASelectorFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBASelectorFragment.java
@@ -165,12 +165,12 @@ public class TBASelectorFragment extends Fragment {
                 try {
                     Date startDate = format.parse(j.getString("start_date"));
                     Date endDate = format.parse(j.getString("end_date"));
-                    if(currentTime.after(endDate)){
+                    if(currentTime.after(startDate) && currentTime.before(endDate)) {
+                        row.setColor(tba_current);
+                    } else if(currentTime.after(endDate)){
                         row.setColor(tba_previous);
                     }else if(currentTime.before(startDate)){
                         row.setColor(tba_next);
-                    }else if(currentTime.after(startDate) && currentTime.before(endDate)){
-                        row.setColor(tba_current);
                     }
                 } catch (Exception e) {
                     AlertManager.error("Failed finding start and end dates!", e);
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/utility/Colors.java b/app/src/main/java/com/ridgebotics/ridgescout/utility/Colors.java
index a621b9a..c524ce8 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/utility/Colors.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/utility/Colors.java
@@ -67,9 +67,9 @@ public class Colors {
     public static final int fileselector_unselected_color = 0x50006600;
 
     // TBA
-    public static final int tba_previous = 0x30FF0000;
-    public static final int tba_current = 0x50ff0000;
-    public static final int tba_next = 0x30FFFF00;
+    public static final int tba_previous = Color.argb(30, 64,64,64);
+    public static final int tba_current = 0x7f00ff00;
+    public static final int tba_next =  Color.argb(30, 192,192,192);
     public static final int tba_red = 0x50ff0000;
     public static final int tba_blue = 0x500000ff;
     public static final int tba_toggle_background = 0x30000000;