diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/EventFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/EventFragment.java
index 3bc183c..8bc0c03 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/EventFragment.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/EventFragment.java
@@ -108,12 +108,11 @@ public class EventFragment extends Fragment {
if(rescout[0]) {
text.setBackgroundColor(color_rescout);
DataManager.rescout_list.add(filename);
- DataManager.save_rescout_list();
}else{
text.setBackgroundColor(color_found);
DataManager.rescout_list.remove(filename);
- DataManager.save_rescout_list();
}
+ DataManager.save_rescout_list();
return true;
});
}else{
@@ -179,12 +178,11 @@ public class EventFragment extends Fragment {
if(rescout[0]) {
text.setBackgroundColor(color_rescout);
DataManager.rescout_list.add(filename);
- DataManager.save_rescout_list();
}else{
text.setBackgroundColor(color_found);
DataManager.rescout_list.remove(filename);
- DataManager.save_rescout_list();
}
+ DataManager.save_rescout_list();
return true;
});
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 cb578bc..ae5579e 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
@@ -3,6 +3,7 @@ package com.ridgebotics.ridgescout.ui.scouting;
import static android.widget.LinearLayout.VERTICAL;
import static androidx.navigation.fragment.FragmentKt.findNavController;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
import static com.ridgebotics.ridgescout.utility.DataManager.event;
import android.app.AlertDialog;
@@ -27,6 +28,7 @@ import com.ridgebotics.ridgescout.databinding.FragmentScoutingBinding;
import com.ridgebotics.ridgescout.utility.DataManager;
import java.util.ArrayList;
+import java.util.Set;
public class ScoutingFragment extends Fragment {
@@ -82,6 +84,12 @@ public class ScoutingFragment extends Fragment {
if(event == null){
binding.noEventError.setVisibility(View.VISIBLE);
+
+ binding.textMatchAlliance.setVisibility(View.GONE);
+ binding.textName.setVisibility(View.GONE);
+ binding.textNextMatch.setVisibility(View.GONE);
+ binding.textRescoutIndicator.setVisibility(View.GONE);
+
binding.matchScoutingButton.setEnabled(false);
binding.pitScoutingButton.setEnabled(false);
binding.eventButton.setEnabled(false);
@@ -113,6 +121,21 @@ public class ScoutingFragment extends Fragment {
findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_scouting_event);
});
+
+ binding.textName.setText("Welcome, " + SettingsManager.getUsername() + "!");
+
+ int nextMatch = -1;
+ int teamNum = SettingsManager.getTeamNum();
+ for(int i = SettingsManager.getMatchNum(); i < event.matches.size(); i++){ // Loop through matches and find next match
+ boolean foundMatch = false;
+ for(int a = 0; a < 3; a++) if(event.matches.get(i).blueAlliance[a] == teamNum){nextMatch = i+1; foundMatch = true;}
+ for(int a = 0; a < 3; a++) if(event.matches.get(i).redAlliance[a] == teamNum){nextMatch = i+1; foundMatch = true;}
+ if(foundMatch) break;
+ }
+ binding.textNextMatch.setText("Our next match: Match " + nextMatch);
+ binding.textMatchAlliance.setText("Match: " + (SettingsManager.getMatchNum()+1) + ", " + SettingsManager.getAllyPos());
+ binding.textRescoutIndicator.setText("Things to rescout: " + DataManager.rescout_list.size());
+
return binding.getRoot();
}
diff --git a/app/src/main/java/com/ridgebotics/ridgescout/utility/FileEditor.java b/app/src/main/java/com/ridgebotics/ridgescout/utility/FileEditor.java
index aec5a20..66e6497 100644
--- a/app/src/main/java/com/ridgebotics/ridgescout/utility/FileEditor.java
+++ b/app/src/main/java/com/ridgebotics/ridgescout/utility/FileEditor.java
@@ -265,7 +265,7 @@ public final class FileEditor {
}
public static boolean deleteFile(String filepath){
- if(fileExist(filepath)){
+ if(!fileExist(filepath)){
return true;
}
File file = new File(baseDir + filepath);
diff --git a/app/src/main/res/layout/fragment_scouting.xml b/app/src/main/res/layout/fragment_scouting.xml
index 9ec1c31..ec8291f 100644
--- a/app/src/main/res/layout/fragment_scouting.xml
+++ b/app/src/main/res/layout/fragment_scouting.xml
@@ -30,8 +30,10 @@
android:layout_marginBottom="48dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0">
+
+
+
+
+
+
+
+
-
\ No newline at end of file