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 9d75fe3..dd60387 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java @@ -61,13 +61,15 @@ public class ScoutingDataWriter { for(int i = 0; i < values[version].length; i++){ switch (objects.get(i+2).getType()){ - case 1: + case 1: // Int dataTypes[i] = intType.newNull(values[version][i].name); dataTypes[i].forceSetValue(objects.get(i+2).get()); + System.out.println("Loaded INT: " + values[version][i].name + ", ("+ dataTypes[i].get() +")"); break; - case 2: + case 2: // String dataTypes[i] = stringType.newNull(values[version][i].name); dataTypes[i].forceSetValue(objects.get(i+2).get()); + System.out.println("Loaded STR: " + values[version][i].name + ", ("+ dataTypes[i].get() +")"); break; } } 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 fc52ba7..c70b939 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 @@ -3,6 +3,7 @@ package com.astatin3.scoutingapp2025.types.data; public class intType extends dataType { public static final int nullval = 0; public static final int unselectedval = 1; + public static final int offset = 2; public valueTypes getValueType() { return valueTypes.NUM; @@ -25,7 +26,7 @@ public class intType extends dataType { public intType(String name, int value) { super(name); - forceSetValue(value+2); + set(value); } public static intType newNull(String name){ diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/inputType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/inputType.java index f7fe6a8..6d94c93 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/inputType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/inputType.java @@ -19,7 +19,6 @@ public abstract class inputType { public static final int notesType = 253; public static final int tallyType = 252; public enum inputTypes { - // USERNAME, SLIDER, DROPDOWN, NOTES_INPUT, diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java index e361647..8e0dd35 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java @@ -79,8 +79,8 @@ public class sliderType extends inputType { } }); return slider; - } + public void setViewValue(Object value) { if(slider == 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 9edda37..9298fea 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+2; + this.default_value = default_value; } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/textType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/textType.java index 7604527..34cc7be 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/textType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/textType.java @@ -1,5 +1,7 @@ package com.astatin3.scoutingapp2025.types.input; +import static com.astatin3.scoutingapp2025.types.data.intType.offset; + import android.content.Context; import android.graphics.Color; import android.text.Editable; @@ -28,6 +30,7 @@ import java.util.List; import java.util.function.Function; public class textType extends inputType { + public int get_byte_id() {return notesType;} public inputTypes getInputType(){return inputTypes.NOTES_INPUT;} public dataType.valueTypes getValueType(){return dataType.valueTypes.STRING;}