diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java b/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java index bd8d9f5..9d75fe3 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java @@ -25,10 +25,10 @@ public class ScoutingDataWriter { for(int i = 0; i < data.length; i++){ switch (data[i].getValueType()){ case NUM: - bb.addInt((int) data[i].get()); + bb.addInt((int) data[i].forceGetValue()); break; case STRING: - bb.addString((String) data[i].get()); + bb.addString((String) data[i].forceGetValue()); break; } } @@ -62,12 +62,12 @@ public class ScoutingDataWriter { for(int i = 0; i < values[version].length; i++){ switch (objects.get(i+2).getType()){ case 1: - dataTypes[i] = new intType(values[version][i].name, (int) objects.get(i+2).get()); + dataTypes[i] = intType.newNull(values[version][i].name); + dataTypes[i].forceSetValue(objects.get(i+2).get()); break; case 2: - String name = values[version][i].name; - String value = (String) objects.get(i+2).get(); - dataTypes[i] = new stringType(name, value); + dataTypes[i] = stringType.newNull(values[version][i].name); + dataTypes[i].forceSetValue(objects.get(i+2).get()); break; } } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/fields.java b/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/fields.java index 7607ac0..1c0263d 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/fields.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/fields.java @@ -31,7 +31,7 @@ public class fields { new sliderType("Overall Driving Performance", 5, 1, 10), new textType("Overall Driving Comments", "None"), new sliderType("Score area (AMP <-> Speaker)", 5, 1, 10), - new dropdownType("End Condition", new String[]{"Nothing", "Attempted Climb", "Successful Climbed", "Climbed with multiple robots", "Climbed with trapz"}, 1), + new dropdownType("End Condition", new String[]{"Nothing", "Attempted Climb", "Successful Climbed", "Climbed with multiple robots", "Climbed with trap"}, 1), new dropdownType("Robot Condition", new String[]{"Everything was working", "Something seemed to be broken", "Something was broken", "Missing robot (Joe Johnson)"}, 1), new textType("Other Comments", "None") } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/data/intType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/data/intType.java index bffeff3..fc52ba7 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/data/intType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/data/intType.java @@ -16,11 +16,11 @@ public class intType extends dataType { // } public Object get(){ - return (int) forceGetValue()+2; + return (int) forceGetValue()-2; } public void set(Object value){ - forceSetValue((int) value - 2); + forceSetValue((int) value + 2); } public intType(String name, int value) { diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/data/stringType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/data/stringType.java index b55cafd..63a7563 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/data/stringType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/data/stringType.java @@ -25,7 +25,7 @@ public class stringType extends dataType{ public stringType(String name, String value) { super(name); - forceSetValue(value+2); + forceSetValue(value); } public static stringType newNull(String name){ diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/dropdownType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/dropdownType.java index e4ea4d9..1a3b632 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/dropdownType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/dropdownType.java @@ -115,7 +115,7 @@ public class dropdownType extends inputType { // }); return dropdown; - }; + } public void setViewValue(Object value) { if(dropdown == null) return; if(intType.isNull((int) value)){ diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/tallyType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/tallyType.java index 070d376..9edda37 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/tallyType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/tallyType.java @@ -33,7 +33,7 @@ public class tallyType extends inputType { public String get_type_name(){return "Dropdown";} public tallyType(String name, int default_value){ super(name); - this.default_value = default_value; + this.default_value = default_value+2; } @@ -73,14 +73,14 @@ public class tallyType extends inputType { public void setViewValue(Object value) { if(tally == null) return; System.out.println(value); - if(((int)value) == 0){ + if((int)value == intType.nullval || (int)value == intType.unselectedval){ nullify(); return; } isBlank = false; tally.setVisibility(View.VISIBLE); - tally.setValue((int)value); + tally.setValue((int) value-2); } public void nullify(){ isBlank = true; diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/MatchScoutingFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/MatchScoutingFragment.java index c30033a..f52d2ee 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/MatchScoutingFragment.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/MatchScoutingFragment.java @@ -303,7 +303,7 @@ public class MatchScoutingFragment extends Fragment { for(int i = 0; i < DataManager.match_latest_values.length; i++){ // types[i] = latest_values[i].getViewValue(); - DataManager.match_latest_values[i].setViewValue(types[i]); + DataManager.match_latest_values[i].setViewValue(types[i].get()); if(DataManager.match_latest_values[i].isBlank){ titles[i].setBackgroundColor(0xffff0000);