Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-09 08:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some random bugfixes and changes

Browse Source
This commit is contained in:
Astatin3
2024-08-01 11:54:46 -06:00
parent 230ba0857b
commit 96cdda23ca
17 changed files with 129 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/astatin3/scoutingapp2025/types/frcEvent.java
+27 -18
View File
@@ -1,44 +1,44 @@
package com.astatin3.scoutingapp2025.types;
import androidx.annotation.NonNull;
import com.astatin3.scoutingapp2025.utility.AlertManager;
import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
import com.astatin3.scoutingapp2025.utility.ByteBuilder;
import java.util.ArrayList;
public class frcEvent {
public static final int typecode = 254;
public String eventCode;
public String name;
public ArrayList<frcMatch> matches;
public ArrayList<frcTeam> teams;
public byte[] encode(){
public byte[] encode() {
try {
ByteBuilder bb = new ByteBuilder()
.addString(eventCode)
.addString(name);
.addString(eventCode)
.addString(name);
for(frcTeam teams : teams){
for (frcTeam teams : teams) {
bb.addRaw(frcTeam.typecode, teams.encode());
}
for(frcMatch match : matches){
for (frcMatch match : matches) {
bb.addRaw(frcMatch.typecode, match.encode());
}
return bb.build();
} catch (ByteBuilder.buildingException e) {
AlertManager.error(e);
return null;
}
}
public static frcEvent decode(byte[] bytes){
try{
ArrayList<BuiltByteParser.parsedObject> objects = new BuiltByteParser(bytes).parse();
public static frcEvent decode(byte[] bytes) {
try {
ArrayList<BuiltByteParser.parsedObject> objects =
new BuiltByteParser(bytes).parse();
frcEvent frc = new frcEvent();
@@ -48,23 +48,32 @@ public class frcEvent {
frc.matches = new ArrayList<>();
frc.teams = new ArrayList<>();
for(BuiltByteParser.parsedObject object : objects){
if(object.getType() == frcTeam.typecode){
for (BuiltByteParser.parsedObject object : objects) {
if (object.getType() == frcTeam.typecode) {
frc.teams.add(frcTeam.decode((byte[]) object.get()));
}else if(object.getType() == frcMatch.typecode){
} else if (object.getType() == frcMatch.typecode) {
frc.matches.add(frcMatch.decode((byte[]) object.get()));
}
}
return frc;
}catch (BuiltByteParser.byteParsingExeption e){
} catch (BuiltByteParser.byteParsingExeption e) {
AlertManager.error(e);
return null;
}
}
@NonNull
public String toString(){
return "frcEvent Name: " + name + ", Code: " + eventCode + " numTeams: " + teams.size() + " numMatches: " + matches.size();
public String toString() {
return (
"frcEvent Name: " +
name +
", Code: " +
eventCode +
" numTeams: " +
teams.size() +
" numMatches: " +
matches.size()
);
}
}
app/src/main/java/com/astatin3/scoutingapp2025/types/input/dropdownType.java
+6 -3
View File
@@ -82,18 +82,21 @@ public class dropdownType extends inputType {
iconSpinnerItems.add(new IconSpinnerItem(text_options[i]));
}
IconSpinnerAdapter iconSpinnerAdapter = new IconSpinnerAdapter(dropdown);
dropdown.setGravity(Gravity.CENTER);
dropdown.setSpinnerAdapter(iconSpinnerAdapter);
dropdown.setItems(iconSpinnerItems);
dropdown.selectItemByIndex((int) default_value);
dropdown.setPadding(10,10,10,10);
dropdown.setPadding(10,20,10,20);
dropdown.setBackgroundColor(0xf0000000);
dropdown.setTextColor(0xff00ff00);
dropdown.setTextSize(15);
dropdown.setTextSize(14.5f);
dropdown.setArrowGravity(SpinnerGravity.END);
dropdown.setArrowPadding(8);
dropdown.setSpinnerItemHeight(46);
// dropdown.setSpinnerItemHeight(46);
dropdown.setSpinnerPopupElevation(14);
app/src/main/java/com/astatin3/scoutingapp2025/ui/TeamSelectorFragment.java
+5 -8
View File
@@ -1,5 +1,8 @@
package com.astatin3.scoutingapp2025.ui;
import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
import static com.astatin3.scoutingapp2025.utility.DataManager.event;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -18,6 +21,7 @@ import com.astatin3.scoutingapp2025.databinding.FragmentTeamSelectorBinding;
import com.astatin3.scoutingapp2025.types.frcEvent;
import com.astatin3.scoutingapp2025.types.frcTeam;
import com.astatin3.scoutingapp2025.utility.AlertManager;
import com.astatin3.scoutingapp2025.utility.DataManager;
import com.astatin3.scoutingapp2025.utility.fileEditor;
import java.util.Arrays;
@@ -25,13 +29,6 @@ import java.util.Arrays;
public class TeamSelectorFragment extends Fragment {
private FragmentTeamSelectorBinding binding;
private String evcode;
private static frcEvent event;
public static void setEvent(frcEvent tmpevent){
event = tmpevent;
}
private static boolean pits_mode;
public static void setPits_mode(boolean mode){
pits_mode = mode;
@@ -52,7 +49,7 @@ public class TeamSelectorFragment extends Fragment {
binding = FragmentTeamSelectorBinding.inflate(inflater, container, false);
// event = fileEditor.g
evcode = latestSettings.settings.get_evcode();
DataManager.reload_event();
if(evcode == null || evcode.equals("unset")){
AlertManager.error("You somehow have not loaded an event!");
app/src/main/java/com/astatin3/scoutingapp2025/ui/data/CompileFragment.java → app/src/main/java/com/astatin3/scoutingapp2025/ui/data/ReportFragment.java
+4 -4
View File
@@ -9,15 +9,15 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.astatin3.scoutingapp2025.databinding.FragmentDataCompileBinding;
import com.astatin3.scoutingapp2025.databinding.FragmentDataReportBinding;
public class CompileFragment extends Fragment {
FragmentDataCompileBinding binding;
public class ReportFragment extends Fragment {
FragmentDataReportBinding binding;
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
binding = FragmentDataCompileBinding.inflate(inflater, container, false);
binding = FragmentDataReportBinding.inflate(inflater, container, false);
return binding.getRoot();
}
app/src/main/java/com/astatin3/scoutingapp2025/ui/data/TeamsFragment.java
+2 -2
View File
@@ -96,13 +96,13 @@ public class TeamsFragment extends Fragment {
dropdown.selectItemByIndex(0);
dropdown.setPadding(15,15,15,15);
dropdown.setPadding(10,20,10,20);
dropdown.setBackgroundColor(0xf0000000);
dropdown.setTextColor(0xff00ff00);
dropdown.setTextSize(15);
dropdown.setArrowGravity(SpinnerGravity.END);
dropdown.setArrowPadding(8);
dropdown.setSpinnerItemHeight(46);
// dropdown.setSpinnerItemHeight(46);
dropdown.setSpinnerPopupElevation(14);
app/src/main/java/com/astatin3/scoutingapp2025/ui/data/dataFragment.java
+3 -8
View File
@@ -41,9 +41,9 @@ public class dataFragment extends Fragment {
binding.noEventError.setVisibility(View.VISIBLE);
binding.buttons.setVisibility(View.VISIBLE);
binding.statusButton.setVisibility(View.GONE);
binding.teamsButton.setVisibility(View.GONE);
binding.compileButton.setVisibility(View.GONE);
binding.compareButton.setVisibility(View.GONE);
binding.reportButton.setVisibility(View.GONE);
binding.fieldsButton.setVisibility(View.VISIBLE);
@@ -52,12 +52,7 @@ public class dataFragment extends Fragment {
frcEvent event = frcEvent.decode(fileEditor.readFile(evcode + ".eventdata"));
binding.statusButton.setOnClickListener(v -> {
findNavController(this).navigate(R.id.action_navigation_data_to_navigation_data_status);
});
binding.teamsButton.setOnClickListener(v -> {
TeamSelectorFragment.setEvent(event);
TeamSelectorFragment.setPits_mode(false);
TeamSelectorFragment.setOnSelect(new TeamSelectorFragment.onTeamSelected() {
@Override
@@ -69,7 +64,7 @@ public class dataFragment extends Fragment {
findNavController(this).navigate(R.id.action_navigation_data_to_navigation_team_selector);
});
binding.compileButton.setOnClickListener(v -> {
binding.reportButton.setOnClickListener(v -> {
findNavController(this).navigate(R.id.action_navigation_data_to_navigation_data_compile);
});
app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/PitScoutingFragment.java
+1 -1
View File
@@ -1,5 +1,6 @@
package com.astatin3.scoutingapp2025.ui.scouting;
import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
import static com.astatin3.scoutingapp2025.utility.DataManager.pit_latest_values;
import static com.astatin3.scoutingapp2025.utility.DataManager.pit_transferValues;
import static com.astatin3.scoutingapp2025.utility.DataManager.pit_values;
@@ -54,7 +55,6 @@ public class PitScoutingFragment extends Fragment {
boolean edited = false;
String evcode;
String filename;
String username;
app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/ScoutingFragment.java
+4 -1
View File
@@ -53,7 +53,6 @@ public class ScoutingFragment extends Fragment {
});
binding.pitScoutingButton.setOnClickListener(v -> {
TeamSelectorFragment.setEvent(event);
TeamSelectorFragment.setPits_mode(true);
TeamSelectorFragment.setOnSelect(new TeamSelectorFragment.onTeamSelected() {
@Override
@@ -65,6 +64,10 @@ public class ScoutingFragment extends Fragment {
findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_team_selector);
});
binding.statusButton.setOnClickListener(v -> {
findNavController(this).navigate(R.id.action_navigation_data_to_navigation_data_status);
});
return binding.getRoot();
}
app/src/main/java/com/astatin3/scoutingapp2025/ui/data/StatusFragment.java → app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/StatusFragment.java
+4 -4
View File
@@ -1,4 +1,4 @@
package com.astatin3.scoutingapp2025.ui.data;
package com.astatin3.scoutingapp2025.ui.scouting;
import static com.astatin3.scoutingapp2025.utility.DataManager.event;
@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.astatin3.scoutingapp2025.databinding.FragmentDataStatusBinding;
import com.astatin3.scoutingapp2025.databinding.FragmentScoutingStatusBinding;
import com.astatin3.scoutingapp2025.utility.DataManager;
import com.astatin3.scoutingapp2025.utility.fileEditor;
import com.astatin3.scoutingapp2025.types.frcEvent;
@@ -23,12 +23,12 @@ import com.astatin3.scoutingapp2025.types.frcMatch;
import java.util.Arrays;
public class StatusFragment extends Fragment {
FragmentDataStatusBinding binding;
FragmentScoutingStatusBinding binding;
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
binding = FragmentDataStatusBinding.inflate(inflater, container, false);
binding = FragmentScoutingStatusBinding.inflate(inflater, container, false);
DataManager.reload_event();
binding.matchTable.removeAllViews();