diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/FieldPosView.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/FieldPosView.java index 4ddccb3..7fae79c 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/FieldPosView.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/FieldPosView.java @@ -72,7 +72,7 @@ public class FieldPosView extends FrameLayout { return false; }); - setImageResource(R.drawable.field_2024); + setImageResource(R.drawable.field_2025); } diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/MultiFieldPosView.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/MultiFieldPosView.java index bddde95..b0e5119 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/MultiFieldPosView.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/MultiFieldPosView.java @@ -52,7 +52,7 @@ public class MultiFieldPosView extends FrameLayout { imageView.setAdjustViewBounds(true); addView(imageView); - setImageResource(R.drawable.field_2024); + setImageResource(R.drawable.field_2025); } 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 eae13e9..9f29e87 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 @@ -16,6 +16,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.ridgebotics.ridgescout.R; +import com.ridgebotics.ridgescout.utility.AlertManager; import com.ridgebotics.ridgescout.utility.settingsManager; import com.ridgebotics.ridgescout.databinding.FragmentScoutingBinding; import com.ridgebotics.ridgescout.types.frcTeam; @@ -36,7 +37,9 @@ public class ScoutingFragment extends Fragment { String evcode = settingsManager.getEVCode(); - if(evcode.equals("unset")){ + DataManager.reload_event(); + + if(event == null){ binding.noEventError.setVisibility(View.VISIBLE); binding.matchScoutingButton.setEnabled(false); binding.pitScoutingButton.setEnabled(false); @@ -45,11 +48,6 @@ public class ScoutingFragment extends Fragment { return binding.getRoot(); } - DataManager.reload_event(); - - if(event.matches.isEmpty()) - binding.matchScoutingButton.setVisibility(View.GONE); - binding.matchScoutingButton.setOnClickListener(v -> { findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_match_scouting); }); diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java index ff920aa..cafbcd1 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java @@ -143,6 +143,8 @@ public class FTPSync extends Thread { for (String remoteFile : remoteTimestamps.keySet()) { File localFile = new File(baseDir, remoteFile); if(remoteFile.equals(timestampsFilename)) continue; + // Remove meta files if the option is disabled + if(!sendMetaFiles && meta_string_array.contains(remoteFile)) continue; // Date t1 = getLocalFileUtcTimestamp(localFile); // Date t2 = getUtcTimestamp(remoteFile); diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBAFragment.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBAFragment.java index 481d0b4..e1017f1 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBAFragment.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBAFragment.java @@ -58,6 +58,10 @@ public class TBAFragment extends Fragment { final RequestTask rq = new RequestTask(); rq.onResult(s -> { + if(s == null || s.isEmpty()) { + AlertManager.error("Could not fetch event!"); + return null; + } eventTable(s); return null; }); diff --git a/app/src/main/java/com/ridgebotics/ridgescout/utility/DataManager.java b/app/src/main/java/com/ridgebotics/ridgescout/utility/DataManager.java index d79664a..b1a0bfd 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/utility/DataManager.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/utility/DataManager.java @@ -10,7 +10,16 @@ public class DataManager { public static frcEvent event; public static void reload_event(){ evcode = getevcode(); + + if(evcode.equals("unset")) return; + event = frcEvent.decode(fileEditor.readFile(evcode + ".eventdata")); + + if(event == null) { + AlertManager.error("Failed to load event!"); + settingsManager.setEVCode("unset"); + evcode = "unset"; + } } public static String getevcode() { diff --git a/app/src/main/res/drawable/field_2024.png b/app/src/main/res/drawable/field_2024.png deleted file mode 100644 index a2a7665..0000000 Binary files a/app/src/main/res/drawable/field_2024.png and /dev/null differ diff --git a/app/src/main/res/drawable/field_2025.png b/app/src/main/res/drawable/field_2025.png new file mode 100644 index 0000000..43b79fe Binary files /dev/null and b/app/src/main/res/drawable/field_2025.png differ diff --git a/app/src/main/res/drawable/field_2025_background.png b/app/src/main/res/drawable/field_2025_background.png new file mode 100644 index 0000000..c682e98 Binary files /dev/null and b/app/src/main/res/drawable/field_2025_background.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7608095..bc2b7a6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,6 +6,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + +