WIP

README.md

@@ -28,9 +28,9 @@
 - Statbotics intgration
 - Scout error estimation using OPR-like calculation
 - - Would most likely require Statbotics
-
+https://www.thebluealliance.com/avatars
 ### Screenshots
 |Match scouting interface|Field editor|Teams data viewer|
 |-|-|-|
 |![Screenshot1](https://github.com/Team4388/ScoutingApp2025/blob/main/metadata/en-US/images/phoneScreenshots/1.png?raw=true)|![Screenshot2](https://github.com/Team4388/ScoutingApp2025/blob/main/metadata/en-US/images/phoneScreenshots/2.png?raw=true)|![Screenshot3](https://github.com/Team4388/ScoutingApp2025/blob/main/metadata/en-US/images/phoneScreenshots/3.png?raw=true)|
-
+z

app/build.gradle.kts

@@ -57,19 +57,21 @@ dependencies {
     implementation(libs.constraintlayout)
     implementation(libs.lifecycle.livedata.ktx)
     implementation(libs.lifecycle.viewmodel.ktx)
-    implementation("androidx.navigation:navigation-fragment:2.8.9")
+    implementation(libs.navigation.fragment.v289)
     implementation(libs.navigation.ui)
     implementation(libs.preference)
-//    implementation(libs.support.annotations)
+//    implementation(libs.asynclayoutinflator)
+
     testImplementation(libs.junit)
+
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
 
 
-    var camerax_version = "1.3.2"
+    var camerax_version = "1.4.2"
-    implementation("androidx.camera:camera-core:1.3.2")
+    implementation("androidx.camera:camera-core:${camerax_version}")
-    implementation("androidx.camera:camera-camera2:1.3.2")
+    implementation("androidx.camera:camera-camera2:${camerax_version}")
-    implementation("androidx.camera:camera-lifecycle:1.3.2")
+    implementation("androidx.camera:camera-lifecycle:${camerax_version}")
     implementation("androidx.camera:camera-view:${camerax_version}")
 
     implementation("com.journeyapps:zxing-android-embedded:4.3.0")

app/src/main/java/com/ridgebotics/ridgescout/types/ColabArray.java

@@ -0,0 +1,4 @@
+package com.ridgebotics.ridgescout.types;
+
+public class ColabArray {
+}

app/src/main/java/com/ridgebotics/ridgescout/types/frcEvent.java

@@ -9,14 +9,13 @@ import com.ridgebotics.ridgescout.utility.ByteBuilder;
 import com.ridgebotics.ridgescout.utility.SettingsManager;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.IntStream;
 
 // Class to contain data for an entire event.
 // Easily encoded and decoded to binary format.
 public class frcEvent {
-
-    public static final int typecode = 254;
     public String eventCode;
     public String name;
     public ArrayList<frcMatch> matches;
@@ -134,29 +133,29 @@ public class frcEvent {
         return null;
     }
 
-//    public
 
     // Returns the soonest match that there will be all the possible upcoming data on other teams
-    public void getReportMatches(int ourTeamNum){
+    public int getMostInformedBy(int ourTeamNum, int curMatch){
-        frcMatch[] teamMatches = event.getTeamMatches(ourTeamNum);
+        frcMatch teamMatch = getNextTeamMatch(ourTeamNum, curMatch);
+
+        int maxMatch = Integer.MIN_VALUE;
 
-        for(int i = 0; i < teamMatches.length; i++){
-            int maxMatch = -1;
         for(int a = 0; a < 6; a++){
             int teamNum;
             if(a < 3)
-                    teamNum = teamMatches[i].redAlliance[a];
+                teamNum = teamMatch.redAlliance[a];
             else
-                    teamNum = teamMatches[i].blueAlliance[a-3];
+                teamNum = teamMatch.blueAlliance[a-3];
 
             if(teamNum == ourTeamNum)
                 continue;
 
-                int matchNum = event.getMostRecentTeamMatch(teamNum, teamMatches[i].matchIndex);
+            int matchNum = event.getMostRecentTeamMatch(teamNum, teamMatch.matchIndex);
             if(maxMatch < matchNum)
                 maxMatch = matchNum;
         }
-        }
+
+        return maxMatch;
     }
 
     public frcTeam getTeamByNum(int teamNum){
@@ -168,6 +167,26 @@ public class frcEvent {
         return  null;
     }
 
+    public List<frcTeam> getTeamsSorted() {
+        int[] teamNums = new int[teams.size()];
+
+        for(int i = 0 ; i < teams.size(); i++){
+            teamNums[i] = teams.get(i).teamNumber;
+        }
+
+        Arrays.sort(teamNums);
+
+        List<frcTeam> list = new ArrayList<>();
+
+        for(int i = 0; i < teams.size(); i++){
+            frcTeam team =  getTeamByNum(teamNums[i]);
+            assert team != null;
+            list.add(team);
+        }
+
+        return list;
+    }
+
 
     public boolean getIsBlueAlliance(int teamNum, int matchNum){
         return getIsBlueAlliance(teamNum, matches.get(matchNum));

app/src/main/java/com/ridgebotics/ridgescout/types/input/FieldType.java

@@ -24,7 +24,6 @@ public abstract class FieldType {
     public static final int numberType = 251;
     public static final int checkboxType = 250;
     public static final int fieldposType = 249;
-    public static final int toggleType = 248;
 
     public enum inputTypes {
         SLIDER,
@@ -33,8 +32,7 @@ public abstract class FieldType {
         TALLY,
         NUMBER,
         CHECKBOX,
-        FIELDPOS,
+        FIELDPOS
-        TOGGLE;
     }
     public String UUID;
     public String name;
@@ -91,6 +89,8 @@ public abstract class FieldType {
     public abstract void setViewValue(Object value);
     public abstract RawDataType getViewValue();
 
+
+
     public abstract void add_individual_view(LinearLayout parent, RawDataType data);
     public abstract void add_compiled_view(LinearLayout parent, RawDataType[] data);
     public abstract void add_history_view(LinearLayout parent, RawDataType[] data);

app/src/main/java/com/ridgebotics/ridgescout/types/input/TallyType.java

@@ -65,7 +65,6 @@ public class TallyType extends FieldType {
 
     public TallyCounterView tally = null;
 
-
     public View createView(Context context, Function<RawDataType, Integer> onUpdate){
         tally = new TallyCounterView(context);
         tally.setOnCountChangedListener(n -> onUpdate.apply(getViewValue()));

app/src/main/java/com/ridgebotics/ridgescout/types/input/ToggleType.java

@@ -1,368 +0,0 @@
-package com.ridgebotics.ridgescout.types.input;
-
-import static com.ridgebotics.ridgescout.utility.Colors.chart_background;
-import static com.ridgebotics.ridgescout.utility.Colors.chart_text;
-import static com.ridgebotics.ridgescout.utility.Colors.dropdown_value_text_1;
-import static com.ridgebotics.ridgescout.utility.Colors.dropdown_value_text_2;
-import static com.ridgebotics.ridgescout.utility.Colors.tally_data;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
-
-import com.github.mikephil.charting.charts.LineChart;
-import com.github.mikephil.charting.components.Legend;
-import com.github.mikephil.charting.data.Entry;
-import com.github.mikephil.charting.data.LineData;
-import com.github.mikephil.charting.data.LineDataSet;
-import com.ridgebotics.ridgescout.types.data.IntType;
-import com.ridgebotics.ridgescout.types.data.RawDataType;
-import com.ridgebotics.ridgescout.ui.data.DataProcessing;
-import com.ridgebotics.ridgescout.ui.views.CandlestickHeader;
-import com.ridgebotics.ridgescout.ui.views.CandlestickView;
-import com.ridgebotics.ridgescout.ui.views.TallyCounterView;
-import com.ridgebotics.ridgescout.utility.BuiltByteParser;
-import com.ridgebotics.ridgescout.utility.ByteBuilder;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-public class ToggleType extends FieldType {
-    public int get_byte_id() {return toggleType;}
-    public inputTypes getInputType(){return inputTypes.TOGGLE;}
-    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
-    public Object get_fallback_value(){return 0;}
-    public ToggleType(){}
-    public String get_type_name(){return "Toggle";}
-    public ToggleType(String UUID, String name, String description, int default_value){
-        super(UUID, name, description);
-        this.default_value = default_value;
-    }
-
-
-
-
-
-    public void encodeData(ByteBuilder bb) throws ByteBuilder.buildingException {
-        bb.addInt((int) default_value);
-    }
-    public void decodeData(ArrayList<BuiltByteParser.parsedObject> objects) {
-        default_value = objects.get(0).get();
-    }
-
-
-
-
-
-    public TallyCounterView tally = null;
-
-
-    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
-        tally = new TallyCounterView(context);
-        tally.setOnCountChangedListener(n -> onUpdate.apply(getViewValue()));
-
-        setViewValue(default_value);
-
-        return tally;
-
-    }
-
-    public void setViewValue(Object value) {
-        if(tally == null) return;
-        if(IntType.isNull((int)value)){
-            nullify();
-            return;
-        }
-
-        isBlank = false;
-        tally.setVisibility(View.VISIBLE);
-        tally.setValue((int) value);
-    }
-    public void nullify(){
-        isBlank = true;
-        tally.setVisibility(View.GONE);
-    }
-    public RawDataType getViewValue(){
-        if(tally == null) return null;
-        if(tally.getVisibility() == View.GONE) return IntType.newNull(name);
-        return new IntType(name, tally.getValue());
-    }
-
-
-
-
-
-
-    public void add_individual_view(LinearLayout parent, RawDataType data){
-        if(data.isNull()) return;
-
-        TextView tv = new TextView(parent.getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText(String.valueOf((int) data.get()));
-        tv.setTextSize(24);
-        parent.addView(tv);
-    }
-
-
-
-
-
-
-
-
-    private static float calculateMean(int[] data) {
-        float sum = 0;
-        for (int value : data) {
-            sum += (float) value;
-        }
-        return sum / data.length;
-    }
-
-    private static float calculateStandardDeviation(int[] data, float mean) {
-        float sum = 0;
-        for (int value : data) {
-            sum += (float) Math.pow((float) value - mean, 2);
-        }
-        return (float) Math.sqrt(sum / (data.length - 1));
-    }
-
-    private static List<Entry> generateNormalDistribution(float mean, float stdDev, int count, int scale) {
-        List<Entry> entries = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            float y = (float) ((1 / (stdDev * Math.sqrt(2 * Math.PI)))
-                    * Math.exp(-0.5 * Math.pow(((float) i - mean) / stdDev, 2)));
-            entries.add(new Entry((float) i, y*scale)); // Scale y for visibility
-        }
-        return entries;
-    }
-
-    private static int findMin(RawDataType[] data){
-        int min = (int)data[0].get();
-        for(int i = 1; i < data.length; i++)
-            if((int)data[i].get() < min)
-                min = (int)data[i].get();
-        return min;
-    }
-
-    private static int findMax(RawDataType[] data){
-        int max = (int)data[0].get();
-        for(int i = 1; i < data.length; i++)
-            if((int)data[i].get() > max)
-                max = (int)data[i].get();
-        return max;
-    }
-
-    public void add_compiled_view(LinearLayout parent, RawDataType[] data){
-        LineChart chart = new LineChart(parent.getContext());
-        FrameLayout.LayoutParams layout = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        layout.height = 350;
-        chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
-
-        int min = findMin(data);
-        int max = findMax(data);
-
-        int[] values = new int[max-min+1];
-
-        for (int i = 0; i < data.length; i++)
-            if(data[i] != null && data[i].isNull())
-                values[(int) data[i].get()-min]++;
-
-
-        ArrayList<Integer> mean_temp = new ArrayList<>();
-        for (int i = 0; i < data.length; i++)
-            if((int)data[i].get() != 0)
-                mean_temp.add((int) data[i].get());
-
-        int[] mean_vals = mean_temp.stream().mapToInt(Integer::intValue).toArray();
-
-        List<Entry> entries = new ArrayList<>();
-        for (int i = 0; i < values.length; i++)
-            entries.add(new Entry(i, values[i]));
-
-
-        LineDataSet dataSet = new LineDataSet(entries, name);
-        dataSet.setColor(tally_data);
-        dataSet.setValueTextColor(dropdown_value_text_1);
-        dataSet.setDrawCircles(false);
-        dataSet.setDrawValues(false);
-
-
-
-        // Calculate mean and standard deviation
-        float mean = calculateMean(mean_vals);
-        float stdDev = calculateStandardDeviation(mean_vals, mean);
-
-        // Generate normal distribution curve
-        List<Entry> normalDistEntries = generateNormalDistribution(mean-min, stdDev, max-min+1, (max-min)/data.length);
-
-
-        LineDataSet normalDistSet = new LineDataSet(normalDistEntries, "Normal Distribution");
-        normalDistSet.setColor(dropdown_value_text_2);
-        normalDistSet.setDrawCircles(false);
-        normalDistSet.setDrawValues(false);
-        normalDistSet.setLineWidth(2f);
-
-        LineData lineData = new LineData(dataSet, normalDistSet);
-
-        chart.setData(lineData);
-        chart.invalidate();
-
-        chart.getDescription().setEnabled(false);
-        chart.setTouchEnabled(false);
-        chart.setDragEnabled(false);
-        chart.setScaleEnabled(false);
-
-        dataSet.setValueTextColor(dropdown_value_text_2);
-
-        chart.getXAxis().setTextColor(chart_text);
-        chart.getAxisLeft().setTextColor(chart_text);
-        chart.getAxisRight().setTextColor(chart_text);
-
-        Legend legend = chart.getLegend();
-        legend.setTextColor(chart_text);
-
-        parent.addView(chart);
-    }
-
-
-
-
-    public void add_history_view(LinearLayout parent, RawDataType[] data){
-        LineChart chart = new LineChart(parent.getContext());
-        FrameLayout.LayoutParams layout = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        layout.height = 350;
-        chart.setLayoutParams(layout);
-        chart.setBackgroundColor(chart_background);
-
-        int min = findMin(data);
-        int max = findMax(data);
-
-        List<Entry> entries = new ArrayList<>();
-        for (int i = 0; i < data.length; i++){
-            if(data[i] == null) continue;
-            if(data[i].isNull()) continue;
-
-            entries.add(new Entry(i, (float)(int) data[i].get()));
-        }
-
-
-        LineDataSet dataSet = new LineDataSet(entries, name);
-        dataSet.setColor(tally_data);
-        dataSet.setValueTextColor(dropdown_value_text_1);
-        dataSet.setDrawCircles(false);
-        dataSet.setDrawValues(false);
-
-        LineData lineData = new LineData(dataSet);
-
-        chart.setData(lineData);
-        chart.invalidate();
-
-        chart.getDescription().setEnabled(false);
-        chart.setTouchEnabled(false);
-        chart.setDragEnabled(false);
-        chart.setScaleEnabled(false);
-
-        dataSet.setValueTextColor(dropdown_value_text_2);
-
-        chart.getXAxis().setTextColor(chart_text);
-        chart.getAxisLeft().setTextColor(chart_text);
-        chart.getAxisRight().setTextColor(chart_text);
-
-        Legend legend = chart.getLegend();
-        legend.setTextColor(chart_text);
-
-
-        chart.getAxisLeft().setAxisMinimum(min);
-        chart.getAxisLeft().setAxisMaximum(max);
-
-        chart.getAxisRight().setAxisMinimum(min);
-        chart.getAxisRight().setAxisMaximum(max);
-
-
-        parent.addView(chart);
-    }
-
-    public void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data){
-        int[] tmp_abs_bounds = DataProcessing.getNumberBounds(data);
-        int absmin = tmp_abs_bounds[0];
-        int absmax = tmp_abs_bounds[1];
-
-        //(int[]) teamData.get(i).get())[0];
-//        AlertManager.alert("Results","Min: " + min + " Max: " + max);
-
-        parent.removeAllViews();
-
-        List<CandlestickView> views = new ArrayList<>();
-
-        for(Integer teamNum : data.keySet()){
-            CandlestickView candlestickView = new CandlestickView(parent.getContext());
-            candlestickView.fromTeamData(data.get(teamNum), teamNum, absmin, absmax);
-            views.add(candlestickView);
-        }
-
-
-        TableRow row = new TableRow(parent.getContext());
-
-        // Make candlestick chart fill full width
-        parent.setColumnStretchable(1, true);
-
-        // Fill in top left cell
-        row.addView(new View(parent.getContext()));
-
-        CandlestickHeader header = new CandlestickHeader(parent.getContext());
-        header.setScale(absmin, absmax);
-        row.addView(header);
-
-        parent.addView(row);
-
-//        parent.addView(new );
-
-        try {
-            Collections.sort(views, (a, b) -> (int) ((b.average - a.average) * 50.f));
-        }catch (Exception e){}
-
-        for(int i = 0; i < views.size(); i++){
-            row = new TableRow(parent.getContext());
-            CandlestickView view = views.get(i);
-
-            TextView teamNum = new TextView(parent.getContext());
-            TableRow.LayoutParams params = new TableRow.LayoutParams();
-            params.gravity = Gravity.CENTER;
-            teamNum.setLayoutParams(params);
-            teamNum.setPadding(10,10,10,10);
-            teamNum.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Headline6);
-            teamNum.setText(String.valueOf(view.teamNum));
-
-
-            row.addView(teamNum);
-            row.addView(view);
-
-            parent.addView(row);
-        }
-    }
-
-    public String toString(RawDataType data){
-        return String.valueOf((int) data.get());
-    }
-}
-

app/src/main/java/com/ridgebotics/ridgescout/ui/data/DataFragment.java

@@ -19,9 +19,12 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.ridgebotics.ridgescout.R;
 import com.ridgebotics.ridgescout.types.frcTeam;
 import com.ridgebotics.ridgescout.ui.views.FieldBorderedRow;
+import com.ridgebotics.ridgescout.ui.views.RecyclerList;
 import com.ridgebotics.ridgescout.ui.views.TeamListOption;
 import com.ridgebotics.ridgescout.utility.DataManager;
 import com.ridgebotics.ridgescout.utility.SettingsManager;
@@ -44,7 +47,7 @@ public class DataFragment extends Fragment {
                              @Nullable Bundle savedInstanceState) {
 
         binding = FragmentDataBinding.inflate(inflater, container, false);
-        binding.table.setStretchAllColumns(true);
+//        binding.table.setStretchAllColumns(true);
         View root = binding.getRoot();
 
         if(evcode == null || evcode.equals("unset") || event == null){
@@ -86,35 +89,21 @@ public class DataFragment extends Fragment {
 
     public void load_teams(){
 
-        int[] teamNums = new int[event.teams.size()];
+        RecyclerList<frcTeam> list = new RecyclerList<>(getContext());
+        binding.table.addView(list);
+//        list.setView
 
-        for(int i = 0 ; i < event.teams.size(); i++){
+        list
-            teamNums[i] = event.teams.get(i).teamNumber;
+            .setup(R.layout.view_team_option, TeamListOption::new)
-        }
+            .withLinearLayout()
-
+            .withDivider()
-        Arrays.sort(teamNums);
+            .withItemClickListener((team, position) -> {
-
+                TeamsFragment.setTeam(team);
-        for(int i = 0; i < event.teams.size(); i++){
-            frcTeam team = null;
-            for(int a = 0 ; a < event.teams.size(); a++){
-                if(event.teams.get(a).teamNumber == teamNums[i]){
-                    team = event.teams.get(a);
-                    break;
-                }
-            }
-            assert team != null;
-
-            TeamListOption teamRow = new TeamListOption(getContext());
-            binding.table.addView(teamRow);
-            teamRow.fromTeam(team);
-
-            frcTeam finalTeam = team;
-            teamRow.setOnClickListener(v -> {
-                TeamsFragment.setTeam(finalTeam);
                 ((DataParentFragment) getParentFragment()).moveToFragment(new TeamsFragment());
-//                findNavController(this).navigate(R.id.action_navigation_data_parent_to_navigation_data_teams);
             });
-        }
+
+        list.setItems(event.getTeamsSorted());
+
     }
     public void load_fields(){
         DataManager.reload_match_fields();

app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/PitScoutingFragment.java

@@ -20,6 +20,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.divider.MaterialDivider;
+import com.ridgebotics.ridgescout.ui.views.PitScoutingIndicator;
 import com.ridgebotics.ridgescout.ui.views.ToggleTitleView;
 import com.ridgebotics.ridgescout.utility.AlertManager;
 import com.ridgebotics.ridgescout.utility.SettingsManager;
@@ -76,7 +77,6 @@ public class PitScoutingFragment extends Fragment {
 
     String fileUsernames = "";
     ToggleTitleView[] titles;
-
     AutoSaveManager asm = new AutoSaveManager(this::save, AUTO_SAVE_DELAY);
 
     ArrayList<RawDataType> rawDataTypes;
@@ -99,7 +99,7 @@ public class PitScoutingFragment extends Fragment {
     }
 
     public void set_indicator_color(int color){
-        binding.pitFileIndicator.setBackgroundColor(color);
+        binding.pitIndicator.setColor(color);
     }
 
     public void update_asm(){
@@ -114,10 +114,9 @@ public class PitScoutingFragment extends Fragment {
     public void loadTeam(){
 //        clear_fields();
 
-        binding.pitFileIndicator.setVisibility(View.VISIBLE);
         binding.pitsTeamCard.setVisibility(View.VISIBLE);
-        binding.pitBarTeamNum.setText(String.valueOf(team.teamNumber));
+        binding.pitIndicator.setTeamNum(team.teamNumber);
-        binding.pitUsername.setText(SettingsManager.getUsername());
+        binding.pitIndicator.setUsername(SettingsManager.getUsername());
         binding.pitsTeamCard.fromTeam(team);
 
         filename = evcode + "-" + team.teamNumber + ".pitscoutdata";
@@ -146,7 +145,7 @@ public class PitScoutingFragment extends Fragment {
             }
         }
 
-        binding.pitFileIndicator.bringToFront();
+        binding.pitIndicator.bringToFront();
 
         asm.start();
 
@@ -154,7 +153,7 @@ public class PitScoutingFragment extends Fragment {
 
     private void enableRescoutButton(){
         set_indicator_color(rescout ? rescout_color : saved_color);
-        binding.pitFileIndicator.setOnLongClickListener(v -> {
+        binding.pitIndicator.setOnLongClickListener(v -> {
             rescout = !rescout;
             if(rescout){
                 set_indicator_color(rescout_color);
@@ -171,7 +170,7 @@ public class PitScoutingFragment extends Fragment {
     }
 
     private void disableRescoutButton(){
-        binding.pitFileIndicator.setOnLongClickListener(null);
+        binding.pitIndicator.setOnLongClickListener(null);
     }
 
 

app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/PitSelectorFragment.java

@@ -51,89 +51,89 @@ public class PitSelectorFragment extends Fragment {
             return binding.getRoot();
         }
 
-        load_teams();
+//        load_teams();
 
 
         return binding.getRoot();
     }
 
-    public void load_teams(){
+//    public void load_teams(){
-//        binding.pitFileIndicator.setVisibility(View.GONE);
+////        binding.pitFileIndicator.setVisibility(View.GONE);
-//        binding.pitTeamName.setVisibility(View.GONE);
+////        binding.pitTeamName.setVisibility(View.GONE);
-//        binding.pitTeamDescription.setVisibility(View.GONE);
+////        binding.pitTeamDescription.setVisibility(View.GONE);
+////
+////        clear_fields();
 //
-//        clear_fields();
+//
-
+//        int[] teamNums = new int[event.teams.size()];
-
+//
-        int[] teamNums = new int[event.teams.size()];
+//        for(int i = 0 ; i < event.teams.size(); i++){
-
+//            teamNums[i] = event.teams.get(i).teamNumber;
-        for(int i = 0 ; i < event.teams.size(); i++){
+//        }
-            teamNums[i] = event.teams.get(i).teamNumber;
+//
-        }
+//        Arrays.sort(teamNums);
-
+//
-        Arrays.sort(teamNums);
+//        TableLayout table = new TableLayout(getContext());
-
+//        table.setStretchAllColumns(true);
-        TableLayout table = new TableLayout(getContext());
+//        binding.teams.addView(table);
-        table.setStretchAllColumns(true);
+//
-        binding.teams.addView(table);
+//
-
+//        for(int i = 0; i < event.teams.size(); i++){
-
+//            frcTeam team = null;
-        for(int i = 0; i < event.teams.size(); i++){
+//            for(int a = 0 ; a < event.teams.size(); a++){
-            frcTeam team = null;
+//                if(event.teams.get(a).teamNumber == teamNums[i]){
-            for(int a = 0 ; a < event.teams.size(); a++){
+//                    team = event.teams.get(a);
-                if(event.teams.get(a).teamNumber == teamNums[i]){
+//                    break;
-                    team = event.teams.get(a);
+//                }
-                    break;
+//            }
-                }
+//            assert team != null;
-            }
+//
-            assert team != null;
+////            TableRow tr = new TableRow(getContext());
-
+////            TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
-//            TableRow tr = new TableRow(getContext());
+////                    FrameLayout.LayoutParams.WRAP_CONTENT,
-//            TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
+////                    FrameLayout.LayoutParams.WRAP_CONTENT
-//                    FrameLayout.LayoutParams.WRAP_CONTENT,
+////            );
-//                    FrameLayout.LayoutParams.WRAP_CONTENT
+////            rowParams.setMargins(20,20,20,20);
-//            );
+////            tr.setLayoutParams(rowParams);
-//            rowParams.setMargins(20,20,20,20);
+////            tr.setPadding(20,20,20,20);
-//            tr.setLayoutParams(rowParams);
+////            table.addView(tr);
-//            tr.setPadding(20,20,20,20);
+//
-//            table.addView(tr);
+//            TeamListOption teamRow = new TeamListOption(getContext());
-
+//            table.addView(teamRow);
-            TeamListOption teamRow = new TeamListOption(getContext());
+//            teamRow.fromTeam(team);
-            table.addView(teamRow);
+//
-            teamRow.fromTeam(team);
+//
-
+//            String filename = evcode + "-" + team.teamNumber + ".pitscoutdata";
-
+//
-            String filename = evcode + "-" + team.teamNumber + ".pitscoutdata";
+//            if (FileEditor.fileExist(filename)) {
-
+//                final boolean[] rescout = {DataManager.rescout_list.contains(filename)};
-            if (FileEditor.fileExist(filename)) {
+//
-                final boolean[] rescout = {DataManager.rescout_list.contains(filename)};
+//                teamRow.setColor(DataManager.rescout_list.contains(filename) ? color_rescout : color_found);
-
+//
-                teamRow.setColor(DataManager.rescout_list.contains(filename) ? color_rescout : color_found);
+//                teamRow.setOnLongClickListener(v -> {
-
+//                    rescout[0] = !rescout[0];
-                teamRow.setOnLongClickListener(v -> {
+//                    if(rescout[0]){
-                    rescout[0] = !rescout[0];
+//                        DataManager.rescout_list.add(filename);
-                    if(rescout[0]){
+//                        teamRow.setColor(color_rescout);
-                        DataManager.rescout_list.add(filename);
+//                        DataManager.save_rescout_list();
-                        teamRow.setColor(color_rescout);
+//                    }else{
-                        DataManager.save_rescout_list();
+//                        DataManager.rescout_list.remove(filename);
-                    }else{
+//                        teamRow.setColor(color_found);
-                        DataManager.rescout_list.remove(filename);
+//                        DataManager.save_rescout_list();
-                        teamRow.setColor(color_found);
+//                    }
-                        DataManager.save_rescout_list();
+//
-                    }
+//
-
+//                    return true;
-
+//                });
-                    return true;
+//            } else {
-                });
+//                teamRow.setColor(color_not_found);
-            } else {
+//                teamRow.setOnLongClickListener(v -> true);
-                teamRow.setColor(color_not_found);
+//            }
-                teamRow.setOnLongClickListener(v -> true);
+//
-            }
+//
-
+//            frcTeam finalTeam = team;
-
+//            teamRow.setOnClickListener(v -> onSelect.onSelect(this, finalTeam));
-            frcTeam finalTeam = team;
+//        }
-            teamRow.setOnClickListener(v -> onSelect.onSelect(this, finalTeam));
+//    }
-        }
-    }
 
 }

app/src/main/java/com/ridgebotics/ridgescout/ui/scouting/ScoutingFragment.java

@@ -15,6 +15,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -89,7 +90,7 @@ public class ScoutingFragment extends Fragment {
 
             binding.textMatchAlliance.setVisibility(View.GONE);
             binding.textName.setVisibility(View.GONE);
-            binding.textNextMatch.setVisibility(View.GONE);
+            binding.infoBox.setVisibility(View.GONE);
             binding.textRescoutIndicator.setVisibility(View.GONE);
 
             binding.matchScoutingButton.setEnabled(false);
@@ -123,20 +124,7 @@ public class ScoutingFragment extends Fragment {
             findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_scouting_event);
         });
 
-
+        updateDashboard();
-        binding.textName.setText("Welcome, " + SettingsManager.getUsername() + "!");
-
-        int matchNum = SettingsManager.getMatchNum();
-        int nextMatch = -1;
-        try {
-            nextMatch = event.getNextTeamMatch(SettingsManager.getTeamNum(), matchNum).matchIndex;
-        } catch (Exception e){
-            AlertManager.error(e);
-        }
-
-        binding.textNextMatch.setText("Our next match: Match " + nextMatch);
-        binding.textMatchAlliance.setText("Match: " + (matchNum+1) + ", " + SettingsManager.getAllyPos());
-        binding.textRescoutIndicator.setText("Things to rescout: " + DataManager.rescout_list.size());
 
         return binding.getRoot();
     }
@@ -165,4 +153,32 @@ public class ScoutingFragment extends Fragment {
         });
     }
 
+    private void updateDashboard() {
+        binding.textName.setText("Welcome, " + SettingsManager.getUsername() + "!");
+
+        int curMatchNum = SettingsManager.getMatchNum();
+        int nextMatch;
+        int teamNum = SettingsManager.getTeamNum();
+        try {
+            nextMatch = event.getNextTeamMatch(teamNum, curMatchNum).matchIndex;
+        } catch (Exception e){
+            AlertManager.error("Sorry, in event ("+evcode+"), your team number ("+teamNum+") wasn't found!", e);
+            return;
+        }
+
+        binding.textMatchAlliance.setText("Match: " + (curMatchNum+1) + ", " + SettingsManager.getAllyPos());
+        binding.textRescoutIndicator.setText("Things to rescout: " + DataManager.rescout_list.size());
+
+        TextView nextMatchText = new TextView(getContext());
+        nextMatchText.setText("Our next match: Match " + nextMatch);
+        nextMatchText.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body1);
+        binding.infoBox.addView(nextMatchText);
+
+        int informedBy = event.getMostInformedBy(teamNum, curMatchNum);
+
+        TextView mostInformedText = new TextView(getContext());
+        mostInformedText.setText("Most informed by: Match " + informedBy);
+        mostInformedText.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body1);
+        binding.infoBox.addView(mostInformedText);
+    }
 }

app/src/main/java/com/ridgebotics/ridgescout/ui/settings/FieldEditorHelper.java

@@ -18,7 +18,6 @@ import com.ridgebotics.ridgescout.types.input.NumberType;
 import com.ridgebotics.ridgescout.types.input.SliderType;
 import com.ridgebotics.ridgescout.types.input.TallyType;
 import com.ridgebotics.ridgescout.types.input.TextType;
-import com.ridgebotics.ridgescout.types.input.ToggleType;
 import com.ridgebotics.ridgescout.utility.AlertManager;
 
 import java.lang.reflect.Field;
@@ -30,8 +29,7 @@ public class FieldEditorHelper {
         paramNumber,
         paramString,
         paramStringArray,
-        paramNumberArray,
+        paramNumberArray
-        paramBoolean
     }
 
     public static class parameterType {
@@ -66,15 +64,6 @@ public class FieldEditorHelper {
         }
     }
 
-    public static class paramBoolean extends parameterType{
-        public boolean val;
-        public paramBoolean(String name, boolean val){
-            this.name = name + " (Boolean)";
-            this.val = val;
-            this.id = parameterTypeEnum.paramBoolean;
-        }
-    }
-
 //    public static class paramNumberArray extends parameterType{
 //        public int[] val;
 //        public paramNumberArray(String name, int[] val){
@@ -124,12 +113,6 @@ public class FieldEditorHelper {
             new paramNumber("Default Y", 0)
     };
 
-    public static final parameterType[] defaultToggleParam = new parameterType[]{
-        new paramString("Name", "New Toggle"),
-                new paramString("Description", ""),
-                new paramBoolean("Default true or false",true)
-    };
-
 
     private static parameterType[] getSliderParams(SliderType s){
         return new parameterType[]{
@@ -190,13 +173,6 @@ public class FieldEditorHelper {
                 new paramNumber("Default Y", ((int[]) s.default_value)[1])
         };
     }
-    private static parameterType[] getToggleParams(ToggleType s){
-        return new parameterType[]{
-                new paramString("Name", s.name),
-                new paramString("Description", s.description),
-                new paramBoolean("Default true or false", (boolean) s.default_value)
-        };
-    }
 
 
 
@@ -248,12 +224,6 @@ public class FieldEditorHelper {
         };
     }
 
-    public static void setToggleParam(ToggleType s, parameterType[] types){
-        s.name = ((paramString) types[0]).val;
-        s.description = ((paramString) types[1]).val;
-        s.default_value = ((paramBoolean) types[2]).val;
-    }
-
 
     private static void setInputParameter(FieldType t, parameterType[] types){
         switch (t.getInputType()){
@@ -278,9 +248,6 @@ public class FieldEditorHelper {
             case FIELDPOS:
                 setFieldPosParam((FieldposType) t, types);
                 break;
-            case TOGGLE:
-                setToggleParam((ToggleType) t, types);
-                break;
         }
     }
 
@@ -302,8 +269,6 @@ public class FieldEditorHelper {
                 return getCheckboxParam((CheckboxType) t);
             case FIELDPOS:
                 return getFieldPosParam((FieldposType) t);
-            case TOGGLE:
-                return getToggleParams((ToggleType) t);
         }
         return new parameterType[]{};
     }
@@ -340,16 +305,6 @@ public class FieldEditorHelper {
         ));
         return text;
     }
-    private static View createBooleanEdit(Context c, boolean value){
-        EditText text = new EditText(c);
-        text.setText(value);
-        text.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        return text;
-    }
-
 
     private static View createEdit(Context c, parameterType t){
         switch (t.id){
@@ -429,11 +384,6 @@ public class FieldEditorHelper {
                 fieldposType.UUID = UUID.randomUUID().toString();
                 setFieldPosParam(fieldposType, defaultFieldPosParam);
                 return fieldposType;
-            case 7:
-                ToggleType toggleType = new ToggleType();
-                toggleType.UUID = UUID.randomUUID().toString();
-                setToggleParam(toggleType, defaultToggleParam);
-                return toggleType;
         }
         return null;
     }

app/src/main/java/com/ridgebotics/ridgescout/ui/settings/FieldsFragment.java

@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.Navigation;
 
+import com.google.android.material.button.MaterialButton;
 import com.ridgebotics.ridgescout.MainActivity;
 import com.ridgebotics.ridgescout.R;
 import com.ridgebotics.ridgescout.databinding.FragmentSettingsFieldsBinding;
@@ -216,7 +217,7 @@ public class FieldsFragment extends Fragment {
         AlertDialog dialog = alert.create();
         dialog.show();
 
-        Button deleteButton = new Button(getContext());
+        MaterialButton deleteButton = new MaterialButton(getContext());
         deleteButton.setText("DELETE");
         deleteButton.setOnClickListener(l -> {
             AlertDialog.Builder alert2 = new AlertDialog.Builder(getContext());

app/src/main/java/com/ridgebotics/ridgescout/ui/settings/SettingsFragment.java

@@ -1,6 +1,8 @@
 package com.ridgebotics.ridgescout.ui.settings;
 
 import static android.view.View.VISIBLE;
+import static android.widget.LinearLayout.HORIZONTAL;
+import static android.widget.LinearLayout.VERTICAL;
 import static androidx.navigation.fragment.FragmentKt.findNavController;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.AllyPosKey;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.CustomEventsKey;
@@ -13,6 +15,7 @@ import static com.ridgebotics.ridgescout.utility.SettingsManager.UnameKey;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.WifiModeKey;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.YearNumKey;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.defaults;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.getEVCode;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.getEditor;
 import static com.ridgebotics.ridgescout.utility.SettingsManager.prefs;
 
@@ -30,13 +33,17 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
+import android.widget.TableLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.divider.MaterialDivider;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 import com.ridgebotics.ridgescout.R;
@@ -48,6 +55,8 @@ import com.ridgebotics.ridgescout.utility.DataManager;
 import com.ridgebotics.ridgescout.utility.FileEditor;
 import com.ridgebotics.ridgescout.utility.SettingsManager;
 
+import org.w3c.dom.Text;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -65,20 +74,6 @@ public class SettingsFragment extends Fragment {
 
         reloadSettings();
 
-        binding.fieldsButton.setOnClickListener(v -> {
-            binding.fieldsButton.setEnabled(false);
-            binding.fieldsButtons.setVisibility(VISIBLE);
-        });
-
-        binding.fieldsMatchesButton.setOnClickListener(v -> {
-            FieldsFragment.set_filename(Fields.matchFieldsFilename);
-            findNavController(this).navigate(R.id.action_navigation_settings_to_navigation_data_fields);
-        });
-
-        binding.fieldsPitsButton.setOnClickListener(v -> {
-            FieldsFragment.set_filename(Fields.pitsFieldsFilename);
-            findNavController(this).navigate(R.id.action_navigation_settings_to_navigation_data_fields);
-        });
 
 
         return root;
@@ -91,28 +86,67 @@ public class SettingsFragment extends Fragment {
         SettingsManager manager = new SettingsManager(getContext());
 
 
+
+        ButtonSettingsItem corruptButton = new ButtonSettingsItem();
+        corruptButton.addButton("Remove corrupted files", view -> {});
+
+        manager.addItem(corruptButton);
+        manager.addItem(new HeaderSettingsItem("Advanced"));
+
+
+
+
+        ButtonSettingsItem fieldsButtons = new ButtonSettingsItem();
+        fieldsButtons.addButton("Edit pit fields", v -> {
+            FieldsFragment.set_filename(Fields.pitsFieldsFilename);
+            findNavController(this).navigate(R.id.action_navigation_settings_to_navigation_data_fields);
+        });
+        fieldsButtons.addButton("Edit match fields", v -> {
+            FieldsFragment.set_filename(Fields.matchFieldsFilename);
+            findNavController(this).navigate(R.id.action_navigation_settings_to_navigation_data_fields);
+        });
+        manager.addItem(fieldsButtons);
+
+        ButtonSettingsItem noticeButton = new ButtonSettingsItem();
+        noticeButton.addButton("Edit scout notice", v->editNotice());
+        noticeButton.setEnabled(!getEVCode().equals("unset"));
+        manager.addItem(noticeButton);
+
+
         manager.addItem(new CheckboxSettingsItem(CustomEventsKey, "Custom Events"));
 
+        CheckboxSettingsItem FTPSendMetaFiles = new CheckboxSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPSendMetaFiles, "[⚠] Send meta files");
+        manager.addItem(FTPSendMetaFiles);
+
+        manager.addItem(new HeaderSettingsItem("Admin"));
+
+
+
+
         StringSettingsItem FTPKey = new StringSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPKey, "Sync Key");
         manager.addItem(FTPKey);
         StringSettingsItem FTPServer = new StringSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPServer, "Sync Server (Sync)");
         manager.addItem(FTPServer);
-        CheckboxSettingsItem FTPSendMetaFiles = new CheckboxSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPSendMetaFiles, "⚠ Send meta files");
+        CheckboxSettingsItem FTPEnabled = new CheckboxSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPEnabled, "Sync Enabled", FTPServer, FTPKey, FTPSendMetaFiles);
-        manager.addItem(FTPSendMetaFiles);
-        CheckboxSettingsItem FTPEnabled = new CheckboxSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPEnabled, "FTP Enabled", FTPServer, FTPKey, FTPSendMetaFiles);
         manager.addItem(FTPEnabled);
 
         manager.addItem(new CheckboxSettingsItem(WifiModeKey, "Wifi Mode", FTPEnabled));
-        manager.addItem(new CheckboxSettingsItem(EnableQuickAllianceChangeKey, "Enable quick alliance swap", null));
 
+
+        manager.addItem(new NumberSettingsItem(YearNumKey, "Year", 0, 9999));
+
+        manager.addItem(new HeaderSettingsItem("Connection"));
+
+
+
+
+
+        manager.addItem(new CheckboxSettingsItem(EnableQuickAllianceChangeKey, "Enable quick alliance swap", null));
         manager.addItem(new DropdownSettingsItem(FieldImageKey, "Field Image", new String[]{
                 "2025",
                 "2025 (Flipped)"
         }));
 
-        manager.addItem(new NumberSettingsItem(YearNumKey, "Year", 0, 9999));
-
-
         manager.addItem(new DropdownSettingsItem(AllyPosKey, "Alliance Pos", alliance_pos_list));
 
         int max = 0;
@@ -134,16 +168,48 @@ public class SettingsFragment extends Fragment {
 
         manager.addItem(new StringSettingsItem(UnameKey, "Username"));
         manager.addItem(new NumberSettingsItem(TeamNumKey, "Team Number", 0, 99999));
+        manager.addItem(new HeaderSettingsItem("Scouting"));
+
+
+
+
 
         binding.SettingsTable.removeAllViews();
+
         manager.getView(binding.SettingsTable);
 
-        if(!DataManager.getevcode().equals("unset")){
+
-            Button editNoticeButton = new Button(getContext());
+        // Add "Edit scout notice" button to the bottom of the page=
-            editNoticeButton.setText("Edit Scout Notice");
+
-            binding.SettingsTable.addView(editNoticeButton);
+
-            editNoticeButton.setOnClickListener(v->editNotice());
+        // Add "Field edit" buttons to the bottom of the page
-        }
+//        LinearLayout fieldButtons = new LinearLayout(getContext());
+//        fieldButtons.setLayoutParams(new LinearLayout.LayoutParams(
+//                LinearLayout.LayoutParams.MATCH_PARENT,
+//                LinearLayout.LayoutParams.WRAP_CONTENT
+//        ));
+//        fieldButtons.setOrientation(HORIZONTAL);
+//
+//        Button editMatchFieldsButton = new Button(getContext());
+//        editMatchFieldsButton.setText("Edit Match Fields");
+//        editMatchFieldsButton.setOnClickListener(v -> {
+//            FieldsFragment.set_filename(Fields.matchFieldsFilename);
+//            findNavController(this).navigate(R.id.action_navigation_settings_to_navigation_data_fields);
+//        });
+//        fieldButtons.addView(editMatchFieldsButton);
+//
+//
+//        Button editPitsFieldsButton = new Button(getContext());
+//        editPitsFieldsButton.setText("Edit pits Fields");
+//        editPitsFieldsButton.setOnClickListener(v -> {
+//            FieldsFragment.set_filename(Fields.pitsFieldsFilename);
+//            findNavController(this).navigate(R.id.action_navigation_settings_to_navigation_data_fields);
+//        });
+//        fieldButtons.addView(editPitsFieldsButton);
+
+
+//        binding.SettingsTable.addView(fieldButtons);
+
 
     }
 
@@ -347,7 +413,7 @@ public class SettingsFragment extends Fragment {
         @Override
         public View createView(Context context) {
             LinearLayout ll = new LinearLayout(getContext());
-            ll.setOrientation(LinearLayout.VERTICAL);
+            ll.setOrientation(VERTICAL);
 
             tally = new TallyCounterView(getContext());
 
@@ -475,6 +541,94 @@ public class SettingsFragment extends Fragment {
         }
     }
 
+    public class HeaderSettingsItem extends SettingsItem<Void> {
+        String title;
+
+        public HeaderSettingsItem(String title) {
+            super("", title, null);
+            this.title = title;
+        }
+
+
+        @Override
+        public void setEnabled(boolean enabled){
+        }
+
+        @Override
+        public View createView(Context context) {
+            LinearLayout ll = new LinearLayout(context);
+            ll.setOrientation(VERTICAL);
+            ll.setPadding(0, 20,0,0);
+
+            TextView tv = new TextView(context);
+            tv.setText(title);
+            tv.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Headline4);
+            ll.addView(tv);
+
+            ll.addView(new MaterialDivider(context));
+
+            return ll;
+        }
+
+        @Override
+        public Void getValue() {
+            return null;
+        }
+    }
+
+    public class ButtonSettingsItem extends SettingsItem<Void> {
+        List<MaterialButton> buttons = new ArrayList<>();
+        List<String> titles = new ArrayList<>();
+        List<View.OnClickListener> callbacks = new ArrayList<>();
+
+        boolean enabled = true;
+
+        public ButtonSettingsItem() {
+            super("", "", null);
+        }
+
+        @Override
+        public void setEnabled(boolean enabled){
+            this.enabled = enabled;
+            for(int i = 0; i < buttons.size(); i++){
+                buttons.get(i).setEnabled(enabled);
+            }
+        }
+
+        public void addButton(String text, View.OnClickListener onClickListener) {
+            titles.add(text);
+            callbacks.add(onClickListener);
+        }
+
+        @Override
+        public View createView(Context context) {
+            LinearLayout ll = new LinearLayout(context);
+            ll.setOrientation(HORIZONTAL);
+
+            for(int i = 0; i < titles.size(); i++){
+                MaterialButton button = new MaterialButton(context);
+                button.setText(titles.get(i));
+                button.setOnClickListener(callbacks.get(i));
+                LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1.0f);
+                layoutParams.setMargins(3, 0, 3, 0);
+//                layoutParams.weight
+                button.setLayoutParams(layoutParams);
+                button.setEnabled(enabled);
+//                button.weight
+                buttons.add(button);
+
+                ll.addView(button);
+            }
+
+            return ll;
+        }
+
+        @Override
+        public Void getValue() {
+            return null;
+        }
+    }
+
     public class SettingsManager {
         private Context context;
         private HashMap<String, Object> settings;
@@ -497,7 +651,7 @@ public class SettingsFragment extends Fragment {
             items.add(item);
 
             LinearLayout itemContainer = new LinearLayout(context);
-            itemContainer.setOrientation(LinearLayout.VERTICAL);
+            itemContainer.setOrientation(VERTICAL);
             itemContainer.setPadding(32, 0, 32, 8);
 
             View view = item.createView(context);

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java

@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-// This is now deprecated
+// This is now deprecated. use HTTPSync
 // Class to synchronise data over FTP.
 public class FTPSync extends Thread {
     public static final String remoteBasePath = "/RidgeScout/";

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/HttpSync.java

@@ -30,8 +30,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-// This is now deprsicated
+// Class to synchronise data over HTTP.
-// Class to syncronise data over FTP.
 public class HttpSync extends Thread {
     public static final String timestampsFilename = "timestamps";
 

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/TBAEventFragment.java

@@ -22,6 +22,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.button.MaterialButton;
 import com.ridgebotics.ridgescout.R;
 import com.ridgebotics.ridgescout.databinding.FragmentTransferTbaBinding;
 import com.ridgebotics.ridgescout.types.frcEvent;
@@ -49,8 +50,6 @@ public class TBAEventFragment extends Fragment {
 
     private final int year = SettingsManager.getYearNum();
 
-    private ProgressDialog loadingDialog;
-
     private static JSONObject eventData = null;
     public static void setEventData(JSONObject j){
         eventData = j;
@@ -74,7 +73,7 @@ public class TBAEventFragment extends Fragment {
 
         Table.setStretchAllColumns(true);
 
-        startLoading("Loading Teams and Matches...");
+        AlertManager.startLoading("Loading Teams and Matches...");
         Table.removeAllViews();
         Table.setStretchAllColumns(true);
         Table.bringToFront();
@@ -92,7 +91,7 @@ public class TBAEventFragment extends Fragment {
             final RequestTask rq1 = new RequestTask();
             rq1.onResult(matchesStr -> {
                 matchTable(matchesStr, teamsStr, eventData);
-                stopLoading();
+                AlertManager.stopLoading();
                 return null;
             });
             rq1.execute((TBAAddress + "event/" + matchKey + "/matches"), TBAHeader);
@@ -153,7 +152,7 @@ public class TBAEventFragment extends Fragment {
 
 
             // Save button
-            Button btn = new Button(getContext());
+            MaterialButton btn = new MaterialButton(getContext());
             btn.setText("Save");
             btn.setTextSize(18);
             btn.setLayoutParams(new TableRow.LayoutParams(
@@ -375,12 +374,12 @@ public class TBAEventFragment extends Fragment {
 
         }catch (JSONException j){
             AlertManager.error("Failed Downloading", j);
-            stopLoading();
+            AlertManager.stopLoading();
         }
     }
 
     private boolean saveData(ArrayList<frcMatch> matchData, JSONArray teamData, JSONObject eventData){
-        startLoading("Saving data...");
+        AlertManager.startLoading("Saving data...");
 
         Thread t = new Thread(() -> {
             try {
@@ -431,31 +430,15 @@ public class TBAEventFragment extends Fragment {
                 AlertManager.toast("Saved!");
 
                 getActivity().runOnUiThread(() -> findNavController(this).navigate(R.id.action_navigation_tba_event_to_navigation_transfer));
-                stopLoading();
+                AlertManager.stopLoading();
 
             }catch(Exception j) {
                 AlertManager.error(j);
-                stopLoading();
+                AlertManager.stopLoading();
             }
         });
         t.start();
 
         return false;
     }
-
-    private void startLoading(String title){
-        getActivity().runOnUiThread(() -> {
-            if(loadingDialog != null && loadingDialog.isShowing())
-                loadingDialog.dismiss();
-            loadingDialog = ProgressDialog.show(getActivity(), title, "Please wait...");
-        });
-    }
-
-    private void stopLoading(){
-        getActivity().runOnUiThread(() -> {
-            if (loadingDialog != null)
-                loadingDialog.cancel();
-            loadingDialog = null;
-        });
-    }
 }

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/codes/CodeGenTask.java

@@ -0,0 +1,135 @@
+package com.ridgebotics.ridgescout.ui.transfer.codes;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.AsyncTask;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.utility.TaskRunner;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.function.Function;
+
+public class CodeGenTask implements Callable<List<Bitmap>> {
+//    private Function<List<Bitmap>, String> resultFunction = null;
+//
+//    @Override
+//    protected List<Bitmap> doInBackground(String... strings) {
+//
+
+//
+//        return new ArrayList<>();
+//    }
+//
+//
+//    public void onResult(Function<List<Bitmap>, String> func) {
+//        this.resultFunction = func;
+//    }
+//
+//
+//    @Override
+//    protected void onPostExecute(List<Bitmap> result) {
+//        super.onPostExecute(result);
+//        if(resultFunction != null){
+//            resultFunction.apply(result);
+//        }
+//    }
+
+    private final String data;
+    private final int randID;
+    private final int qrSize;
+    private final int qrCount;
+    private final int imageSize;
+
+    public CodeGenTask(String data, int randID, int qrSize, int qrCount, int imageSize) {
+        this.data = data;
+        this.randID = randID;
+        this.qrSize = qrSize;
+        this.qrCount = qrCount;
+        this.imageSize = imageSize;
+    }
+
+    @Override
+    public List<Bitmap> call() {
+        List<Bitmap> qrBitmaps = new ArrayList<>();
+
+        for(int i=0;i<=((data.length()+1)/qrSize);i++){
+            final int start = i*qrSize;
+            int end = (i+1)*qrSize;
+            if(end >= data.length()){
+                end = data.length();
+            }
+            try {
+                Bitmap unscaledBitmap = generateQrCode(
+                        FileEditor.byteToChar(FileEditor.internalDataVersion, FileEditor.lengthHeaderBytes) +
+                                String.valueOf(FileEditor.byteToChar(randID, FileEditor.lengthHeaderBytes)) +
+                                FileEditor.byteToChar(i, FileEditor.lengthHeaderBytes) +
+                                FileEditor.byteToChar(qrCount - 1, FileEditor.lengthHeaderBytes) +
+                                data.substring(start, end)
+                );
+                if(unscaledBitmap == null) {
+                    AlertManager.error("Generated image was null!");
+                    continue;
+                }
+                qrBitmaps.add(Bitmap.createScaledBitmap(unscaledBitmap, imageSize, imageSize, false));
+//                alert("title", ""+(qrCount-1));
+            }catch (WriterException e){
+                AlertManager.error(e);
+            }
+        }
+
+        return qrBitmaps;
+    }
+
+    private Bitmap generateQrCode(String contents) throws WriterException {
+
+        final int size = 512;
+
+        if (contents == null) {
+            return null;
+        }
+
+        Map<EncodeHintType, Object> hints = new EnumMap<>(EncodeHintType.class);
+
+        // The Charset must be UTF-8, Or data will not be transferred properly. IDK why.
+        hints.put(EncodeHintType.CHARACTER_SET, "ISO-8859-1");
+//        hints.put(EncodeHintType.);
+        hints.put(EncodeHintType.MARGIN, 0); /* default = 4 */
+        MultiFormatWriter writer = new MultiFormatWriter();
+
+        BitMatrix result;
+        try {
+            result = writer.encode(contents, BarcodeFormat.DATA_MATRIX, size, size, hints);
+        } catch (IllegalArgumentException e) {
+            // Unsupported format
+            AlertManager.error(e);
+            return null;
+        }
+
+        int width = result.getWidth();
+        int height = result.getHeight();
+        int[] pixels = new int[width * height];
+        for (int y = 0; y < height; y++) {
+            int offset = y * width;
+            for (int x = 0; x < width; x++) {
+                pixels[offset + x] = result.get(x, y) ? Color.BLACK : Color.WHITE;
+            }
+        }
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height,
+                Bitmap.Config.ARGB_8888);
+        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+
+        return bitmap;
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/codes/CodeGeneratorView.java

@@ -1,9 +1,10 @@
 package com.ridgebotics.ridgescout.ui.transfer.codes;
 
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.os.CountDownTimer;
+import android.os.Handler;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,16 +19,11 @@ import androidx.fragment.app.Fragment;
 import com.ridgebotics.ridgescout.databinding.FragmentTransferCodeSenderBinding;
 import com.ridgebotics.ridgescout.utility.AlertManager;
 import com.ridgebotics.ridgescout.utility.FileEditor;
-import com.google.zxing.BarcodeFormat;
+import com.ridgebotics.ridgescout.utility.TaskRunner;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.EnumMap;
+import java.util.List;
-import java.util.Map;
 import java.util.Random;
 
 // Class to show the code transfer thing.
@@ -38,23 +34,28 @@ public class CodeGeneratorView extends Fragment {
     private TextView qrIndexN;
     private TextView qrIndexD;
 
-    private final int maxQrCount = 256; //The max number that can be stored in a byte
+    private static final int maxQrCount = 256; //The max number that can be stored in a byte
 
-    private final int maxQrSpeed = 5;
+    private static final int maxQrSize = 800;
-    private final int minQrSpeed = 300 + maxQrSpeed - 1;
+
+
+    private static final int maxQrSpeed = 50;
+    private static final int minQrSpeed = 1000;
+    private static final int defaultQrDelay = 12;
+
+
+    private int imageSize;
 
     private int minQrSize = 0;
-    private final int maxQrSize = 800;
     private int qrSize = 200;
 
-    private final int defaultQrDelay = 419;
+    private double qrDelay = 0;
-    private int qrDelay = 0;
     private int qrIndex = 0;
 
     private CountDownTimer timer;
     private int qrCount = 0;
 
-    private ArrayList<Bitmap> qrBitmaps;
+    private List<Bitmap> qrBitmaps = new ArrayList<>();
 
     private FragmentTransferCodeSenderBinding binding;
 
@@ -77,6 +78,12 @@ public class CodeGeneratorView extends Fragment {
         qrIndexN = binding.qrIndexN;
         qrIndexD = binding.qrIndexD;
 
+        DisplayMetrics displaymetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
+//        int height = displaymetrics.heightPixels;
+        imageSize = displaymetrics.widthPixels;
+//         = 800;
+
         String compressed = new String(FileEditor.blockCompress(data, FileEditor.lengthHeaderBytes), StandardCharsets.ISO_8859_1);
 
         if(compressed.isEmpty()){
@@ -85,75 +92,30 @@ public class CodeGeneratorView extends Fragment {
         }
 
         minQrSize = Math.round((float)compressed.length() / maxQrCount)+1;
-
+        qrSize += minQrSize;
-        qrSizeSlider.setMax(maxQrSize-minQrSize);
-        qrSpeedSlider.setMax((minQrSpeed-maxQrSpeed)*2);
-
-        qrSizeSlider.setProgress(minQrSize+qrSize);
-        qrSpeedSlider.setProgress(defaultQrDelay+5);
 
         sendData(compressed);
 
+        qrSpeedSlider.setMax(maxQrSpeed*2);
+        qrSpeedSlider.setProgress(maxQrSpeed + defaultQrDelay);
+
+        qrSizeSlider.setMax(maxQrSize-minQrSize);
+        qrSizeSlider.setProgress(qrSize-minQrSize);
+
+        startLoop();
+
         return binding.getRoot();
     }
 
-
-    private Bitmap generateQrCode(String contents) throws WriterException {
-
-        final int size = 512;
-
-        if (contents == null) {
-            return null;
-        }
-
-        Map<EncodeHintType, Object> hints = new EnumMap<>(EncodeHintType.class);
-
-        // The Charset must be UTF-8, Or data will not be transferred properly. IDK why.
-        hints.put(EncodeHintType.CHARACTER_SET, "ISO-8859-1");
-//        hints.put(EncodeHintType.);
-        hints.put(EncodeHintType.MARGIN, 0); /* default = 4 */
-        MultiFormatWriter writer = new MultiFormatWriter();
-
-        BitMatrix result;
-        try {
-            result = writer.encode(contents, BarcodeFormat.DATA_MATRIX, size, size, hints);
-        } catch (IllegalArgumentException e) {
-            // Unsupported format
-            AlertManager.error(e);
-            return null;
-        }
-
-        int width = result.getWidth();
-        int height = result.getHeight();
-        int[] pixels = new int[width * height];
-        for (int y = 0; y < height; y++) {
-            int offset = y * width;
-            for (int x = 0; x < width; x++) {
-                pixels[offset + x] = result.get(x, y) ? Color.BLACK : Color.WHITE;
-            }
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(width, height,
-                Bitmap.Config.ARGB_8888);
-        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
-
-        return bitmap;
-    }
-
-
     private void sendData(String data){
-
-
-
         qrCount = (data.length()/qrSize)+1;
         qrIndexD.setText(String.valueOf(qrCount));
 
-//        alert("size", ""+binding.qrSizeSlider.getProgress()+"\n"+binding.qrSizeSlider.getMax());
-
         qrSpeedSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                qrDelay = -(minQrSpeed - progress - maxQrSpeed + 1);
+                qrDelay = ((double) progress /maxQrSpeed) - 1;
+//                startLoop();
             }
             @Override
             public void onStartTrackingTouch(SeekBar seekBar) {}
@@ -173,43 +135,24 @@ public class CodeGeneratorView extends Fragment {
                 qrCount = ((data.length()+1)/qrSize) +1;
                 qrIndexD.setText(String.valueOf(qrCount));
                 sendData(data);
+//                startLoop();
             }
         });
 
-//        qrSizeSlider.setProgress(qr);
+        AlertManager.startLoading("Generating codes...");
 
-        qrBitmaps = new ArrayList<>();
+        new TaskRunner().executeAsync(new CodeGenTask(data, new Random().nextInt(255), qrSize, qrCount, imageSize), result -> {
-
+            qrBitmaps = result;
-        int randID = new Random().nextInt(255);
+            AlertManager.stopLoading();
-
-        for(int i=0;i<=((data.length()+1)/qrSize);i++){
-            final int start = i*qrSize;
-            int end = (i+1)*qrSize;
-            if(end >= data.length()){
-                end = data.length();
-            }
-            try {
-//                alert("test", ""+Math.ceil((double)data.length()/(double)qrSize));
-                qrBitmaps.add(generateQrCode(
-                    FileEditor.byteToChar(FileEditor.internalDataVersion, FileEditor.lengthHeaderBytes) +
-                                String.valueOf(FileEditor.byteToChar(randID, FileEditor.lengthHeaderBytes)) +
-                                FileEditor.byteToChar(i, FileEditor.lengthHeaderBytes) +
-                                FileEditor.byteToChar(qrCount - 1, FileEditor.lengthHeaderBytes) +
-                                data.substring(start, end)
-                ));
-//                alert("title", ""+(qrCount-1));
-            }catch (WriterException e){
-                AlertManager.error(e);
-            }
-        }
             qrIndex = 0;
-        if(timer != null){
+        });
-            timer.cancel();
+
-        }
-        qrLoop();
     }
 
     private void updateQr(){
+        if(qrBitmaps.isEmpty())
+            return;
+
         qrImage.setImageBitmap(qrBitmaps.get(qrIndex));
         if(qrDelay > 0) {
             this.qrIndex += 1;
@@ -226,13 +169,36 @@ public class CodeGeneratorView extends Fragment {
         qrIndexN.setText(String.valueOf(qrIndex+1));
     }
 
-    private void qrLoop(){
+    private boolean shouldstop = false;
-        timer = new CountDownTimer(minQrSpeed-Math.abs(qrDelay)+1, 1000) {
+
-            public void onTick(long millisUntilFinished) {}
+    private void startLoop() {
-            public void onFinish() {
+        final Handler handler = new Handler();
-                updateQr();
+        Runnable runnable = new Runnable() {
-                qrLoop();
+
+            @Override
+            public void run() {
+                if(shouldstop){
+                    return;
                 }
-        }.start();
+                try{
+                    updateQr();
+                }
+                catch (Exception e) {
+                    AlertManager.error(e);
+                }
+                finally{
+                    double a = ((double) maxQrSpeed) / (Math.abs(qrDelay));
+                    a = Math.min(Math.max(a, maxQrSpeed), minQrSpeed);
+                    handler.postDelayed(this, (long) a);
+                }
+            }
+        };
+        handler.post(runnable);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        shouldstop = true;
     }
 }

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/codes/CodeOverlayView.java

@@ -65,7 +65,7 @@ public class CodeOverlayView extends View {
                 }
             }
             if(barColors != null){
-                final double width = getWidth()/barColors.length;
+                final double width = (double) getWidth() /barColors.length;
 
                 final int top = 0;
                 final int bottom = barHeight;

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/codes/CodeScanTask.java

@@ -14,19 +14,69 @@ import com.google.zxing.Reader;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.datamatrix.DataMatrixReader;
+import com.ridgebotics.ridgescout.utility.TaskRunner;
 
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Callable;
 import java.util.function.Function;
 
 // Background task for code scanning, to not slow down the scanner.
-public class CodeScanTask extends AsyncTask<String, String, String>{
+//public class CodeScanTask extends AsyncTask<String, String, String>{
-    private Function<String, String> resultFunction = null;
+//    private Function<String, String> resultFunction = null;
+//    private Bitmap image;
+//
+//    @Override
+//    protected String doInBackground(String... str) {
+//        if(image == null){return null;}
+//
+//        int width = image.getWidth();
+//        int height = image.getHeight();
+//        int[] pixels = new int[width * height];
+//        image.getPixels(pixels, 0, width, 0, 0, width, height);
+//
+//        RGBLuminanceSource source = new RGBLuminanceSource(width, height, pixels);
+//        BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+//
+//        Map<DecodeHintType, Object> hints = new HashMap<>();
+//        hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
+////        hints.put(DecodeHintType.PURE_BARCODE, Boolean.TRUE);
+//        hints.put(DecodeHintType.POSSIBLE_FORMATS, EnumSet.of(BarcodeFormat.DATA_MATRIX));
+//
+//        Reader reader = new DataMatrixReader();
+//        try {
+//            Result result = reader.decode(binaryBitmap, hints);
+//            return result.getText();
+//        } catch (NotFoundException | ChecksumException | FormatException e) {
+////            AlertManager.error(e);
+//        }
+//
+//        return null;
+//    }
+//    public void setImage(Bitmap image){this.image = image;}
+//    public void onResult(Function<String, String> func) {
+//        this.resultFunction = func;
+//    }
+//
+//    @Override
+//    protected void onPostExecute(String result) {
+//        super.onPostExecute(result);
+//        if(resultFunction != null){
+//            resultFunction.apply(result);
+//        }
+//    }
+//}
+
+public class CodeScanTask implements Callable<String> {
     private Bitmap image;
 
+    public CodeScanTask(Bitmap image) {
+        this.image = image;
+    }
+
     @Override
-    protected String doInBackground(String... str) {
+    public String call() {
         if(image == null){return null;}
 
         int width = image.getWidth();
@@ -52,17 +102,4 @@ public class CodeScanTask extends AsyncTask<String, String, String>{
 
         return null;
     }
-    public void setImage(Bitmap image){this.image = image;}
-    public void onResult(Function<String, String> func) {
-        this.resultFunction = func;
-    }
-
-    @Override
-    protected void onPostExecute(String result) {
-        super.onPostExecute(result);
-        if(resultFunction != null){
-            resultFunction.apply(result);
-        }
-    }
 }
-

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/codes/CodeScannerView.java

@@ -6,6 +6,7 @@ import android.Manifest;
 import android.app.AlertDialog;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.Matrix;
 import android.media.Image;
 import android.os.Bundle;
 import android.os.Handler;
@@ -38,11 +39,15 @@ import com.ridgebotics.ridgescout.utility.AlertManager;
 import com.ridgebotics.ridgescout.utility.BuiltByteParser;
 import com.ridgebotics.ridgescout.utility.FileEditor;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.ridgebotics.ridgescout.utility.TaskRunner;
+
+import org.checkerframework.checker.units.qual.C;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Objects;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -62,21 +67,12 @@ public class CodeScannerView extends Fragment {
         alert.create().show();
     }
 
-
-    private float scale = 0;
     private final int downscale = 1;
     private LifecycleOwner lifecycle;
 
     private void setImage(Bitmap bmp){
-        if(scale == 0) {
-            scale = ((float) binding.container.getWidth() / bmp.getWidth()) * ((float) 16 / 9);
-            binding.scannerImage.setTranslationX(0);
-            binding.scannerImage.setTranslationY(0);
-        }
         scanQRCode(bmp);
         binding.scannerImage.setImageBitmap(bmp);
-        binding.scannerThreshold.bringToFront();
-//        alert("test", getChildCount()+"");
     }
 
 //    private Bitmap img
@@ -99,23 +95,27 @@ public class CodeScannerView extends Fragment {
         final int height = image.getHeight();
 
         int[] pixels = new int[width * height];
-        for (int y = 0; y < height; y++) {
+        for (int i = 0; i < width*height; i++) {
-            for (int x = 0; x < width; x++) {
+            int L = levelMap[yBuffer.get(i) & 0xff];
-                int L = levelMap[yBuffer.get() & 0xff];
+            pixels[i] = 0xff000000 | (L << 16) | (L << 8) | L;
-                pixels[y * width + x] = 0xff000000 | (L << 16) | (L << 8) | L;
-            }
         }
 
+        Matrix matrix = new Matrix();
+
+        matrix.postRotate(90);
+
+
         Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+        bitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true);
+//        Bitmap.rota
 
         return bitmap;
     }
     public void scanQRCode(Bitmap bitmap) {
 
-        CodeScanTask async = new CodeScanTask();
+//        CodeScanTask async = new CodeScanTask();
-        async.setImage(bitmap);
+        new TaskRunner().executeAsync(new CodeScanTask(bitmap), data -> {
-        async.onResult(data -> {
             if(data != null){
 //                    alert("test", ""+fileEditor.byteFromChar(data.charAt(0)));
                 compileData(
@@ -126,10 +126,7 @@ public class CodeScannerView extends Fragment {
                         data.substring(4)
                 );
             }
-            return null;
         });
-        async.execute();
-
 
 
 //        return contents;
@@ -231,26 +228,23 @@ public class CodeScannerView extends Fragment {
 
     void bindPreview(@NonNull ProcessCameraProvider cameraProvider) {
 
-        Preview preview = new Preview.Builder()
+        Preview preview = new Preview.Builder().build();
-                .setTargetAspectRatio(AspectRatio.RATIO_16_9)
-                .setTargetRotation(Surface.ROTATION_180)
-                .build();
 
         CameraSelector cameraSelector = new CameraSelector.Builder()
                 .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+
 //                .addCameraFilter(CameraFilters.NON)
                 .build();
 
         ExecutorService executor = Executors.newSingleThreadExecutor();
 
         ImageAnalysis imageAnalysis = new ImageAnalysis.Builder()
-//                .setTargetResolution(new Size(224, 224))
+//                .setTargetAspectRatio(AspectRatio.RATIO_16_9)
-                .setOutputImageRotationEnabled(false)
-                .setTargetAspectRatio(AspectRatio.RATIO_16_9)
                 .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
+//                .setOutputImageRotationEnabled(true)
+//                .setTargetRotation(Surface.ROTATION_0)
                 .build();
 
-
         imageAnalysis.setAnalyzer(executor, new ImageAnalysis.Analyzer() {
             @OptIn(markerClass = ExperimentalGetImage.class) @Override
             public void analyze(@NonNull ImageProxy image) {
@@ -269,6 +263,7 @@ public class CodeScannerView extends Fragment {
         });
 
         cameraProvider.unbindAll();
+//        cameraProvider.ro
 
         cameraProvider.bindToLifecycle(lifecycle,
                 cameraSelector, imageAnalysis, preview);
@@ -295,6 +290,7 @@ public class CodeScannerView extends Fragment {
             Log.i("title", ""+qrCount);
             barColors = new int[qrCount];
             prevQrIndex = qrIndex;
+            qrScannedCount = 0;
         }
 
         final boolean updated;
@@ -313,8 +309,20 @@ public class CodeScannerView extends Fragment {
 
         if(updated && qrScannedCount >= qrCount){
 
+            AlertManager.startLoading("Decoding data...");
+            new TaskRunner().executeAsync(new CodeDecodeTask(), result -> {
+                AlertManager.stopLoading();
+            });
+
+        }
+        prevQrIndex = qrIndex;
+    }
+
+    private class CodeDecodeTask implements Callable<Void> {
+        @Override
+        public Void call() {
             String compiledString = "";
-            for(int i=0;i<qrCount;i++){
+            for(int i=0;i<qrDataArr.length;i++){
                 compiledString += qrDataArr[i];
             }
 
@@ -342,9 +350,8 @@ public class CodeScannerView extends Fragment {
             }catch (Exception e){
                 AlertManager.error(e);
             }
-        }
-        prevQrIndex = qrIndex;
-    }
-
 
+            return null;
+        }
+    }
 }

app/src/main/java/com/ridgebotics/ridgescout/ui/views/CustomSpinnerView.java

@@ -62,7 +62,7 @@ public class CustomSpinnerView extends LinearLayout {
         this.index = defaultOption;
 
         if(defaultOption != -1)
-            this.item.setText(options.get(defaultOption));
+            this.item.setText("▼ " + options.get(defaultOption));
 
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
@@ -78,7 +78,7 @@ public class CustomSpinnerView extends LinearLayout {
         CustomSpinnerPopup popup = new CustomSpinnerPopup(getContext()).init(options, option -> {
 //            dialog.();
             if(!isEnabled()) return;
-            item.setText(option);
+            item.setText("▼ " + option);
             index = options.indexOf(option);
             if(onClickListener != null) {
                 onClickListener.onClick(option, options.indexOf(option));
@@ -105,12 +105,12 @@ public class CustomSpinnerView extends LinearLayout {
     }
 
     public void setOption(String option) {
-        item.setText(option);
+        item.setText("▼ " + option);
         index = options.indexOf(option);
     }
 
     public void setOption(int index) {
-        item.setText(options.get(index));
+        item.setText("▼ " + options.get(index));
         this.index = index;
     }
 

app/src/main/java/com/ridgebotics/ridgescout/ui/views/MatchScoutingIndicator.java

@@ -1,6 +1,7 @@
 package com.ridgebotics.ridgescout.ui.views;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
@@ -54,6 +55,20 @@ public class MatchScoutingIndicator extends RelativeLayout {
         match_indicator_bar_team_num = findViewById(R.id.match_indicator_bar_team_num);
         box =  findViewById(R.id.file_indicator_box);
         coloredBackground = findViewById(R.id.match_indicator_background);
+
+        int currentNightMode = getContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        switch (currentNightMode) {
+            case Configuration.UI_MODE_NIGHT_NO:
+                // Night mode is not active on device
+                match_indicator_back_button.setColorFilter(Color.BLACK, PorterDuff.Mode.SRC_IN);
+                match_indicator_next_button.setColorFilter(Color.BLACK, PorterDuff.Mode.SRC_IN);
+                break;
+            case Configuration.UI_MODE_NIGHT_YES:
+                // Night mode is active on device
+                match_indicator_back_button.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
+                match_indicator_next_button.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
+                break;
+        }
     }
 
     public void setUsername(String username){
@@ -73,19 +88,31 @@ public class MatchScoutingIndicator extends RelativeLayout {
     }
 
     public void setColor(int color){
-        Drawable drawable = box.getBackground();
+        // Set color of main background rectangle
-        drawable.mutate();
+        Drawable box_drawable = box.getBackground();
-        drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        box_drawable.mutate();
+        box_drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
 
         float[] hsv = new float[3];
         Color.colorToHSV(color,hsv);
 
-        coloredBackground.setBackgroundColor(
+        int background_color = Color.HSVToColor(220, new float[]{
-                Color.HSVToColor(220, new float[]{
                 hsv[0],
                 Math.min(hsv[1], 0.75f),
                 Math.min(hsv[2], 0.5f)
-                })
+        });
+
+        // Set color of main background rectangle, slightly dimmer
+        coloredBackground.setBackgroundColor(
+                background_color
         );
+
+        Drawable left_drawable = match_indicator_back_button.getBackground();
+        left_drawable.mutate();
+        left_drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+
+        Drawable right_drawable = match_indicator_next_button.getBackground();
+        right_drawable.mutate();
+        right_drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
     }
 }

app/src/main/java/com/ridgebotics/ridgescout/ui/views/PitScoutingIndicator.java

@@ -0,0 +1,75 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.ridgebotics.ridgescout.R;
+
+// A view for displaying information about a team.
+public class PitScoutingIndicator extends RelativeLayout {
+    public PitScoutingIndicator(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public PitScoutingIndicator(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public TextView pit_indicator_username;
+    public TextView pit_indicator_team_num;
+    private ConstraintLayout box;
+    private View coloredBackground;
+
+    public void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.view_pit_scouting_indicator, this, true);
+        pit_indicator_username = findViewById(R.id.pit_indicator_username);
+        pit_indicator_team_num = findViewById(R.id.pit_indicator_teamnum);
+
+        box =  findViewById(R.id.pit_indicator_box);
+        coloredBackground = findViewById(R.id.pit_indicator_background);
+
+    }
+
+    public void setUsername(String username){
+        pit_indicator_username.setText(username);
+    }
+
+    public void setTeamNum(int teamNum) {
+        pit_indicator_team_num.setText(String.valueOf(teamNum));
+    }
+
+    public void setColor(int color){
+        // Set color of main background rectangle
+        Drawable box_drawable = box.getBackground();
+        box_drawable.mutate();
+        box_drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+
+        float[] hsv = new float[3];
+        Color.colorToHSV(color,hsv);
+
+        int background_color = Color.HSVToColor(220, new float[]{
+                hsv[0],
+                Math.min(hsv[1], 0.75f),
+                Math.min(hsv[2], 0.5f)
+        });
+
+        // Set color of main background rectangle, slightly dimmer
+        coloredBackground.setBackgroundColor(
+                background_color
+        );
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/views/RecyclerAdapter.java

@@ -0,0 +1,105 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RecyclerAdapter<T> extends RecyclerView.Adapter<RecyclerHolder<T>> {
+    private List<T> items;
+    private final int layoutResId;
+    private final RecyclerHolderFactory<T> viewHolderFactory;
+    private RecyclerClickListener<T> onItemClickListener;
+
+    public RecyclerAdapter(int layoutResId, RecyclerHolderFactory<T> viewHolderFactory) {
+        this.items = new ArrayList<>();
+        this.layoutResId = layoutResId;
+        this.viewHolderFactory = viewHolderFactory;
+    }
+
+    @Override
+    public RecyclerHolder<T> onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(layoutResId, parent, false);
+        return viewHolderFactory.createViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerHolder<T> holder, int position) {
+        T item = items.get(position);
+        holder.bind(item, position);
+        holder.setOnItemClickListener(item, onItemClickListener);
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    // List management methods
+    public void setItems(List<T> newItems) {
+        this.items.clear();
+        if (newItems != null) {
+            this.items.addAll(newItems);
+        }
+        notifyDataSetChanged();
+    }
+
+    public void addItem(T item) {
+        items.add(item);
+        notifyItemInserted(items.size() - 1);
+    }
+
+    public void addItem(int position, T item) {
+        items.add(position, item);
+        notifyItemInserted(position);
+    }
+
+    public void removeItem(int position) {
+        if (position >= 0 && position < items.size()) {
+            items.remove(position);
+            notifyItemRemoved(position);
+        }
+    }
+
+    public void removeItem(T item) {
+        int position = items.indexOf(item);
+        if (position != -1) {
+            removeItem(position);
+        }
+    }
+
+    public void updateItem(int position, T item) {
+        if (position >= 0 && position < items.size()) {
+            items.set(position, item);
+            notifyItemChanged(position);
+        }
+    }
+
+    public void clear() {
+        int size = items.size();
+        items.clear();
+        notifyItemRangeRemoved(0, size);
+    }
+
+    public T getItem(int position) {
+        return items.get(position);
+    }
+
+    public List<T> getItems() {
+        return new ArrayList<>(items);
+    }
+
+    public void setOnItemClickListener(RecyclerClickListener<T> listener) {
+        this.onItemClickListener = listener;
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/views/RecyclerClickListener.java

@@ -0,0 +1,5 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+public interface RecyclerClickListener<T> {
+    void onItemClick(T item, int position);
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/views/RecyclerHolder.java

@@ -0,0 +1,19 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+
+public abstract class RecyclerHolder<T> extends RecyclerView.ViewHolder {
+    public RecyclerHolder(View itemView) {
+        super(itemView);
+    }
+
+    public abstract void bind(T item, int position);
+
+    // Optional method for handling item clicks
+    public void setOnItemClickListener(T item, RecyclerClickListener<T> listener) {
+        if (listener != null) {
+            itemView.setOnClickListener(v -> listener.onItemClick(item, getAdapterPosition()));
+        }
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/views/RecyclerHolderFactory.java

@@ -0,0 +1,7 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.view.View;
+
+public interface RecyclerHolderFactory<T> {
+    RecyclerHolder<T> createViewHolder(View itemView);
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/views/RecyclerList.java

@@ -0,0 +1,133 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.GridLayoutManager;
+import java.util.List;
+
+public class RecyclerList<T> extends RecyclerView {
+    private RecyclerAdapter<T> adapter;
+
+    public RecyclerList(Context context) {
+        super(context);
+        init();
+    }
+
+    public RecyclerList(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public RecyclerList(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        // Set default layout manager
+        setLayoutManager(new LinearLayoutManager(getContext()));
+
+        // Enable optimizations
+        setHasFixedSize(true);
+        setItemViewCacheSize(20);
+        setDrawingCacheEnabled(true);
+        setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
+    }
+
+    // Setup method to configure the RecyclerView
+    public RecyclerList<T> setup(int layoutResId, RecyclerHolderFactory<T> RecyclerHolderFactory) {
+        adapter = new RecyclerAdapter<>(layoutResId, RecyclerHolderFactory);
+        setAdapter(adapter);
+        return this;
+    }
+
+    // Layout manager convenience methods
+    public RecyclerList<T> withLinearLayout() {
+        setLayoutManager(new LinearLayoutManager(getContext()));
+        return this;
+    }
+
+    public RecyclerList<T> withLinearLayout(int orientation) {
+        setLayoutManager(new LinearLayoutManager(getContext(), orientation, false));
+        return this;
+    }
+
+    public RecyclerList<T> withGridLayout(int spanCount) {
+        setLayoutManager(new GridLayoutManager(getContext(), spanCount));
+        return this;
+    }
+
+    public RecyclerList<T> withDivider() {
+        DividerItemDecoration divider = new DividerItemDecoration(getContext(),
+                DividerItemDecoration.VERTICAL);
+        addItemDecoration(divider);
+        return this;
+    }
+
+    public RecyclerList<T> withItemClickListener(RecyclerClickListener<T> listener) {
+        if (adapter != null) {
+            adapter.setOnItemClickListener(listener);
+        }
+        return this;
+    }
+
+    // Data management methods
+    public void setItems(List<T> items) {
+        if (adapter != null) {
+            adapter.setItems(items);
+        }
+    }
+
+    public void addItem(T item) {
+        if (adapter != null) {
+            adapter.addItem(item);
+        }
+    }
+
+    public void addItem(int position, T item) {
+        if (adapter != null) {
+            adapter.addItem(position, item);
+        }
+    }
+
+    public void removeItem(int position) {
+        if (adapter != null) {
+            adapter.removeItem(position);
+        }
+    }
+
+    public void removeItem(T item) {
+        if (adapter != null) {
+            adapter.removeItem(item);
+        }
+    }
+
+    public void updateItem(int position, T item) {
+        if (adapter != null) {
+            adapter.updateItem(position, item);
+        }
+    }
+
+    public void clear() {
+        if (adapter != null) {
+            adapter.clear();
+        }
+    }
+
+    public T getItem(int position) {
+        return adapter != null ? adapter.getItem(position) : null;
+    }
+
+    public List<T> getItems() {
+        return adapter != null ? adapter.getItems() : null;
+    }
+
+    public RecyclerAdapter<T> getGenericAdapter() {
+        return adapter;
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/ui/views/TeamListOption.java

@@ -19,34 +19,37 @@ import com.ridgebotics.ridgescout.R;
 import com.ridgebotics.ridgescout.types.frcTeam;
 
 // A view that acts as a row specifically to display a team and their icon in a list formmt.
-public class TeamListOption extends LinearLayout {
+public class TeamListOption extends RecyclerHolder<frcTeam> {
-    public TeamListOption(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init(context);
-    }
 
-    public TeamListOption(Context context) {
-        super(context);
-        init(context);
-    }
 
+//    public TeamListOption(Context context, @Nullable AttributeSet attrs) {
+//        super(context, attrs);
+//        init(context);
+//    }
+//
+//    public TeamListOption(Context context) {
+//        super(context);
+//        init(context);
+//    }
+//
     private TextView teamNumber;
     private TextView teamName;
 
     private ImageView teamLogo;
     private ConstraintLayout box;
     private View coloredBackground;
+//
+    public TeamListOption(View view) {
+        super(view);
+//        LayoutInflater.from(context).inflate(R.layout.view_team_option, this, true);
 
-    public void init(Context context) {
+        teamNumber = view.findViewById(R.id.field_option_type);
-        LayoutInflater.from(context).inflate(R.layout.view_team_option, this, true);
+        teamName = view.findViewById(R.id.field_option_name);
-
+        teamLogo = view.findViewById(R.id.team_option_logo);
-        teamNumber = findViewById(R.id.field_option_type);
-        teamName = findViewById(R.id.field_option_name);
-        teamLogo = findViewById(R.id.team_option_logo);
 
 
-        box =  findViewById(R.id.team_option_box);
+        box =  view.findViewById(R.id.team_option_box);
-        coloredBackground = findViewById(R.id.team_option_background);
+        coloredBackground = view.findViewById(R.id.team_option_background);
     }
 
     public void setTeamNumber(int num){
@@ -59,6 +62,7 @@ public class TeamListOption extends LinearLayout {
 
     public void setTeamLogo(Bitmap bitmap){
         teamLogo.setImageBitmap(bitmap);
+        showLogo();
     }
 
     public void hideLogo(){
@@ -68,7 +72,8 @@ public class TeamListOption extends LinearLayout {
         teamLogo.setVisibility(View.VISIBLE);
     }
 
-    public void fromTeam(frcTeam team){
+    @Override
+    public void bind(frcTeam team, int position){
         setTeamNumber(team.teamNumber);
         setTeamName(team.teamName);
 

app/src/main/java/com/ridgebotics/ridgescout/utility/AlertManager.java

@@ -3,6 +3,7 @@ package com.ridgebotics.ridgescout.utility;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.widget.Toast;
@@ -113,4 +114,22 @@ public class AlertManager {
         });
     }
 
+    private static ProgressDialog loadingDialog;
+
+    public static void startLoading(String title){
+        ((Activity) context).runOnUiThread(() -> {
+            if(loadingDialog != null && loadingDialog.isShowing())
+                loadingDialog.dismiss();
+            loadingDialog = ProgressDialog.show(context, title, "Please wait...");
+        });
+    }
+
+    public static void stopLoading(){
+        ((Activity) context).runOnUiThread(() -> {
+            if (loadingDialog != null)
+                loadingDialog.cancel();
+            loadingDialog = null;
+        });
+    }
+
 }

app/src/main/java/com/ridgebotics/ridgescout/utility/Colors.java

@@ -6,7 +6,7 @@ import android.graphics.Color;
 public class Colors {
     // Lists and stuff
     public static final int color_found = 0x7f00ff00;
-    public static final int color_rescout = 0x7f0000ff;
+    public static final int color_rescout = 0xff007fff;
     public static final int color_not_found = 0x7f7f0000;
 
 
@@ -14,9 +14,9 @@ public class Colors {
     public static final int unfocused_background_color = 0x50118811;
 
 
-    public static final int unsaved_color = 0x60ff0000;
+    public static final int unsaved_color = 0xffaa0000;
-    public static final int saved_color = 0x6000ff00;
+    public static final int saved_color = 0xff00aa00;
-    public static final int rescout_color = 0x600000ff;
+    public static final int rescout_color = 0xff007fff;
 
 
     // Data graphs

app/src/main/java/com/ridgebotics/ridgescout/utility/FileEditor.java

@@ -100,7 +100,7 @@ public final class FileEditor {
 
 
     public static int byteFromChar(char c){
-        byte[] bytes = (String.valueOf(c)).getBytes(Charset.defaultCharset());
+        byte[] bytes = (String.valueOf(c)).getBytes(StandardCharsets.ISO_8859_1);
         return Byte.toUnsignedInt(bytes[0]);
     }
 
@@ -398,9 +398,10 @@ public final class FileEditor {
             Arrays.sort(filenames, (o1, o2) -> {
                 try {
                     if (!o1.contains("-") || !o2.contains("-"))
-                        return 0;
+                        return o2.compareTo(o1);
-                    return Integer.valueOf(o1.split("-")[1]).compareTo(Integer.valueOf(o2.split("-")[1]));
+                    return Integer.valueOf(o1.split("-")[1].split("\\.")[0]).compareTo(Integer.valueOf(o2.split("-")[1].split("\\.")[0]));
                 } catch (Exception e) {
+                    AlertManager.error(e);
                     return 0;
                 }
             });

app/src/main/java/com/ridgebotics/ridgescout/utility/ImageRequestTask.java

@@ -25,11 +25,24 @@ public class ImageRequestTask extends AsyncTask<String, Void, Bitmap> {
         try {
             URL url = new URL(src);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            // We do a little bit of spoofing
+            connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11");
             connection.setDoInput(true);
             connection.connect();
+
+            int code = connection.getResponseCode();
+            switch (code) {
+                case 200:
                     InputStream input = connection.getInputStream();
                     return BitmapFactory.decodeStream(input);
-        } catch (FileNotFoundException e) {
+                case 403:
+//                    AlertManager.error("Got 403, Going to https://www.thebluealliance.com/avatars may fix this");
+                    return null;
+                default:
+                    AlertManager.error("Error downloading image " + src, "Got response code: " + code);
+                    return null;
+            }
+        } catch (FileNotFoundException e){
             return null;
         } catch (IOException e){
             AlertManager.error("Error downloading image " + src, e);

app/src/main/java/com/ridgebotics/ridgescout/utility/TaskRunner.java

@@ -0,0 +1,32 @@
+package com.ridgebotics.ridgescout.utility;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+// https://stackoverflow.com/questions/58767733/the-asynctask-api-is-deprecated-in-android-11-what-are-the-alternatives
+public class TaskRunner {
+    private final Executor executor = Executors.newSingleThreadExecutor(); // change according to your requirements
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    public interface Callback<R> {
+        void onComplete(R result);
+    }
+
+    public <R> void executeAsync(Callable<R> callable, Callback<R> callback) {
+        executor.execute(() -> {
+            final R result;
+            try {
+                result = callable.call();
+                handler.post(() -> {
+                    callback.onComplete(result);
+                });
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+}

app/src/main/res/layout/fragment_data.xml

@@ -17,25 +17,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ScrollView
+    <LinearLayout
+        android:id="@+id/table"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingBottom="50dp"
-            android:orientation="vertical">
-
-            <TableLayout
-                android:id="@+id/table"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
         <com.ridgebotics.ridgescout.ui.views.CustomSpinnerView
             android:id="@+id/data_type_dropdown"
             android:layout_width="wrap_content"
@@ -43,10 +33,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-            </TableLayout>
 
     </LinearLayout>
-    </ScrollView>
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_scouting.xml

@@ -92,17 +92,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/text_next_match"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:text="TextView"
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_name" />
-
         <TextView
             android:id="@+id/text_match_alliance"
             android:layout_width="wrap_content"
@@ -122,6 +111,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/event_button" />
 
+        <LinearLayout
+            android:id="@+id/info_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_name" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_scouting_match.xml

@@ -45,7 +45,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="Scouting Notice"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"></TextView>
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_scouting_pit.xml

@@ -4,54 +4,27 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <com.ridgebotics.ridgescout.ui.views.PitScoutingIndicator
-        android:id="@+id/pit_file_indicator"
+        android:id="@+id/pit_indicator"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="60dp"
-        android:background="#60ff0000"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/pit_bar_team_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="4388"
-            android:textAlignment="center"
-            android:textSize="24sp"
-            app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/pitUsername"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Username"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/pit_bar_team_num"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:id="@+id/pitScoutArea"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:paddingTop="48dp">
+            android:paddingTop="60dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/scouting_notice_box"
@@ -60,16 +33,15 @@
                 android:layout_alignParentEnd="true"
                 android:layout_margin="5dp"
                 android:background="@drawable/border"
-                android:padding="10dp"
+                android:orientation="horizontal"
-                android:orientation="horizontal">
+                android:padding="10dp">
 
                 <TextView
                     android:id="@+id/scouting_notice_text"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:text="Scouting Notice"
-                    android:text="Scouting Notice">
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"></TextView>
-                </TextView>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_settings.xml

@@ -10,7 +10,6 @@
         android:id="@+id/scrollView2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="60dp"
         android:fillViewport="true"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -18,55 +17,70 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TableLayout
+        <LinearLayout
-            android:id="@+id/SettingsTable"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-        </TableLayout>
+            <TableLayout
+                android:id="@+id/SettingsTable"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+
+
+<!--            <Button-->
+<!--                android:id="@+id/scoutNoticeButton"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_weight="1"-->
+<!--                android:layout_margin="5dp"-->
+<!--                android:text="Edit Scout notice"-->
+<!--                android:textSize="16sp" />-->
+
+<!--            <LinearLayout-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:orientation="horizontal">-->
+
+<!--                <Button-->
+<!--                    android:id="@+id/fieldsPitsButton"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_weight="1"-->
+<!--                    android:layout_margin="5dp"-->
+<!--                    android:text="Edit PIT Fields"-->
+<!--                    android:textSize="16sp" />-->
+
+<!--                <Button-->
+<!--                    android:id="@+id/fieldsMatchesButton"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_weight="1"-->
+<!--                    android:layout_margin="5dp"-->
+<!--                    android:text="Edit MATCH Fields"-->
+<!--                    android:textSize="16sp" />-->
+
+<!--            </LinearLayout>-->
+
+        </LinearLayout>
 
     </ScrollView>
 
 
-    <Button
+    <!--    <LinearLayout-->
-        android:id="@+id/fieldsButton"
+<!--        android:id="@+id/fieldsButtons"-->
-        android:layout_width="wrap_content"
+<!--        android:layout_width="match_parent"-->
-        android:layout_height="wrap_content"
+<!--        android:layout_height="wrap_content"-->
-        android:text="Fields"
+<!--        android:layout_marginTop="1dp"-->
-        android:textSize="34sp"
+<!--        android:gravity="center"-->
-        app:layout_constraintBottom_toBottomOf="@+id/scrollView2"
+<!--        android:orientation="horizontal"-->
-        app:layout_constraintEnd_toEndOf="parent"
+<!--        android:visibility="gone"-->
-        app:layout_constraintStart_toStartOf="parent" />
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintBottom_toTopOf="@+id/fieldsButton"-->
+<!--        tools:visibility="visible">-->
 
-    <LinearLayout
+<!--    </LinearLayout>-->
-        android:id="@+id/fieldsButtons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="1dp"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/fieldsButton"
-        tools:visibility="visible">
-
-        <Button
-            android:id="@+id/fieldsPitsButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:text="Pits"
-            android:textSize="34sp" />
-
-        <Button
-            android:id="@+id/fieldsMatchesButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:text="Matches"
-            android:textSize="34sp" />
-    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_team_selector.xml

@@ -14,8 +14,7 @@
             android:id="@+id/teams"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
+            android:orientation="vertical" />
-            android:paddingTop="48dp" />
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_transfer_code_receiver.xml

@@ -7,77 +7,65 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-    <SeekBar
-        android:id="@+id/scannerColors"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="15dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <SeekBar
-        android:id="@+id/scannerThreshold"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/scannerColors" />
-
-    <SeekBar
-        android:id="@+id/scannerBrightness"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/scannerThreshold" />
-
-    <TextView
-        android:id="@+id/scannerColorsLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="-12dp"
-        android:text="Posterize"
-        app:layout_constraintBottom_toTopOf="@+id/scannerColors"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/scannerThresholdLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="-12dp"
-        android:text="Exposure"
-        app:layout_constraintBottom_toTopOf="@+id/scannerThreshold"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/scannerBrightnessLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="-12dp"
-        android:text="Brightness"
-        app:layout_constraintBottom_toTopOf="@+id/scannerBrightness"
-        app:layout_constraintStart_toStartOf="parent" />
-
-
     <ImageView
         android:id="@+id/scannerImage"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:adjustViewBounds="true"
-        android:rotation="90"
         android:scaleType="fitCenter"
-        android:scaleX="1"
-        android:scaleY="1"
-        android:translationY="-40dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:context=".CodeScannerView" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="3dp"
+        android:padding="3dp"
+        android:background="@drawable/border"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:layout_editor_absoluteX="3dp">
+
+        <TextView
+            android:id="@+id/scannerColorsLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Posterize"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"/>
+
+        <SeekBar
+            android:id="@+id/scannerColors"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="15dp" />
+
+        <TextView
+            android:id="@+id/scannerThresholdLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Exposure"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"/>
+
+        <SeekBar
+            android:id="@+id/scannerThreshold"
+            android:layout_width="match_parent"
+            android:layout_height="48dp" />
+
+        <TextView
+            android:id="@+id/scannerBrightnessLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Brightness"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"/>
+
+        <SeekBar
+            android:id="@+id/scannerBrightness"
+            android:layout_width="match_parent"
+            android:layout_height="48dp" />
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_transfer_code_sender.xml

@@ -1,31 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SeekBar
-        android:id="@+id/qrSizeSlider"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginBottom="60dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
-
-    <SeekBar
-        android:id="@+id/qrSpeedSlider"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginBottom="60dp"
-        app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.971"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage"
-        app:layout_constraintVertical_bias="0.93" />
-
     <ImageView
         android:id="@+id/qrImage"
         android:layout_width="match_parent"
@@ -36,14 +15,30 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="3dp"
+        android:orientation="vertical"
+        android:background="@drawable/border"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+
         <TextView
             android:id="@+id/qrSpeedText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="QR Speed"
-        app:layout_constraintBottom_toTopOf="@+id/qrSpeedSlider"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
-        app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintBottom_toTopOf="@+id/qrSpeedSlider" />
+
+        <SeekBar
+            android:id="@+id/qrSpeedSlider"
+            android:layout_width="match_parent"
+            android:layout_height="48dp" />
 
         <TextView
             android:id="@+id/qrSizeText"
@@ -51,8 +46,17 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="QR Size"
-        app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
-        app:layout_constraintStart_toStartOf="parent" />
+
+
+        <SeekBar
+            android:id="@+id/qrSizeSlider"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            tools:layout_editor_absoluteY="135dp" />
+
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/qrIndexN"
@@ -60,7 +64,8 @@
         android:layout_height="wrap_content"
         android:text="0"
         app:layout_constraintEnd_toStartOf="@+id/qrIndexSlash"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+        app:layout_constraintTop_toBottomOf="@+id/qrImage"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"/>
 
     <TextView
         android:id="@+id/qrIndexSlash"
@@ -69,7 +74,8 @@
         android:text="/"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+        app:layout_constraintTop_toBottomOf="@+id/qrImage"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
 
     <TextView
         android:id="@+id/qrIndexD"
@@ -77,6 +83,7 @@
         android:layout_height="wrap_content"
         android:text="0"
         app:layout_constraintStart_toEndOf="@+id/qrIndexSlash"
-        app:layout_constraintTop_toBottomOf="@+id/qrImage" />
+        app:layout_constraintTop_toBottomOf="@+id/qrImage"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/view_custom_spinner.xml

@@ -8,9 +8,12 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="3dp"
+        android:layout_marginLeft="3dp"
-        android:orientation="horizontal"
+        android:layout_marginTop="5dp"
+        android:layout_marginRight="3dp"
+        android:layout_marginBottom="3dp"
         android:background="@drawable/border"
+        android:orientation="horizontal"
         tools:ignore="UselessParent">
 
         <TextView
@@ -18,8 +21,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="10dp"
-            android:textSize="24sp"
+            android:overlapAnchor="false"
-            android:overlapAnchor="false"/>
+            android:text="▼ Options"
+            android:textSize="24sp" />
 
     </LinearLayout>
 
@@ -28,9 +32,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="9dp"
-        android:layout_marginTop="-5dp"
+        android:layout_marginTop="-6dp"
         android:paddingLeft="3dp"
         android:paddingRight="3dp"
         android:text="Test"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"/>
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" />
 </RelativeLayout>

app/src/main/res/layout/view_match_scouting_indicator.xml

@@ -11,7 +11,6 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@drawable/border"
-            android:padding="3dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -23,16 +22,18 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:visibility="gone" />
 
                 <ImageButton
                     android:id="@+id/match_indicator_back_button"
                     android:layout_width="50dp"
                     android:layout_height="50dp"
+                    android:contentDescription="Back"
                     android:scaleType="fitCenter"
                     android:src="@drawable/triangle_left"
                     android:text="Back"
-                    android:background="@color/zxing_transparent"
+                    android:background="@drawable/border"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -42,9 +43,10 @@
                     android:layout_width="50dp"
                     android:layout_height="50dp"
                     android:scaleType="fitCenter"
+                    android:contentDescription="Next"
                     android:src="@drawable/triangle_right"
                     android:text="Next"
-                    android:background="@color/zxing_transparent"
+                    android:background="@drawable/border"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -53,24 +55,24 @@
                     android:id="@+id/match_indicator_alliance_pos_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginEnd="58dp"
                     android:text="Temp"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
                     android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/match_indicator_next_button"
+                    app:layout_constraintEnd_toEndOf="@+id/match_indicator_next_button"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/match_indicator_username"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginStart="58dp"
                     android:text="Temp"
                     android:textAlignment="center"
                     android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/match_indicator_back_button"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView

app/src/main/res/layout/view_pit_scouting_indicator.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/pit_indicator_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:background="@drawable/border"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+                <View
+                    android:id="@+id/pit_indicator_background"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/pit_indicator_username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="58dp"
+                    android:text="Username"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/pit_indicator_teamnum"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="4388"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

app/src/main/res/layout/view_tally_counter.xml

@@ -17,6 +17,8 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        android:text="0"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
         android:textSize="24sp" />
 
     <Button

app/src/main/res/layout/view_team_option.xml

@@ -28,13 +28,15 @@
             android:id="@+id/team_option_logo"
             android:layout_width="54dp"
             android:layout_height="54dp"
-            android:layout_margin="3dp"
+            android:layout_margin="2dp"
             android:scaleType="fitXY"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:srcCompat="@drawable/ic_robologo" />
+            tools:srcCompat="@drawable/ic_robologo"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/field_option_name"

gradle/libs.versions.toml

@@ -1,5 +1,6 @@
 [versions]
-agp = "8.8.0"
+agp = "8.11.1"
+asynclayoutinflator = "1.1.0"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
@@ -10,11 +11,13 @@ lifecycleLivedataKtx = "2.6.1"
 lifecycleViewmodelKtx = "2.6.1"
 material3 = "1.3.1"
 navigationFragment = "2.6.0"
+navigationFragmentVersion = "2.8.9"
 navigationUi = "2.6.0"
 supportAnnotations = "28.0.0"
 preference = "1.2.1"
 
 [libraries]
+asynclayoutinflator = { module = "androidx.asynclayoutinflator:asynclayoutinflator", version.ref = "asynclayoutinflator" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
@@ -25,6 +28,7 @@ lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-lived
 lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
 material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
 navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigationFragment" }
+navigation-fragment-v289 = { module = "androidx.navigation:navigation-fragment", version.ref = "navigationFragmentVersion" }
 navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigationUi" }
 support-annotations = { group = "com.android.support", name = "support-annotations", version.ref = "supportAnnotations" }
 preference = { group = "androidx.preference", name = "preference", version.ref = "preference" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Mar 24 10:48:55 MDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists