Add comments to classes and update TODO

Fix CSV Export

.gitignore

@@ -1,6 +1,7 @@
 # Gradle files
 .gradle/
 build/
+release/
 
 # Local configuration file (sdk path, etc)
 local.properties

README.md

@@ -1,40 +1,36 @@
-# ScoutingApp2025
-Ridgebotics 2025 scouting app in Android
+![Ridgescout](https://github.com/Team4388/ScoutingApp2025/blob/main/metadata/en-US/images/featureGraphic.png?raw=true)
 
-## TODO:
-#### Scouting:
-- Make the "Report" menu, A tool that lets users select data to display from the the teams and compare menus.
-- Make practice mode
-#### Data Analysis:
-- Statbotics intigration???
-- AI overview of scouting data for a team???
-- Make the "Compare" menu, cross comparing team's stats.
-#### Functionality:
-- Add more types of data fields.
-- Test the scouting app
-- Deploy to F-Droid
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/com.ridgebotics.ridgescout/)   
+**Note**: The F-Droid version of this app is not currently up to date with the GitHub release
 
-## In Progress:
-#### Scouting:
-#### Data Analysis:
-#### Functionality:
-- Make server software to allow for easy sync over wifi - FTP
+[**Read the wiki**](https://github.com/Team4388/ScoutingApp2025/wiki)
+
+[**Test Data**](https://github.com/Team4388/ScoutingApp2025/blob/main/2024week0-1728149849985.scoutbundle)
+
+#### Here is an overview of the main features currently included in the app:
+- This project is written for Android! No need for some kind of janky laptop charging setup.
+- Similar to ScoutingPASS, there are many diffrent types of fields that can be used to collect data.
+- The app is designed to handle updates to the fields on the fly, without loosing any data!
+- Unlike other scouting solutions, scouters can disable any field they did not measure, and disabled fields will not be included in any calculations.
+- Dynamic displays based off of the diffrent fields.
+- Data transfer including 2D codes, Bluetooth, and File Bundle.
+- Exporting using CSV.
+- Deployment on F-Droid
+- Data cloud sync using an FTP server
+
+#### Things that are yet to be implemented:
+- A page that lets users cross-compare scouting data between teams. (Compare)
+- A page that lets scouters more easily make reports to the drive team before a match starts (Report)
+
+#### Things that may or may not be implemented:
+- Statbotics intgration
+- Scout error estimation using OPR-like calculation
+- - Would most likely require Statbotics
+
+### 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)|
 
-## Done:
-#### Scouting:
-- Add an "unselect" option to all of the scouting fields
-- When a field is created, make updated scouting data return null values, not the default value
-- Fix scouting offset bug
-#### Data Analysis:
-- Add "history" view type to the teams view menu.
-- Sentiment analysis of text input type
-- Add CSV exporting of match scouting data.
-#### Functionality:
-- Improve the code scanning progress indicator. It has a rounding error, I think.
-- Fix navigation crashes.
-- Make everything use Fragments instead of views that toggle visibility
-- Make the file browser UI
-- Bluetooth data sync
-- Formalize error messages & stacktraces
-- Make pit and match data field builder UIs. I don't want to have to keep editing a variable
-- Make the system for blank and unselected fields better.

TODO.md

@@ -0,0 +1,31 @@
+### TODO:
+##### Scouting:
+- Make an easier way to make game-specific UI elements
+##### Data Analysis:
+- Add analysis for the rest of the data types besides Tally
+- Add a "scout note" system for scouters to contribute to the scouting report?
+- Make data that has been marked for rescouting not processed in either by team or by type analysis.
+##### Functionality:
+- Rewrite FTP transfer to be over HTTP requests
+- - Potentially using a python server or some other pre-existing file transfer over HTTP
+- Delete file menu
+- Make "Sync meta files" option only block uploading fields specifically.
+##### UI:
+- Update docs and README.md with new features
+- Improve file status indicator for scouting
+- - The autosave timeout can be significantly reduced, so the save indicator is not a necessity
+- - A new system for the rescout indicator should be used.
+- Improve UI elements for scouting data by team
+- Field button in settings overlaps with other elements in some devices
+
+### In Progress:
+##### Scouting:
+##### Data Analysis:
+##### Functionality:
+##### UI:
+
+### Done:
+##### Scouting:
+##### Data Analysis:
+##### Functionality:
+##### UI:

app/build.gradle.kts

@@ -1,6 +1,3 @@
-import com.android.build.api.dsl.AaptOptions
-import com.android.build.api.dsl.AndroidResources
-
 plugins {
     alias(libs.plugins.androidApplication)
 //    id("com.google.gms.google-services")
@@ -13,15 +10,23 @@ plugins {
 //}
 
 android {
-    namespace = "com.astatin3.scoutingapp2025"
+    namespace = "com.ridgebotics.ridgescout"
     compileSdk = 34
 
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
+
+
     defaultConfig {
-        applicationId = "com.astatin3.scoutingapp2025"
+        applicationId = "com.ridgebotics.ridgescout"
         minSdk = 24
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 11    // **IMPORTANT** Increment this before releasing on github
+        versionName = "1.4"// **IMPORTANT** Change this before releasing on github (<Year num since 2024>.<Update Version>)
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -48,11 +53,13 @@ dependencies {
 
     implementation(libs.appcompat)
     implementation(libs.material)
+    implementation(libs.material3)
     implementation(libs.constraintlayout)
     implementation(libs.lifecycle.livedata.ktx)
     implementation(libs.lifecycle.viewmodel.ktx)
-    implementation(libs.navigation.fragment)
+    implementation("androidx.navigation:navigation-fragment:2.8.9")
     implementation(libs.navigation.ui)
+    implementation(libs.preference)
 //    implementation(libs.support.annotations)
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
@@ -67,17 +74,17 @@ dependencies {
 
     implementation("com.journeyapps:zxing-android-embedded:4.3.0")
 
-    implementation("com.github.skydoves:powerspinner:1.2.7")
     implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
 
 
-
-
 //    implementation("com.google.firebase:firebase-ml-modeldownloader:24.1.2")
 //    implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
 
     implementation("org.tensorflow:tensorflow-lite-task-text:0.3.0")
 
+    implementation("com.squareup.okhttp3:okhttp:4.9.0")
+    implementation("commons-net:commons-net:3.10.0")
+
 
 
 //    implementation("com.github.DeveloperPaul123:SimpleBluetoothLibrary:1.5.1")

app/src/androidTest/java/com/ridgebotics/ridgescout/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025;
+package com.ridgebotics.ridgescout;
 
 import android.content.Context;
 
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.astatin3.scoutingapp2025", appContext.getPackageName());
+        assertEquals("com.ridgebotics.ridgescout", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
         android:required="true" />
 
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
@@ -15,8 +15,8 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
+<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA"/>
@@ -29,8 +29,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.ScoutingApp2025"
+        android:theme="@style/Theme.RidgeScout"
         android:hardwareAccelerated="true"
+
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
+
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
@@ -42,6 +46,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <action android:name="android.intent.action.GET_CONTENT" />
                 <category android:name="android.intent.category.OPEN_FILE" />
+            </intent-filter>
+            <intent-filter>
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>

app/src/main/java/com/astatin3/scoutingapp2025/MainActivity.java

@@ -1,162 +0,0 @@
-package com.astatin3.scoutingapp2025;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.MenuItem;
-
-import com.astatin3.scoutingapp2025.scoutingData.fields;
-import com.astatin3.scoutingapp2025.utility.SentimentAnalysis;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.navigation.AnimBuilder;
-import androidx.navigation.NavController;
-import androidx.navigation.NavDestination;
-import androidx.navigation.NavOptions;
-import androidx.navigation.NavOptionsBuilder;
-import androidx.navigation.Navigation;
-import androidx.navigation.ui.AppBarConfiguration;
-import androidx.navigation.ui.NavigationUI;
-
-import com.astatin3.scoutingapp2025.databinding.ActivityMainBinding;
-
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.google.android.material.navigation.NavigationBarView;
-
-import java.util.Objects;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-
-public class MainActivity extends AppCompatActivity {
-
-
-    private ActivityMainBinding binding;
-    private BottomNavigationView navView;
-
-    private AppBarConfiguration appBarConfiguration;
-    private NavController navController;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        latestSettings.update();
-
-        if(!fileEditor.fileExist(fields.matchFieldsFilename)){
-            fields.save(fields.matchFieldsFilename, fields.default_match_fields);
-        }
-
-        if(!fileEditor.fileExist(fields.pitsFieldsFilename)){
-            fields.save(fields.pitsFieldsFilename, fields.default_pit_fields);
-        }
-
-        AlertManager.init(this);
-        SentimentAnalysis.init(this);
-
-        Objects.requireNonNull(getSupportActionBar()).hide();
-
-
-
-
-        super.onCreate(savedInstanceState);
-
-        binding = ActivityMainBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-
-
-
-
-
-        navView = findViewById(R.id.nav_view);
-//        appBarConfiguration = new AppBarConfiguration.Builder(
-//                R.id.navigation_scouting,
-//                R.id.navigation_match_scouting,
-//                R.id.navigation_team_selector,
-//                R.id.navigation_pit_scouting,
-//
-//                R.id.navigation_data,
-//                R.id.navigation_data_status,
-//                R.id.navigation_data_teams,
-//                R.id.navigation_data_compile,
-//                R.id.navigation_data_fields_chooser,
-//                R.id.navigation_data_fields,
-//
-//                R.id.navigation_transfer,
-//                R.id.navigation_file_selector,
-//                R.id.navigation_transfer_selector,
-//                R.id.navigation_code_generator,
-//                R.id.navigation_code_scanner,
-//                R.id.navigation_bluetooth_sender,
-//                R.id.navigation_bluetooth_receiver,
-//                R.id.navigation_tba,
-//
-//                R.id.navigation_settings)
-//                .build();
-
-        appBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.navigation_scouting,
-                R.id.navigation_data,
-                R.id.navigation_transfer,
-                R.id.navigation_settings)
-                .build();
-
-//        appBarConfiguration.set
-
-        navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main);
-
-
-        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
-        NavigationUI.setupWithNavController(navView, navController);
-
-        navView.setOnItemSelectedListener(new NavigationBarView.OnItemSelectedListener() {
-            @Override
-            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                clearBackStack();
-                navController.navigate(item.getItemId(), savedInstanceState, new NavOptions.Builder()
-                        .setEnterAnim(R.anim.enter_anim)
-                        .setExitAnim(R.anim.exit_anim)
-                        .setPopEnterAnim(R.anim.pop_enter_anim)
-                        .setPopExitAnim(R.anim.pop_exit_anim).build()
-                );
-                return true;
-            }
-        });
-
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        return navController.navigateUp() || super.onSupportNavigateUp();
-    }
-
-    private void clearBackStack() {
-        navController.popBackStack(navController.getGraph().getStartDestinationId(), false);
-    }
-
-
-
-
-    public interface activityResultRelay {
-        void onActivityResult(int requestCode, int resultCode, Intent data);
-    }
-
-    public static activityResultRelay resultRelay = null;
-    public static void setResultRelay(activityResultRelay tmpresultRelay){
-        resultRelay = tmpresultRelay;
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-//        AlertManager.error(String.valueOf(requestCode));
-        if (resultRelay != null) {
-            resultRelay.onActivityResult(resultCode, requestCode, data);
-        }
-    }
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/latestSettings.java

@@ -1,9 +0,0 @@
-package com.astatin3.scoutingapp2025.SettingsVersionStack;
-
-public class latestSettings {
-    public static sv1 settings = new sv1();
-    public static void update(){
-        settings.init_settings();
-        settings.update();
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/settingsVersion.java

@@ -1,110 +0,0 @@
-package com.astatin3.scoutingapp2025.SettingsVersionStack;
-
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-
-import java.nio.charset.StandardCharsets;
-
-public abstract class settingsVersion {
-    private static final String settingsFilename = "settings.txt";
-    public abstract void defaultSettings();
-    public abstract int getVersion();
-    public abstract void update();
-
-    public static String get_settings_file_content(){
-        byte[] data = fileEditor.readFile(settingsFilename);
-        if(data == null){return "";}
-        return new String(data, StandardCharsets.UTF_8);
-    }
-
-    public int get_file_version(){
-        String[] fileContent = get_settings_file_content().split("\n");
-        try{
-            return Integer.parseInt(fileContent[0]);
-        }catch(Exception e){
-            return -1;
-        }
-    }
-
-    public void set_file_version(int version){
-        String[] fileContent = get_settings_file_content().split("\n");
-        String output = String.valueOf(version);
-        for(int i = 0; i < fileContent.length; i++){
-            output += ("\n" + fileContent[i]);
-        }
-        fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8));
-    }
-
-    public String readTag(String search_tag){
-        String[] fileContent = get_settings_file_content().split("\n");
-
-        try{
-            for(String line : fileContent){
-                if(line.isEmpty()){
-                    continue;
-                }
-                String[] split = line.split("=");
-                if(split[0].equals(search_tag)){
-                    if(split[1].equals("<empty>")){
-                        return "";
-                    }else if(split[1].equals("<null>")){
-                        return null;
-                    }else {
-                        return split[1];
-                    }
-                }
-            }
-        }catch (Exception e){
-            AlertManager.error(e);
-        }
-
-        return null;
-    }
-
-    public void init_settings(){
-        if(!fileEditor.fileExist(settingsFilename)){
-            fileEditor.createFile(settingsFilename);
-
-            set_file_version(getVersion());
-            defaultSettings();
-
-        }
-    }
-
-    public String writeTag(String tag_name, String data){
-        final boolean already_exists = readTag(tag_name) != null;
-
-        if(data == null){
-            data = "<null>";
-        }else if(data.equals("")){
-            data = "<empty>";
-        }
-
-        if(!already_exists){
-            String fileContent = get_settings_file_content();
-            String output = fileContent + "\n" + tag_name + "=" + data;
-            fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8));
-            return output;
-        }else{
-            String[] fileContent = get_settings_file_content().split("\n");
-            try{
-                for(int i = 0; i < fileContent.length; i++){
-                    if(fileContent[i].isEmpty()){
-                        continue;
-                    }
-                    String[] split = fileContent[i].split("=");
-                    if(split[0].equals(tag_name)){
-                        fileContent[i] = tag_name + "=" + data;
-                        String output = String.join("\n", fileContent);
-                        fileEditor.writeFile(settingsFilename, output.getBytes(StandardCharsets.UTF_8));
-                        return output;
-                    }
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }
-
-        return "No idea how this happened";
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/sv0.java

@@ -1,51 +0,0 @@
-package com.astatin3.scoutingapp2025.SettingsVersionStack;
-
-public class sv0 extends settingsVersion {
-    @Override
-    public int getVersion() {
-        return 0;
-    }
-    @Override
-    public void update(){
-//        int file_version = get_file_version();
-//        if(file_version == getVersion()) {
-//            return;
-//        }else if(file_version < getVersion()){
-//            super.update();
-//        }
-//        set_file_version(getVersion());
-    }
-
-    @Override
-    public void defaultSettings() {
-        writeTag("username", "Username");
-        writeTag("selected_event_code", "unset");
-//        writeTag("practice_mode", "false");
-        writeTag("wifi_mode", "false");
-    }
-
-    public void set_username(String name){
-        writeTag("username", name);
-    }
-    public String get_username(){
-        return readTag("username");
-    }
-    public void set_evcode(String evcode){
-        writeTag("selected_event_code", evcode);
-    }
-    public String get_evcode(){
-        return readTag("selected_event_code");
-    }
-//    public void set_practice_mode(boolean value) {
-//        writeTag("practice_mode", value ? "true" : "false");
-//    }
-//    public boolean get_practice_mode(){
-//        return readTag("practice_mode").equals("true");
-//    }
-    public void set_wifi_mode(boolean value){
-        writeTag("wifi_mode", value ? "true" : "false");
-    }
-    public boolean get_wifi_mode(){
-        return readTag("wifi_mode").equals("true");
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/SettingsVersionStack/sv1.java

@@ -1,84 +0,0 @@
-package com.astatin3.scoutingapp2025.SettingsVersionStack;
-
-import java.util.UUID;
-
-public class sv1 extends sv0 {
-    @Override
-    public int getVersion() {
-        return 0;
-    }
-    @Override
-    public void update(){
-        int file_version = get_file_version();
-        if(file_version == getVersion()) {
-            return;
-        }else if(file_version < getVersion()){
-            super.update();
-        }
-        set_file_version(getVersion());
-    }
-
-    @Override
-    public void defaultSettings() {
-        writeTag("username", "Username");
-        writeTag("selected_event_code", "unset");
-//        writeTag("practice_mode", "false");
-        writeTag("wifi_mode", "false");
-        writeTag("team_num", "4388");
-
-        writeTag("match_num", "0");
-        writeTag("alliance_pos", "red-1");
-        writeTag("data_view_mode", "0");
-        writeTag("bt_uuid", UUID.randomUUID().toString());
-    }
-
-    public int get_match_num(){
-        return Integer.parseInt(readTag("match_num"));
-    }
-
-    public void set_match_num(int num){
-        writeTag("match_num", String.valueOf(num));
-    }
-
-    @Override
-    public void set_evcode(String evcode){
-        set_match_num(0);
-        writeTag("selected_event_code", evcode);
-    }
-
-    public String get_alliance_pos(){
-        return readTag("alliance_pos");
-    }
-
-    public void set_alliance_pos(String pos){
-        writeTag("alliance_pos", pos);
-    }
-
-    public int get_team_num(){return Integer.parseInt(readTag("team_num"));}
-    public void set_team_num(String str){
-
-        if(str.isEmpty()) {
-            set_team_num(0);
-            return;
-        }
-
-        set_team_num(Integer.parseInt(str));
-    }
-    public void set_team_num(int num){writeTag("team_num", String.valueOf(num));}
-
-    public int get_data_view_mode(){
-        return Integer.parseInt(readTag("data_view_mode"));
-    }
-
-    public void set_data_view_mode(int mode){
-        writeTag("data_view_mode", String.valueOf(mode));
-    }
-
-    public void setUUID(UUID uuid){
-        writeTag("bt_uuid", uuid.toString());
-    }
-
-    public UUID getUUID(){
-        return UUID.fromString(readTag("bt_uuid"));
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/ScoutingDataWriter.java

@@ -1,97 +0,0 @@
-package com.astatin3.scoutingapp2025.scoutingData;
-
-import com.astatin3.scoutingapp2025.scoutingData.transfer.transferType;
-import com.astatin3.scoutingapp2025.types.ScoutingArray;
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.data.stringType;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-import com.astatin3.scoutingapp2025.types.data.intType;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-
-import java.util.ArrayList;
-
-public class ScoutingDataWriter {
-//    private static final int int_type_id = 255;
-//    private static final int string_type_id = 254;
-
-    public static boolean save(int version, String username, String filename, dataType[] data){
-        ByteBuilder bb = new ByteBuilder();
-        try {
-            bb.addInt(version);
-            bb.addString(username);
-            for(int i = 0; i < data.length; i++){
-                switch (data[i].getValueType()){
-                    case NUM:
-                        bb.addInt((int) data[i].forceGetValue());
-                        System.out.println("Saved INT: " + data[i].getName() + ", ("+ data[i].get() +")");
-                        break;
-                    case STRING:
-                        bb.addString((String) data[i].forceGetValue());
-                        System.out.println("Saved STR: " + data[i].getName() + ", ("+ data[i].get() +")");
-                        break;
-                }
-            }
-            byte[] bytes = bb.build();
-            fileEditor.writeFile(filename, bytes);
-            return true;
-        } catch (ByteBuilder.buildingException e) {
-            AlertManager.error(e);
-            return false;
-        }
-    }
-
-    public static class ParsedScoutingDataResult {
-        public String filename;
-        public String username;
-        public int version;
-        public ScoutingArray data;
-    }
-
-    public static ParsedScoutingDataResult load(String filename, inputType[][] values , transferType[][] transferValues){
-        byte[] bytes = fileEditor.readFile(filename);
-        BuiltByteParser bbp = new BuiltByteParser(bytes);
-        try {
-            ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-            dataType[] dataTypes = new dataType[objects.size()-2];
-
-            int version = ((int)objects.get(0).get());
-//            System.out.println(version);
-            String username = (String) objects.get(1).get();
-
-            for(int i = 0; i < values[version].length; i++){
-                switch (objects.get(i+2).getType()){
-                    case 1: // Int
-                        dataTypes[i] = intType.newNull(values[version][i].name);
-                        dataTypes[i].forceSetValue(objects.get(i+2).get());
-                        System.out.println("Loaded INT: " + values[version][i].name + ", ("+ dataTypes[i].get() +")");
-                        break;
-                    case 2: // String
-                        dataTypes[i] = stringType.newNull(values[version][i].name);
-                        dataTypes[i].forceSetValue(objects.get(i+2).get());
-                        System.out.println("Loaded STR: " + values[version][i].name + ", ("+ dataTypes[i].get() +")");
-                        break;
-                }
-            }
-
-            ScoutingArray msa = new ScoutingArray(version, dataTypes, values, transferValues);
-            msa.update();
-
-            ParsedScoutingDataResult psda = new ParsedScoutingDataResult();
-
-            psda.filename = filename;
-            psda.username = username;
-            psda.version = version;
-            psda.data = msa;
-
-            return psda;
-
-        } catch (BuiltByteParser.byteParsingExeption e){
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/fields.java

@@ -1,150 +0,0 @@
-package com.astatin3.scoutingapp2025.scoutingData;
-
-import com.astatin3.scoutingapp2025.types.input.dropdownType;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-import com.astatin3.scoutingapp2025.types.input.tallyType;
-import com.astatin3.scoutingapp2025.types.input.textType;
-import com.astatin3.scoutingapp2025.types.input.sliderType;
-import com.astatin3.scoutingapp2025.types.input.textType;
-import com.astatin3.scoutingapp2025.ui.scouting.TallyCounterView;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-
-import java.util.ArrayList;
-
-public class fields {
-//    public static ScoutingVersion sv = new ScoutingVersion();
-
-    public static final String matchFieldsFilename = "matches.fields";
-    public static final String pitsFieldsFilename = "pits.fields";
-
-    public static final inputType[][] default_match_fields = new inputType[][] {
-        {
-            new tallyType("Auto Notes", 0),
-            new sliderType("Auto Performance", 5, 0, 10),
-            new textType("Auto Comments", ""),
-            new tallyType("Teleop Notes", 0),
-            new sliderType("Teleop Performance", 5, 0, 10),
-            new textType("Teleop Comments", ""),
-            new sliderType("Overall Driving Performance", 5, 0, 10),
-            new textType("Overall Driving Comments", ""),
-            new sliderType("Score area (AMP <-> Speaker)", 5, 0, 10),
-            new dropdownType("End Condition", new String[]{"Nothing", "Attempted Climb", "Successful Climbed", "Climbed with multiple robots", "Climbed with trap"}, 0),
-            new dropdownType("Robot Condition", new String[]{"Everything was working", "Something seemed to be broken", "Something was broken", "Missing robot (Joe Johnson)"}, 0),
-            new textType("Other Comments", "")
-        }
-    };
-
-    public static final inputType[][] default_pit_fields = new inputType[][] {
-        {
-            new sliderType("How good is robot", 5, 0, 10),
-            new textType("notes", ""),
-        },{
-            new sliderType("How good is robot", 5, 0, 10),
-            new sliderType("Test", 1, 0, 10),
-            new textType("notes", ""),
-        }
-    };
-
-
-    public static boolean save(String filename, inputType[][] values){
-        try {
-            ByteBuilder bb = new ByteBuilder();
-            for (int i = 0; i < values.length; i++) {
-                bb.addRaw(127, save_version(values[i]));
-            }
-            fileEditor.writeFile(filename, bb.build());
-            return true;
-        }catch (ByteBuilder.buildingException e) {
-            AlertManager.error(e);
-            return false;
-//            throw new RuntimeException(e);
-        }
-    }
-
-    private static byte[] save_version(inputType[] values) throws ByteBuilder.buildingException {
-        ByteBuilder bb = new ByteBuilder();
-        for(int i =0; i < values.length; i++){
-            bb.addRaw(values[i].get_byte_id(), values[i].encode());
-        }
-        return bb.build();
-    }
-
-    public static inputType[][] load(String filename){
-        byte[] bytes = fileEditor.readFile(filename);
-
-//        System.out.println(bytes);
-
-        try {
-            BuiltByteParser bbp = new BuiltByteParser(bytes);
-            ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-            inputType[][] values = new inputType[objects.size()][];
-
-            for(int i = 0 ; i < objects.size(); i++){
-                values[i] = load_version((byte[]) objects.get(i).get());
-            }
-
-
-            return values;
-        } catch (Exception e) {
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-    private static inputType[] load_version(byte[] bytes) throws BuiltByteParser.byteParsingExeption{
-        BuiltByteParser bbp = new BuiltByteParser(bytes);
-        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-        inputType[] output = new inputType[objects.size()];
-
-        for(int i = 0 ; i < objects.size(); i++){
-            BuiltByteParser.parsedObject obj = objects.get(i);
-            inputType t = null;
-            switch (obj.getType()){
-                case inputType.slider_type_id:
-                    t = new sliderType();
-                    break;
-                case inputType.dropdownType:
-                    t = new dropdownType();
-                    break;
-                case inputType.notesType:
-                    t = new textType();
-                    break;
-                case inputType.tallyType:
-                    t = new tallyType();
-                    break;
-            }
-
-            t.decode((byte[]) obj.get());
-            output[i] = t;
-        }
-
-        return output;
-    }
-
-//    public static void test(){
-//        ScoutingVersion.transferType[][] transferValues = sv.get_transfer_values(values);
-//
-//        ScoutingVersion.ScoutingArray msa = sv.new ScoutingArray(0, new ScoutingVersion.dataType[]{
-//                sv.new stringType("name", "test-username"),
-//                sv.new intType("How good is robot", 12)
-//        }, values, transferValues);
-//
-//        msa.update();
-//
-//        for(ScoutingVersion.dataType dt : msa.array){
-//            if(dt == null) continue;
-//            switch (dt.getValueType()){
-//                case NUM:
-//                    System.out.println(dt.name + " " + (int) dt.get());
-//                    break;
-//                case STRING:
-//                    System.out.println(dt.name + " " + (String) dt.get());
-//                    break;
-//            }
-//
-//        }
-//    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/transfer/createTransferType.java

@@ -1,8 +0,0 @@
-package com.astatin3.scoutingapp2025.scoutingData.transfer;
-
-public class createTransferType extends transferType {
-    public transferValue getType() {return transferValue.CREATE;}
-    public createTransferType(String name){
-        super(name);
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/transfer/directTransferType.java

@@ -1,8 +0,0 @@
-package com.astatin3.scoutingapp2025.scoutingData.transfer;
-
-public class directTransferType extends transferType {
-    public transferValue getType() {return transferValue.DIRECT;}
-    public directTransferType(String name){
-        super(name);
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/scoutingData/transfer/transferType.java

@@ -1,41 +0,0 @@
-package com.astatin3.scoutingapp2025.scoutingData.transfer;
-
-import com.astatin3.scoutingapp2025.types.input.inputType;
-
-public abstract class transferType {
-    public enum transferValue {
-        DIRECT,
-        CREATE
-    }
-    public String name;
-    public abstract transferValue getType();
-    public transferType(String name){
-        this.name = name;
-    }
-
-    private static inputType get_input_type_by_name(inputType[] values, String name){
-        for(inputType it : values){
-            if(it.name.equals(name)){
-                return it;
-            }
-        }
-        return null;
-    }
-
-    public static transferType[][] get_transfer_values(inputType[][] values) {
-        transferType[][] output = new transferType[values.length][];
-        for(int a = 1; a < values.length; a++){
-            transferType[] v = new transferType[values[a].length];
-            for(int b = 0; b < values[a].length; b++){
-                String name = values[a][b].name;
-                if(get_input_type_by_name(values[a-1], name) != null){
-                    v[b] = new directTransferType(name);
-                }else{
-                    v[b] = new createTransferType(name);
-                }
-            }
-            output[a-1] = v;
-        }
-        return output;
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/types/ScoutingArray.java

@@ -1,96 +0,0 @@
-package com.astatin3.scoutingapp2025.types;
-
-import com.astatin3.scoutingapp2025.scoutingData.transfer.createTransferType;
-import com.astatin3.scoutingapp2025.scoutingData.transfer.directTransferType;
-import com.astatin3.scoutingapp2025.scoutingData.transfer.transferType;
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.data.intType;
-import com.astatin3.scoutingapp2025.types.data.stringType;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-
-public class ScoutingArray {
-    public int version;
-    public dataType[] array;
-    public inputType[][] values;
-    public int latest_version_num;
-    public transferType[][] transfer_values;
-
-    public ScoutingArray(int version, dataType[] array, inputType[][] values, transferType[][] transfer_values){
-        this.version = version;
-        this.array = array;
-        this.values = values;
-        this.latest_version_num = values.length-1;
-        this.transfer_values = transfer_values;
-    }
-
-    public ScoutingArray(int version, dataType[] array, inputType[][] values){
-        this(version, array, values, transferType.get_transfer_values(values));
-    }
-
-    public void update(){
-        while(version<latest_version_num){
-            dataType[] new_values = new dataType[transfer_values[version].length];
-            for(int i = 0; i < transfer_values[version].length; i++){
-                transferType tv = transfer_values[version][i];
-                switch (tv.getType()){
-                    case DIRECT:
-                        new_values[i] = direct_transfer((directTransferType) tv);
-                        continue;
-//                        case RENAME:
-//                            new_values[i] = rename_transfer((renameTransferType) tv);
-//                            continue;
-                    case CREATE:
-                        new_values[i] = create_transfer((createTransferType) tv);
-                        continue;
-                }
-            }
-            this.array = new_values;
-            version++;
-            System.out.println("Updated to " + version);
-        }
-    }
-
-    private inputType get_input_type_by_name(int version, String name){
-        for(inputType it : values[version]){
-            if(it.name.equals(name)){
-                return it;
-            }
-        }
-        return null;
-    }
-
-    private dataType get_data_type_by_name(String name){
-        for(dataType dt : array){
-            if(dt.getName().equals(name)){
-                return dt;
-            }
-        }
-        return null;
-    }
-
-    private dataType direct_transfer(directTransferType tv){
-        return get_data_type_by_name(tv.name);
-    }
-
-//        private dataType rename_transfer(renameTransferType tv){
-//            dataType dt = get_data_type_by_name(tv.name);
-//            dt.name = tv.new_name;
-//            return dt;
-//        }
-
-    private dataType create_transfer(createTransferType tv){
-        inputType it = get_input_type_by_name(version+1, tv.name);
-        switch (it.getValueType()){
-            case NUM:
-                return intType.newNull(it.name);
-            case STRING:
-                return stringType.newNull(it.name);
-        }
-        return null;
-    }
-
-
-
-
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/types/file.java

@@ -1,63 +0,0 @@
-package com.astatin3.scoutingapp2025.types;
-
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-public class file {
-    public static final int typecode = 255;
-    public String filename;
-    public byte[] data;
-
-
-    public file(){}
-
-    public file(String filename){
-        this(filename, fileEditor.readFile(filename));
-    }
-
-    public file(String filename, byte[] data){
-        this.filename = filename;
-        this.data = data;
-    }
-
-    public byte[] encode(){
-        try {
-            ByteBuilder bb = new ByteBuilder()
-                    .addString(filename)
-                    .addRaw(255, Objects.requireNonNull(fileEditor.readFile(filename)));
-
-            return bb.build();
-
-        } catch (ByteBuilder.buildingException e) {
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-    public static file decode(byte[] bytes){
-        try{
-            ArrayList<BuiltByteParser.parsedObject> objects = new BuiltByteParser(bytes).parse();
-
-            file f = new file();
-
-            f.filename = (String) objects.get(0).get();
-            f.data = (byte[]) objects.get(1).get();
-
-            return f;
-
-        }catch (BuiltByteParser.byteParsingExeption e){
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-    public boolean write(){
-        if(data == null || filename == null) return false;
-        return fileEditor.writeFile(filename, data);
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/types/frcEvent.java

@@ -1,79 +0,0 @@
-package com.astatin3.scoutingapp2025.types;
-
-import androidx.annotation.NonNull;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-import java.util.ArrayList;
-
-public class frcEvent {
-
-    public static final int typecode = 254;
-    public String eventCode;
-    public String name;
-    public ArrayList<frcMatch> matches;
-    public ArrayList<frcTeam> teams;
-
-    public byte[] encode() {
-        try {
-            ByteBuilder bb = new ByteBuilder()
-                .addString(eventCode)
-                .addString(name);
-
-            for (frcTeam teams : teams) {
-                bb.addRaw(frcTeam.typecode, teams.encode());
-            }
-
-            for (frcMatch match : matches) {
-                bb.addRaw(frcMatch.typecode, match.encode());
-            }
-
-            return bb.build();
-        } catch (ByteBuilder.buildingException e) {
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-    public static frcEvent decode(byte[] bytes) {
-        try {
-            ArrayList<BuiltByteParser.parsedObject> objects =
-                new BuiltByteParser(bytes).parse();
-
-            frcEvent frc = new frcEvent();
-
-            frc.eventCode = (String) objects.get(0).get();
-            frc.name = (String) objects.get(1).get();
-
-            frc.matches = new ArrayList<>();
-            frc.teams = new ArrayList<>();
-
-            for (BuiltByteParser.parsedObject object : objects) {
-                if (object.getType() == frcTeam.typecode) {
-                    frc.teams.add(frcTeam.decode((byte[]) object.get()));
-                } else if (object.getType() == frcMatch.typecode) {
-                    frc.matches.add(frcMatch.decode((byte[]) object.get()));
-                }
-            }
-
-            return frc;
-        } catch (BuiltByteParser.byteParsingExeption e) {
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-    @NonNull
-    public String toString() {
-        return (
-            "frcEvent Name: " +
-            name +
-            ", Code: " +
-            eventCode +
-            " numTeams: " +
-            teams.size() +
-            " numMatches: " +
-            matches.size()
-        );
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/types/frcTeam.java

@@ -1,67 +0,0 @@
-package com.astatin3.scoutingapp2025.types;
-
-import androidx.annotation.NonNull;
-
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-
-import java.util.ArrayList;
-
-public class frcTeam {
-    public static final int typecode = 252;
-    public int teamNumber = 0;
-    public String teamName = "null";
-    public String city = "null";
-    public String stateOrProv = "null";
-    public String school = "null";
-    public String country = "null";
-    public int startingYear = 0;
-
-    public String getDescription(){
-        return teamName + " Started in " + startingYear + ", and are from " + school + " in " + city + ", " + stateOrProv + ", " + country;
-    }
-
-    public byte[] encode(){
-        try {
-            return new ByteBuilder()
-            .addInt(teamNumber)
-            .addString(teamName)
-            .addString(city)
-            .addString(stateOrProv)
-            .addString(school)
-            .addString(country)
-            .addInt(startingYear)
-            .build();
-        } catch (ByteBuilder.buildingException e) {
-            AlertManager.error(e);
-            return null;
-        }
-    }
-    public static frcTeam decode(byte[] bytes){
-        try {
-            ArrayList<BuiltByteParser.parsedObject> objects = new BuiltByteParser(bytes).parse();
-
-            frcTeam frc = new frcTeam();
-
-            frc.teamNumber   = (int)    objects.get(0).get();
-            frc.teamName     = (String) objects.get(1).get();
-            frc.city         = (String) objects.get(2).get();
-            frc.stateOrProv  = (String) objects.get(3).get();
-            frc.school       = (String) objects.get(4).get();
-            frc.country      = (String) objects.get(5).get();
-            frc.startingYear = (int)    objects.get(6).get();
-
-            return frc;
-
-        } catch (BuiltByteParser.byteParsingExeption e) {
-            AlertManager.error(e);
-            return null;
-        }
-    }
-
-    @NonNull
-    public String toString(){
-        return "frcTeam Num: " + teamNumber + ", " + getDescription();
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/types/input/inputType.java

@@ -1,104 +0,0 @@
-package com.astatin3.scoutingapp2025.types.input;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.ui.data.FieldEditorHelper;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-
-import java.util.function.Function;
-
-public abstract class inputType {
-    public static final int slider_type_id = 255;
-    public static final int dropdownType = 254;
-    public static final int notesType = 253;
-    public static final int tallyType = 252;
-    public enum inputTypes {
-        SLIDER,
-        DROPDOWN,
-        NOTES_INPUT,
-        TALLY
-    }
-    public String name;
-    public Object default_value;
-    public abstract inputTypes getInputType();
-    public abstract dataType.valueTypes getValueType();
-    public abstract Object get_fallback_value();
-    public abstract int get_byte_id();
-    public inputType(){}
-    public inputType(String name){
-        this.name = name;
-    }
-
-    public abstract String get_type_name();
-
-    public abstract byte[] encode() throws ByteBuilder.buildingException;
-    public abstract void decode(byte[] bytes) throws BuiltByteParser.byteParsingExeption;
-
-//    public abstract dataType[] getConfig();
-//    public abstract void setConfig(dataType[] config);
-
-    public abstract View createView(Context context, Function<dataType, Integer> onUpdate);
-    public boolean isBlank = false;
-    public abstract void nullify();
-    public void setViewValue(dataType type){setViewValue(type.get());}
-    public abstract void setViewValue(Object value);
-    public abstract dataType getViewValue();
-
-
-
-//    private enum parameterTypeEnum {
-//        paramNumber,
-//        paramString,
-//        paramStringArray
-//    }
-//
-//    public static class parameterType {
-//        public String name;
-//        public parameterTypeEnum id;
-//    }
-//
-//    public static class paramNumber extends parameterType {
-//        public int val;
-//        public paramNumber(String name, int val){
-//            this.name = name + " (Number)";
-//            this.val = val;
-//            this.id = parameterTypeEnum.paramNumber;
-//        }
-//    }
-//
-//    public static class paramString extends parameterType {
-//        public String val;
-//        public paramString(String name, String val){
-//            this.name = name + " (String)";
-//            this.val = val;
-//            this.id = parameterTypeEnum.paramString;
-//        }
-//    }
-//
-//    public static class paramStringArray extends parameterType {
-//        public String[] val;
-//        public paramStringArray(String name, String[] val){
-//            this.name = name + " (String array)";
-//            this.val = val;
-//            this.id = parameterTypeEnum.paramStringArray;
-//        }
-//    }
-
-//    public abstract parameterType[] getDefaultParameters();
-
-
-    public abstract void add_individual_view(LinearLayout parent, dataType data);
-
-
-    public abstract void add_compiled_view(LinearLayout parent, dataType[] data);
-
-
-    public abstract void add_history_view(LinearLayout parent, dataType[] data);
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/TeamSelectorFragment.java

@@ -1,128 +0,0 @@
-package com.astatin3.scoutingapp2025.ui;
-
-import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
-import static com.astatin3.scoutingapp2025.utility.DataManager.event;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-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.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentTeamSelectorBinding;
-import com.astatin3.scoutingapp2025.types.frcEvent;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-
-import java.util.Arrays;
-
-public class TeamSelectorFragment extends Fragment {
-    private FragmentTeamSelectorBinding binding;
-
-    private static boolean pits_mode;
-    public static void setPits_mode(boolean mode){
-        pits_mode = mode;
-    }
-
-    private static onTeamSelected onSelect = new onTeamSelected() {@Override public void onSelect(TeamSelectorFragment self, frcTeam team) {}};
-
-    public interface onTeamSelected {
-        void onSelect(TeamSelectorFragment self, frcTeam team);
-    }
-    public static void setOnSelect(onTeamSelected tmponSelect){
-        onSelect = tmponSelect;
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        binding = FragmentTeamSelectorBinding.inflate(inflater, container, false);
-
-//        event = fileEditor.g
-        DataManager.reload_event();
-
-        if(evcode == null || evcode.equals("unset")){
-            AlertManager.error("You somehow have not loaded an event!");
-            return binding.getRoot();
-        }
-
-        load_teams();
-
-
-        return binding.getRoot();
-    }
-
-    public void load_teams(){
-//        binding.pitFileIndicator.setVisibility(View.GONE);
-//        binding.pitTeamName.setVisibility(View.GONE);
-//        binding.pitTeamDescription.setVisibility(View.GONE);
-//
-//        clear_fields();
-
-
-        int[] teamNums = new int[event.teams.size()];
-
-        for(int i = 0 ; i < event.teams.size(); i++){
-            teamNums[i] = event.teams.get(i).teamNumber;
-        }
-
-        Arrays.sort(teamNums);
-
-        TableLayout table = new TableLayout(getContext());
-        table.setStretchAllColumns(true);
-        binding.teams.addView(table);
-
-
-        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;
-                }
-            }
-
-            TableRow tr = new TableRow(getContext());
-            TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
-                    FrameLayout.LayoutParams.WRAP_CONTENT,
-                    FrameLayout.LayoutParams.WRAP_CONTENT
-            );
-            rowParams.setMargins(20,20,20,20);
-            tr.setLayoutParams(rowParams);
-            tr.setPadding(20,20,20,20);
-            table.addView(tr);
-
-            if(!pits_mode || fileEditor.fileExist(evcode + "-" + team.teamNumber + ".pitscoutdata")){
-                tr.setBackgroundColor(0x3000FF00);
-            }else{
-                tr.setBackgroundColor(0x30FF0000);
-            }
-
-            TextView tv = new TextView(getContext());
-            tv.setText(String.valueOf(team.teamNumber));
-            tv.setTextSize(20);
-            tr.addView(tv);
-
-            tv = new TextView(getContext());
-            tv.setText(team.teamName);
-            tv.setTextSize(16);
-            tr.addView(tv);
-
-            frcTeam finalTeam = team;
-            tr.setOnClickListener(v -> {
-                onSelect.onSelect(this, finalTeam);
-            });
-        }
-    }
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/CompareFragment.java

@@ -1,24 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.databinding.FragmentDataCompareBinding;
-import com.astatin3.scoutingapp2025.databinding.FragmentDataReportBinding;
-
-public class CompareFragment extends Fragment {
-    FragmentDataCompareBinding binding;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentDataCompareBinding.inflate(inflater, container, false);
-        return binding.getRoot();
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/DataFragment.java

@@ -1,81 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-
-import static androidx.navigation.fragment.FragmentKt.findNavController;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.R;
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentDataBinding;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.ui.TeamSelectorFragment;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.astatin3.scoutingapp2025.types.frcEvent;
-
-public class DataFragment extends Fragment {
-
-    private FragmentDataBinding binding;
-
-    private boolean submenu = false;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentDataBinding.inflate(inflater, container, false);
-        View root = binding.getRoot();
-
-        String evcode = latestSettings.settings.get_evcode();
-
-
-
-        if(evcode.equals("unset")){
-            binding.noEventError.setVisibility(View.VISIBLE);
-
-            binding.buttons.setVisibility(View.VISIBLE);
-            binding.teamsButton.setVisibility(View.GONE);
-            binding.compareButton.setVisibility(View.GONE);
-            binding.reportButton.setVisibility(View.GONE);
-            binding.fieldsButton.setVisibility(View.VISIBLE);
-
-
-            return root;
-        }
-
-        frcEvent event = frcEvent.decode(fileEditor.readFile(evcode + ".eventdata"));
-
-        binding.teamsButton.setOnClickListener(v -> {
-            TeamSelectorFragment.setPits_mode(false);
-            TeamSelectorFragment.setOnSelect(new TeamSelectorFragment.onTeamSelected() {
-                @Override
-                public void onSelect(TeamSelectorFragment self, frcTeam team) {
-                    TeamsFragment.setTeam(team);
-                    findNavController(self).navigate(R.id.action_navigation_team_selector_to_navigation_data_teams);
-                }
-            });
-            findNavController(this).navigate(R.id.action_navigation_data_to_navigation_team_selector);
-        });
-
-        binding.compareButton.setOnClickListener(v -> {
-            findNavController(this).navigate(R.id.action_navigation_data_to_navigation_data_compare);
-        });
-
-        binding.reportButton.setOnClickListener(v -> {
-            findNavController(this).navigate(R.id.action_navigation_data_to_navigation_data_report);
-        });
-
-        binding.fieldsButton.setOnClickListener(v -> {
-            findNavController(this).navigate(R.id.action_navigation_data_to_navigation_data_fields_chooser);
-        });
-
-        return root;
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/FieldEditorHelper.java

@@ -1,250 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-import static android.text.InputType.TYPE_CLASS_NUMBER;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TableLayout;
-import android.widget.TextView;
-
-import com.astatin3.scoutingapp2025.types.input.dropdownType;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-import com.astatin3.scoutingapp2025.types.input.sliderType;
-import com.astatin3.scoutingapp2025.types.input.tallyType;
-import com.astatin3.scoutingapp2025.types.input.textType;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.google.android.material.textfield.TextInputEditText;
-
-public class FieldEditorHelper {
-    private enum parameterTypeEnum {
-        paramNumber,
-        paramString,
-        paramStringArray
-    }
-
-    public static class parameterType {
-        public String name;
-        public parameterTypeEnum id;
-    }
-
-    public static class paramNumber extends parameterType{
-        public int val;
-        public paramNumber(String name, int val){
-            this.name = name + " (Number)";
-            this.val = val;
-            this.id = parameterTypeEnum.paramNumber;
-        }
-    }
-
-    public static class paramString extends parameterType {
-        public String val;
-        public paramString(String name, String val){
-            this.name = name + " (String)";
-            this.val = val;
-            this.id = parameterTypeEnum.paramString;
-        }
-    }
-
-    public static class paramStringArray extends parameterType{
-        public String[] val;
-        public paramStringArray(String name, String[] val){
-            this.name = name + " (String array)";
-            this.val = val;
-            this.id = parameterTypeEnum.paramStringArray;
-        }
-    }
-
-    public static final parameterType[] defaultSliderParams = new parameterType[]{
-            new paramNumber("Min", 0),
-            new paramNumber("Max", 10),
-            new paramNumber("Default Value", 5)
-    };
-    public static final parameterType[] defaultDropdownParams = new parameterType[]{
-            new paramStringArray("Default Value", new String[]{"Zero","One","Two","Three"}),
-            new paramNumber("Default Option", 0),
-    };
-    public static final parameterType[] defaultTextParams = new parameterType[]{
-            new paramString("Default Value", "")
-    };
-    public static final parameterType[] defaultTallyParams = new parameterType[]{
-            new paramNumber("Default Value", 0)
-    };
-
-
-    private static parameterType[] getSliderParams(sliderType s){
-        return new parameterType[]{
-            new paramNumber("Min", s.min),
-            new paramNumber("Max", s.max),
-            new paramNumber("Default Value", (int) s.default_value)
-        };
-    }
-
-    private static parameterType[] getDropdownParams(dropdownType s){
-        return new parameterType[]{
-                new paramStringArray("Default Value",s.text_options),
-                new paramNumber("Default Option", (int) s.default_value),
-        };
-    }
-
-    private static parameterType[] getTextParams(textType s){
-        return new parameterType[]{
-                new paramString("Default Value", (String) s.default_value)
-        };
-    }
-
-    private static parameterType[] getTallyParams(tallyType s){
-        return new parameterType[]{
-                new paramNumber("Default Value", (int) s.default_value)
-        };
-    }
-
-
-
-    public static void setSliderParams(sliderType s, parameterType[] types){
-        s.min = ((paramNumber) types[0]).val;
-        s.max = ((paramNumber) types[1]).val;
-        s.default_value = ((paramNumber) types[2]).val;
-    }
-
-    public static void setDropdownParams(dropdownType s, parameterType[] types){
-        s.text_options = ((paramStringArray) types[0]).val;
-        s.default_value = ((paramNumber) types[1]).val;
-    }
-
-    public static void setTextParams(textType s, parameterType[] types){
-        s.default_value = ((paramString) types[0]).val;
-    }
-
-    public static void setTallyParams(tallyType s, parameterType[] types){
-        s.default_value = ((paramNumber) types[0]).val;
-    }
-
-    private static void setInputParameter(inputType t, parameterType[] types){
-        switch (t.getInputType()){
-            case TALLY:
-                setTallyParams((tallyType) t, types);
-                break;
-            case SLIDER:
-                setSliderParams((sliderType) t, types);
-                break;
-            case DROPDOWN:
-                setDropdownParams((dropdownType) t, types);
-                break;
-            case NOTES_INPUT:
-                setTextParams((textType) t, types);
-                break;
-        }
-    }
-
-
-
-    private static parameterType[] getParamsFromInputType(inputType t){
-        switch (t.getInputType()){
-            case TALLY:
-                return getTallyParams((tallyType) t);
-            case SLIDER:
-                return getSliderParams((sliderType) t);
-            case DROPDOWN:
-                return getDropdownParams((dropdownType) t);
-            case NOTES_INPUT:
-                return getTextParams((textType) t);
-        }
-        return new parameterType[]{};
-    }
-
-
-
-    private static View createNumberEdit(Context c, int value){
-        EditText text = new EditText(c);
-        text.setInputType(TYPE_CLASS_NUMBER);
-        text.setText(String.valueOf(value));
-        return text;
-    }
-
-    private static View createStringEdit(Context c, String value){
-        EditText text = new EditText(c);
-        text.setText(value);
-        return text;
-    }
-
-    private static View createStringArrayEdit(Context c, String[] value){
-        EditText text = new EditText(c);
-        text.setText(String.join("\n", value));
-        return text;
-    }
-
-    private static View createEdit(Context c, parameterType t){
-        switch (t.id){
-            case paramNumber:
-                return createNumberEdit(c, ((paramNumber) t).val);
-            case paramString:
-                return createStringEdit(c, ((paramString) t).val);
-            case paramStringArray:
-                return createStringArrayEdit(c, ((paramStringArray) t).val);
-        }
-        return null;
-    }
-
-
-    private static boolean readEdit(View v, parameterType t){
-        try{
-            String val;
-            switch (t.id) {
-                case paramNumber:
-                    val = ((EditText) v).getText().toString();
-                    if(val.isEmpty() || val.isBlank()) return false;
-                    ((paramNumber) t).val = Integer.parseInt(val);
-                    break;
-                case paramString:
-                    val = ((EditText) v).getText().toString();
-                    //if(val.isEmpty() || val.isBlank()) return false;
-                    ((paramString) t).val = val;
-                    break;
-                case paramStringArray:
-                    val = ((EditText) v).getText().toString();
-                    if(val.isEmpty() || val.isBlank()) return false;
-                    ((paramStringArray) t).val = val.split("\n");
-                    break;
-            }
-        } catch (Exception e) {
-            AlertManager.error(e);
-            return false;
-        }
-
-        return true;
-    }
-
-
-    private parameterType[] types;
-    private View[] views;
-    private inputType t;
-    public FieldEditorHelper(Context c, inputType t, TableLayout parentView, parameterType[] tmptypes){
-        this.types = tmptypes;
-        this.t = t;
-        views = new View[types.length];
-        for(int i = 0; i < types.length; i++){
-            TextView tv = new TextView(c);
-            tv.setText(types[i].name);
-            tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-            tv.setTextSize(20);
-            parentView.addView(tv);
-
-            views[i] = createEdit(c, types[i]);
-            parentView.addView(views[i]);
-        }
-    }
-    public FieldEditorHelper(Context c, inputType t, TableLayout parentView){
-        this(c,t,parentView,getParamsFromInputType(t));
-    }
-
-    public boolean save(){
-        for(int i = 0; i < types.length; i++){
-            if(!readEdit(views[i], types[i]))
-                return false;
-        }
-        setInputParameter(t, types);
-        return true;
-    }
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/FieldsChooserFragment.java

@@ -1,38 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-import static androidx.navigation.fragment.FragmentKt.findNavController;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.R;
-import com.astatin3.scoutingapp2025.databinding.FragmentDataFieldsChooserBinding;
-import com.astatin3.scoutingapp2025.scoutingData.fields;
-
-public class FieldsChooserFragment  extends Fragment {
-
-    FragmentDataFieldsChooserBinding binding;
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentDataFieldsChooserBinding.inflate(inflater, container, false);
-
-        binding.matchScoutingButton.setOnClickListener(v -> {
-            FieldsFragment.set_filename(fields.matchFieldsFilename);
-            findNavController(this).navigate(R.id.action_navigation_data_fields_chooser_to_navigation_data_fields);
-        });
-
-        binding.pitScoutingButton.setOnClickListener(v -> {
-            FieldsFragment.set_filename(fields.pitsFieldsFilename);
-            findNavController(this).navigate(R.id.action_navigation_data_fields_chooser_to_navigation_data_fields);
-        });
-
-        return binding.getRoot();
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/FieldsFragment.java

@@ -1,522 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-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 androidx.navigation.Navigation;
-
-import com.astatin3.scoutingapp2025.R;
-import com.astatin3.scoutingapp2025.databinding.FragmentDataFieldsBinding;
-import com.astatin3.scoutingapp2025.scoutingData.fields;
-import com.astatin3.scoutingapp2025.types.input.dropdownType;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-import com.astatin3.scoutingapp2025.types.input.sliderType;
-import com.astatin3.scoutingapp2025.types.input.tallyType;
-import com.astatin3.scoutingapp2025.types.input.textType;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.skydoves.powerspinner.IconSpinnerAdapter;
-import com.skydoves.powerspinner.IconSpinnerItem;
-import com.skydoves.powerspinner.PowerSpinnerView;
-import com.skydoves.powerspinner.SpinnerGravity;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class FieldsFragment extends Fragment {
-    FragmentDataFieldsBinding binding;
-
-    private static String filename;
-    public static void set_filename(String tmpfilename){
-        filename = tmpfilename;
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        binding = FragmentDataFieldsBinding.inflate(inflater, container, false);
-
-        binding.revertVersionButton.setVisibility(View.VISIBLE);
-        binding.valueEditScrollview.setOnTouchListener((v, event) -> true);
-
-
-        binding.saveButton.setVisibility(View.GONE);
-        binding.cancelEditButton.setVisibility(View.GONE);
-        binding.editButton.setVisibility(View.GONE);
-        binding.upButton.setVisibility(View.GONE);
-        binding.addButton.setVisibility(View.GONE);
-        binding.downButton.setVisibility(View.GONE);
-        binding.deleteButton.setVisibility(View.GONE);
-
-        binding.valueEditContainer.setVisibility(View.GONE);
-
-        load_field_menu();
-
-        return binding.getRoot();
-    }
-
-    private static final int background_color = 0x5000ff00;
-    private static final int unfocused_background_color = 0x2000ff00;
-
-    inputType[][] values;
-
-    private void load_field_menu() {
-
-        values = fields.load(filename);
-
-        binding.fieldsArea.bringToFront();
-        binding.fieldsArea.setStretchAllColumns(true);
-        binding.fieldsArea.removeAllViews();
-        binding.fieldsArea.setReorderingEnabled(false);
-
-        if(values == null) return;
-
-        for(int i = 0; i < values.length; i++){
-
-            TableRow tr = new TableRow(getContext());
-            TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
-                    FrameLayout.LayoutParams.WRAP_CONTENT,
-                    FrameLayout.LayoutParams.WRAP_CONTENT
-            );
-
-            rowParams.setMargins(20,20,20,20);
-            tr.setLayoutParams(rowParams);
-            tr.setPadding(20,20,20,20);
-
-            TextView tv = new TextView(getContext());
-            tv.setText("v" + i);
-            tv.setTextSize(20);
-            tr.addView(tv);
-
-            tv = new TextView(getContext());
-            tv.setText(values[i].length + " Fields");
-            tv.setTextSize(16);
-            tr.addView(tv);
-
-            binding.fieldsArea.addView(tr);
-
-            if(i == values.length-1) {
-                tr.setBackgroundColor(background_color);
-                int fi = i;
-                tr.setOnClickListener(v -> {
-                    display_fields(values[fi]);
-                });
-            }else{
-                tr.setBackgroundColor(unfocused_background_color);
-            }
-        }
-    }
-
-    private void display_fields(inputType[] version_values) {
-        binding.fieldsArea.removeAllViews();
-        binding.fieldsArea.setReorderingEnabled(false);
-
-        binding.revertVersionButton.setVisibility(View.GONE);
-
-        binding.saveButton.setVisibility(View.GONE);
-        binding.editButton.setVisibility(View.GONE);
-        binding.upButton.setVisibility(View.VISIBLE);
-        binding.addButton.setVisibility(View.VISIBLE);
-        binding.downButton.setVisibility(View.VISIBLE);
-
-        binding.valueEditContainer.setVisibility(View.GONE);
-
-        for(int i = 0; i < version_values.length; i++){
-            addRow(version_values[i]);
-        }
-        selindex = -1;
-
-
-        binding.addButton.setOnClickListener(this::addField);
-        binding.saveButton.setOnClickListener(this::buttonfunc);
-    }
-
-    private void addRow(inputType field){
-        TableRow tr = getTableRow(field);
-
-        binding.fieldsArea.addView(tr);
-
-        tr.setOnClickListener(v -> {
-            binding.editButton.setVisibility(View.VISIBLE);
-            trOnClick(values[values.length-1], tr);
-        });
-
-        binding.upButton.setOnClickListener(v -> {
-            if(selindex != 0) {
-                binding.saveButton.setVisibility(View.VISIBLE);
-                binding.fieldsArea.updateRowOrder(selindex, selindex - 1);
-                selindex -= 1;
-            }
-        });
-
-        binding.downButton.setOnClickListener(v -> {
-            if(selindex != values[values.length-1].length-1) {
-                binding.saveButton.setVisibility(View.VISIBLE);
-                binding.fieldsArea.updateRowOrder(selindex, selindex + 1);
-                selindex += 1;
-            }
-        });
-
-    }
-
-    private void buttonfunc(View v){
-        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-        alert.setTitle("Warning!");
-        alert.setMessage("Changing or removing some values will result in lost data!\nBut this will create a new field version, and you can revert at any time.");
-        alert.setPositiveButton("OK", null);
-        alert.setNegativeButton("Cancel", null);
-        alert.setCancelable(true);
-        alert.setOnDismissListener(b -> {
-            inputType[][] currentValues = fields.load(filename);
-            assert currentValues != null;
-            inputType[][] newValues = new inputType[currentValues.length+1][];
-            System.arraycopy(currentValues, 0, newValues, 0, currentValues.length);
-
-            newValues[newValues.length-1] = new inputType[values[values.length-1].length];
-
-            for(int i = 0; i < values[values.length-1].length; i++){
-                newValues[newValues.length-1][i] = values[values.length-1][binding.fieldsArea.getReorderedIndexes().get(i)];
-            }
-//            newValues[newValues.length-1] = values[values.length-1];
-
-            boolean saved = fields.save(filename, newValues);
-            AlertManager.alert("Saved", String.valueOf(saved));
-
-            Navigation.findNavController((Activity) getContext(), R.id.nav_host_fragment_activity_main).navigate(R.id.action_navigation_data_fields_to_navigation_data_fields_chooser);
-        });
-        alert.create().show();
-    }
-
-    private int selindex = -1;
-
-    private void trOnClick(inputType[] version_values, TableRow tr){
-        selindex = -1;
-        for(int i = 0; i < binding.fieldsArea.getChildCount(); i++){
-            View v = binding.fieldsArea.getChildAt(i);
-
-            if(v.equals(tr)) {
-                tr.setBackgroundColor(background_color);
-                selindex = i;
-            } else
-                binding.fieldsArea.getChildAt(i).setBackgroundColor(unfocused_background_color);
-        }
-
-        onFieldSelect(version_values[binding.fieldsArea.getReorderedIndexes().get(selindex)]);
-    }
-
-    private void onFieldSelect(inputType field){
-        //System.out.println(field.name);
-
-        binding.editButton.setOnClickListener(v -> {
-            binding.editButton.setVisibility(View.GONE);
-            binding.addButton.setVisibility(View.GONE);
-            binding.upButton.setVisibility(View.GONE);
-            binding.downButton.setVisibility(View.GONE);
-
-            binding.ValueEditTable.removeAllViews();
-            binding.valueEditContainer.setVisibility(View.VISIBLE);
-            TextView tv = new TextView(getContext());
-
-            tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-            tv.setText(field.name);
-            tv.setPadding(8,8,8,8);
-            tv.setTextSize(24);
-
-            binding.ValueEditTable.addView(tv);
-
-            final FieldEditorHelper fe = new FieldEditorHelper(
-                getContext(),
-                field,
-                binding.ValueEditTable
-            );
-
-            binding.saveButton.setVisibility(View.VISIBLE);
-            binding.saveButton.setOnClickListener(a -> {
-                System.out.println(fe.save());
-                defaultVisibility();
-            });
-
-            binding.cancelEditButton.setVisibility(View.VISIBLE);
-            binding.cancelEditButton.setOnClickListener(a -> {
-                defaultVisibility();
-            });
-
-            binding.deleteButton.setVisibility(View.VISIBLE);
-            binding.deleteButton.setOnClickListener(a -> {
-                deleteField(field);
-            });
-        });
-
-    }
-
-    private void deleteField(inputType field){
-        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-        alert.setTitle("Warning!");
-        alert.setMessage("Removing a value will result in data being deleted in subsequent field versions!");
-        alert.setNegativeButton("Cancel", null);
-        alert.setPositiveButton("OK", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                defaultVisibility();
-
-                int oldindex = -1;
-                for(int i = 0; i < values[values.length - 1].length; i++){
-                    if(values[values.length - 1][i].equals(field)){
-                        oldindex = i;
-                        break;
-                    }
-                }
-
-                if(oldindex != -1) {
-                    System.out.println(Arrays.toString(values[values.length - 1]));
-                    binding.fieldsArea.removeViewAt(selindex);
-                    binding.fieldsArea.removeElement(oldindex);
-                    values[values.length - 1] = removeElement(values[values.length - 1], oldindex);
-                    selindex = -1;
-                    AlertManager.toast("Removed!");
-                    binding.editButton.setVisibility(View.GONE);
-                    System.out.println(Arrays.toString(values[values.length - 1]));
-                    //System.out.println(values[values.length-1].length);
-                }
-
-            }
-        });
-        alert.setCancelable(true);
-        alert.create().show();
-    }
-
-    public inputType[] removeElement(inputType[] src, int i) {
-        inputType[] newArray = new inputType[src.length - 1];
-        if (i > 0){
-            System.arraycopy(src, 0, newArray, 0, i);
-        }
-
-        if (newArray.length > i){
-            System.arraycopy(src, i + 1, newArray, i, newArray.length - i);
-        }
-
-        return newArray;
-    }
-
-
-
-
-
-
-
-
-
-
-    private void defaultVisibility() {
-        binding.editButton.setVisibility(View.VISIBLE);
-        binding.addButton.setVisibility(View.VISIBLE);
-        binding.upButton.setVisibility(View.VISIBLE);
-        binding.downButton.setVisibility(View.VISIBLE);
-        binding.ValueEditTable.removeAllViews();
-        binding.valueEditContainer.setVisibility(View.GONE);
-        binding.cancelEditButton.setVisibility(View.GONE);
-        binding.deleteButton.setVisibility(View.GONE);
-        binding.saveButton.setOnClickListener(this::buttonfunc);
-    }
-
-
-
-
-    private void addField(View v) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        builder.setTitle("Title");
-
-        final EditText input = new EditText(getContext());
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-
-        builder.setView(input);
-
-        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-
-        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                String title = input.getText().toString();
-                if(title.isEmpty() || title.isBlank()) {
-                    AlertManager.error("Title cannot be blank!");
-                    return;
-                }
-                addField_Part_2(title);
-            }
-        });
-
-        builder.show();
-    }
-
-    private void addField_Part_2(String title) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        builder.setTitle("Title");
-
-        final PowerSpinnerView dropdown = new PowerSpinnerView(getContext());
-
-        List<IconSpinnerItem> iconSpinnerItems = new ArrayList<>();
-
-        iconSpinnerItems.add(new IconSpinnerItem("Slider"));
-        iconSpinnerItems.add(new IconSpinnerItem("Text"));
-        iconSpinnerItems.add(new IconSpinnerItem("Dropdown"));
-        iconSpinnerItems.add(new IconSpinnerItem("Tally"));
-
-        IconSpinnerAdapter iconSpinnerAdapter = new IconSpinnerAdapter(dropdown);
-
-        dropdown.setGravity(Gravity.CENTER);
-
-        dropdown.setSpinnerAdapter(iconSpinnerAdapter);
-        dropdown.setItems(iconSpinnerItems);
-
-        dropdown.selectItemByIndex(0);
-
-        dropdown.setPadding(10,20,10,20);
-        dropdown.setBackgroundColor(0xf0000000);
-        dropdown.setTextColor(0xff00ff00);
-        dropdown.setTextSize(14.5f);
-        dropdown.setArrowGravity(SpinnerGravity.END);
-        dropdown.setArrowPadding(8);
-//        dropdown.setSpinnerItemHeight(46);
-        dropdown.setSpinnerPopupElevation(14);
-
-        builder.setView(dropdown);
-
-        builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-
-        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                addField_Part_3(title, dropdown.getSelectedIndex());
-            }
-        });
-
-        builder.show();
-    }
-
-    private void addField_Part_3(String title, int typeIndex) {
-        switch (typeIndex){
-            case 0:
-                sliderType slider = new sliderType();
-                slider.name = title;
-                FieldEditorHelper.setSliderParams(slider, FieldEditorHelper.defaultSliderParams);
-                addField_Part_4(slider);
-                break;
-            case 1:
-                textType text = new textType();
-                text.name = title;
-                FieldEditorHelper.setTextParams(text, FieldEditorHelper.defaultTextParams);
-                addField_Part_4(text);
-                break;
-            case 2:
-                dropdownType dropdown = new dropdownType();
-                dropdown.name = title;
-                FieldEditorHelper.setDropdownParams(dropdown, FieldEditorHelper.defaultDropdownParams);
-                addField_Part_4(dropdown);
-                break;
-            case 3:
-                tallyType tally = new tallyType();
-                tally.name = title;
-                FieldEditorHelper.setTallyParams(tally, FieldEditorHelper.defaultTallyParams);
-                addField_Part_4(tally);
-                break;
-
-        }
-
-    }
-    private void addField_Part_4(inputType field) {
-        binding.editButton.setVisibility(View.GONE);
-        binding.addButton.setVisibility(View.GONE);
-        binding.upButton.setVisibility(View.GONE);
-        binding.downButton.setVisibility(View.GONE);
-
-        binding.ValueEditTable.removeAllViews();
-        binding.valueEditContainer.setVisibility(View.VISIBLE);
-        TextView tv = new TextView(getContext());
-
-        tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-        tv.setText(field.name);
-        tv.setPadding(8,8,8,8);
-        tv.setTextSize(24);
-
-        binding.ValueEditTable.addView(tv);
-
-        final FieldEditorHelper fe = new FieldEditorHelper(
-                getContext(),
-                field,
-                binding.ValueEditTable
-        );
-
-        binding.saveButton.setVisibility(View.VISIBLE);
-        binding.saveButton.setOnClickListener(a -> {
-            inputType[] newValues = new inputType[values[values.length-1].length+1];
-            System.arraycopy(values[values.length-1], 0, newValues, 0, values[values.length-1].length);
-            newValues[newValues.length-1] = field;
-            values[values.length-1] = newValues;
-
-            AlertManager.alert("Test", String.valueOf(binding.fieldsArea.getReorderedIndexes()));
-
-            //TableRow tr = getTableRow(field);
-            //binding.fieldsArea.addView(tr);
-            addRow(field);
-
-            System.out.println(fe.save());
-            defaultVisibility();
-        });
-
-        binding.cancelEditButton.setVisibility(View.VISIBLE);
-        binding.cancelEditButton.setOnClickListener(a -> {
-            defaultVisibility();
-        });
-
-    }
-
-    private @NonNull TableRow getTableRow(inputType field) {
-        TableRow tr = new TableRow(getContext());
-        TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
-                FrameLayout.LayoutParams.WRAP_CONTENT,
-                FrameLayout.LayoutParams.WRAP_CONTENT
-        );
-
-        rowParams.setMargins(20,20,20,20);
-        tr.setLayoutParams(rowParams);
-        tr.setPadding(20,20,20,20);
-        tr.setBackgroundColor(unfocused_background_color);
-
-        TextView tv = new TextView(getContext());
-        tv.setText(field.get_type_name());
-        tv.setTextSize(12);
-        tr.addView(tv);
-
-        tv = new TextView(getContext());
-        tv.setText(field.name);
-        tv.setTextSize(20);
-        tr.addView(tv);
-        return tr;
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/ReportFragment.java

@@ -1,24 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.databinding.FragmentDataReportBinding;
-
-public class ReportFragment extends Fragment {
-    FragmentDataReportBinding binding;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentDataReportBinding.inflate(inflater, container, false);
-
-        return binding.getRoot();
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/data/TeamsFragment.java

@@ -1,384 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.data;
-
-import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
-import static com.astatin3.scoutingapp2025.utility.DataManager.match_latest_values;
-import static com.astatin3.scoutingapp2025.utility.DataManager.match_transferValues;
-import static com.astatin3.scoutingapp2025.utility.DataManager.match_values;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_latest_values;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_transferValues;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_values;
-
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.TableLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentDataTeamsBinding;
-import com.astatin3.scoutingapp2025.scoutingData.ScoutingDataWriter;
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.google.android.material.divider.MaterialDivider;
-import com.skydoves.powerspinner.IconSpinnerAdapter;
-import com.skydoves.powerspinner.IconSpinnerItem;
-import com.skydoves.powerspinner.OnSpinnerItemSelectedListener;
-import com.skydoves.powerspinner.PowerSpinnerView;
-import com.skydoves.powerspinner.SpinnerGravity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TeamsFragment extends Fragment {
-    FragmentDataTeamsBinding binding;
-
-    private static frcTeam team;
-    public static void setTeam(frcTeam tmpteam){
-        team = tmpteam;
-    }
-
-    private static final int background_color = 0x5000ff00;
-    private static final int unsaved_background_color = 0x2000ff00;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentDataTeamsBinding.inflate(inflater, container, false);
-
-        binding.teamsArea.removeAllViews();
-
-        DataManager.reload_match_fields();
-        DataManager.reload_pit_fields();
-
-        TableLayout table = new TableLayout(getContext());
-        table.setStretchAllColumns(true);
-        binding.teamsArea.addView(table);
-
-        loadTeam(latestSettings.settings.get_data_view_mode());
-
-        return binding.getRoot();
-    }
-
-    public void loadTeam(int mode) {
-        binding.teamsArea.removeAllViews();
-
-        LinearLayout ll = new LinearLayout(getContext());
-        ll.setLayoutParams(new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        ll.setOrientation(LinearLayout.VERTICAL);
-        binding.teamsArea.addView(ll);
-
-
-
-        PowerSpinnerView dropdown = new PowerSpinnerView(getContext());
-
-        List<IconSpinnerItem> iconSpinnerItems = new ArrayList<>();
-
-        iconSpinnerItems.add(new IconSpinnerItem("Individual"));
-        iconSpinnerItems.add(new IconSpinnerItem("Compiled"));
-        iconSpinnerItems.add(new IconSpinnerItem("History"));
-
-        IconSpinnerAdapter iconSpinnerAdapter = new IconSpinnerAdapter(dropdown);
-        dropdown.setSpinnerAdapter(iconSpinnerAdapter);
-        dropdown.setItems(iconSpinnerItems);
-
-        dropdown.selectItemByIndex(0);
-
-        dropdown.setPadding(10,20,10,20);
-        dropdown.setBackgroundColor(0xf0000000);
-        dropdown.setTextColor(0xff00ff00);
-        dropdown.setTextSize(15);
-        dropdown.setArrowGravity(SpinnerGravity.END);
-        dropdown.setArrowPadding(8);
-//        dropdown.setSpinnerItemHeight(46);
-        dropdown.setSpinnerPopupElevation(14);
-
-
-        dropdown.selectItemByIndex(mode);
-
-
-        dropdown.setOnSpinnerItemSelectedListener(new OnSpinnerItemSelectedListener<IconSpinnerItem>() {
-            @Override
-            public void onItemSelected(int oldIndex, @Nullable IconSpinnerItem oldItem, int newIndex,
-                                       IconSpinnerItem newItem) {
-
-                latestSettings.settings.set_data_view_mode(newIndex);
-                loadTeam(newIndex);
-            }
-        });
-
-        ll.addView(dropdown);
-
-
-
-
-
-
-
-        TextView tv = new TextView(getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText(String.valueOf(team.teamNumber));
-        tv.setTextSize(28);
-        ll.addView(tv);
-
-        tv = new TextView(getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText(team.teamName);
-        tv.setTextSize(28);
-        ll.addView(tv);
-
-        tv = new TextView(getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText(team.getDescription());
-        tv.setTextSize(16);
-        ll.addView(tv);
-
-        add_pit_data(ll, team);
-        add_match_data(ll, team, mode);
-    }
-
-    public void add_pit_data(LinearLayout ll, frcTeam team){
-        final String filename = evcode+"-"+team.teamNumber+".pitscoutdata";
-
-        ll.addView(new MaterialDivider(getContext()));
-
-        TextView tv = new TextView(getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setPadding(0,10,0,10);
-        tv.setText("----- Pit data -----");
-        tv.setTextSize(30);
-        ll.addView(tv);
-
-        ll.addView(new MaterialDivider(getContext()));
-
-        if(!fileEditor.fileExist(filename)){
-            tv = new TextView(getContext());
-            tv.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            ));
-            tv.setGravity(Gravity.CENTER_HORIZONTAL);
-            tv.setText("No pit data has been collected!");
-            tv.setTextSize(23);
-            ll.addView(tv);
-            return;
-        }
-
-        ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(filename, pit_values, pit_transferValues);
-
-        tv = new TextView(getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setPadding(0, 20, 0, 5);
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText("Pit scouting by " + psda.username);
-        tv.setTextSize(30);
-        ll.addView(tv);
-
-        for (int a = 0; a < psda.data.array.length; a++) {
-            tv = new TextView(getContext());
-            tv.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            ));
-            tv.setGravity(Gravity.CENTER_HORIZONTAL);
-            tv.setText(psda.data.array[a].getName());
-            tv.setTextSize(25);
-
-            if(psda.data.array[a].isNull()){
-                tv.setBackgroundColor(0xffff0000);
-                tv.setTextColor(0xff000000);
-            }
-
-
-            ll.addView(tv);
-
-
-            pit_latest_values[a].add_individual_view(ll, psda.data.array[a]);
-        }
-    }
-
-
-
-
-    public void add_match_data(LinearLayout ll, frcTeam team, int mode){
-        String[] files = fileEditor.getMatchesByTeamNum(evcode, team.teamNumber);
-
-        ll.addView(new MaterialDivider(getContext()));
-
-        TextView tv = new TextView(getContext());
-        tv.setLayoutParams(new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText("----- Match data -----");
-        tv.setPadding(0,10,0,10);
-        tv.setTextSize(30);
-        ll.addView(tv);
-
-        ll.addView(new MaterialDivider(getContext()));
-
-
-
-        if(files.length == 0){
-            tv = new TextView(getContext());
-            tv.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            ));
-            tv.setGravity(Gravity.CENTER_HORIZONTAL);
-            tv.setText("No match data has been collected!");
-            tv.setTextSize(23);
-            ll.addView(tv);
-            return;
-        }
-
-        switch (mode){
-            case 0:
-                add_individual_views(ll,files);
-                break;
-            case 1:
-                add_compiled_views(ll,files);
-                break;
-            case 2:
-                add_history_views(ll,files);
-                break;
-        }
-    }
-
-
-
-
-    public void add_individual_views(LinearLayout ll, String[] files) {
-        for (int i = 0; i < files.length; i++) {
-            String[] split = files[i].split("-");
-            int match_num = Integer.parseInt(split[1]);
-
-            ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
-
-            TextView tv = new TextView(getContext());
-            tv.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            ));
-            tv.setPadding(0, 40, 0, 5);
-            tv.setGravity(Gravity.CENTER_HORIZONTAL);
-            tv.setText("M" + (match_num) + " " + split[2] + "-" + split[3] + " by " + psda.username);
-            tv.setTextSize(30);
-            ll.addView(tv);
-
-            for (int a = 0; a < psda.data.array.length; a++) {
-                tv = new TextView(getContext());
-                tv.setLayoutParams(new FrameLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                ));
-                tv.setGravity(Gravity.CENTER_HORIZONTAL);
-                tv.setText(psda.data.array[a].getName());
-                tv.setTextSize(25);
-
-                if (psda.data.array[a].isNull()) {
-                    tv.setBackgroundColor(0xffff0000);
-                    tv.setTextColor(0xff000000);
-                }
-
-                ll.addView(tv);
-
-
-                match_latest_values[a].add_individual_view(ll, psda.data.array[a]);
-            }
-        }
-    }
-
-
-
-
-
-
-    public void add_compiled_views(LinearLayout ll, String[] files){
-        dataType[][] data = new dataType[match_latest_values.length][files.length];
-        for (int i = 0; i < files.length; i++) {
-
-            ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
-            for (int a = 0; a < data.length; a++) {
-                data[a][i] = psda.data.array[a];
-            }
-        }
-
-        for(int i = 0; i < match_latest_values.length; i++){
-            TextView tv = new TextView(getContext());
-            tv.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            ));
-            tv.setPadding(0, 20, 0, 5);
-            tv.setGravity(Gravity.CENTER_HORIZONTAL);
-            tv.setText(match_latest_values[i].name);
-            tv.setTextSize(30);
-            ll.addView(tv);
-
-            match_latest_values[i].add_compiled_view(ll, data[i]);
-        }
-    }
-
-
-
-
-
-    public void add_history_views(LinearLayout ll, String[] files){
-        dataType[][] data = new dataType[match_latest_values.length][files.length];
-        for (int i = 0; i < files.length; i++) {
-
-            ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
-            for (int a = 0; a < data.length; a++) {
-                data[a][i] = psda.data.array[a];
-            }
-        }
-
-        for(int i = 0; i < match_latest_values.length; i++){
-            TextView tv = new TextView(getContext());
-            tv.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            ));
-            tv.setPadding(0, 20, 0, 5);
-            tv.setGravity(Gravity.CENTER_HORIZONTAL);
-            tv.setText(match_latest_values[i].name);
-            tv.setTextSize(30);
-            ll.addView(tv);
-
-            match_latest_values[i].add_history_view(ll, data[i]);
-        }
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/PitScoutingFragment.java

@@ -1,257 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.scouting;
-
-import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_latest_values;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_transferValues;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_values;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentScoutingPitBinding;
-import com.astatin3.scoutingapp2025.scoutingData.ScoutingDataWriter;
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-import com.astatin3.scoutingapp2025.utility.AutoSaveManager;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-
-import java.util.ArrayList;
-import java.util.function.Function;
-
-public class PitScoutingFragment extends Fragment {
-
-    FragmentScoutingPitBinding binding;
-
-    private static frcTeam team;
-    public static void setTeam(frcTeam tmpteam){
-        team = tmpteam;
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentScoutingPitBinding.inflate(inflater, container, false);
-
-        username = latestSettings.settings.get_username();
-        DataManager.reload_pit_fields();
-
-        loadTeam();
-
-        return binding.getRoot();
-    }
-    private static final int unsaved_color = 0x60ff0000;
-    private static final int saved_color = 0x6000ff00;
-
-    boolean edited = false;
-
-    String filename;
-    String username;
-
-    TextView[] titles;
-
-    AutoSaveManager asm = new AutoSaveManager(this::save);
-
-    ArrayList<dataType> dataTypes;
-
-    public void save(){
-        edited = false;
-        set_indicator_color(saved_color);
-
-        dataType[] types = new dataType[pit_latest_values.length];
-
-        for(int i = 0; i < pit_latest_values.length; i++){
-            types[i] = pit_latest_values[i].getViewValue();
-        }
-
-        if(ScoutingDataWriter.save(pit_values.length-1, username, filename, types))
-            System.out.println("Saved!");
-        else
-            System.out.println("Error saving");
-    }
-
-    public void set_indicator_color(int color){
-        binding.pitFileIndicator.setBackgroundColor(color);
-    }
-
-    public void update_asm(){
-//        v.getBackground().setColorFilter(Color.parseColor("#00ff00"), PorterDuff.Mode.DARKEN);
-        edited = true;
-        set_indicator_color(unsaved_color);
-        asm.update();
-    }
-
-
-//    public void init(frcEvent event){
-//
-//        evcode = event.eventCode;
-//        this.event = event;
-//        username = latestSettings.settings.get_username();
-//
-////        binding.eventcode.setText(evcode);
-//
-//        binding.pitBackButton.setOnClickListener(view -> {
-//            if(edited) save();
-//            binding.pitTeamName.setVisibility(View.GONE);
-//            binding.pitTeamDescription.setVisibility(View.GONE);
-//            clear_fields();
-//            load_teams();
-//        });
-//
-//        values = fields.load(fields.pitsFieldsFilename);
-//
-//        if(values == null || values.length == 0){
-//            TextView tv = new TextView(getContext());
-//            tv.setText("Failed to load fields.\nTry to either download or create pit scouting fields.");
-//            tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-//            binding.pitScoutArea.addView(tv);
-//            return;
-//        }
-//
-//        latest_values = values[values.length-1];
-//        transferValues = transferType.get_transfer_values(values);
-//    }
-//
-//    public void clear_fields(){
-//        int childCount = binding.pitScoutArea.getChildCount();
-//        View[] views = new View[childCount];
-//
-//        for(int i = 0; i < childCount; i++){
-//            views[i] = binding.pitScoutArea.getChildAt(i);
-//        }
-//
-//        for(int i = 0; i < childCount; i++){
-//            if(!views[i].isShown()) continue;
-//            binding.pitScoutArea.removeView(views[i]);
-//        }
-//    }
-
-    public void loadTeam(){
-//        clear_fields();
-
-        binding.pitFileIndicator.setVisibility(View.VISIBLE);
-        binding.pitTeamName.setVisibility(View.VISIBLE);
-        binding.pitTeamDescription.setVisibility(View.VISIBLE);
-
-        binding.pitTeamName.setText(team.teamName);
-        binding.pitTeamDescription.setText(team.getDescription());
-        binding.pitBarTeamNum.setText(String.valueOf(team.teamNumber));
-
-//        binding.teamName.setText(team.teamName);
-//        binding.teamDescription.setText(team.getDescription());
-
-        filename = evcode + "-" + team.teamNumber + ".pitscoutdata";
-
-        boolean new_file = !fileEditor.fileExist(filename);
-
-        if(asm.isRunning){
-            asm.stop();
-        }
-
-        create_fields();
-
-        if(new_file){
-            default_fields();
-            set_indicator_color(unsaved_color);
-        }else{
-            get_fields();
-            set_indicator_color(saved_color);
-        }
-
-        asm.start();
-
-    }
-
-    private int default_text_color = 0;
-
-
-    private void create_fields() {
-        if(asm.isRunning){
-            asm.stop();
-        }
-
-        titles = new TextView[pit_latest_values.length];
-
-        for(int i = 0 ; i < pit_latest_values.length; i++) {
-            TextView tv = new TextView(getContext());
-            tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-            tv.setText(pit_latest_values[i].name);
-            tv.setTextSize(24);
-            tv.setPadding(8,8,8,8);
-            titles[i] = tv;
-            binding.pitScoutArea.addView(tv);
-
-            default_text_color = tv.getCurrentTextColor();
-
-            int fi = i;
-            tv.setOnClickListener(p -> {
-//                boolean blank = !latest_values[fi].getViewValue().isNull();
-
-//                System.out.println(blank);
-
-                asm.update();
-
-                if(!pit_latest_values[fi].isBlank){
-                    tv.setBackgroundColor(0xffff0000);
-                    tv.setTextColor(0xff000000);
-                    pit_latest_values[fi].nullify();
-                }else{
-                    tv.setBackgroundColor(0x00000000);
-                    tv.setTextColor(default_text_color);
-                    pit_latest_values[fi].setViewValue(pit_latest_values[fi].default_value);
-                }
-            });
-
-            View v = pit_latest_values[i].createView(getContext(), new Function<dataType, Integer>() {
-                @Override
-                public Integer apply(dataType dataType) {
-//                    edited = true;
-                    if(asm.isRunning)
-                        update_asm();
-                    return 0;
-                }
-            });
-
-            binding.pitScoutArea.addView(v);
-        }
-    }
-
-    public void default_fields(){
-        for(int i = 0; i < pit_latest_values.length; i++){
-            inputType input = pit_latest_values[i];
-            input.setViewValue(input.default_value);
-
-            titles[i].setBackgroundColor(0x00000000);
-            titles[i].setTextColor(default_text_color);
-        }
-    }
-
-    public void get_fields(){
-
-        ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, pit_values, pit_transferValues);
-        dataType[] types = psdr.data.array;
-
-        for(int i = 0; i < pit_latest_values.length; i++){
-//            types[i] = latest_values[i].getViewValue();
-            pit_latest_values[i].setViewValue(types[i]);
-
-            if(pit_latest_values[i].isBlank){
-                titles[i].setBackgroundColor(0xffff0000);
-                titles[i].setTextColor(0xff000000);
-            }else{
-                titles[i].setBackgroundColor(0x00000000);
-                titles[i].setTextColor(default_text_color);
-            }
-        }
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/ScoutingFragment.java

@@ -1,104 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.scouting;
-
-import static androidx.navigation.fragment.FragmentKt.findNavController;
-
-import static com.astatin3.scoutingapp2025.utility.DataManager.event;
-
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.R;
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentScoutingBinding;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.ui.TeamSelectorFragment;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-
-public class ScoutingFragment extends Fragment {
-
-    private FragmentScoutingBinding binding;
-    private boolean is_main_page = true;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentScoutingBinding.inflate(inflater, container, false);
-
-        binding.buttons.setVisibility(View.VISIBLE);
-
-        String evcode = latestSettings.settings.get_evcode();
-
-        if(evcode.equals("unset")){
-            binding.noEventError.setVisibility(View.VISIBLE);
-            binding.buttons.setVisibility(View.GONE);
-            is_main_page = false;
-            return binding.getRoot();
-        }
-
-        DataManager.reload_event();
-
-        if(event.matches.isEmpty())
-            binding.matchScoutingButton.setVisibility(View.GONE);
-
-        binding.matchScoutingButton.setOnClickListener(v -> {
-            findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_match_scouting);
-        });
-
-        binding.pitScoutingButton.setOnClickListener(v -> {
-            TeamSelectorFragment.setPits_mode(true);
-            TeamSelectorFragment.setOnSelect(new TeamSelectorFragment.onTeamSelected() {
-                @Override
-                public void onSelect(TeamSelectorFragment self, frcTeam team) {
-                    PitScoutingFragment.setTeam(team);
-                    findNavController(self).navigate(R.id.action_navigation_team_selector_to_navigation_pit_scouting);
-                }
-            });
-            findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_team_selector);
-        });
-
-        binding.statusButton.setOnClickListener(v -> {
-            findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_scouting_status);
-        });
-
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if(getView() == null){
-            return;
-        }
-
-        getView().setFocusableInTouchMode(true);
-        getView().requestFocus();
-        getView().setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-
-                if (event.getAction() == KeyEvent.ACTION_UP
-                        && keyCode == KeyEvent.KEYCODE_BACK
-                        && !is_main_page){
-
-//                    binding.buttons.setVisibility(View.VISIBLE);
-//                    binding.matchScoutingView.setVisibility(View.GONE);
-//                    binding.pitScoutingView.setVisibility(View.GONE);
-                    is_main_page = true;
-
-                    return true;
-                }
-                return false;
-            }
-        });
-    }
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/scouting/StatusFragment.java

@@ -1,165 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.scouting;
-
-import static com.astatin3.scoutingapp2025.utility.DataManager.event;
-
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TableRow;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.databinding.FragmentScoutingStatusBinding;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.astatin3.scoutingapp2025.types.frcEvent;
-import com.astatin3.scoutingapp2025.types.frcMatch;
-
-import java.util.Arrays;
-
-public class StatusFragment extends Fragment {
-    FragmentScoutingStatusBinding binding;
-
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-
-        binding = FragmentScoutingStatusBinding.inflate(inflater, container, false);
-
-        DataManager.reload_event();
-        binding.matchTable.removeAllViews();
-        binding.matchTable.setStretchAllColumns(true);
-        add_pit_scouting(event);
-        add_match_scouting(event);
-
-        return binding.getRoot();
-    }
-    public static int color_found = 0x7f00ff00;
-    public static int color_not_found = 0x7f7f0000;
-    private void addTableText(TableRow tr, String textStr){
-        TextView text = new TextView(getContext());
-        text.setTextSize(18);
-        text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
-        text.setText(textStr);
-        tr.addView(text);
-    }
-
-    public void add_pit_scouting(frcEvent event){
-        TextView tv = new TextView(getContext());
-        tv.setLayoutParams(new TableRow.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText("Pit Scouting");
-        tv.setTextSize(28);
-        binding.matchTable.addView(tv);
-
-        int[] teams = new int[event.teams.size()];
-
-        for(int i = 0 ; i < event.teams.size(); i++){
-            teams[i] = event.teams.get(i).teamNumber;
-        }
-
-        Arrays.sort(teams);
-
-        TableRow tr = null;
-        for(int i=0; i < event.teams.size(); i++){
-//            frcTeam team = event.teams.get(i);
-            int num = teams[i];
-
-            if(i % 7 == 0){
-                if(i != 0)
-                    binding.matchTable.addView(tr);
-                tr = new TableRow(getContext());
-            }
-
-            TextView text = new TextView(getContext());
-            text.setTextSize(18);
-            text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-
-            text.setText(String.valueOf(num));
-            if(fileEditor.fileExist(event.eventCode + "-" + num + ".pitscoutdata")){
-                text.setBackgroundColor(color_found);
-            }else{
-                text.setBackgroundColor(color_not_found);
-            }
-            tr.addView(text);
-        }
-        if(tr != null)
-            binding.matchTable.addView(tr);
-    }
-
-
-    public void add_match_scouting(frcEvent event){
-
-        TextView tv = new TextView(getContext());
-        tv.setLayoutParams(new TableRow.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        ));
-        tv.setGravity(Gravity.CENTER_HORIZONTAL);
-        tv.setText("Match Scouting");
-        tv.setTextSize(28);
-        binding.matchTable.addView(tv);
-
-        TableRow tr = new TableRow(getContext());
-        addTableText(tr, "#");
-        addTableText(tr, "Red-1");
-        addTableText(tr, "Red-2");
-        addTableText(tr, "Red-3");
-        addTableText(tr, "Blue-1");
-        addTableText(tr, "Blue-2");
-        addTableText(tr, "Blue-3");
-        binding.matchTable.addView(tr);
-
-        for(frcMatch match : event.matches){
-
-            tr = new TableRow(getContext());
-            addTableText(tr, String.valueOf(match.matchIndex));
-//
-            for(int i=0;i<6;i++){
-                TextView text = new TextView(getContext());
-                text.setTextSize(18);
-                text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-
-                int team_num;
-                String alliance_position;
-
-                if(i < 3){
-                    team_num = match.redAlliance[i];
-                    alliance_position = "red-"+(i+1);
-                }else{
-                    team_num = match.blueAlliance[i-3];
-                    alliance_position = "blue-"+(i-2);
-                }
-
-                text.setText(String.valueOf(team_num));
-                if(fileEditor.fileExist(event.eventCode + "-" + match.matchIndex + "-" + alliance_position + "-" + team_num + ".matchscoutdata")){
-                    text.setBackgroundColor(color_found);
-                }else{
-                    text.setBackgroundColor(color_not_found);
-                }
-                tr.addView(text);
-            }
-
-//            addTableText(tr, String.valueOf(match.matchIndex));
-//            addTableText(tr, String.valueOf(match.blueAlliance[0]));
-//            addTableText(tr, String.valueOf(match.blueAlliance[1]));
-//            addTableText(tr, String.valueOf(match.blueAlliance[2]));
-//            addTableText(tr, String.valueOf(match.redAlliance[0]));
-//            addTableText(tr, String.valueOf(match.redAlliance[1]));
-//            addTableText(tr, String.valueOf(match.redAlliance[2]));
-//            if (toggle) {
-//                tr.setBackgroundColor(0x30000000);
-//            }
-//
-//            toggle = !toggle;
-            binding.matchTable.addView(tr);
-        }
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/settings/settingsFragment.java

@@ -1,226 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.settings;
-
-import android.app.AlertDialog;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.Spinner;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.astatin3.scoutingapp2025.databinding.FragmentSettingsBinding;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-
-import com.skydoves.powerspinner.IconSpinnerAdapter;
-import com.skydoves.powerspinner.IconSpinnerItem;
-import com.skydoves.powerspinner.OnSpinnerItemSelectedListener;
-import com.skydoves.powerspinner.PowerSpinnerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class settingsFragment extends Fragment {
-    private FragmentSettingsBinding binding;
-    private android.widget.ScrollView ScrollArea;
-    private android.widget.TableLayout Table;
-
-    private void setDropdownItems(Spinner dropdown, String[] items){
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(requireActivity(), android.R.layout.simple_spinner_item, items);
-        dropdown.setAdapter(adapter);
-    }
-
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-
-        binding = FragmentSettingsBinding.inflate(inflater, container, false);
-        View root = binding.getRoot();
-
-        EditText username = binding.username;
-        username.setText(latestSettings.settings.get_username());
-        username.addTextChangedListener(new TextWatcher() {
-
-            public void afterTextChanged(Editable s) {
-                latestSettings.settings.set_username(username.getText().toString());
-            }
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-            public void onTextChanged(CharSequence s, int start, int before, int count) {}
-        });
-
-
-
-
-        PowerSpinnerView spinnerView = binding.eventDropdown;
-
-        List<IconSpinnerItem> iconSpinnerItems = new ArrayList<>();
-
-        String target_event_name = latestSettings.settings.get_evcode();
-        int target_index = -1;
-
-        ArrayList<String> evlist = fileEditor.getEventList();
-        for(int i = 0; i < evlist.size(); i++){
-            if(evlist.get(i).equals(target_event_name)){
-                target_index = i;
-            }
-            iconSpinnerItems.add(new IconSpinnerItem(evlist.get(i)));
-        }
-
-        IconSpinnerAdapter iconSpinnerAdapter = new IconSpinnerAdapter(spinnerView);
-        spinnerView.setSpinnerAdapter(iconSpinnerAdapter);
-        spinnerView.setItems(iconSpinnerItems);
-//        spinnerView.setLifecycleOwner(this);
-
-        if(!iconSpinnerItems.isEmpty() && target_index != -1){
-            spinnerView.selectItemByIndex(target_index);
-        }
-
-        spinnerView.setOnSpinnerItemSelectedListener(new OnSpinnerItemSelectedListener<IconSpinnerItem>() {
-            @Override
-            public void onItemSelected(int oldIndex, @Nullable IconSpinnerItem oldItem, int newIndex,
-                                       IconSpinnerItem newItem) {
-                latestSettings.settings.set_evcode(newItem.getText().toString());
-            }
-        });
-
-
-
-
-
-
-
-
-
-
-        PowerSpinnerView alliance_pos_spinnerView = binding.alliancePosDropdown;
-
-        List<IconSpinnerItem> alliance_pos_iconSpinnerItems = new ArrayList<>();
-
-        String target_alliance_pos = latestSettings.settings.get_alliance_pos();
-        int alliance_pos_target_index = -1;
-
-        String[] alliance_pos_list = new String[]{"red-1", "red-2", "red-3",
-                                                  "blue-1", "blue-2", "blue-3"};
-
-        for(int i = 0; i < alliance_pos_list.length; i++){
-            if(alliance_pos_list[i].equals(target_alliance_pos)){
-                alliance_pos_target_index = i;
-            }
-            alliance_pos_iconSpinnerItems.add(new IconSpinnerItem(alliance_pos_list[i]));
-        }
-
-        IconSpinnerAdapter alliance_pos_iconSpinnerAdapter = new IconSpinnerAdapter(alliance_pos_spinnerView);
-        alliance_pos_spinnerView.setSpinnerAdapter(alliance_pos_iconSpinnerAdapter);
-        alliance_pos_spinnerView.setItems(alliance_pos_iconSpinnerItems);
-        alliance_pos_spinnerView.setLifecycleOwner(this);
-
-        if(alliance_pos_target_index != -1){
-            alliance_pos_spinnerView.selectItemByIndex(alliance_pos_target_index);
-        }
-
-        alliance_pos_spinnerView.setOnSpinnerItemSelectedListener(new OnSpinnerItemSelectedListener<IconSpinnerItem>() {
-            @Override
-            public void onItemSelected(int oldIndex, @Nullable IconSpinnerItem oldItem, int newIndex,
-                                       IconSpinnerItem newItem) {
-                latestSettings.settings.set_alliance_pos(newItem.getText().toString());
-            }
-        });
-
-
-
-
-
-
-
-
-
-//
-//        CheckBox practice_mode = binding.practiceMode;
-//        practice_mode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-//            @Override
-//            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-//                latestSettings.settings.set_practice_mode(isChecked);
-//            }
-//
-//        });
-//
-//        practice_mode.setChecked(latestSettings.settings.get_practice_mode());
-
-
-
-        EditText team_num = binding.teamNumber;
-        team_num.setText(String.valueOf(latestSettings.settings.get_team_num()));
-        team_num.addTextChangedListener(new TextWatcher() {
-
-            public void afterTextChanged(Editable s) {
-                latestSettings.settings.set_team_num(team_num.getText().toString());
-            }
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-            public void onTextChanged(CharSequence s, int start, int before, int count) {}
-        });
-
-
-
-
-
-
-        CheckBox wifi_mode = binding.wifiMode;
-        wifi_mode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
-                latestSettings.settings.set_wifi_mode(isChecked);
-            }
-
-        });
-
-        wifi_mode.setChecked(latestSettings.settings.get_wifi_mode());
-
-
-
-
-
-
-        Button reset_button = binding.resetButton;
-        reset_button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-                alert.setTitle("Warning");
-                alert.setMessage("Do you really want to reset settings?");
-                alert.setCancelable(true);
-
-                alert.setPositiveButton("Ok", (dialog, which) -> {
-                    latestSettings.settings.defaultSettings();
-                    username.setText(latestSettings.settings.get_username());
-                    spinnerView.clearSelectedItem();
-//                    practice_mode.setChecked(latestSettings.settings.get_practice_mode());
-                    wifi_mode.setChecked(latestSettings.settings.get_wifi_mode());
-                    alliance_pos_spinnerView.selectItemByIndex(0);
-                    team_num.setText(String.valueOf(latestSettings.settings.get_team_num()));
-                });
-
-                alert.setNegativeButton("Cancel", null);
-                alert.create().show();
-            }
-        });
-
-        return root;
-    }
-
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/CSVExport.java

@@ -1,126 +0,0 @@
-package com.astatin3.scoutingapp2025.ui.transfer;
-
-import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
-import static com.astatin3.scoutingapp2025.utility.DataManager.event;
-import static com.astatin3.scoutingapp2025.utility.DataManager.match_latest_values;
-import static com.astatin3.scoutingapp2025.utility.DataManager.pit_latest_values;
-import static com.astatin3.scoutingapp2025.utility.SharePrompt.shareContent;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-import androidx.core.content.FileProvider;
-
-import com.astatin3.scoutingapp2025.scoutingData.ScoutingDataWriter;
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.frcMatch;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class CSVExport {
-    private static String[] alliances = {"red", "blue"};
-
-
-    public static void exportMatches(Context c){
-        DataManager.reload_event();
-        DataManager.reload_match_fields();
-
-        String data = "";
-
-        data += ("num,alliance,alliance_position,teamnum,");
-        for(int i = 0; i < match_latest_values.length; i++){
-            data += (match_latest_values[i].name + ",");
-        }
-        data += ("\n");
-
-
-        for(int matchNum = 1; matchNum <= event.matches.size(); matchNum++){
-        for(int allianceIndex = 0; allianceIndex <= 1; allianceIndex++){
-            String alliance = alliances[allianceIndex];
-        for(int alliancePos = 1; alliancePos <= 3; alliancePos++){
-            data += (matchNum + ",");
-            data += (alliance + ",");
-            data += (alliancePos + ",");
-
-            frcMatch match = event.matches.get(matchNum-1);
-            int teamNum = 0;
-
-            if(allianceIndex == 0){
-                teamNum = match.redAlliance[alliancePos-1];
-            }else{
-                teamNum = match.blueAlliance[alliancePos-1];
-            }
-
-            data += (teamNum + ",");
-
-            String filename = evcode+"-"+matchNum+"-"+alliance+"-"+alliancePos+"-"+teamNum+".matchscoutdata";
-            if(!fileEditor.fileExist(filename)){
-                data += ("null,".repeat(match_latest_values.length));
-            }else{
-                ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.match_values, DataManager.match_transferValues);
-                dataType[] types = psdr.data.array;
-                for(int i = 0; i < types.length; i++) {
-                    data += (types[i].get() + ",");
-                }
-
-            }
-
-            data += ("\n");
-        }}}
-
-        shareContent(c, evcode+"-matches.csv", data, "text/plain");
-    }
-
-
-
-    public static void exportPits(Context c){
-        DataManager.reload_event();
-        DataManager.reload_pit_fields();
-
-        String data = "";
-
-        data += ("teamnum,teamname,city,teamnum,stateOrProv,school,country,startingYear,");
-        for(int i = 0; i < pit_latest_values.length; i++){
-            data += (pit_latest_values[i].name + ",");
-        }
-        data += ("\n");
-
-
-        for(int teamIndex = 0; teamIndex < event.teams.size(); teamIndex++){
-            frcTeam team = event.teams.get(teamIndex);
-
-            data += (team.teamNumber + ",");
-            data += (team.teamName + ",");
-            data += (team.city + ",");
-            data += (team.stateOrProv + ",");
-            data += (team.school + ",");
-            data += (team.country + ",");
-            data += (team.startingYear + ",");
-
-            String filename = evcode+"-"+team.teamNumber+".pitscoutdata";
-            if(!fileEditor.fileExist(filename)){
-                data += ("null,".repeat(pit_latest_values.length));
-            }else{
-                ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.pit_values, DataManager.pit_transferValues);
-                dataType[] types = psdr.data.array;
-                for(int i = 0; i < types.length; i++) {
-                    data += (types[i].get() + ",");
-                }
-
-            }
-
-            data += ("\n");
-        }
-
-//        System.out.print(data);
-
-        shareContent(c, evcode+"-pits.csv", data, "text/plain");
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/utility/AlertManager.java

@@ -1,73 +0,0 @@
-package com.astatin3.scoutingapp2025.utility;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.os.Looper;
-import android.widget.Toast;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class AlertManager {
-    public static Context context;
-
-    public static void init(Context c){
-        context = c;
-    }
-
-    public static void alert(String title, String content) {
-        ((Activity) context).runOnUiThread(new Runnable() {
-            public void run() {
-                AlertDialog.Builder alert = new AlertDialog.Builder(context);
-                alert.setMessage(content);
-                alert.setTitle(title);
-                alert.setPositiveButton("OK", null);
-                alert.setCancelable(true);
-
-                alert.create().show();
-            }
-        });
-    }
-
-    public static void toast(String content) {
-        ((Activity) context).runOnUiThread(new Runnable() {
-            public void run() {
-                Toast.makeText(context, content, Toast.LENGTH_LONG).show();
-            }
-        });
-    }
-
-    public static void error(String content) {
-        ((Activity) context).runOnUiThread(new Runnable() {
-            public void run() {
-                AlertDialog.Builder alert = new AlertDialog.Builder(context);
-                alert.setMessage(content);
-                alert.setTitle("Error!");
-                alert.setPositiveButton("OK", null);
-                alert.setCancelable(true);
-
-                alert.create().show();
-            }
-        });
-    }
-
-    public static void error(Exception e) {
-        e.printStackTrace();
-        ((Activity) context).runOnUiThread(new Runnable() {
-            public void run() {
-                StringWriter sw = new StringWriter();
-                e.printStackTrace(new PrintWriter(sw));
-
-                AlertDialog.Builder alert = new AlertDialog.Builder(context);
-                alert.setMessage(sw.toString());
-                alert.setTitle(e.getMessage());
-                alert.setPositiveButton("OK", null);
-                alert.setCancelable(true);
-
-                alert.create().show();
-            }
-        });
-    }
-
-}

app/src/main/java/com/astatin3/scoutingapp2025/utility/DataManager.java

@@ -1,38 +0,0 @@
-package com.astatin3.scoutingapp2025.utility;
-
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.scoutingData.fields;
-import com.astatin3.scoutingapp2025.scoutingData.transfer.transferType;
-import com.astatin3.scoutingapp2025.types.frcEvent;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-
-public class DataManager {
-    public static String evcode;
-    public static frcEvent event;
-    public static void reload_event(){
-        evcode = getevcode();
-        event = frcEvent.decode(fileEditor.readFile(evcode + ".eventdata"));
-    }
-
-    public static String getevcode() {
-        return latestSettings.settings.get_evcode();
-    }
-
-    public static inputType[][] match_values;
-    public static inputType[] match_latest_values;
-    public static transferType[][] match_transferValues;
-    public static void reload_match_fields(){
-        match_values = fields.load(fields.matchFieldsFilename);
-        match_latest_values = match_values[match_values.length-1];
-        match_transferValues = transferType.get_transfer_values(match_values);
-    }
-
-    public static inputType[][] pit_values;
-    public static inputType[] pit_latest_values;
-    public static transferType[][] pit_transferValues;
-    public static void reload_pit_fields(){
-        pit_values = fields.load(fields.pitsFieldsFilename);
-        pit_latest_values = pit_values[pit_values.length-1];
-        pit_transferValues = transferType.get_transfer_values(pit_values);
-    }
-}

app/src/main/java/com/astatin3/scoutingapp2025/utility/ReorderableTableLayout.java

@@ -1,158 +0,0 @@
-package com.astatin3.scoutingapp2025.utility;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import android.view.MotionEvent;
-import android.widget.TableLayout;
-
-public class ReorderableTableLayout extends TableLayout {
-    private boolean reorderingEnabled = false;
-    private int draggedRowIndex = -1;
-    private float lastY;
-    private List<View> rows;
-    private List<Integer> reorderedIndices;
-    private int rowHeight;
-
-    public ReorderableTableLayout(Context context) {
-        super(context);
-        init();
-    }
-
-    public ReorderableTableLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    private void init() {
-        rows = new ArrayList<>();
-        reorderedIndices = new ArrayList<>();
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (!reorderingEnabled) {
-            return super.onInterceptTouchEvent(ev);
-        }
-
-        switch (ev.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                lastY = ev.getY();
-                draggedRowIndex = getRowIndexAtY(lastY);
-                if (draggedRowIndex != -1) {
-                    View draggedRow = getChildAt(draggedRowIndex);
-                    rowHeight = draggedRow.getHeight();
-                    saveOriginalOrder();
-                    return true;
-                }
-                break;
-        }
-        return super.onInterceptTouchEvent(ev);
-    }
-
-    @Override
-    public void addView(View child) {
-        super.addView(child);
-        reorderedIndices.add(reorderedIndices.size());
-    }
-
-    @Override
-    public void removeAllViews() {
-        super.removeAllViews();
-        reorderedIndices.clear();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (!reorderingEnabled || draggedRowIndex == -1) {
-            return super.onTouchEvent(event);
-        }
-
-        float currentY = event.getY();
-        int targetIndex = getRowIndexAtY(currentY);
-        View child = getChildAt(targetIndex);
-        if(child != null)
-            getChildAt(targetIndex).callOnClick();
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_MOVE:
-                if (targetIndex != -1 && targetIndex != draggedRowIndex) {
-                    updateRowOrder(draggedRowIndex, targetIndex);
-                    draggedRowIndex = targetIndex;
-                }
-                lastY = currentY;
-                break;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                draggedRowIndex = -1;
-                break;
-        }
-        return true;
-    }
-
-    private int getRowIndexAtY(float y) {
-        for (int i = 0; i < getChildCount(); i++) {
-            View child = getChildAt(i);
-            if (y >= child.getTop() && y <= child.getBottom()) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    private void saveOriginalOrder() {
-        rows.clear();
-        for (int i = 0; i < getChildCount(); i++) {
-            rows.add(getChildAt(i));
-        }
-    }
-
-    public void updateRowOrder(int fromIndex, int toIndex) {
-        saveOriginalOrder();
-        if (fromIndex < toIndex) {
-            for (int i = fromIndex; i < toIndex; i++) {
-                Collections.swap(rows, i, i + 1);
-                Collections.swap(reorderedIndices, i, i + 1);
-            }
-        } else {
-            for (int i = fromIndex; i > toIndex; i--) {
-                Collections.swap(rows, i, i - 1);
-                Collections.swap(reorderedIndices, i, i - 1);
-            }
-        }
-
-        removeAllViewsInLayout();
-        for (View view : rows) {
-            addViewInLayout(view, -1, view.getLayoutParams(), true);
-        }
-        requestLayout();
-        invalidate();
-    }
-
-    public void setReorderingEnabled(boolean enabled) {
-        reorderingEnabled = enabled;
-    }
-
-    public List<Integer> getReorderedIndexes() {
-        return reorderedIndices;
-    }
-
-    public void removeElement(int unshuffledindex){
-        System.out.println(Arrays.toString(new List[]{reorderedIndices}));
-
-        reorderedIndices.remove(unshuffledindex);
-
-        for (int i = 0; i < reorderedIndices.size(); i++) {
-            if(reorderedIndices.get(i) > unshuffledindex)
-                reorderedIndices.set(i, reorderedIndices.get(i) - 1);
-        }
-
-        System.out.println(Arrays.toString(new List[]{reorderedIndices}));
-    }
-}

app/src/main/java/com/ridgebotics/ridgescout/MainActivity.java

@@ -0,0 +1,157 @@
+package com.ridgebotics.ridgescout;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.ridgebotics.ridgescout.databinding.ActivityMainBinding;
+import com.ridgebotics.ridgescout.scoutingData.Fields;
+import com.ridgebotics.ridgescout.utility.SentimentAnalysis;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.navigation.NavController;
+import androidx.navigation.NavOptions;
+import androidx.navigation.Navigation;
+import androidx.navigation.ui.AppBarConfiguration;
+import androidx.navigation.ui.NavigationUI;
+
+
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+import java.util.Objects;
+import java.util.TimeZone;
+
+// Entrypoint for the scouting app.
+// Configures stuff like the nav menu
+// Also has some extra functions like a better back stack or a way to suppress the back button.
+public class MainActivity extends AppCompatActivity {
+
+
+    private ActivityMainBinding binding;
+    private BottomNavigationView navView;
+
+    private AppBarConfiguration appBarConfiguration;
+    private NavController navController;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        // Load shared prefrences
+        SettingsManager.prefs = this.getSharedPreferences(
+                "com.ridgebotics.ridgescout", Context.MODE_PRIVATE);
+
+        // Load default match fields
+        if(!FileEditor.fileExist(Fields.matchFieldsFilename)){
+            Fields.save(Fields.matchFieldsFilename, Fields.default_match_fields);
+        }
+
+        // Load default pit fields
+        if(!FileEditor.fileExist(Fields.pitsFieldsFilename)){
+            Fields.save(Fields.pitsFieldsFilename, Fields.default_pit_fields);
+        }
+
+        // get time zone for FTP file transfer
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+
+        AlertManager.init(this);
+        SentimentAnalysis.init(this);
+
+        Objects.requireNonNull(getSupportActionBar()).hide();
+
+
+
+
+        super.onCreate(savedInstanceState);
+
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+
+
+
+
+        navView = findViewById(R.id.nav_view);
+
+        appBarConfiguration = new AppBarConfiguration.Builder(
+                R.id.navigation_scouting,
+                R.id.navigation_data_parent,
+                R.id.navigation_transfer,
+                R.id.navigation_settings)
+                .build();
+
+//        appBarConfiguration.set
+
+        navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main);
+
+
+        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
+        NavigationUI.setupWithNavController(navView, navController);
+
+        navView.setOnItemSelectedListener(item -> {
+            backPressed = null;
+            clearBackStack();
+            navController.navigate(item.getItemId(), savedInstanceState, new NavOptions.Builder()
+                    .setEnterAnim(R.anim.enter_anim)
+                    .setExitAnim(R.anim.exit_anim)
+                    .setPopEnterAnim(R.anim.pop_enter_anim)
+                    .setPopExitAnim(R.anim.pop_exit_anim).build()
+            );
+            return true;
+        });
+
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        return navController.navigateUp() || super.onSupportNavigateUp();
+    }
+
+    private void clearBackStack() {
+        navController.popBackStack(navController.getGraph().getStartDestinationId(), false);
+    }
+
+
+
+    public interface activityResultRelay {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
+    public static activityResultRelay resultRelay = null;
+    public static void setResultRelay(activityResultRelay tmpresultRelay){
+        resultRelay = tmpresultRelay;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+//        AlertManager.error(String.valueOf(requestCode));
+        if (resultRelay != null) {
+            resultRelay.onActivityResult(resultCode, requestCode, data);
+        }
+    }
+
+
+    public interface onBackPressed {
+        boolean onBackPressed();
+    }
+
+    public onBackPressed backPressed = null;
+    public void setOnBackPressed(onBackPressed onBackPressed){
+        this.backPressed = onBackPressed;
+    }
+
+
+
+    @Override
+    public void onBackPressed() {
+        if(backPressed != null) {
+            if (backPressed.onBackPressed()) {
+                super.onBackPressed();
+            }
+        } else {super.onBackPressed();}
+    }
+
+}

app/src/main/java/com/ridgebotics/ridgescout/scoutingData/Fields.java

@@ -0,0 +1,178 @@
+package com.ridgebotics.ridgescout.scoutingData;
+
+import com.ridgebotics.ridgescout.types.input.CheckboxType;
+import com.ridgebotics.ridgescout.types.input.DropdownType;
+import com.ridgebotics.ridgescout.types.input.FieldposType;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+import com.ridgebotics.ridgescout.types.input.NumberType;
+import com.ridgebotics.ridgescout.types.input.TallyType;
+import com.ridgebotics.ridgescout.types.input.TextType;
+import com.ridgebotics.ridgescout.types.input.SliderType;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+
+// The mechanism to load, save, and create the fields based off of the raw types from ScoutingDataWriter.java
+public class Fields {
+//    public static ScoutingVersion sv = new ScoutingVersion();
+
+    public static final String matchFieldsFilename = "matches.fields";
+    public static final String pitsFieldsFilename = "pits.fields";
+
+    private static String uuid(){
+        return UUID.randomUUID().toString();
+    }
+
+    public static final FieldType[][] default_match_fields = new FieldType[][] {
+        {
+            new FieldposType(uuid(),"Auto start pos", "Where does the robot start its auto?", new int[]{0,0}),
+
+            new TallyType(uuid(),"Auto L4 Coral", "How many coral did this robot score in L4 during auto?", 0),
+            new TallyType(uuid(),"Auto L3 Coral", "How many coral did this robot score in L3 during auto?", 0),
+            new TallyType(uuid(),"Auto L2 Coral", "How many coral did this robot score in L2 during auto?", 0),
+            new TallyType(uuid(),"Auto L1/Trough Coral", "How many coral did this robot score in L1 during auto?", 0),
+            new TallyType(uuid(),"Auto Processor Algae", "How many algae did this robot score in the Barge during auto?", 0),
+            new TallyType(uuid(),"Auto Barge Algae", "How many algae did this robot score in the Barge during auto?", 0),
+
+            new DropdownType(uuid(),"Auto Quality", "How did the robot drive during auto?", new String[]{"Smooth", "Jittery"}, 0),
+            new TextType(uuid(),"Auto Comments", "Anything interesting about auto", ""),
+
+            new TallyType(uuid(),"Teleop L4 Coral", "How many coral did this robot score in L4 during auto?", 0),
+            new TallyType(uuid(),"Teleop L3 Coral", "How many coral did this robot score in L3 during auto?", 0),
+            new TallyType(uuid(),"Teleop L2 Coral", "How many coral did this robot score in L2 during auto?", 0),
+            new TallyType(uuid(),"Teleop L1 Coral", "How many coral did this robot score in L1 during auto?", 0),
+            new TallyType(uuid(),"Teleop Processor Algae", "How many algae did this robot score in the Barge during auto?", 0),
+            new TallyType(uuid(),"Teleop Barge Algae", "How many algae did this robot score in the Barge during auto?", 0),
+
+            new CheckboxType(uuid(),"Upper Algae Removal", "Did the robot remove upper Algae?", 0),
+            new CheckboxType(uuid(),"Lower Algae Removal", "Did the robot remove lower Algae?", 0),
+
+            new DropdownType(uuid(),"Teleop Quality", "How did the robot drive during Teleop?", new String[]{"Smooth", "Jittery"}, 0),
+            new TextType(uuid(),"Teleop Comments", "Anything interesting about Teleop", ""),
+
+            new DropdownType(uuid(),"Climb State", "What was the final condition of the robot?", new String[]{"Nothing", "Continued Cycling", "Park", "Attempted Shallow", "Shallow", "Attempted Deep", "Deep"}, 0),
+
+            new DropdownType(uuid(),"Robot Condition", "Was anything broken?", new String[]{"Everything was working", "Something was maybe broken", "Something was broken", "Robot was disabled for part of the match", "Missing robot"}, 0),
+
+            new TextType(uuid(),"Other Comments", "Any other comments you have", "")
+        }
+    };
+
+    public static final FieldType[][] default_pit_fields = new FieldType[][] {
+        {
+            new DropdownType(uuid(),"Drivetrain type", "What type of drivetrain does this team have?", new String[]{"Swerve Drive", "Tank Drive (Differential)", "Other, Info in comments"}, 0),
+            new DropdownType(uuid(),"Intake type", "What type of intake does this team have?", new String[]{"Ground only", "Player Station only", "Both", "Other, Info in comments"}, 0),
+            new DropdownType(uuid(),"Intake Consistency", "How consistent is the robot at intakeing?", new String[]{"Does not work", "Worked a few times during testing", "Works most of the time", "Fails sometimes", "Never fails"}, 0),
+
+            new DropdownType(uuid(),"Score Area", "What does this robot score?", new String[]{"Only Algae", "Mostly Algae", "Both", "Mostly Coral", "Only Coral"}, 0),
+
+            new CheckboxType(uuid(),"L4 Scoring", "Will the robot score in Layer 4?", 0),
+            new CheckboxType(uuid(),"L3 Scoring", "Will the robot score in Layer 3?", 0),
+            new CheckboxType(uuid(),"L2 Scoring", "Will the robot score in Layer 3?", 0),
+            new CheckboxType(uuid(),"L1/Trough Scoring", "Will the robot score in Layer 1?", 0),
+            new CheckboxType(uuid(),"Processor Scoring", "Will the robot score in the Processor?", 0),
+            new CheckboxType(uuid(),"Barge Scoring", "Will the robot score algae in the Barge?", 0),
+            new DropdownType(uuid(),"Scoring Consistency", "How consistent is the robot at Scoring?", new String[]{"Does not work", "Worked a few times during testing", "Works most of the time", "Fails sometimes", "Never fails"}, 0),
+
+            new TextType(uuid(),"Auto Capability", "What autos does this team have?", ""),
+            new DropdownType(uuid(),"Auto Consistency", "How consistent is the robot at Auto?", new String[]{"Does not work", "Worked a few times during testing", "Works most of the time", "Fails sometimes", "Never fails"}, 0),
+
+            new DropdownType(uuid(),"Climb type", "What does the robot do to climb?", new String[]{"No Climb", "Only Shallow", "Only Deep", "Both Shallow and Deep"}, 0),
+            new DropdownType(uuid(),"Climb Consistency", "How consistent is the robot at climbing?", new String[]{"Does not work", "Worked a few times during testing", "Works most of the time", "Fails sometimes", "Never fails"}, 0),
+
+            new TextType(uuid(),"Cool Comments", "Is there anything cool about the robot?", ""),
+
+            new TextType(uuid(),"Comments", "Things go here", "Day 1:\n\nDay 2:\n\nDay 3:\n")
+        }
+    };
+
+
+    public static boolean save(String filename, FieldType[][] values){
+        try {
+            ByteBuilder bb = new ByteBuilder();
+            for (int i = 0; i < values.length; i++) {
+                bb.addRaw(127, save_version(values[i]));
+            }
+            FileEditor.writeFile(filename, bb.build());
+            return true;
+        }catch (ByteBuilder.buildingException e) {
+            AlertManager.error(e);
+            return false;
+//            throw new RuntimeException(e);
+        }
+    }
+
+    private static byte[] save_version(FieldType[] values) throws ByteBuilder.buildingException {
+        ByteBuilder bb = new ByteBuilder();
+        for(int i =0; i < values.length; i++){
+            bb.addRaw(values[i].get_byte_id(), values[i].encode());
+        }
+        return bb.build();
+    }
+
+    public static FieldType[][] load(String filename){
+        byte[] bytes = FileEditor.readFile(filename);
+
+//        System.out.println(bytes);
+
+        try {
+            BuiltByteParser bbp = new BuiltByteParser(bytes);
+            ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
+            FieldType[][] values = new FieldType[objects.size()][];
+
+            for(int i = 0 ; i < objects.size(); i++){
+                values[i] = load_version((byte[]) objects.get(i).get());
+            }
+
+
+            return values;
+        } catch (Exception e) {
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    private static FieldType[] load_version(byte[] bytes) throws BuiltByteParser.byteParsingExeption{
+        BuiltByteParser bbp = new BuiltByteParser(bytes);
+        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
+        FieldType[] output = new FieldType[objects.size()];
+
+        for(int i = 0 ; i < objects.size(); i++){
+            BuiltByteParser.parsedObject obj = objects.get(i);
+            FieldType t = null;
+            switch (obj.getType()){
+                case FieldType.slider_type_id:
+                    t = new SliderType();
+                    break;
+                case FieldType.dropdownType:
+                    t = new DropdownType();
+                    break;
+                case FieldType.notesType:
+                    t = new TextType();
+                    break;
+                case FieldType.tallyType:
+                    t = new TallyType();
+                    break;
+                case FieldType.numberType:
+                    t = new NumberType();
+                    break;
+                case FieldType.checkboxType:
+                    t = new CheckboxType();
+                    break;
+                case FieldType.fieldposType:
+                    t = new FieldposType();
+                    break;
+            }
+
+            t.decode((byte[]) obj.get());
+            output[i] = t;
+        }
+
+        return output;
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/scoutingData/ScoutingDataWriter.java

@@ -0,0 +1,129 @@
+package com.ridgebotics.ridgescout.scoutingData;
+
+import com.ridgebotics.ridgescout.scoutingData.transfer.TransferType;
+import com.ridgebotics.ridgescout.types.ScoutingArray;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntArrType;
+import com.ridgebotics.ridgescout.types.data.StringType;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+// Mostly an extension of Fields.java. Saves the raw data from each Field Type.
+public class ScoutingDataWriter {
+//    private static final int int_type_id = 255;
+//    private static final int string_type_id = 254;
+
+    public static boolean save(int version, String username, String filename, RawDataType[] data){
+        ByteBuilder bb = new ByteBuilder();
+        try {
+            bb.addInt(version);
+            bb.addString(username);
+            for(int i = 0; i < data.length; i++){
+                switch (data[i].getValueType()){
+                    case NUM:
+                        bb.addInt((int) data[i].forceGetValue());
+                        System.out.println("Saved INT: " + data[i].getUUID() + ", ("+ data[i].get() +")");
+                        break;
+                    case STRING:
+                        bb.addString((String) data[i].forceGetValue());
+                        System.out.println("Saved STR: " + data[i].getUUID() + ", ("+ data[i].get() +")");
+                        break;
+                    case NUMARR:
+                        bb.addIntArray((int[]) data[i].forceGetValue());
+                        System.out.println("Saved INT Array: " + data[i].getUUID() + ", ("+ Arrays.toString((int[]) data[i].get()) +")");
+                }
+            }
+            byte[] bytes = bb.build();
+            FileEditor.writeFile(filename, bytes);
+            return true;
+        } catch (ByteBuilder.buildingException e) {
+            AlertManager.error(e);
+            return false;
+        }
+    }
+
+    public static class ParsedScoutingDataResult {
+        public String filename;
+        public String username;
+        public int version;
+        public ScoutingArray data;
+    }
+
+    public static ParsedScoutingDataResult load(String filename, FieldType[][] values , TransferType[][] transferValues){
+        byte[] bytes = FileEditor.readFile(filename);
+        BuiltByteParser bbp = new BuiltByteParser(bytes);
+
+        try {
+            ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
+            RawDataType[] rawDataTypes = new RawDataType[objects.size()-2];
+
+            int version = ((int)objects.get(0).get());
+
+            if(values.length <= version) {
+//                AlertManager.addSimpleError("Error loading " + filename);
+                AlertManager.error(new BuiltByteParser.byteParsingExeption("Field version (" +version + ") is too recent as compared to latest version (" + (values.length-1) + ")!"));
+                return null;
+            }
+
+//            System.out.println(version);
+            String username = (String) objects.get(1).get();
+
+            for(int i = 0; i < values[version].length; i++){
+                switch (objects.get(i+2).getType()){
+                    case 1: // Int
+                        rawDataTypes[i] = IntType.newNull(values[version][i].UUID);
+                        rawDataTypes[i].forceSetValue(objects.get(i+2).get());
+                        System.out.println("Loaded INT: " + values[version][i].name + " (" + values[version][i].UUID + ") " + ", ("+ rawDataTypes[i].get() +")");
+                        break;
+                    case 2: // String
+                        rawDataTypes[i] = StringType.newNull(values[version][i].UUID);
+                        rawDataTypes[i].forceSetValue(objects.get(i+2).get());
+                        System.out.println("Loaded STR: " + values[version][i].name + " (" + values[version][i].UUID + ") " + ", ("+ rawDataTypes[i].get() +")");
+                        break;
+                    case 3: // Int array
+                        rawDataTypes[i] = IntArrType.newNull(values[version][i].UUID);
+                        rawDataTypes[i].forceSetValue(objects.get(i+2).get());
+                        System.out.println("Loaded intARR: " + values[version][i].name + " (" + values[version][i].UUID + ") " + ", ("+ Arrays.toString((int[]) rawDataTypes[i].get()) +")");
+                        break;
+                }
+            }
+
+            ScoutingArray msa = new ScoutingArray(version, rawDataTypes, values, transferValues);
+            msa.update();
+
+            ParsedScoutingDataResult psda = new ParsedScoutingDataResult();
+
+            psda.filename = filename;
+            psda.username = username;
+            psda.version = version;
+            psda.data = msa;
+
+            return psda;
+
+        } catch (BuiltByteParser.byteParsingExeption e){
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    // A function that takes in a list of names seperated by commas, and adds a name if it is not included
+    // This is used for multi-scouter attribution to data.
+    public static String checkAddName(String prevnames, String name){
+        List<String> names = new ArrayList<>(List.of(prevnames.split(", ")));
+
+        if(!names.contains(name))
+            names.add(name);
+
+        return String.join(", ", names);
+    }
+
+}

app/src/main/java/com/ridgebotics/ridgescout/scoutingData/transfer/CreateTransferType.java

@@ -0,0 +1,9 @@
+package com.ridgebotics.ridgescout.scoutingData.transfer;
+
+// Transfer type if a field was created
+public class CreateTransferType extends TransferType {
+    public transferValue getType() {return transferValue.CREATE;}
+    public CreateTransferType(String UUID){
+        super(UUID);
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/scoutingData/transfer/DirectTransferType.java

@@ -0,0 +1,9 @@
+package com.ridgebotics.ridgescout.scoutingData.transfer;
+
+// Transfer type if a field directly transfers
+public class DirectTransferType extends TransferType {
+    public transferValue getType() {return transferValue.DIRECT;}
+    public DirectTransferType(String UUID){
+        super(UUID);
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/scoutingData/transfer/TransferType.java

@@ -0,0 +1,48 @@
+package com.ridgebotics.ridgescout.scoutingData.transfer;
+
+import com.ridgebotics.ridgescout.types.input.FieldType;
+
+
+// The "Transfer Types" system, a component in the loading of scouting data.
+// Dictates how the
+// For example, a field can be created in one version, and how the app updates it is by obtaining it's transfer value, in this case being "create".
+public abstract class TransferType {
+    public enum transferValue {
+        DIRECT,
+        CREATE
+    }
+    public String UUID;
+    public abstract transferValue getType();
+    public TransferType(String UUID){
+        this.UUID = UUID;
+    }
+
+    private static FieldType get_input_type_by_UUID(FieldType[] values, String UUID){
+        for(FieldType it : values){
+            if(it.UUID.equals(UUID)){
+                return it;
+            }
+        }
+        return null;
+    }
+
+    //Inputs:
+    public static TransferType[][] get_transfer_values(FieldType[][] values) {
+        TransferType[][] output = new TransferType[values.length][];
+        for(int a = 1; a < values.length; a++){
+
+            TransferType[] v = new TransferType[values[a].length];
+
+            for(int b = 0; b < values[a].length; b++){
+                String UUID = values[a][b].UUID;
+                if(get_input_type_by_UUID(values[a-1], UUID) != null){
+                    v[b] = new DirectTransferType(UUID);
+                }else{
+                    v[b] = new CreateTransferType(UUID);
+                }
+            }
+            output[a-1] = v;
+        }
+        return output;
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.ridgebotics.ridgescout.types;
+
+import com.ridgebotics.ridgescout.scoutingData.transfer.CreateTransferType;
+import com.ridgebotics.ridgescout.scoutingData.transfer.DirectTransferType;
+import com.ridgebotics.ridgescout.scoutingData.transfer.TransferType;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.types.data.StringType;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+
+// A wrapper class for the stuff going on in Fields.java and ScoutingDataWriter.java.
+public class ScoutingArray {
+    public int version;
+    public RawDataType[] array;
+    public FieldType[][] values;
+    public int latest_version_num;
+    public TransferType[][] transfer_values;
+
+    public ScoutingArray(int version, RawDataType[] array, FieldType[][] values, TransferType[][] transfer_values){
+        this.version = version;
+        this.array = array;
+        this.values = values;
+        this.latest_version_num = values.length-1;
+        this.transfer_values = transfer_values;
+    }
+
+    public ScoutingArray(int version, RawDataType[] array, FieldType[][] values){
+        this(version, array, values, TransferType.get_transfer_values(values));
+    }
+
+    public void update(){
+        while(version<latest_version_num){
+            RawDataType[] new_values = new RawDataType[transfer_values[version].length];
+            for(int i = 0; i < transfer_values[version].length; i++){
+                TransferType tv = transfer_values[version][i];
+                switch (tv.getType()){
+                    case DIRECT:
+                        new_values[i] = direct_transfer((DirectTransferType) tv);
+                        continue;
+                    case CREATE:
+                        new_values[i] = create_transfer((CreateTransferType) tv);
+                        continue;
+                }
+            }
+            this.array = new_values;
+            version++;
+            System.out.println("Updated to " + version);
+        }
+    }
+
+    private FieldType get_input_type_by_UUID(int version, String UUID){
+        for(FieldType it : values[version]){
+            if(it.UUID.equals(UUID)){
+                return it;
+            }
+        }
+        return null;
+    }
+
+    private RawDataType get_data_type_by_UUID(String UUID){
+        for(RawDataType dt : array){
+            if(dt.getUUID().equals(UUID)){
+                return dt;
+            }
+        }
+        return null;
+    }
+
+    private RawDataType direct_transfer(DirectTransferType tv){
+        return get_data_type_by_UUID(tv.UUID);
+    }
+
+//        private dataType rename_transfer(renameTransferType tv){
+//            dataType dt = get_data_type_by_name(tv.name);
+//            dt.name = tv.new_name;
+//            return dt;
+//        }
+
+    private RawDataType create_transfer(CreateTransferType tv){
+        FieldType it = get_input_type_by_UUID(version+1, tv.UUID);
+        switch (it.getValueType()){
+            case NUM:
+                return IntType.newNull(it.UUID);
+            case STRING:
+                return StringType.newNull(it.UUID);
+        }
+        return null;
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,72 @@
+package com.ridgebotics.ridgescout.types;
+
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Objects;
+
+// Basically just holds a byte array and a filename, and then us just encoded.
+public class ScoutingFile {
+    public static final int typecode = 255;
+    public String filename;
+    public byte[] data;
+
+
+    public ScoutingFile(){}
+
+    public ScoutingFile(String filename){
+        this(filename, FileEditor.readFile(filename));
+    }
+
+    public ScoutingFile(String filename, byte[] data){
+        this.filename = filename;
+        this.data = data;
+    }
+
+    public byte[] encode(){
+        try {
+            ByteBuilder bb = new ByteBuilder()
+                    .addString(filename);
+
+//            byte[] data = Objects.requireNonNull(fileEditor.readFile(filename));
+
+//            for(int i = 0; i < data.length / 65535; i++){
+//                bb.addRaw(255, fileEditor.getByteBlock(data, i*65535, (i+1)*65535));
+//            }
+
+            bb.addRaw(255, Objects.requireNonNull(FileEditor.readFile(filename)));
+
+            return bb.build();
+
+        } catch (ByteBuilder.buildingException e) {
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    public static ScoutingFile decode(byte[] bytes){
+        try{
+            ArrayList<BuiltByteParser.parsedObject> objects = new BuiltByteParser(bytes).parse();
+
+            ScoutingFile f = new ScoutingFile();
+
+            f.filename = (String) objects.get(0).get();
+            f.data = (byte[]) objects.get(1).get();
+
+            return f;
+
+        }catch (Exception e){
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    public boolean write(){
+        if(data == null || filename == null) return false;
+        return FileEditor.writeFile(filename, data);
+    }
+}

app/src/main/java/com/ridgebotics/ridgescout/types/data/IntArrType.java

@@ -0,0 +1,56 @@
+package com.ridgebotics.ridgescout.types.data;
+
+
+// Int array raw data type
+public class IntArrType extends RawDataType {
+    public static final int[] nullval = new int[]{255, 255};
+//    public static final int unselectedval = 1;
+
+    public valueTypes getValueType() {
+        return valueTypes.NUMARR;
+    }
+
+//    public Object getNullValue(){
+//        return nullval;
+//    }
+//    public Object getUnselectedValue(){
+//        return unselectedval;
+//    }
+
+    public Object get(){
+        return (int[]) forceGetValue();
+    }
+
+    public void set(Object value){
+        forceSetValue((int[]) value);
+    }
+
+    public IntArrType(String name, int[] value) {
+        super(name);
+        set(value);
+    }
+
+    public static IntArrType newNull(String name){
+        return new IntArrType(name, nullval);
+    }
+
+//    public static intType newUnselected(String name){
+//        final intType a = new intType(name, 0);
+//        a.forceSetValue(unselectedval);
+//        return a;
+//    }
+
+    public static boolean isNull(int[] obj){
+        return obj == nullval;
+    }
+    public boolean isNull() {
+        return isNull((int[]) forceGetValue());
+    }
+
+//    public static boolean isUnselected(int obj){
+//        return obj == unselectedval;
+//    }
+//    public boolean isUnselected() {
+//        return isUnselected((int) forceGetValue());
+//    }
+}

app/src/main/java/com/ridgebotics/ridgescout/types/data/IntType.java

@@ -1,6 +1,7 @@
-package com.astatin3.scoutingapp2025.types.data;
+package com.ridgebotics.ridgescout.types.data;
 
-public class intType extends dataType {
+// Number raw data type
+public class IntType extends RawDataType {
     public static final int nullval = 255;
 //    public static final int unselectedval = 1;
 
@@ -23,13 +24,13 @@ public class intType extends dataType {
         forceSetValue((int) value);
     }
 
-    public intType(String name, int value) {
+    public IntType(String name, int value) {
         super(name);
         set(value);
     }
 
-    public static intType newNull(String name){
-        final intType a = new intType(name, 0);
+    public static IntType newNull(String name){
+        final IntType a = new IntType(name, 0);
         a.forceSetValue(nullval);
         return a;
     }

app/src/main/java/com/ridgebotics/ridgescout/types/data/RawDataType.java

@@ -1,13 +1,15 @@
-package com.astatin3.scoutingapp2025.types.data;
+package com.ridgebotics.ridgescout.types.data;
 
-public abstract class dataType {
+// Abstract class for raw data types for use in fields.
+public abstract class RawDataType {
     public enum valueTypes {
         NUM,
-        STRING
+        NUMARR,
+        STRING,
     }
 
     private Object value;
-    private final String name;
+    private final String UUID;
 
     public abstract valueTypes getValueType();
 
@@ -23,9 +25,9 @@ public abstract class dataType {
     public abstract boolean isNull();
 //    public abstract boolean isUnselected();
 
-    public String getName() {return name;}
+    public String getUUID() {return UUID;}
 
-    public dataType(String name){
-        this.name = name;
+    public RawDataType(String UUID){
+        this.UUID = UUID;
     }
 }

app/src/main/java/com/ridgebotics/ridgescout/types/data/StringType.java

@@ -1,6 +1,7 @@
-package com.astatin3.scoutingapp2025.types.data;
+package com.ridgebotics.ridgescout.types.data;
 
-public class stringType extends dataType{
+// String raw data type
+public class StringType extends RawDataType {
     public static final String nullval = "null";
 //    public static final String unselectedval = "■";
 
@@ -23,13 +24,13 @@ public class stringType extends dataType{
         forceSetValue(value);
     }
 
-    public stringType(String name, String value) {
+    public StringType(String name, String value) {
         super(name);
         forceSetValue(value);
     }
 
-    public static stringType newNull(String name){
-        final stringType a = new stringType(name, "");
+    public static StringType newNull(String name){
+        final StringType a = new StringType(name, "");
         a.forceSetValue(nullval);
         return a;
     }

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

@@ -0,0 +1,186 @@
+package com.ridgebotics.ridgescout.types;
+
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+
+import androidx.annotation.NonNull;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+import java.util.ArrayList;
+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;
+    public ArrayList<frcTeam> teams;
+
+    public byte[] encode() {
+        try {
+            ByteBuilder bb = new ByteBuilder()
+                .addString(eventCode)
+                .addString(name);
+
+            for (frcTeam teams : teams) {
+                bb.addRaw(frcTeam.typecode, teams.encode());
+            }
+
+            for (frcMatch match : matches) {
+                bb.addRaw(frcMatch.typecode, match.encode());
+            }
+
+            if(SettingsManager.getEVCode().equals("unset")){
+                SettingsManager.setEVCode(eventCode);
+            }
+
+            return bb.build();
+        } catch (ByteBuilder.buildingException e) {
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    public static frcEvent decode(byte[] bytes) {
+        try {
+            ArrayList<BuiltByteParser.parsedObject> objects =
+                new BuiltByteParser(bytes).parse();
+
+            frcEvent frc = new frcEvent();
+
+            frc.eventCode = (String) objects.get(0).get();
+            frc.name = (String) objects.get(1).get();
+
+            frc.matches = new ArrayList<>();
+            frc.teams = new ArrayList<>();
+
+            for (BuiltByteParser.parsedObject object : objects) {
+                if (object.getType() == frcTeam.typecode) {
+                    frc.teams.add(frcTeam.decode((byte[]) object.get()));
+                } else if (object.getType() == frcMatch.typecode) {
+                    frc.matches.add(frcMatch.decode((byte[]) object.get()));
+                }
+            }
+
+            return frc;
+        } catch (BuiltByteParser.byteParsingExeption e) {
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    @NonNull
+    public String toString() {
+        return (
+            "frcEvent Name: " +
+            name +
+            ", Code: " +
+            eventCode +
+            " numTeams: " +
+            teams.size() +
+            " numMatches: " +
+            matches.size()
+        );
+    }
+
+    // A func that will return every match a team is in.
+    public frcMatch[] getTeamMatches(int teamNum){
+        List<frcMatch> teamMatches = new ArrayList<>();
+        for(int i = 0; i < matches.size(); i++){
+            frcMatch match = matches.get(i);
+            boolean isTeamMatch = false;
+            isTeamMatch = IntStream.of(match.redAlliance).anyMatch(x -> x == teamNum);
+            isTeamMatch = isTeamMatch || IntStream.of(match.blueAlliance).anyMatch(x -> x == teamNum);
+            if(isTeamMatch)
+                teamMatches.add(match);
+        }
+        return teamMatches.toArray(new frcMatch[0]);
+    }
+
+    // A func that will return the most recent match a team is in. (Not up until the current match)
+    public int getMostRecentTeamMatch(int teamNum, int curMatch){
+        frcMatch[] teamMatches = getTeamMatches(teamNum);
+        int maxMatch = - 1;
+
+        for(int i = 0; i < teamMatches.length; i++) {
+            if (teamMatches[i].matchIndex < curMatch &&
+                    teamMatches[i].matchIndex > maxMatch) {
+                maxMatch = teamMatches[i].matchIndex;
+            }
+
+        }
+
+        if(maxMatch == -1)
+            return curMatch;
+        else
+            return maxMatch;
+    }
+
+    public frcMatch getNextTeamMatch(int teamNum, int curMatch){
+        frcMatch[] teamMatches = getTeamMatches(teamNum);
+
+        for(int i = 0; i < teamMatches.length; i++) {
+            if (teamMatches[i].matchIndex > curMatch)
+                return teamMatches[i];
+
+        }
+
+        return null;
+    }
+
+//    public
+
+    // Returns the soonest match that there will be all the possible upcoming data on other teams
+    public void getReportMatches(int ourTeamNum){
+        frcMatch[] teamMatches = event.getTeamMatches(ourTeamNum);
+
+        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];
+                else
+                    teamNum = teamMatches[i].blueAlliance[a-3];
+
+                if(teamNum == ourTeamNum)
+                    continue;
+
+                int matchNum = event.getMostRecentTeamMatch(teamNum, teamMatches[i].matchIndex);
+                if(maxMatch < matchNum)
+                    maxMatch = matchNum;
+            }
+        }
+    }
+
+    public frcTeam getTeamByNum(int teamNum){
+        for(int i = 0; i < teams.size(); i++){
+            frcTeam team = teams.get(i);
+            if(team.teamNumber == teamNum)
+                return team;
+        }
+        return  null;
+    }
+
+
+    public boolean getIsBlueAlliance(int teamNum, int matchNum){
+        return getIsBlueAlliance(teamNum, matches.get(matchNum));
+    }
+
+    public boolean getIsBlueAlliance(int teamNum, frcMatch match){
+
+        for(int i = 0; i < match.redAlliance.length; i++)
+            if(match.redAlliance[i] == teamNum) return false;
+        for(int i = 0; i < match.blueAlliance.length; i++)
+            if(match.blueAlliance[i] == teamNum) return true;
+
+        return false;
+
+    }
+}

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

@@ -1,14 +1,16 @@
-package com.astatin3.scoutingapp2025.types;
+package com.ridgebotics.ridgescout.types;
 
 import androidx.annotation.NonNull;
 
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
+// Class to contain data for the six teams numbers in a single match
+// Easily encoded and decoded to binary format.
 public class frcMatch {
     public static final int typecode = 253;
     public frcMatch(){}
@@ -27,7 +29,7 @@ public class frcMatch {
                     .addInt(redAlliance[1])
                     .addInt(redAlliance[2])
                     .build();
-        } catch (ByteBuilder.buildingException e) {
+        } catch (Exception e) {
             AlertManager.error(e);
             return new byte[1];
         }
@@ -49,7 +51,7 @@ public class frcMatch {
 
             return frc;
 
-        } catch (BuiltByteParser.byteParsingExeption e) {
+        } catch (Exception e) {
             AlertManager.error(e);
             return null;
         }
@@ -60,4 +62,14 @@ public class frcMatch {
         return "frcMatch Num: " + matchIndex + ", Blue: " + Arrays.toString(blueAlliance) + ", Red: " + Arrays.toString(redAlliance);
     }
 
+    public String getTeamAlliance(int teamNum){
+        if(redAlliance[0] == teamNum) return "red-1";
+        if(redAlliance[1] == teamNum) return "red-2";
+        if(redAlliance[2] == teamNum) return "red-3";
+        if(blueAlliance[0] == teamNum) return "blue-1";
+        if(blueAlliance[1] == teamNum) return "blue-2";
+        if(blueAlliance[2] == teamNum) return "blue-3";
+        return "";
+    }
+
 }

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

@@ -0,0 +1,196 @@
+package com.ridgebotics.ridgescout.types;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+
+import androidx.annotation.NonNull;
+
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+// Class to contain data for a team, in an event.
+// Easily encoded and decoded to binary format.
+public class frcTeam {
+    public static final int typecode = 252;
+    private static final int[] DEFAULT_COLOR_ARR = new int[]{64,64,64};
+    private static final int DEFAULT_COLOR = Color.argb(255, DEFAULT_COLOR_ARR[0],DEFAULT_COLOR_ARR[1],DEFAULT_COLOR_ARR[2]);
+
+    public int teamNumber = 0;
+    public String teamName = "null";
+    public String city = "null";
+    public String stateOrProv = "null";
+    public String school = "null";
+    public String country = "null";
+    public Bitmap bitmap = null;
+    public int[] teamColor = DEFAULT_COLOR_ARR;
+    public int startingYear = 0;
+
+    public String getDescription(){
+        return teamName + " Started in " + startingYear + ", and are from " + school + " in " + city + ", " + stateOrProv + ", " + country;
+    }
+
+    public byte[] encode(){
+        try {
+            return new ByteBuilder()
+            .addInt(teamNumber)
+            .addString(teamName)
+            .addString(city)
+            .addString(stateOrProv)
+            .addString(school)
+            .addString(country)
+            .addInt(startingYear)
+            .addRaw(127, encodeBitmap(bitmap))
+            .addIntArray(teamColor)
+            .build();
+        } catch (ByteBuilder.buildingException e) {
+            AlertManager.error(e);
+            return null;
+        }
+    }
+    public static frcTeam decode(byte[] bytes){
+        try {
+            ArrayList<BuiltByteParser.parsedObject> objects = new BuiltByteParser(bytes).parse();
+
+            frcTeam frc = new frcTeam();
+
+            frc.teamNumber   = (int)    objects.get(0).get();
+            frc.teamName     = (String) objects.get(1).get();
+            frc.city         = (String) objects.get(2).get();
+            frc.stateOrProv  = (String) objects.get(3).get();
+            frc.school       = (String) objects.get(4).get();
+            frc.country      = (String) objects.get(5).get();
+            frc.startingYear = (int)    objects.get(6).get();
+
+            if(objects.size() == 9){
+                frc.bitmap   = decodeBitmap((BuiltByteParser.rawObject) objects.get(7));
+                frc.teamColor = (int[])    objects.get(8).get();
+
+//                System.out.println(Arrays.toString(frc.teamColor));
+            }
+
+            return frc;
+
+        } catch (BuiltByteParser.byteParsingExeption e) {
+            AlertManager.error(e);
+            return null;
+        }
+    }
+
+    public static byte[] encodeBitmap(Bitmap bitmap){
+        if(bitmap == null) return new byte[]{0};
+        ByteArrayOutputStream blob = new ByteArrayOutputStream();
+        if(bitmap.compress(Bitmap.CompressFormat.PNG, 0 /* Ignored for PNGs */, blob)){
+            return blob.toByteArray();
+        }else{
+            return new byte[]{0};
+        }
+    }
+
+    public static Bitmap decodeBitmap(BuiltByteParser.rawObject rawObject){
+        if(rawObject.getType() != 127) return null;
+        byte[] bytes = (byte[]) rawObject.get();
+        if(bytes.length <= 1) return null;
+        return BitmapFactory.decodeByteArray(bytes,0,bytes.length);
+    }
+
+    public static int[] findPrimaryColor(Bitmap bitmap) {
+        if (bitmap == null) {
+            return DEFAULT_COLOR_ARR;
+        }
+
+        // Step 1: Posterize the image (reduce color levels)
+        Bitmap posterizedBitmap = posterize(bitmap, 8); // 8 levels of posterization
+
+        // Step 2: Find the most saturated and frequent color
+        return findMostSaturatedAndFrequentColor(posterizedBitmap);
+    }
+
+    // Posterize the image by reducing color levels
+    private static Bitmap posterize(Bitmap original, int levels) {
+        int width = original.getWidth();
+        int height = original.getHeight();
+        Bitmap posterized = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+
+        int step = 255 / (levels - 1);
+
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int pixel = original.getPixel(x, y);
+                int r = Color.red(pixel);
+                int g = Color.green(pixel);
+                int b = Color.blue(pixel);
+
+                // Quantize the RGB values
+                r = (r / step) * step;
+                g = (g / step) * step;
+                b = (b / step) * step;
+
+                int newPixel = Color.rgb(r, g, b);
+                posterized.setPixel(x, y, newPixel);
+            }
+        }
+
+        return posterized;
+    }
+
+    // Find the most saturated and frequent color
+    private static int[] findMostSaturatedAndFrequentColor(Bitmap bitmap) {
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        Map<Integer, Integer> colorFrequency = new HashMap<>();
+
+        // Count the frequency of each color
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int pixel = bitmap.getPixel(x, y);
+                colorFrequency.put(pixel, colorFrequency.getOrDefault(pixel, 0) + 1);
+            }
+        }
+
+        // Find the most saturated and frequent color
+        int primaryColor = DEFAULT_COLOR; // Default fallback
+        double maxColorness = -1;
+        int maxFrequency = 0;
+
+        for (Map.Entry<Integer, Integer> entry : colorFrequency.entrySet()) {
+            int color = entry.getKey();
+            int frequency = entry.getValue();
+            float[] hsv = new float[3];
+            Color.colorToHSV(color, hsv);
+            double colorness = Math.pow(hsv[1],2)+Math.pow(hsv[2],2);
+
+            // Prioritize saturation, then frequency
+            if ((colorness > maxColorness && frequency > maxFrequency * 0.5) && Color.alpha(color) > 127) { //|| (colorness == maxColorness)
+                maxColorness = colorness;
+//                maxFrequency = frequency;
+                primaryColor = color;
+            }
+        }
+
+        float[] hsv = new float[3];
+        Color.colorToHSV(primaryColor, hsv);
+
+        primaryColor = Color.HSVToColor(new float[]{hsv[0], Math.max(hsv[1], (float) 0.2), Math.max(hsv[2], (float) 0.3)});
+
+        return new int[]{Color.red(primaryColor),Color.blue(primaryColor),Color.green(primaryColor)};
+    }
+
+    public int getTeamColor(){
+        return Color.argb(255,teamColor[0],teamColor[2],teamColor[1]);
+    }
+
+
+
+    @NonNull
+    public String toString(){
+        return "frcTeam Num: " + teamNumber + ", " + getDescription();
+    }
+}

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

@@ -0,0 +1,218 @@
+package com.ridgebotics.ridgescout.types.input;
+
+import static com.ridgebotics.ridgescout.utility.Colors.chart_background;
+import static com.ridgebotics.ridgescout.utility.Colors.checkbox_colors;
+import static com.ridgebotics.ridgescout.utility.Colors.checkbox_data_color;
+import static com.ridgebotics.ridgescout.utility.Colors.checkbox_value_text_color;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+
+import com.github.mikephil.charting.charts.LineChart;
+import com.github.mikephil.charting.charts.PieChart;
+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.github.mikephil.charting.data.PieData;
+import com.github.mikephil.charting.data.PieDataSet;
+import com.github.mikephil.charting.data.PieEntry;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class CheckboxType extends FieldType {
+    public int get_byte_id() {return checkboxType;}
+    public inputTypes getInputType(){return inputTypes.CHECKBOX;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
+    public Object get_fallback_value(){return 0;}
+    public CheckboxType(){};
+    public String get_type_name(){return "Checkbox";}
+    public CheckboxType(String UUID, String name, String description, int isChecked){
+        super(UUID, name, description);
+        this.default_value = isChecked;
+    }
+
+
+    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 PowerSpinnerView dropdown = null;
+
+    public CheckBox checkBox = null;
+
+    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
+        checkBox = new CheckBox(context);
+        checkBox.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Headline6);
+        checkBox.setText(name);
+
+        setViewValue(default_value);
+        checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> onUpdate.apply(getViewValue()));
+
+        return checkBox;
+
+    }
+    public void setViewValue(Object value) {
+        if(checkBox == null) return;
+        if(IntType.isNull((int) value)){
+            nullify();
+            return;
+        }
+
+        isBlank = false;
+
+        checkBox.setVisibility(View.VISIBLE);
+        checkBox.setChecked((int) value == 1);
+    }
+    public void nullify(){
+        isBlank = true;
+        checkBox.setVisibility(View.GONE);
+    }
+    public RawDataType getViewValue(){
+        if(checkBox == null) return null;
+        if(checkBox.getVisibility() == View.GONE) return new IntType(name, IntType.nullval);
+        return new IntType(name, checkBox.isChecked() ? 1 : 0);
+    }
+
+
+
+
+
+
+    public void add_individual_view(LinearLayout parent, RawDataType data){
+        if(data.isNull()) return;
+        CheckBox cb = new CheckBox(parent.getContext());
+        cb.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Headline6);
+        cb.setText(name);
+        cb.setChecked((int) data.get() == 1);
+        cb.setEnabled(false);
+        parent.addView(cb);
+    }
+
+
+    public void add_compiled_view(LinearLayout parent, RawDataType[] data){
+        PieChart chart = new PieChart(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);
+        parent.addView(chart);
+
+        int numTrue = 0;
+        int numFalse = 0;
+
+        for(int i = 0; i < data.length; i++)
+            if(!data[i].isNull()){
+                if((int) data[i].get() == 1)
+                    numTrue += 1;
+                else
+                    numFalse += 1;
+            }
+
+
+        List<PieEntry> entries = new ArrayList<>();
+
+        entries.add(new PieEntry((float) numTrue, "True"));
+        entries.add(new PieEntry((float) numFalse, "False"));
+
+        PieDataSet pieDataSet = new PieDataSet(entries, name);
+        pieDataSet.setColors(checkbox_colors);
+        PieData pieData = new PieData(pieDataSet);
+        chart.setDrawHoleEnabled(false);
+        chart.setData(pieData);
+    }
+
+
+
+
+
+
+    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);
+
+        LineData lineData = new LineData();
+
+        List<Entry> entries = new ArrayList<>();
+        for (int a = 0; a < data.length; a++) {
+            if(data[a].isNull()) continue;
+
+            entries.add(
+                    new Entry(a,
+                        ((int) data[a].get())
+                    )
+            );
+        }
+
+        LineDataSet dataSet = new LineDataSet(entries, "is checked");
+        dataSet.setColor(checkbox_data_color);
+        dataSet.setValueTextColor(Color.BLACK);
+        dataSet.setDrawCircles(false);
+        dataSet.setDrawValues(false);
+        dataSet.setValueTextColor(checkbox_value_text_color);
+        lineData.addDataSet(dataSet);
+
+
+
+
+        chart.setData(lineData);
+        chart.invalidate();
+
+        chart.getDescription().setEnabled(false);
+        chart.setTouchEnabled(false);
+        chart.setDragEnabled(false);
+        chart.setScaleEnabled(false);
+
+
+        chart.getXAxis().setTextColor(Color.WHITE);
+        chart.getAxisLeft().setTextColor(Color.WHITE);
+        chart.getAxisRight().setTextColor(Color.WHITE);
+
+        chart.getAxisLeft().setAxisMinimum(0.f);
+        chart.getAxisLeft().setAxisMaximum(1.f);
+
+        chart.getAxisRight().setAxisMinimum(0.f);
+        chart.getAxisRight().setAxisMaximum(1.f);
+
+        Legend legend = chart.getLegend();
+        legend.setTextColor(Color.WHITE);
+
+        chart.invalidate();
+        parent.addView(chart);
+    }
+
+    public void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data){
+
+    }
+
+    public String toString(RawDataType data){
+        return  (int) data.get() == 1 ? "true" : "false";
+    }
+}
+

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

@@ -1,4 +1,9 @@
-package com.astatin3.scoutingapp2025.types.input;
+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 android.content.Context;
 import android.graphics.Color;
@@ -7,14 +12,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.TableLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.data.intType;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.ui.views.CustomSpinnerView;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
 import com.github.mikephil.charting.charts.LineChart;
 import com.github.mikephil.charting.charts.PieChart;
 import com.github.mikephil.charting.components.Legend;
@@ -24,98 +29,56 @@ import com.github.mikephil.charting.data.LineDataSet;
 import com.github.mikephil.charting.data.PieData;
 import com.github.mikephil.charting.data.PieDataSet;
 import com.github.mikephil.charting.data.PieEntry;
-import com.skydoves.powerspinner.IconSpinnerAdapter;
-import com.skydoves.powerspinner.IconSpinnerItem;
-import com.skydoves.powerspinner.OnSpinnerItemSelectedListener;
-import com.skydoves.powerspinner.PowerSpinnerView;
-import com.skydoves.powerspinner.SpinnerGravity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
-public class dropdownType extends inputType {
+public class DropdownType extends FieldType {
     public String[] text_options;
     public int get_byte_id() {return dropdownType;}
     public inputTypes getInputType(){return inputTypes.DROPDOWN;}
-    public dataType.valueTypes getValueType(){return dataType.valueTypes.NUM;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
     public Object get_fallback_value(){return 0;}
-    public dropdownType(){};
+    public DropdownType(){};
     public String get_type_name(){return "Dropdown";}
-    public dropdownType(String name, String[] text_options, int defaultSelIndex){
-        super(name);
+    public DropdownType(String UUID, String name, String description, String[] text_options, int defaultSelIndex){
+        super(UUID, name, description);
         this.text_options = text_options;
         this.default_value = defaultSelIndex;
     }
 
 
-    public byte[] encode() throws ByteBuilder.buildingException {
-        ByteBuilder bb = new ByteBuilder();
-        bb.addString(name);
+    public void encodeData(ByteBuilder bb) throws ByteBuilder.buildingException {
         bb.addInt((int)default_value);
         bb.addStringArray(text_options);
-        return bb.build();
     }
-    public void decode(byte[] bytes) throws BuiltByteParser.byteParsingExeption {
-        BuiltByteParser bbp = new BuiltByteParser(bytes);
-        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-
-        name          = (String)   objects.get(0).get();
-        default_value =            objects.get(1).get();
-        text_options  = (String[]) objects.get(2).get();
+    public void decodeData(ArrayList<BuiltByteParser.parsedObject> objects) {
+        default_value =            objects.get(0).get();
+        text_options  = (String[]) objects.get(1).get();
     }
 
-    public PowerSpinnerView dropdown = null;
+    public CustomSpinnerView dropdown = null;
 
-    public View createView(Context context, Function<dataType, Integer> onUpdate){
-        dropdown = new PowerSpinnerView(context);
+    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
+        dropdown = new CustomSpinnerView(context);
 
-        List<IconSpinnerItem> iconSpinnerItems = new ArrayList<>();
-        for(int i = 0; i < text_options.length; i++){
-            iconSpinnerItems.add(new IconSpinnerItem(text_options[i]));
-        }
-        IconSpinnerAdapter iconSpinnerAdapter = new IconSpinnerAdapter(dropdown);
+        ArrayList<String> iconSpinnerItems = new ArrayList<>(Arrays.asList(text_options));
 
-        dropdown.setGravity(Gravity.CENTER);
+        dropdown.setTitle(name);
+        dropdown.setOptions(iconSpinnerItems, (int) default_value);
+        onUpdate.apply(getViewValue());
 
-        dropdown.setSpinnerAdapter(iconSpinnerAdapter);
-        dropdown.setItems(iconSpinnerItems);
+        dropdown.setOnClickListener((item, index) -> onUpdate.apply(getViewValue()));
 
-        dropdown.selectItemByIndex((int) default_value);
-
-        dropdown.setPadding(10,20,10,20);
-        dropdown.setBackgroundColor(0xf0000000);
-        dropdown.setTextColor(0xff00ff00);
-        dropdown.setTextSize(14.5f);
-        dropdown.setArrowGravity(SpinnerGravity.END);
-        dropdown.setArrowPadding(8);
-//        dropdown.setSpinnerItemHeight(46);
-        dropdown.setSpinnerPopupElevation(14);
-
-
-
-
-        dropdown.setOnSpinnerItemSelectedListener(new OnSpinnerItemSelectedListener<IconSpinnerItem>() {
-            @Override
-            public void onItemSelected(int oldIndex, @Nullable IconSpinnerItem oldItem, int newIndex,
-                                       IconSpinnerItem newItem) {
-                onUpdate.apply(getViewValue());
-            }
-        });
-
-//            dropdown.setLifecycleOwner(context.life);
-//            slider.addOnChangeListener(new Slider.OnChangeListener() {
-//                @Override
-//                public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
-//                    onUpdate.apply(getViewValue());
-//                }
-//            });
         return dropdown;
 
     }
     public void setViewValue(Object value) {
         if(dropdown == null) return;
-        if(intType.isNull((int) value)){
+        if(IntType.isNull((int) value)){
             nullify();
             return;
         }
@@ -123,16 +86,16 @@ public class dropdownType extends inputType {
         isBlank = false;
 
         dropdown.setVisibility(View.VISIBLE);
-        dropdown.selectItemByIndex((int) value);
+        dropdown.setOption((int) value);
     }
     public void nullify(){
         isBlank = true;
         dropdown.setVisibility(View.GONE);
     }
-    public dataType getViewValue(){
+    public RawDataType getViewValue(){
         if(dropdown == null) return null;
-        if(dropdown.getVisibility() == View.GONE) return new intType(name, intType.nullval);
-        return new intType(name, dropdown.getSelectedIndex());
+        if(dropdown.getVisibility() == View.GONE) return new IntType(name, IntType.nullval);
+        return new IntType(name, dropdown.getIndex());
     }
 
 
@@ -140,7 +103,7 @@ public class dropdownType extends inputType {
 
 
 
-    public void add_individual_view(LinearLayout parent, dataType data){
+    public void add_individual_view(LinearLayout parent, RawDataType data){
         if(data.isNull()) return;
         TextView tv = new TextView(parent.getContext());
         tv.setLayoutParams(new FrameLayout.LayoutParams(
@@ -176,7 +139,7 @@ public class dropdownType extends inputType {
         return colors;
     }
 
-    public void add_compiled_view(LinearLayout parent, dataType[] data){
+    public void add_compiled_view(LinearLayout parent, RawDataType[] data){
         PieChart chart = new PieChart(parent.getContext());
         FrameLayout.LayoutParams layout = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -184,7 +147,7 @@ public class dropdownType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
         parent.addView(chart);
 
         int[] data_2 = new int[text_options.length];
@@ -210,7 +173,7 @@ public class dropdownType extends inputType {
 
 
 
-    public void add_history_view(LinearLayout parent, dataType[] data){
+    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,
@@ -218,7 +181,7 @@ public class dropdownType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
 
 
 
@@ -240,10 +203,10 @@ public class dropdownType extends inputType {
 
             LineDataSet dataSet = new LineDataSet(entries, text_options[i]);
             dataSet.setColor(colors[i]);
-            dataSet.setValueTextColor(Color.BLACK);
+            dataSet.setValueTextColor(dropdown_value_text_1);
             dataSet.setDrawCircles(false);
             dataSet.setDrawValues(false);
-            dataSet.setValueTextColor(Color.RED);
+            dataSet.setValueTextColor(dropdown_value_text_2);
             lineData.addDataSet(dataSet);
         }
 
@@ -259,9 +222,9 @@ public class dropdownType extends inputType {
         chart.setScaleEnabled(false);
 
 
-        chart.getXAxis().setTextColor(Color.WHITE);
-        chart.getAxisLeft().setTextColor(Color.WHITE);
-        chart.getAxisRight().setTextColor(Color.WHITE);
+        chart.getXAxis().setTextColor(chart_text);
+        chart.getAxisLeft().setTextColor(chart_text);
+        chart.getAxisRight().setTextColor(chart_text);
 
         chart.getAxisLeft().setAxisMinimum(0.f);
         chart.getAxisLeft().setAxisMaximum(1.f);
@@ -270,10 +233,18 @@ public class dropdownType extends inputType {
         chart.getAxisRight().setAxisMaximum(1.f);
 
         Legend legend = chart.getLegend();
-        legend.setTextColor(Color.WHITE);
+        legend.setTextColor(chart_text);
 
         chart.invalidate();
         parent.addView(chart);
     }
+
+    public void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data){
+
+    }
+
+    public String toString(RawDataType data){
+        return text_options[(int) data.get()];
+    }
 }
 

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

@@ -0,0 +1,105 @@
+package com.ridgebotics.ridgescout.types.input;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+// Abstract class for fields.
+public abstract class FieldType {
+    // Define what the IDS are for each type
+    public static final int slider_type_id = 255;
+    public static final int dropdownType = 254;
+    public static final int notesType = 253;
+    public static final int tallyType = 252;
+    public static final int numberType = 251;
+    public static final int checkboxType = 250;
+    public static final int fieldposType = 249;
+
+    public enum inputTypes {
+        SLIDER,
+        DROPDOWN,
+        NOTES_INPUT,
+        TALLY,
+        NUMBER,
+        CHECKBOX,
+        FIELDPOS
+    }
+    public String UUID;
+    public String name;
+    public String description;
+    public Object default_value;
+    public abstract inputTypes getInputType();
+    public abstract RawDataType.valueTypes getValueType();
+    public abstract Object get_fallback_value();
+    public abstract int get_byte_id();
+    public FieldType(){}
+    public FieldType(String UUID, String name, String description){
+        this.UUID = UUID;
+        this.name = name;
+        this.description = description;
+    }
+
+    public abstract String get_type_name();
+
+    public byte[] encode() throws ByteBuilder.buildingException {
+        ByteBuilder bb = new ByteBuilder();
+        bb.addString(UUID);
+        bb.addString(name);
+        bb.addString(description);
+
+        encodeData(bb);
+
+        return bb.build();
+    }
+
+
+    public abstract void encodeData(ByteBuilder byteBuilder) throws ByteBuilder.buildingException;
+    public void decode(byte[] bytes) throws BuiltByteParser.byteParsingExeption {
+        BuiltByteParser bbp = new BuiltByteParser(bytes);
+        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
+
+        UUID          = (String)   objects.remove(0).get();
+        name          = (String)   objects.remove(0).get();
+
+        description   = (String)   objects.remove(0).get();
+
+        decodeData(objects);
+    }
+
+
+    public abstract void decodeData(ArrayList<BuiltByteParser.parsedObject> objects);
+
+//    public abstract dataType[] getConfig();
+//    public abstract void setConfig(dataType[] config);
+
+    public abstract View createView(Context context, Function<RawDataType, Integer> onUpdate);
+    public boolean isBlank = false;
+    public abstract void nullify();
+    public void setViewValue(RawDataType type){setViewValue(type.get());}
+    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);
+
+
+    public abstract void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data);
+
+
+    public abstract String toString(RawDataType data);
+
+
+}

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

@@ -0,0 +1,233 @@
+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.fieldpos_data;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+
+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.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntArrType;
+import com.ridgebotics.ridgescout.ui.views.FieldPosView;
+import com.ridgebotics.ridgescout.ui.views.MultiFieldPosView;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class FieldposType extends FieldType {
+    public int get_byte_id() {return fieldposType;}
+    public inputTypes getInputType(){return inputTypes.FIELDPOS;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
+    public Object get_fallback_value(){return 0;}
+    public FieldposType(){}
+    public String get_type_name(){return "Field Pos";}
+    public FieldposType(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.addIntArray((int[]) default_value);
+    }
+
+    public void decodeData(ArrayList<BuiltByteParser.parsedObject> objects) {
+        default_value = objects.get(0).get();
+    }
+
+
+
+
+
+    public FieldPosView field = null;
+
+    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
+        field = new FieldPosView(context, pos -> {
+            onUpdate.apply(new IntArrType(name, pos));
+        });
+        setViewValue(default_value);
+        return field;
+
+    }
+
+    public void setViewValue(Object value) {
+        if(field == null) return;
+        if(IntArrType.isNull((int[]) value)){
+            nullify();
+            return;
+        }
+        if(((int[]) value)[0] == 255 && ((int[]) value)[1] == 255){
+            nullify();
+            return;
+        }
+
+        isBlank = false;
+        field.setVisibility(View.VISIBLE);
+        field.setPos((int[]) value);
+    }
+    public void nullify(){
+        isBlank = true;
+        field.setVisibility(View.GONE);
+    }
+    public RawDataType getViewValue(){
+        if(field == null) return null;
+        if(field.getVisibility() == View.GONE) return IntArrType.newNull(name);
+        return new IntArrType(name, field.getPos());
+    }
+
+
+
+    public void add_individual_view(LinearLayout parent, RawDataType data){
+        if(data.isNull()) return;
+
+        FieldPosView fp = new FieldPosView(parent.getContext());
+        fp.setEnabled(false);
+        fp.setPos((int[]) data.get());
+
+        parent.addView(fp);
+    }
+
+
+
+
+
+
+
+
+    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){
+        MultiFieldPosView mfp = new MultiFieldPosView(parent.getContext());
+        for(int i = 0; i < data.length; i++){
+            if(data[i].isNull()) continue;
+            mfp.addPos((int[]) data[i].get());
+        }
+        parent.addView(mfp);
+    }
+
+    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 = 0;
+        int max = 255;
+
+        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, 255-(float)((int[]) data[i].get())[1]));
+        }
+
+        LineDataSet dataSet = new LineDataSet(entries, "Field position Y value");
+        dataSet.setColor(fieldpos_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){
+
+    }
+
+    public String toString(RawDataType data){
+        int[] intarr = (int[]) data.get();
+        return "[" + intarr[0] + "," + intarr[1] + "]";
+    }
+}
+

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

@@ -1,38 +1,49 @@
-package com.astatin3.scoutingapp2025.types.input;
+package com.ridgebotics.ridgescout.types.input;
+
+import static android.text.InputType.TYPE_CLASS_NUMBER;
+
+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.number_data;
 
 import android.content.Context;
-import android.graphics.Color;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.TableLayout;
 import android.widget.TextView;
 
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.data.intType;
-import com.astatin3.scoutingapp2025.ui.scouting.TallyCounterView;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
 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.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
-public class tallyType extends inputType {
-    public int get_byte_id() {return tallyType;}
-    public inputTypes getInputType(){return inputTypes.TALLY;}
-    public dataType.valueTypes getValueType(){return dataType.valueTypes.NUM;}
+public class NumberType extends FieldType {
+    public int get_byte_id() {return numberType;}
+    public inputTypes getInputType(){return inputTypes.NUMBER;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
     public Object get_fallback_value(){return 0;}
-    public tallyType(){}
-    public String get_type_name(){return "Tally";}
-    public tallyType(String name, int default_value){
-        super(name);
+    public NumberType(){}
+    public String get_type_name(){return "Number";}
+    public NumberType(String UUID, String name, String description, int default_value){
+        super(UUID, name, description);
         this.default_value = default_value;
     }
 
@@ -40,64 +51,72 @@ public class tallyType extends inputType {
 
 
 
-    public byte[] encode() throws ByteBuilder.buildingException {
-        ByteBuilder bb = new ByteBuilder();
-        bb.addString(name);
+    public void encodeData(ByteBuilder bb) throws ByteBuilder.buildingException {
         bb.addInt((int)default_value);
-        return bb.build();
     }
-    public void decode(byte[] bytes) throws BuiltByteParser.byteParsingExeption {
-        BuiltByteParser bbp = new BuiltByteParser(bytes);
-        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-
-        name          = (String)   objects.get(0).get();
-        default_value =            objects.get(1).get();
+    public void decodeData(ArrayList<BuiltByteParser.parsedObject> objects) {
+        default_value = objects.get(0).get();
     }
 
 
 
 
 
-    public TallyCounterView tally = null;
+    public EditText num = null;
 
-    public View createView(Context context, Function<dataType, Integer> onUpdate){
-        tally = new TallyCounterView(context);
-        tally.setOnCountChangedListener(n -> onUpdate.apply(getViewValue()));
+    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
+        num = new EditText(context);
+        num.setInputType(TYPE_CLASS_NUMBER);
+        num.addTextChangedListener(new TextWatcher() {
+            public void afterTextChanged(Editable s) {
+                onUpdate.apply(getViewValue());}
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+        });
 
         setViewValue(default_value);
 
-        return tally;
+        return num;
 
     }
 
     public void setViewValue(Object value) {
-        if(tally == null) return;
-        System.out.println(value);
-        if(intType.isNull((int)value)){
+        if(num == null) return;
+        if(IntType.isNull((int)value)){
             nullify();
             return;
         }
 
         isBlank = false;
-        tally.setVisibility(View.VISIBLE);
-        tally.setValue((int) value);
+        num.setVisibility(View.VISIBLE);
+        num.setText(String.valueOf(value));
     }
     public void nullify(){
         isBlank = true;
-        tally.setVisibility(View.GONE);
+        num.setVisibility(View.GONE);
     }
-    public dataType getViewValue(){
-        if(tally == null) return null;
-        if(tally.getVisibility() == View.GONE) return intType.newNull(name);
-        return new intType(name, tally.getValue());
+    public RawDataType getViewValue(){
+        if(num == null) return null;
+        if(num.getVisibility() == View.GONE) return IntType.newNull(name);
+        return new IntType(name, safeToInt(num.getText().toString()));
+    }
+
+
+
+    private int safeToInt(String num){
+        if(num.isEmpty())
+            return IntType.nullval;
+        try {
+            return Integer.parseInt(num);
+        }catch (NumberFormatException e){
+            return IntType.nullval;
+        }
     }
 
 
 
 
-
-
-    public void add_individual_view(LinearLayout parent, dataType data){
+    public void add_individual_view(LinearLayout parent, RawDataType data){
         if(data.isNull()) return;
 
         TextView tv = new TextView(parent.getContext());
@@ -144,7 +163,7 @@ public class tallyType extends inputType {
         return entries;
     }
 
-    private static int findMin(dataType[] data){
+    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)
@@ -152,7 +171,7 @@ public class tallyType extends inputType {
         return min;
     }
 
-    private static int findMax(dataType[] data){
+    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)
@@ -160,7 +179,7 @@ public class tallyType extends inputType {
         return max;
     }
 
-    public void add_compiled_view(LinearLayout parent, dataType[] data){
+    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,
@@ -168,7 +187,7 @@ public class tallyType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
 
         int min = findMin(data);
         int max = findMax(data);
@@ -193,8 +212,8 @@ public class tallyType extends inputType {
 
 
         LineDataSet dataSet = new LineDataSet(entries, name);
-        dataSet.setColor(Color.BLUE);
-        dataSet.setValueTextColor(Color.BLACK);
+        dataSet.setColor(number_data);
+        dataSet.setValueTextColor(dropdown_value_text_1);
         dataSet.setDrawCircles(false);
         dataSet.setDrawValues(false);
 
@@ -209,7 +228,7 @@ public class tallyType extends inputType {
 
 
         LineDataSet normalDistSet = new LineDataSet(normalDistEntries, "Normal Distribution");
-        normalDistSet.setColor(Color.RED);
+        normalDistSet.setColor(dropdown_value_text_2);
         normalDistSet.setDrawCircles(false);
         normalDistSet.setDrawValues(false);
         normalDistSet.setLineWidth(2f);
@@ -224,14 +243,14 @@ public class tallyType extends inputType {
         chart.setDragEnabled(false);
         chart.setScaleEnabled(false);
 
-        dataSet.setValueTextColor(Color.RED);
+        dataSet.setValueTextColor(dropdown_value_text_2);
 
-        chart.getXAxis().setTextColor(Color.WHITE);
-        chart.getAxisLeft().setTextColor(Color.WHITE);
-        chart.getAxisRight().setTextColor(Color.WHITE);
+        chart.getXAxis().setTextColor(chart_text);
+        chart.getAxisLeft().setTextColor(chart_text);
+        chart.getAxisRight().setTextColor(chart_text);
 
         Legend legend = chart.getLegend();
-        legend.setTextColor(Color.WHITE);
+        legend.setTextColor(chart_text);
 
         parent.addView(chart);
     }
@@ -239,7 +258,7 @@ public class tallyType extends inputType {
 
 
 
-    public void add_history_view(LinearLayout parent, dataType[] data){
+    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,
@@ -247,7 +266,7 @@ public class tallyType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
 
         int min = findMin(data);
         int max = findMax(data);
@@ -262,8 +281,8 @@ public class tallyType extends inputType {
 
 
         LineDataSet dataSet = new LineDataSet(entries, name);
-        dataSet.setColor(Color.BLUE);
-        dataSet.setValueTextColor(Color.BLACK);
+        dataSet.setColor(number_data);
+        dataSet.setValueTextColor(dropdown_value_text_1);
         dataSet.setDrawCircles(false);
         dataSet.setDrawValues(false);
 
@@ -277,14 +296,14 @@ public class tallyType extends inputType {
         chart.setDragEnabled(false);
         chart.setScaleEnabled(false);
 
-        dataSet.setValueTextColor(Color.RED);
+        dataSet.setValueTextColor(dropdown_value_text_2);
 
-        chart.getXAxis().setTextColor(Color.WHITE);
-        chart.getAxisLeft().setTextColor(Color.WHITE);
-        chart.getAxisRight().setTextColor(Color.WHITE);
+        chart.getXAxis().setTextColor(chart_text);
+        chart.getAxisLeft().setTextColor(chart_text);
+        chart.getAxisRight().setTextColor(chart_text);
 
         Legend legend = chart.getLegend();
-        legend.setTextColor(Color.WHITE);
+        legend.setTextColor(chart_text);
 
 
         chart.getAxisLeft().setAxisMinimum(min);
@@ -296,5 +315,13 @@ public class tallyType extends inputType {
 
         parent.addView(chart);
     }
+
+    public void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data){
+
+    }
+
+    public String toString(RawDataType data){
+        return String.valueOf((int) data.get());
+    }
 }
 

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

@@ -1,20 +1,25 @@
-package com.astatin3.scoutingapp2025.types.input;
+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.slider_data;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.TableLayout;
 
 import androidx.annotation.NonNull;
 
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.data.intType;
-import com.astatin3.scoutingapp2025.types.data.stringType;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
 import com.github.mikephil.charting.charts.LineChart;
 import com.github.mikephil.charting.components.Legend;
 import com.github.mikephil.charting.data.Entry;
@@ -24,20 +29,21 @@ import com.google.android.material.slider.Slider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
-public class sliderType extends inputType {
+public class SliderType extends FieldType {
     //        public int defaultValue;
     public int min;
     public int max;
     public int get_byte_id() {return slider_type_id;}
     public inputTypes getInputType(){return inputTypes.SLIDER;}
-    public dataType.valueTypes getValueType(){return dataType.valueTypes.NUM;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
     public Object get_fallback_value(){return 0;}
-    public sliderType(){};
+    public SliderType(){};
     public String get_type_name(){return "Slider";}
-    public sliderType(String name, int defaultValue, int min, int max){
-        super(name);
+    public SliderType(String UUID, String name, String description, int defaultValue, int min, int max){
+        super(UUID, name, description);
         this.default_value = defaultValue;
         this.min = min;
         this.max = max;
@@ -46,22 +52,15 @@ public class sliderType extends inputType {
 
 
 
-    public byte[] encode() throws ByteBuilder.buildingException {
-        ByteBuilder bb = new ByteBuilder();
-        bb.addString(name);
-        bb.addInt((int)default_value);
+    public void encodeData(ByteBuilder bb) throws ByteBuilder.buildingException {
+        bb.addInt((int) default_value);
         bb.addInt(min);
         bb.addInt(max);
-        return bb.build();
     }
-    public void decode(byte[] bytes) throws BuiltByteParser.byteParsingExeption {
-        BuiltByteParser bbp = new BuiltByteParser(bytes);
-        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-
-        name          = (String) objects.get(0).get();
-        default_value =          objects.get(1).get();
-        min           = (int)    objects.get(2).get();
-        max           = (int)    objects.get(3).get();
+    public void decodeData(ArrayList<BuiltByteParser.parsedObject> objects) {
+        default_value =       objects.get(0).get();
+        min           = (int) objects.get(1).get();
+        max           = (int) objects.get(2).get();
     }
 
 
@@ -69,7 +68,7 @@ public class sliderType extends inputType {
 
     public Slider slider = null;
 
-    public View createView(Context context, Function<dataType, Integer> onUpdate){
+    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
         slider = new Slider(context);
         setViewValue(default_value);
         slider.setStepSize((float) 1 / (max-min));
@@ -84,7 +83,7 @@ public class sliderType extends inputType {
 
     public void setViewValue(Object value) {
         if(slider == null) return;
-        if(intType.isNull((int) value)){
+        if(IntType.isNull((int) value)){
             nullify();
             return;
         }
@@ -95,7 +94,7 @@ public class sliderType extends inputType {
 
         float slidervalue = round_position*step_size;
         if(slidervalue > 1 || slidervalue < 0) {
-            AlertManager.error("Error loading slider " + name);
+            AlertManager.addSimpleError("Error loading slider " + name);
             slider.setValue(0);
         }else{
             slider.setValue(slidervalue);
@@ -104,10 +103,10 @@ public class sliderType extends inputType {
 
         slider.setVisibility(View.VISIBLE);
     }
-    public dataType getViewValue(){
+    public RawDataType getViewValue(){
         if(slider == null) return null;
-        if(slider.getVisibility() == View.GONE) return intType.newNull(name);
-        return new intType(name, min + (int) (slider.getValue() * (max-min)));
+        if(slider.getVisibility() == View.GONE) return IntType.newNull(name);
+        return new IntType(name, min + (int) (slider.getValue() * (max-min)));
     }
     public void nullify(){
         isBlank = true;
@@ -119,7 +118,7 @@ public class sliderType extends inputType {
 
 
 
-    public void add_individual_view(LinearLayout parent, dataType data){
+    public void add_individual_view(LinearLayout parent, RawDataType data){
         if(data.isNull()) return;
         Slider slider = new Slider(parent.getContext());
 
@@ -128,7 +127,7 @@ public class sliderType extends inputType {
         int round_position = Math.round(slider_position / step_size);
         float value = round_position*step_size;
         if(value > 1 || value < 0) {
-            AlertManager.error("Error loading slider " + name);
+            AlertManager.addSimpleError("Error loading slider " + name);
             slider.setValue(0);
         }else{
             slider.setValue(value);
@@ -173,7 +172,7 @@ public class sliderType extends inputType {
         return entries;
     }
 
-    public void add_compiled_view(LinearLayout parent, dataType[] data){
+    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,
@@ -181,7 +180,7 @@ public class sliderType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
 
         int[] values = new int[max-min+1];
 
@@ -203,8 +202,8 @@ public class sliderType extends inputType {
 
 
         LineDataSet dataSet = new LineDataSet(entries, name);
-        dataSet.setColor(Color.BLUE);
-        dataSet.setValueTextColor(Color.BLACK);
+        dataSet.setColor(slider_data);
+        dataSet.setValueTextColor(dropdown_value_text_1);
         dataSet.setDrawCircles(false);
         dataSet.setDrawValues(false);
 
@@ -219,7 +218,7 @@ public class sliderType extends inputType {
 
 
         LineDataSet normalDistSet = new LineDataSet(normalDistEntries, "Normal Distribution");
-        normalDistSet.setColor(Color.RED);
+        normalDistSet.setColor(dropdown_value_text_2);
         normalDistSet.setDrawCircles(false);
         normalDistSet.setDrawValues(false);
         normalDistSet.setLineWidth(2f);
@@ -234,14 +233,14 @@ public class sliderType extends inputType {
         chart.setDragEnabled(false);
         chart.setScaleEnabled(false);
 
-        dataSet.setValueTextColor(Color.RED);
+        dataSet.setValueTextColor(dropdown_value_text_2);
 
-        chart.getXAxis().setTextColor(Color.WHITE);
-        chart.getAxisLeft().setTextColor(Color.WHITE);
-        chart.getAxisRight().setTextColor(Color.WHITE);
+        chart.getXAxis().setTextColor(chart_text);
+        chart.getAxisLeft().setTextColor(chart_text);
+        chart.getAxisRight().setTextColor(chart_text);
 
         Legend legend = chart.getLegend();
-        legend.setTextColor(Color.WHITE);
+        legend.setTextColor(chart_text);
 
         parent.addView(chart);
     }
@@ -249,7 +248,7 @@ public class sliderType extends inputType {
 
 
 
-    public void add_history_view(LinearLayout parent, dataType[] data){
+    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,
@@ -257,7 +256,7 @@ public class sliderType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
 
         List<Entry> entries = new ArrayList<>();
         for (int i = 0; i < data.length; i++){
@@ -269,8 +268,8 @@ public class sliderType extends inputType {
 
 
         LineDataSet dataSet = new LineDataSet(entries, name);
-        dataSet.setColor(Color.BLUE);
-        dataSet.setValueTextColor(Color.BLACK);
+        dataSet.setColor(slider_data);
+        dataSet.setValueTextColor(dropdown_value_text_1);
         dataSet.setDrawCircles(false);
         dataSet.setDrawValues(false);
 
@@ -284,14 +283,14 @@ public class sliderType extends inputType {
         chart.setDragEnabled(false);
         chart.setScaleEnabled(false);
 
-        dataSet.setValueTextColor(Color.RED);
+        dataSet.setValueTextColor(dropdown_value_text_2);
 
-        chart.getXAxis().setTextColor(Color.WHITE);
-        chart.getAxisLeft().setTextColor(Color.WHITE);
-        chart.getAxisRight().setTextColor(Color.WHITE);
+        chart.getXAxis().setTextColor(chart_text);
+        chart.getAxisLeft().setTextColor(chart_text);
+        chart.getAxisRight().setTextColor(chart_text);
 
         Legend legend = chart.getLegend();
-        legend.setTextColor(Color.WHITE);
+        legend.setTextColor(chart_text);
 
 
         chart.getAxisLeft().setAxisMinimum(min);
@@ -303,4 +302,12 @@ public class sliderType extends inputType {
 
         parent.addView(chart);
     }
+
+    public void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data){
+
+    }
+
+    public String toString(RawDataType data){
+        return String.valueOf((int) data.get());
+    }
 }

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

@@ -0,0 +1,367 @@
+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.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.IntType;
+import com.ridgebotics.ridgescout.ui.views.CandlestickHeader;
+import com.ridgebotics.ridgescout.ui.views.CandlestickView;
+import com.ridgebotics.ridgescout.ui.data.DataProcessing;
+import com.ridgebotics.ridgescout.ui.views.TallyCounterView;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class TallyType extends FieldType {
+    public int get_byte_id() {return tallyType;}
+    public inputTypes getInputType(){return inputTypes.TALLY;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.NUM;}
+    public Object get_fallback_value(){return 0;}
+    public TallyType(){}
+    public String get_type_name(){return "Tally";}
+    public TallyType(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/types/input/TextType.java

@@ -1,7 +1,12 @@
-package com.astatin3.scoutingapp2025.types.input;
+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.text_data;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;
@@ -10,13 +15,14 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.TableLayout;
 import android.widget.TextView;
 
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.data.stringType;
-import com.astatin3.scoutingapp2025.utility.SentimentAnalysis;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.data.StringType;
+import com.ridgebotics.ridgescout.utility.SentimentAnalysis;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
 import com.github.mikephil.charting.charts.LineChart;
 import com.github.mikephil.charting.components.Legend;
 import com.github.mikephil.charting.data.Entry;
@@ -25,17 +31,18 @@ import com.github.mikephil.charting.data.LineDataSet;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
-public class textType extends inputType {
+public class TextType extends FieldType {
 
     public int get_byte_id() {return notesType;}
     public inputTypes getInputType(){return inputTypes.NOTES_INPUT;}
-    public dataType.valueTypes getValueType(){return dataType.valueTypes.STRING;}
+    public RawDataType.valueTypes getValueType(){return RawDataType.valueTypes.STRING;}
     public Object get_fallback_value(){return "<no-notes>";}
-    public textType(){}
-    public textType(String name, String default_text){
-        super(name);
+    public TextType(){}
+    public TextType(String UUID, String name, String description, String default_text){
+        super(UUID, name, description);
         this.default_value = default_text;
     }
     public String get_type_name(){return "Text";}
@@ -46,18 +53,11 @@ public class textType extends inputType {
 
 
 
-    public byte[] encode() throws ByteBuilder.buildingException {
-        ByteBuilder bb = new ByteBuilder();
-        bb.addString(name);
+    public void encodeData(ByteBuilder bb) throws ByteBuilder.buildingException {
         bb.addString((String) default_value);
-        return bb.build();
     }
-    public void decode(byte[] bytes) throws BuiltByteParser.byteParsingExeption {
-        BuiltByteParser bbp = new BuiltByteParser(bytes);
-        ArrayList<BuiltByteParser.parsedObject> objects = bbp.parse();
-
-        name          = (String) objects.get(0).get();
-        default_value =          objects.get(1).get();
+    public void decodeData(ArrayList<BuiltByteParser.parsedObject> objects) {
+        default_value = objects.get(0).get();
     }
 
 
@@ -75,7 +75,7 @@ public class textType extends inputType {
 
     public EditText text = null;
 
-    public View createView(Context context, Function<dataType, Integer> onUpdate){
+    public View createView(Context context, Function<RawDataType, Integer> onUpdate){
         text = new EditText(context);
         text.setText((String)default_value);
         text.addTextChangedListener(new TextWatcher() {
@@ -89,7 +89,7 @@ public class textType extends inputType {
     }
     public void setViewValue(Object value) {
         if(text == null) return;
-        if(stringType.isNull((String) value)){
+        if(StringType.isNull((String) value)){
             nullify();
             return;
         }
@@ -101,16 +101,16 @@ public class textType extends inputType {
         isBlank = true;
         text.setVisibility(View.GONE);
     }
-    public dataType getViewValue(){
+    public RawDataType getViewValue(){
         if(text == null) return null;
-        if(text.getVisibility() == View.GONE) return new stringType(name, stringType.nullval);
-        return new stringType(name, text.getText().toString());
+        if(text.getVisibility() == View.GONE) return new StringType(name, StringType.nullval);
+        return new StringType(name, text.getText().toString());
     }
 
 
 
 
-    public void add_individual_view(LinearLayout parent, dataType data){
+    public void add_individual_view(LinearLayout parent, RawDataType data){
         if(data.isNull()) return;
         TextView tv = new TextView(parent.getContext());
         tv.setLayoutParams(new FrameLayout.LayoutParams(
@@ -140,7 +140,7 @@ public class textType extends inputType {
 
     TextView positive_text;
 
-    public void add_compiled_view(LinearLayout parent, dataType[] data) {
+    public void add_compiled_view(LinearLayout parent, RawDataType[] data) {
         positive_mean = 0;
         count = 0;
 
@@ -169,7 +169,7 @@ public class textType extends inputType {
     }
 
 
-    public void add_history_view(LinearLayout parent, dataType[] data){
+    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,
@@ -177,7 +177,7 @@ public class textType extends inputType {
         );
         layout.height = 350;
         chart.setLayoutParams(layout);
-        chart.setBackgroundColor(0xff252025);
+        chart.setBackgroundColor(chart_background);
 
 
         List<Entry> entries = new ArrayList<>();
@@ -192,11 +192,11 @@ public class textType extends inputType {
             );
         }
         LineDataSet dataSet = new LineDataSet(entries, "Sentiment");
-        dataSet.setColor(Color.BLUE);
-        dataSet.setValueTextColor(Color.BLACK);
+        dataSet.setColor(text_data);
+        dataSet.setValueTextColor(dropdown_value_text_1);
         dataSet.setDrawCircles(false);
         dataSet.setDrawValues(false);
-        dataSet.setValueTextColor(Color.RED);
+        dataSet.setValueTextColor(dropdown_value_text_2);
 
 
         LineData lineData = new LineData(dataSet);
@@ -210,9 +210,9 @@ public class textType extends inputType {
         chart.setScaleEnabled(false);
 
 
-        chart.getXAxis().setTextColor(Color.WHITE);
-        chart.getAxisLeft().setTextColor(Color.WHITE);
-        chart.getAxisRight().setTextColor(Color.WHITE);
+        chart.getXAxis().setTextColor(chart_text);
+        chart.getAxisLeft().setTextColor(chart_text);
+        chart.getAxisRight().setTextColor(chart_text);
 
         chart.getAxisLeft().setAxisMinimum(0.f);
         chart.getAxisLeft().setAxisMaximum(1.f);
@@ -221,11 +221,19 @@ public class textType extends inputType {
         chart.getAxisRight().setAxisMaximum(1.f);
 
         Legend legend = chart.getLegend();
-        legend.setTextColor(Color.WHITE);
+        legend.setTextColor(chart_text);
 
         chart.invalidate();
         parent.addView(chart);
 
     }
+
+    public void addDataToTable(TableLayout parent, Map<Integer, List<RawDataType>> data){
+
+    }
+
+    public String toString(RawDataType data){
+        return String.valueOf(data.get());
+    }
 }
 

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

@@ -0,0 +1,138 @@
+package com.ridgebotics.ridgescout.ui.data;
+
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import static com.ridgebotics.ridgescout.utility.Colors.datafragment_option_1;
+import static com.ridgebotics.ridgescout.utility.Colors.datafragment_option_2;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_latest_values;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.ui.views.FieldBorderedRow;
+import com.ridgebotics.ridgescout.ui.views.TeamListOption;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+import com.ridgebotics.ridgescout.databinding.FragmentDataBinding;
+
+import java.util.Arrays;
+import java.util.List;
+
+// Fragment for the menu of the data tab.
+// Shows either by field type or by team.
+// This is held in a sub-fragment under DataParentFragment
+public class DataFragment extends Fragment {
+
+    private FragmentDataBinding binding;
+    private int option = 0;
+
+
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentDataBinding.inflate(inflater, container, false);
+        binding.table.setStretchAllColumns(true);
+        View root = binding.getRoot();
+
+        if(evcode == null || evcode.equals("unset") || event == null){
+            binding.noEventError.setVisibility(VISIBLE);
+            binding.dataTypeDropdown.setVisibility(GONE);
+            return root;
+        }
+
+        option = SettingsManager.getDataMode();
+
+        binding.dataTypeDropdown.setTitle("Data type");
+        binding.dataTypeDropdown.setOptions(List.of(new String[]{
+            "By Team", "By Data Field"
+        }), option);
+        binding.dataTypeDropdown.setOnClickListener((item, index) -> {
+            option = index;
+            SettingsManager.setDataMode(option);
+            reload_views();
+        });
+
+        reload_views();
+
+        return root;
+    }
+
+    public void reload_views(){
+        binding.table.removeViews(1, binding.table.getChildCount()-1);
+
+        switch (option) {
+            case 0:
+                load_teams();
+                break;
+            case 1:
+                load_fields();
+                break;
+        }
+
+    }
+
+    public void load_teams(){
+
+        int[] teamNums = new int[event.teams.size()];
+
+        for(int i = 0 ; i < event.teams.size(); i++){
+            teamNums[i] = event.teams.get(i).teamNumber;
+        }
+
+        Arrays.sort(teamNums);
+
+        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);
+            });
+        }
+    }
+    public void load_fields(){
+        DataManager.reload_match_fields();
+
+        if(match_latest_values == null) return;
+
+        for(int i = 0; i < match_latest_values.length; i++){
+            FieldBorderedRow tr = new FieldBorderedRow(getContext());
+            tr.fromField(match_latest_values[i]);
+            tr.setColor(i % 2 == 0 ? datafragment_option_1 : datafragment_option_2);
+            binding.table.addView(tr);
+
+            final int fi = i;
+            tr.setOnClickListener(v -> {
+                FieldDataFragment.setFieldIndex(fi);
+                ((DataParentFragment) getParentFragment()).moveToFragment(new FieldDataFragment());
+//                findNavController(get).navigate(R.id.action_navigation_data_parent_to_navigation_data_field_data);
+            });
+        }
+    }
+}

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

@@ -0,0 +1,183 @@
+package com.ridgebotics.ridgescout.ui.data;
+
+
+import static android.content.Context.CLIPBOARD_SERVICE;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.databinding.FragmentDataParentBinding;
+import com.ridgebotics.ridgescout.types.frcMatch;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.AutoSaveManager;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// Holds the scouting data editor aswell as the sub-fragment for the scouting data browser
+public class DataParentFragment extends Fragment {
+
+    private FragmentDataParentBinding binding;
+    private DataFragment dataFragment;
+
+
+    private boolean editBoxEnabled = true;
+    private int teamNum = SettingsManager.getTeamNum();
+    private frcMatch[] ourMatches;
+    private int matchIndex = 0;
+
+    private AutoSaveManager asm;
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentDataParentBinding.inflate(inflater, container, false);
+        DataManager.reload_event();
+
+        if (savedInstanceState == null && dataFragment == null){
+            dataFragment = new DataFragment();
+
+            //add child fragment
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .add(R.id.data_subfragment, dataFragment, "Data Subfragment")
+                    .commit();
+        }
+
+        if(evcode.equals("unset") || event == null){
+            binding.reportToggleButton.setVisibility(GONE);
+            return binding.getRoot();
+        }
+
+        ourMatches = event.getTeamMatches(SettingsManager.getTeamNum());
+        matchIndex = SettingsManager.getReportMatchIndex(evcode);
+
+        if(ourMatches.length == 0){
+            binding.reportToggleButton.setVisibility(GONE);
+            return binding.getRoot();
+        }
+
+        binding.scoutUpButton.setOnClickListener(v -> {
+            matchIndex++;
+            updateButtons();
+        });
+
+        binding.scoutDownButton.setOnClickListener(v -> {
+            matchIndex--;
+            updateButtons();
+        });
+
+        updateButtons();
+
+        binding.reportToggleButton.setOnClickListener(view -> {
+            editBoxEnabled  =! editBoxEnabled;
+            binding.ScoutingEditBox.setVisibility(editBoxEnabled ? GONE : VISIBLE);
+            binding.reportToggleButton.setText(editBoxEnabled ? "▲ report" : "▼ report");
+        });
+
+        binding.reportCopyButton.setOnClickListener(v -> {
+//            ClipData e = new ClipData();
+            ClipboardManager clipboardManager = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE);
+            ClipData clipData = ClipData.newPlainText(
+                    "Scouting report",
+                    binding.scoutingReportEdittext.getText().toString()
+            );
+
+            clipboardManager.setPrimaryClip(clipData);
+            AlertManager.toast("Copied report to clipboard!");
+        });
+
+        asm = new AutoSaveManager(() -> SettingsManager.setScoutingReport(evcode, matchIndex, binding.scoutingReportEdittext.getText().toString()), 300);
+        asm.start();
+
+        binding.scoutingReportEdittext.addTextChangedListener(new TextWatcher() {
+            @Override public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+            @Override public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                asm.update();
+            }
+            @Override public void afterTextChanged(Editable editable) {}
+        });
+
+        return binding.getRoot();
+    }
+
+    private void updateButtons(){
+        binding.matchNum.setText(String.valueOf(ourMatches[matchIndex].matchIndex));
+        binding.scoutUpButton.setEnabled(matchIndex < ourMatches.length-1);
+        binding.scoutDownButton.setEnabled(matchIndex > 0);
+        SettingsManager.setReportIndex(matchIndex, evcode);
+
+        String report = SettingsManager.getScoutingReport(evcode, matchIndex);
+        if(report.isEmpty()) report = generateScoutingTemplate(ourMatches[matchIndex]);
+        binding.scoutingReportEdittext.setText(report);
+    }
+
+    public void moveToFragment(Fragment newFragment){
+        // consider using Java coding conventions (upper first char class names!!!)
+        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+        // Replace whatever is in the fragment_container view with this fragment,
+        // and add the transaction to the back stack
+        transaction.replace(R.id.data_subfragment, newFragment);
+        transaction.addToBackStack(null);
+        // Commit the transaction
+        transaction.commit();
+    }
+
+
+    // Generate format for scouting data
+    private String generateScoutingTemplate(frcMatch nextMatch){
+        boolean isBlueAlliance = event.getIsBlueAlliance(teamNum, nextMatch);
+
+
+
+        List<frcTeam> ourAlliance = new ArrayList<>();
+        List<frcTeam> opposingAlliance = new ArrayList<>();
+
+        for(int a = 0; a < nextMatch.blueAlliance.length; a++)
+            if(nextMatch.blueAlliance[a] != teamNum){
+                (isBlueAlliance ? ourAlliance : opposingAlliance).add(event.getTeamByNum(nextMatch.blueAlliance[a]));
+            }
+        for(int a = 0; a < nextMatch.redAlliance.length; a++)
+            if(nextMatch.redAlliance[a] != teamNum){
+                (!isBlueAlliance ? ourAlliance : opposingAlliance).add(event.getTeamByNum(nextMatch.redAlliance[a]));
+            }
+
+
+        String output = "Match: " + (nextMatch.matchIndex) + "\n";
+
+        output += "## Our Alliance ##";
+        output += getTeamNameAndNum(ourAlliance.get(0));
+        output += getTeamNameAndNum(ourAlliance.get(1));
+        output += "\n## Opposing Alliance ##";
+        output += getTeamNameAndNum(opposingAlliance.get(0));
+        output += getTeamNameAndNum(opposingAlliance.get(1));
+        output += getTeamNameAndNum(opposingAlliance.get(2));
+
+
+        return output;
+
+    }
+
+    private static String getTeamNameAndNum(frcTeam team){
+        return "\n" + team.teamNumber + " " + team.teamName + ": \n";
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ridgebotics.ridgescout.ui.data;
+
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+// Helper class for scouting data by fields.
+public class DataProcessing {
+    public static int[] getNumberBounds(Map<Integer, List<RawDataType>> data){
+        int min = Integer.MAX_VALUE;
+        int max = Integer.MIN_VALUE;
+
+
+
+        for(Integer teamNum : data.keySet()){
+            List<RawDataType> teamData = data.get(teamNum);
+
+            int[] locBounds = getNumberBounds(teamData);
+
+            if(locBounds[1] > max) max = locBounds[1];
+            if(locBounds[0] < min) min = locBounds[0];
+
+        }
+
+        return new int[]{min, max};
+    }
+
+    public static int[] getNumberBounds(List<RawDataType> data){
+        int min = Integer.MAX_VALUE;
+        int max = Integer.MIN_VALUE;
+
+        if(data == null) return new int[]{min, max};
+        for(int i = 0; i < data.size(); i++){
+            RawDataType dataPoint = data.get(i);
+//                if(dataPoint == null) continue;
+            int num = (int) dataPoint.get();
+            if(num > max) max = num;
+            if(num < min) min = num;
+        }
+
+        return new int[]{min, max};
+    }
+
+
+    //https://stackoverflow.com/questions/42381759/finding-first-quartile-and-third-quartile-in-integer-array-using-java#63891545
+    public static float[] getQuartiles(List<RawDataType> data) {
+        float ans[] = new float[3];
+
+        float[] val = new float[data.size()];
+        for(int i = 0; i < val.length; i++){
+            val[i] = (int) data.get(i).get();
+        }
+
+        for (int quartileType = 1; quartileType < 4; quartileType++) {
+            float length = val.length + 1;
+            float quartile;
+            float newArraySize = (length * ((float) (quartileType) * 25 / 100)) - 1;
+            Arrays.sort(val);
+            if (newArraySize % 1 == 0) {
+                quartile = val[(int) (newArraySize)];
+            } else {
+                int newArraySize1 = (int) (newArraySize);
+                quartile = (val[newArraySize1] + val[newArraySize1 + 1]) / 2;
+            }
+            ans[quartileType - 1] =  quartile;
+        }
+        return ans;
+    }
+
+
+    /**
+     * Calculates the specified percentile of a dataset.
+     *
+     * @param data       The dataset to analyze
+     * @param percentile The percentile to find (0-100)
+     * @return The value at the specified percentile
+     */
+    public static float calculatePercentile(float[] data, float percentile) {
+        // Make a copy of the data to avoid modifying the original
+        float[] dataCopy = Arrays.copyOf(data, data.length);
+
+        // Sort the data in ascending order
+        Arrays.sort(dataCopy);
+
+        // Calculate the position as a fraction
+        float position = (percentile / 100.0f) * (dataCopy.length - 1);
+
+        // Get the integer part of the position
+        int lowerIndex = (int) Math.floor(position);
+        int upperIndex = (int) Math.ceil(position);
+
+        // If position is already an integer, return the value at that position
+        if (lowerIndex == upperIndex) {
+            return dataCopy[lowerIndex];
+        }
+
+        // Otherwise, interpolate between the two adjacent values
+        float fraction = position - lowerIndex;
+        float lowerValue = dataCopy[lowerIndex];
+        float upperValue = dataCopy[upperIndex];
+
+        // Linear interpolation
+        return lowerValue + fraction * (upperValue - lowerValue);
+    }
+
+}

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

@@ -0,0 +1,113 @@
+package com.ridgebotics.ridgescout.ui.data;
+
+
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_latest_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_transferValues;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.rescout_list;
+
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.databinding.FragmentDataFieldDataBinding;
+import com.ridgebotics.ridgescout.scoutingData.ScoutingDataWriter;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+// Fragment for viewing the data of a specfic field.
+public class FieldDataFragment extends Fragment {
+
+    private FragmentDataFieldDataBinding binding;
+
+    private static int fieldIndex = -1;
+    public static void setFieldIndex(int index){
+        fieldIndex = index;
+    }
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentDataFieldDataBinding.inflate(inflater, container, false);
+        binding.table.setStretchAllColumns(true);
+        View root = binding.getRoot();
+
+        if (fieldIndex == -1)
+            return root;
+
+        startLoading("Loading data...");
+
+        Thread t = new Thread(() -> {
+
+            Map<Integer, List<RawDataType>> data = new HashMap<>();
+            for (int teamIndex = 0; teamIndex < event.teams.size(); teamIndex++) {
+                int teamNum = event.teams.get(teamIndex).teamNumber;
+                List<String> filenames = new ArrayList<>(List.of(FileEditor.getMatchesByTeamNum(evcode, event.teams.get(teamIndex).teamNumber)));
+                filenames.removeAll(rescout_list);
+
+                ArrayList<RawDataType> teamData = new ArrayList<>();
+
+                for (int i = 0; i < filenames.size(); i++) {
+                    try {
+                        System.out.println("Loading: " + filenames.get(i));
+                        ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(filenames.get(i), match_values, match_transferValues);
+                        if (psda.data.array[fieldIndex] != null && psda.data.array[fieldIndex].get() != null && !psda.data.array[fieldIndex].isNull())
+                            teamData.add(psda.data.array[fieldIndex]);
+                    } catch (Exception e) {
+                        AlertManager.error("Failure to load file " + filenames.get(i), e);
+                    }
+                }
+
+                data.put(teamNum, teamData);
+            }
+
+            System.out.println("Finished!");
+
+
+
+            getActivity().runOnUiThread(() -> {
+                binding.table.setStretchAllColumns(false);
+                match_latest_values[fieldIndex].addDataToTable(binding.table, data);
+                stopLoading();
+            });
+        });
+
+        t.start();
+
+        return root;
+    }
+
+
+    private ProgressDialog loadingDialog;
+
+    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/data/TeamsFragment.java

@@ -0,0 +1,347 @@
+package com.ridgebotics.ridgescout.ui.data;
+
+import static com.ridgebotics.ridgescout.utility.Colors.toggletitle_black_background;
+import static com.ridgebotics.ridgescout.utility.Colors.toggletitle_unselected;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_latest_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_transferValues;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_latest_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_transferValues;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_values;
+
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+import com.ridgebotics.ridgescout.databinding.FragmentDataTeamsBinding;
+import com.ridgebotics.ridgescout.scoutingData.ScoutingDataWriter;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// Fragment for viewing the data of a team.
+public class TeamsFragment extends Fragment {
+    FragmentDataTeamsBinding binding;
+
+    private static frcTeam team;
+    public static void setTeam(frcTeam tmpteam){
+        team = tmpteam;
+    }
+
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentDataTeamsBinding.inflate(inflater, container, false);
+
+        DataManager.reload_match_fields();
+        DataManager.reload_pit_fields();
+
+        binding.dataTypeSpinner.setTitle("Data Mode");
+
+        List<String> options = new ArrayList<>();
+        options.add("Individual");
+        options.add("Compiled");
+        options.add("History");
+
+        binding.dataTypeSpinner.setOptions(options, SettingsManager.getTeamsDataMode());
+
+        binding.dataTypeSpinner.setOnClickListener((item, index) -> {
+            SettingsManager.setTeamsDataMode(index);
+            loadTeam(index);
+        });
+
+        loadTeam(SettingsManager.getTeamsDataMode());
+
+        return binding.getRoot();
+    }
+
+    public void loadTeam(int mode) {
+
+//        LinearLayout ll = new LinearLayout(getContext());
+//        ll.setLayoutParams(new LinearLayout.LayoutParams(
+//                ViewGroup.LayoutParams.MATCH_PARENT,
+//                ViewGroup.LayoutParams.WRAP_CONTENT
+//        ));
+//        ll.setOrientation(LinearLayout.VERTICAL);
+//        binding.teamsArea.addView(ll);
+
+        binding.dataTeamCard.fromTeam(team);
+
+//        tv = new TextView(getContext());
+//        tv.setLayoutParams(new FrameLayout.LayoutParams(
+//                ViewGroup.LayoutParams.MATCH_PARENT,
+//                ViewGroup.LayoutParams.WRAP_CONTENT
+//        ));
+//        tv.setGravity(Gravity.CENTER_HORIZONTAL);
+//        tv.setText(team.getDescription());
+//        tv.setTextSize(16);
+//        ll.addView(tv);
+
+        try {add_pit_data(team);}catch(Exception e){AlertManager.error(e);}
+        try {add_match_data(team, mode);}catch(Exception e){AlertManager.error(e);}
+    }
+
+    public void add_pit_data(frcTeam team){
+        binding.pitArea.removeAllViews();
+        final String filename = evcode+"-"+team.teamNumber+".pitscoutdata";
+
+//        ll.addView(new MaterialDivider(getContext()));
+
+//        TextView tv = new TextView(getContext());
+//        tv.setLayoutParams(new FrameLayout.LayoutParams(
+//                ViewGroup.LayoutParams.MATCH_PARENT,
+//                ViewGroup.LayoutParams.WRAP_CONTENT
+//        ));
+//        tv.setGravity(Gravity.CENTER_HORIZONTAL);
+//        tv.setPadding(0,10,0,10);
+//        tv.setText("----- Pit data -----");
+//        tv.setTextSize(30);
+//        ll.addView(tv);
+
+//        ll.addView(new MaterialDivider(getContext()));
+
+        if(!FileEditor.fileExist(filename)){
+            TextView tv = new TextView(getContext());
+            tv.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            tv.setGravity(Gravity.CENTER_HORIZONTAL);
+            tv.setText("No pit data has been collected!");
+            tv.setTextSize(23);
+            binding.pitArea.addView(tv);
+            return;
+        }
+
+        ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(filename, pit_values, pit_transferValues);
+
+        TextView tv = new TextView(getContext());
+        tv.setLayoutParams(new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        ));
+        tv.setPadding(0, 20, 0, 5);
+        tv.setGravity(Gravity.CENTER_HORIZONTAL);
+        tv.setText("Pit scouting by " + psda.username);
+        tv.setTextSize(30);
+        binding.pitArea.addView(tv);
+
+        for (int a = 0; a < psda.data.array.length; a++) {
+            tv = new TextView(getContext());
+            tv.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            tv.setGravity(Gravity.CENTER_HORIZONTAL);
+            tv.setText(pit_latest_values[a].name);
+            tv.setTextSize(25);
+
+            if(psda.data.array[a].isNull()){
+                tv.setBackgroundColor(toggletitle_unselected);
+                tv.setTextColor(toggletitle_black_background);
+            }
+
+
+
+            binding.pitArea.addView(tv);
+
+
+            pit_latest_values[a].add_individual_view(binding.pitArea, psda.data.array[a]);
+        }
+    }
+
+
+    private int matchIndex = 0;
+
+    public void add_match_data(frcTeam team, int mode){
+        binding.matchArea.removeAllViews();
+        binding.individualViewSelector.setVisibility(View.GONE);
+        String[] files = FileEditor.getMatchesByTeamNum(evcode, team.teamNumber);
+
+        if(files.length == 0){
+            TextView tv = new TextView(getContext());
+            tv.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            tv.setGravity(Gravity.CENTER_HORIZONTAL);
+            tv.setText("No match data has been collected!");
+            tv.setTextSize(23);
+            binding.matchArea.addView(tv);
+            return;
+        }
+
+        switch (mode){
+            case 0:
+                add_individual_views(files);
+                break;
+            case 1:
+                add_compiled_views(files);
+                break;
+            case 2:
+                add_history_views(files);
+                break;
+        }
+    }
+
+
+
+
+    public void add_individual_views(String[] files) {
+
+
+        matchIndex = 0;
+
+        binding.individualViewSelector.setVisibility(View.VISIBLE);
+
+        binding.matchesPlusBtn.setOnClickListener(view -> {
+            matchIndex++;
+            update_individual_view(files);
+        });
+
+        binding.matchesMinusBtn.setOnClickListener(view -> {
+            matchIndex--;
+            update_individual_view(files);
+        });
+
+        update_individual_view(files);
+    }
+
+    private void update_individual_view(String[] files){
+        binding.matchesPlusBtn.setEnabled(matchIndex < files.length - 1);
+        binding.matchesMinusBtn.setEnabled(matchIndex > 0);
+        binding.matchArea.removeAllViews();
+
+
+        try {
+            String[] split = files[matchIndex].split("-");
+            int match_num = Integer.parseInt(split[1]);
+            binding.matchNum.setText(split[1]);
+
+            ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[matchIndex], match_values, match_transferValues);
+
+            TextView tv = new TextView(getContext());
+            tv.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            tv.setPadding(0, 40, 0, 5);
+            tv.setGravity(Gravity.CENTER_HORIZONTAL);
+            tv.setText("M" + (match_num) + " " + split[2] + "-" + split[3] + " by " + psda.username);
+            tv.setTextSize(30);
+            binding.matchArea.addView(tv);
+
+            for (int i = 0; i < psda.data.array.length; i++) {
+                tv = new TextView(getContext());
+                tv.setLayoutParams(new FrameLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT
+                ));
+                tv.setGravity(Gravity.CENTER_HORIZONTAL);
+                tv.setText(match_latest_values[i].name);
+                tv.setTextSize(25);
+
+                if (psda.data.array[i].isNull()) {
+                    tv.setBackgroundColor(toggletitle_unselected);
+                    tv.setTextColor(toggletitle_black_background);
+                }
+
+                binding.matchArea.addView(tv);
+
+
+                if(psda.data.array[i] != null)
+                    match_latest_values[i].add_individual_view(binding.matchArea, psda.data.array[i]);
+            }
+        }catch (Exception e){
+            AlertManager.error("Failure to load file " + files[matchIndex], e);
+        }
+
+    }
+
+
+
+
+
+
+    public void add_compiled_views(String[] files){
+        RawDataType[][] data = new RawDataType[match_latest_values.length][files.length];
+        for (int i = 0; i < files.length; i++) {
+            try {
+                ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
+                for (int a = 0; a < data.length; a++) {
+                    if(psda.data.array[a] != null && psda.data.array[a].get() != null)
+                        data[a][i] = psda.data.array[a];
+                }
+            } catch (Exception e){
+                AlertManager.error("Failure to load file " + files[i], e);
+            }
+        }
+
+        for(int i = 0; i < match_latest_values.length; i++){
+            TextView tv = new TextView(getContext());
+            tv.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            tv.setPadding(0, 20, 0, 5);
+            tv.setGravity(Gravity.CENTER_HORIZONTAL);
+            tv.setText(match_latest_values[i].name);
+            tv.setTextSize(30);
+            binding.matchArea.addView(tv);
+
+            if(data[i] != null)
+                match_latest_values[i].add_compiled_view(binding.matchArea, data[i]);
+        }
+    }
+
+
+
+
+
+    public void add_history_views(String[] files){
+        RawDataType[][] data = new RawDataType[match_latest_values.length][files.length];
+        for (int i = 0; i < files.length; i++) {
+            try {
+                ScoutingDataWriter.ParsedScoutingDataResult psda = ScoutingDataWriter.load(files[i], match_values, match_transferValues);
+                for (int a = 0; a < data.length; a++) {
+                    if(psda.data.array[a] != null && psda.data.array[a].get() != null)
+                        data[a][i] = psda.data.array[a];
+                }
+            }catch (Exception e){
+                AlertManager.error("Failure to load file " + files[i], e);
+            }
+        }
+
+        for(int i = 0; i < match_latest_values.length; i++){
+            TextView tv = new TextView(getContext());
+            tv.setLayoutParams(new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+            tv.setPadding(0, 20, 0, 5);
+            tv.setGravity(Gravity.CENTER_HORIZONTAL);
+            tv.setText(match_latest_values[i].name);
+            tv.setTextSize(30);
+            binding.matchArea.addView(tv);
+
+            if(data[i] != null)
+                match_latest_values[i].add_history_view(binding.matchArea, data[i]);
+        }
+    }
+}

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

@@ -0,0 +1,410 @@
+package com.ridgebotics.ridgescout.ui.scouting;
+
+import static com.ridgebotics.ridgescout.utility.Colors.color_found;
+import static com.ridgebotics.ridgescout.utility.Colors.color_not_found;
+import static com.ridgebotics.ridgescout.utility.Colors.color_rescout;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.text.InputType;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.databinding.FragmentScoutingEventBinding;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.ui.views.CustomSpinnerView;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.types.frcEvent;
+import com.ridgebotics.ridgescout.types.frcMatch;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+// Fragment to show the status of scouting, aswell as adding or removing matches and teams manually.
+public class EventFragment extends Fragment {
+    FragmentScoutingEventBinding binding;
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentScoutingEventBinding.inflate(inflater, container, false);
+
+        reloadTable();
+
+        return binding.getRoot();
+    }
+
+    public void reloadTable() {
+        DataManager.reload_event();
+        binding.teamsTable.removeAllViews();
+        binding.teamsTable.setStretchAllColumns(true);
+        binding.matchTable.removeAllViews();
+        binding.matchTable.setStretchAllColumns(true);
+        add_pit_scouting(event);
+        add_match_scouting(event);
+    }
+    private void addTableText(TableRow tr, String textStr){
+        TextView text = new TextView(getContext());
+        text.setTextSize(18);
+        text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
+        text.setText(textStr);
+        tr.addView(text);
+    }
+
+    public void add_pit_scouting(frcEvent event){
+
+        if(SettingsManager.getCustomEvents()){
+            binding.teamsMinusBtn.setVisibility(View.VISIBLE);
+            binding.teamsMinusBtn.setOnClickListener(view -> removeTeam());
+            binding.teamsPlusBtn.setVisibility(View.VISIBLE);
+            binding.teamsPlusBtn.setOnClickListener(view -> addTeam());
+        }
+
+        int[] teams = new int[event.teams.size()];
+
+        for(int i = 0 ; i < event.teams.size(); i++){
+            teams[i] = event.teams.get(i).teamNumber;
+        }
+
+        Arrays.sort(teams);
+
+        TableRow tr = null;
+        for(int i=0; i < event.teams.size(); i++){
+//            frcTeam team = event.teams.get(i);
+            int num = teams[i];
+
+            if(i % 7 == 0){
+                if(i != 0)
+                    binding.teamsTable.addView(tr);
+                tr = new TableRow(getContext());
+            }
+
+            TextView text = new TextView(getContext());
+            text.setTextSize(18);
+            text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+
+            text.setText(String.valueOf(num));
+            final String filename = event.eventCode + "-" + num + ".pitscoutdata";
+            if(FileEditor.fileExist(filename)){
+                final boolean[] rescout = {DataManager.rescout_list.contains(filename)};
+
+                text.setBackgroundColor(rescout[0] ? color_rescout : color_found);
+
+                text.setOnLongClickListener(view -> {
+                    rescout[0] = !rescout[0];
+                    if(rescout[0]) {
+                        text.setBackgroundColor(color_rescout);
+                        DataManager.rescout_list.add(filename);
+                    }else{
+                        text.setBackgroundColor(color_found);
+                        DataManager.rescout_list.remove(filename);
+                    }
+                    DataManager.save_rescout_list();
+                    return true;
+                });
+            }else{
+                text.setBackgroundColor(color_not_found);
+            }
+            tr.addView(text);
+        }
+        if(tr != null)
+            binding.teamsTable.addView(tr);
+    }
+
+
+    public void add_match_scouting(frcEvent event){
+
+
+        if(SettingsManager.getCustomEvents()){
+            binding.matchesMinusBtn.setVisibility(View.VISIBLE);
+            binding.matchesMinusBtn.setOnClickListener(view -> removeMatch());
+            binding.matchesPlusBtn.setVisibility(View.VISIBLE);
+            binding.matchesPlusBtn.setOnClickListener(view -> addMatch());
+        }
+
+        TableRow tr = new TableRow(getContext());
+        addTableText(tr, "#");
+        addTableText(tr, "Red-1");
+        addTableText(tr, "Red-2");
+        addTableText(tr, "Red-3");
+        addTableText(tr, "Blue-1");
+        addTableText(tr, "Blue-2");
+        addTableText(tr, "Blue-3");
+        binding.matchTable.addView(tr);
+
+        for(frcMatch match : event.matches){
+
+            tr = new TableRow(getContext());
+            addTableText(tr, String.valueOf(match.matchIndex));
+//
+            for(int i=0;i<6;i++){
+                TextView text = new TextView(getContext());
+                text.setTextSize(18);
+                text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+
+                int team_num;
+                String alliance_position;
+
+                if(i < 3){
+                    team_num = match.redAlliance[i];
+                    alliance_position = "red-"+(i+1);
+                }else{
+                    team_num = match.blueAlliance[i-3];
+                    alliance_position = "blue-"+(i-2);
+                }
+
+                text.setText(String.valueOf(team_num));
+                final String filename = event.eventCode + "-" + match.matchIndex + "-" + alliance_position + "-" + team_num + ".matchscoutdata";
+                if(FileEditor.fileExist(filename)){
+                    final boolean[] rescout = {DataManager.rescout_list.contains(filename)};
+
+                    text.setBackgroundColor(rescout[0] ? color_rescout : color_found);
+
+                    text.setOnLongClickListener(view -> {
+                        rescout[0] = !rescout[0];
+                        if(rescout[0]) {
+                            text.setBackgroundColor(color_rescout);
+                            DataManager.rescout_list.add(filename);
+                        }else{
+                            text.setBackgroundColor(color_found);
+                            DataManager.rescout_list.remove(filename);
+                        }
+                        DataManager.save_rescout_list();
+                        return true;
+                    });
+
+                }else{
+                    text.setBackgroundColor(color_not_found);
+                }
+                tr.addView(text);
+            }
+
+            binding.matchTable.addView(tr);
+        }
+    }
+
+    public void addTeam(){
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("Add team");
+
+        LinearLayout ll = new LinearLayout(getContext());
+        ll.setOrientation(LinearLayout.VERTICAL);
+
+        EditText teamNum = new EditText(getContext());
+        teamNum.setHint("Team Number");
+        teamNum.setInputType(InputType.TYPE_CLASS_NUMBER);
+        ll.addView(teamNum);
+
+        EditText teamName = new EditText(getContext());
+        teamName.setHint("Team Name");
+        ll.addView(teamName);
+
+        EditText school = new EditText(getContext());
+        school.setHint("School");
+        ll.addView(school);
+
+        EditText city = new EditText(getContext());
+        city.setHint("City");
+        ll.addView(city);
+
+        EditText stateOrProv = new EditText(getContext());
+        stateOrProv.setHint("State Or Province");
+        ll.addView(stateOrProv);
+
+        EditText country = new EditText(getContext());
+        country.setHint("Country");
+        ll.addView(country);
+
+        EditText startingYear = new EditText(getContext());
+        startingYear.setHint("Starting Year");
+        startingYear.setInputType(InputType.TYPE_CLASS_NUMBER);
+        ll.addView(startingYear);
+
+        builder.setView(ll);
+
+        builder.setNeutralButton("Cancel", (dialogInterface, i) -> {});
+        builder.setPositiveButton("OK", (dialogInterface, i) -> {
+            if(teamNum.getText().toString().isEmpty() || teamName.getText().toString().isEmpty()) return;
+            frcTeam team = new frcTeam();
+            team.teamNumber = Integer.parseInt(teamNum.getText().toString());
+            team.teamName = teamName.getText().toString();
+            team.school = school.getText().toString();
+            team.city = city.getText().toString();
+            team.country = country.getText().toString();
+            team.stateOrProv = stateOrProv.getText().toString();
+            team.startingYear = safeToInt(startingYear.getText().toString());
+
+            event.teams.add(team);
+            FileEditor.setEvent(event);
+            reloadTable();
+        });
+
+        builder.create().show();
+
+    }
+    public void removeTeam(){
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("Remove team");
+
+        CustomSpinnerView dropdown = new CustomSpinnerView(getContext());
+
+        List<String> teamNums = new ArrayList<>();
+        for(int i = 0 ;i < event.teams.size(); i++)
+            teamNums.add(String.valueOf(event.teams.get(i).teamNumber));
+
+
+        dropdown.setTitle("Teams");
+        dropdown.setOptions(teamNums, -1);
+
+        builder.setView(dropdown);
+
+        builder.setNeutralButton("Cancel", (dialogInterface, i) -> {});
+        builder.setPositiveButton("OK", (dialogInterface, i) -> {
+
+            int index = dropdown.getIndex();
+            System.out.println(index);
+            if(!(index >= 0 && index < teamNums.size())) return;
+
+            event.teams.remove(index);
+            FileEditor.setEvent(event);
+            reloadTable();
+        });
+
+        builder.create().show();
+
+    }
+    public void addMatch(){
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("Add match");
+
+        List<String> teamNums = new ArrayList<>();
+        for(int i = 0 ;i < event.teams.size(); i++)
+            teamNums.add(String.valueOf(event.teams.get(i).teamNumber));
+
+        ScrollView sv = new ScrollView(getContext());
+//        sv.setLayoutDirection(ScrollView.SCROLL_AXIS_VERTICAL);
+
+        LinearLayout ll = new LinearLayout(getContext());
+        ll.setOrientation(LinearLayout.VERTICAL);
+        sv.addView(ll);
+
+        CustomSpinnerView Red1dropdown = new CustomSpinnerView(getContext());
+        Red1dropdown.setTitle("Red-1");
+        Red1dropdown.setOptions(teamNums, -1);
+        ll.addView(Red1dropdown);
+
+        CustomSpinnerView Red2dropdown = new CustomSpinnerView(getContext());
+        Red2dropdown.setTitle("Red-2");
+        Red2dropdown.setOptions(teamNums, -1);
+        ll.addView(Red2dropdown);
+
+        CustomSpinnerView Red3dropdown = new CustomSpinnerView(getContext());
+        Red3dropdown.setTitle("Red-3");
+        Red3dropdown.setOptions(teamNums, -1);
+        ll.addView(Red3dropdown);
+
+
+        CustomSpinnerView Blue1dropdown = new CustomSpinnerView(getContext());
+        Blue1dropdown.setTitle("Blue-1");
+        Blue1dropdown.setOptions(teamNums, -1);
+        ll.addView(Blue1dropdown);
+
+        CustomSpinnerView Blue2dropdown = new CustomSpinnerView(getContext());
+        Blue2dropdown.setTitle("Blue-2");
+        Blue2dropdown.setOptions(teamNums, -1);
+        ll.addView(Blue2dropdown);
+
+        CustomSpinnerView Blue3dropdown = new CustomSpinnerView(getContext());
+        Blue3dropdown.setTitle("Blue-3");
+        Blue3dropdown.setOptions(teamNums, -1);
+        ll.addView(Blue3dropdown);
+
+        builder.setView(sv);
+
+        builder.setNeutralButton("Cancel", (dialogInterface, i) -> {});
+        builder.setPositiveButton("OK", (dialogInterface, i) -> {
+            int red1index = Red1dropdown.getIndex();
+            int red2index = Red2dropdown.getIndex();
+            int red3index = Red3dropdown.getIndex();
+            int blue1index = Blue1dropdown.getIndex();
+            int blue2index = Blue2dropdown.getIndex();
+            int blue3index = Blue3dropdown.getIndex();
+
+            if(red1index == -1 || red2index == -1 || red3index == -1 || blue1index == -1 || blue2index == -1 || blue3index == -1) return;
+
+            frcMatch match = new frcMatch();
+            match.matchIndex = event.matches.size() + 1;
+            match.redAlliance = new int[] {
+                event.teams.get(red1index).teamNumber,
+                event.teams.get(red2index).teamNumber,
+                event.teams.get(red3index).teamNumber
+            };
+            match.blueAlliance = new int[] {
+                event.teams.get(blue1index).teamNumber,
+                event.teams.get(blue2index).teamNumber,
+                event.teams.get(blue3index).teamNumber
+            };
+
+            event.matches.add(match);
+            FileEditor.setEvent(event);
+            reloadTable();
+        });
+
+        builder.create().show();
+
+
+
+
+    }
+    public void removeMatch(){
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("Remove match");
+
+        List<String> matches = new ArrayList<>();
+        for(int i = 0 ;i < event.matches.size(); i++) {
+            frcMatch match = event.matches.get(i);
+            matches.add(match.matchIndex + " - " + Arrays.toString(match.redAlliance) + ", " + Arrays.toString(match.blueAlliance));
+        }
+
+        CustomSpinnerView dropdown = new CustomSpinnerView(getContext());
+        dropdown.setTitle("Matches");
+        dropdown.setOptions(matches, -1);
+
+        builder.setView(dropdown);
+
+        builder.setNeutralButton("Cancel", (dialogInterface, i) -> {});
+        builder.setPositiveButton("OK", (dialogInterface, i) -> {
+                if(dropdown.getIndex() == -1) return;
+                event.matches.remove(dropdown.getIndex());
+                FileEditor.setEvent(event);
+                reloadTable();
+        });
+
+        builder.create().show();
+
+    }
+
+
+    public int safeToInt(String str){
+        try{
+            return Integer.parseInt(str);
+        }catch (Exception e){
+            return 0;
+        }
+    }
+}

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

@@ -1,12 +1,15 @@
-package com.astatin3.scoutingapp2025.ui.scouting;
+package com.ridgebotics.ridgescout.ui.scouting;
 
-import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
-import static com.astatin3.scoutingapp2025.utility.DataManager.event;
+import static com.ridgebotics.ridgescout.utility.AutoSaveManager.AUTO_SAVE_DELAY;
+import static com.ridgebotics.ridgescout.utility.Colors.rescout_color;
+import static com.ridgebotics.ridgescout.utility.Colors.saved_color;
+import static com.ridgebotics.ridgescout.utility.Colors.unsaved_color;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -15,21 +18,21 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentScoutingMatchBinding;
-import com.astatin3.scoutingapp2025.scoutingData.ScoutingDataWriter;
-import com.astatin3.scoutingapp2025.types.data.dataType;
-import com.astatin3.scoutingapp2025.types.frcMatch;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.types.input.inputType;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.AutoSaveManager;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-
-import java.util.ArrayList;
-import java.util.function.Function;
+import com.google.android.material.divider.MaterialDivider;
+import com.ridgebotics.ridgescout.ui.views.ToggleTitleView;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+import com.ridgebotics.ridgescout.databinding.FragmentScoutingMatchBinding;
+import com.ridgebotics.ridgescout.scoutingData.ScoutingDataWriter;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.frcMatch;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.AutoSaveManager;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
 
+// Fragment for match scouting data editing.
 public class MatchScoutingFragment extends Fragment {
 
     private FragmentScoutingMatchBinding binding;
@@ -42,17 +45,15 @@ public class MatchScoutingFragment extends Fragment {
 
         DataManager.reload_match_fields();
 
-        alliance_position = latestSettings.settings.get_alliance_pos();
-        username = latestSettings.settings.get_username();
+        alliance_position = SettingsManager.getAllyPos();
+        username = SettingsManager.getUsername();
 
         binding.username.setText(username);
         binding.alliancePosText.setText(alliance_position);
 
-        binding.teamDescription.setVisibility(View.GONE);
-        binding.teamName.setVisibility(View.GONE);
+        binding.matchTeamCard.setVisibility(View.GONE);
         clear_fields();
-        binding.teamDescription.setVisibility(View.VISIBLE);
-        binding.teamName.setVisibility(View.VISIBLE);
+        binding.matchTeamCard.setVisibility(View.VISIBLE);
 
         if(DataManager.match_values == null || DataManager.match_values.length == 0){
             TextView tv = new TextView(getContext());
@@ -64,37 +65,32 @@ public class MatchScoutingFragment extends Fragment {
 
 
 
-
-        cur_match_num = latestSettings.settings.get_match_num();
-        update_match_num();
-
         binding.nextButton.setOnClickListener(v -> {
             if(edited) save();
-            latestSettings.settings.set_match_num(cur_match_num+1);
+            SettingsManager.setMatchNum(cur_match_num+1);
             cur_match_num += 1;
             update_match_num();
             update_scouting_data();
         });
 
+        if(SettingsManager.getEnableQuickAlliancePosChange())
+            binding.fileIndicator.setOnClickListener(v -> {
+    //            if(e.getAction() != MotionEvent.ACTION_MOVE) return true;
+    //            System.out.println(e.getAxisValue(0));
+                if(edited) save();
 
-        boolean fileIndicatorTapped = false;
-        binding.fileIndicator.setOnClickListener(v -> {
-//            if(e.getAction() != MotionEvent.ACTION_MOVE) return true;
-//            System.out.println(e.getAxisValue(0));
-            if(edited) save();
+                alliance_position = incrementMatchPos(alliance_position);
+                SettingsManager.setAllyPos(alliance_position);
+                binding.alliancePosText.setText(alliance_position);
 
-            alliance_position = incrementMatchPos(alliance_position);
-            latestSettings.settings.set_alliance_pos(alliance_position);
-            binding.alliancePosText.setText(alliance_position);
-
-            update_match_num();
-            update_scouting_data();
-//            return true;
-        });
+                update_match_num();
+                update_scouting_data();
+    //            return true;
+            });
 
         binding.backButton.setOnClickListener(v -> {
             if(edited) save();
-            latestSettings.settings.set_match_num(cur_match_num-1);
+            SettingsManager.setMatchNum(cur_match_num-1);
             cur_match_num -= 1;
             update_match_num();
             update_scouting_data();
@@ -104,9 +100,22 @@ public class MatchScoutingFragment extends Fragment {
 //            if(edited) save();
 //        });
 
+        cur_match_num = SettingsManager.getMatchNum();
+
+        if(cur_match_num >= event.matches.size()) {
+            cur_match_num = 0;
+            SettingsManager.setMatchNum(0);
+        }
+
+        update_match_num();
         create_fields();
         update_scouting_data();
 
+        if(DataManager.scoutNotice.isEmpty())
+            binding.scoutingNoticeBox.setVisibility(View.GONE);
+        else
+            binding.scoutingNoticeText.setText(DataManager.scoutNotice);
+
         return binding.getRoot();
     }
 
@@ -128,28 +137,22 @@ public class MatchScoutingFragment extends Fragment {
         return "red-1";
     }
 
-    private static final int unsaved_color = 0x60ff0000;
-    private static final int saved_color = 0x6000ff00;
-
     String alliance_position;
     int cur_match_num;
     String username;
+    String fileUsernames = "";
     String filename;
-
     boolean edited = false;
-
-    TextView[] titles;
-
-    AutoSaveManager asm = new AutoSaveManager(this::save);
-
-    ArrayList<dataType> dataTypes;
+    boolean rescout = false;
+    ToggleTitleView[] titles;
+    AutoSaveManager asm = new AutoSaveManager(this::save, AUTO_SAVE_DELAY);
 
 
 
     public void save(){
         System.out.println("Saved!");
         edited = false;
-        set_indicator_color(saved_color);
+        enableRescoutButton();
         AlertManager.toast("Saved " + filename);
         save_fields();
     }
@@ -162,6 +165,7 @@ public class MatchScoutingFragment extends Fragment {
 //        v.getBackground().setColorFilter(Color.parseColor("#00ff00"), PorterDuff.Mode.DARKEN);
         edited = true;
         set_indicator_color(unsaved_color);
+        disableRescoutButton();
         asm.update();
     }
 
@@ -187,48 +191,41 @@ public class MatchScoutingFragment extends Fragment {
             asm.stop();
         }
 
-        titles = new TextView[DataManager.match_latest_values.length];
+        titles = new ToggleTitleView[DataManager.match_latest_values.length];
 
         for(int i = 0 ; i < DataManager.match_latest_values.length; i++) {
-            final TextView tv = new TextView(getContext());
-            tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
-            tv.setText(DataManager.match_latest_values[i].name);
-            tv.setPadding(8,8,8,8);
-            tv.setTextSize(24);
-            titles[i] = tv;
+            binding.MatchScoutArea.addView(new MaterialDivider(getContext()));
 
-            default_text_color = tv.getCurrentTextColor();
 
-            final View v = DataManager.match_latest_values[i].createView(getContext(), new Function<dataType, Integer>() {
-                @Override
-                public Integer apply(dataType dataType) {
-//                    edited = true;
-                    if(asm.isRunning)
-                        update_asm();
-                    return 0;
-                }
+            final ToggleTitleView ttv = new ToggleTitleView(getContext());
+            ttv.setTitle(DataManager.match_latest_values[i].name);
+            ttv.setDescription(DataManager.match_latest_values[i].description);
+            titles[i] = ttv;
+
+
+            final View v = DataManager.match_latest_values[i].createView(getContext(), dataType -> {
+//                edited = true;
+                if(asm.isRunning)
+                    update_asm();
+                return 0;
             });
 
-            binding.MatchScoutArea.addView(tv);
+            binding.MatchScoutArea.addView(ttv);
             int fi = i;
-            tv.setOnClickListener(p -> {
-//                boolean blank = !latest_values[fi].getViewValue().isNull();
 
-//                System.out.println(blank);
+            ttv.setOnToggleListener(enabled -> {
                 if(asm.isRunning)
                     update_asm();
 
-                if(!DataManager.match_latest_values[fi].isBlank){
-                    tv.setBackgroundColor(0xffff0000);
-                    tv.setTextColor(0xff000000);
+//                System.out.println("Checked!");
+
+                if(enabled){
                     DataManager.match_latest_values[fi].nullify();
-                }else{
-                    tv.setBackgroundColor(0x00000000);
-                    tv.setTextColor(default_text_color);
+                }else
                     DataManager.match_latest_values[fi].setViewValue(DataManager.match_latest_values[fi].default_value);
-                }
             });
 
+
             binding.MatchScoutArea.addView(v);
         }
     }
@@ -287,6 +284,8 @@ public class MatchScoutingFragment extends Fragment {
 
         filename = evcode + "-" + (cur_match_num+1) + "-" + alliance_position + "-" + team_num + ".matchscoutdata";
 
+        rescout = DataManager.rescout_list.contains(filename);
+
         return team;
     }
 
@@ -298,10 +297,16 @@ public class MatchScoutingFragment extends Fragment {
         frcMatch match = event.matches.get(cur_match_num);
         frcTeam team = get_team(match);
 
-        binding.teamName.setText(team.teamName);
-        binding.teamDescription.setText(team.getDescription());
+        if(team == null) {
+            AlertManager.addSimpleError("This team does not exist!");
+            binding.matchTeamCard.setTeamName("Error!");
+            binding.matchTeamCard.setTeamDescription("Error!");
+            return;
+        }
 
-        boolean new_file = !fileEditor.fileExist(filename);
+        binding.matchTeamCard.fromTeam(team);
+
+        boolean new_file = !FileEditor.fileExist(filename);
 
         if(asm.isRunning){
             asm.stop();
@@ -310,9 +315,17 @@ public class MatchScoutingFragment extends Fragment {
         if(new_file){
             default_fields();
             set_indicator_color(unsaved_color);
+            disableRescoutButton();
         }else{
-            get_fields();
-            set_indicator_color(saved_color);
+            try {
+                get_fields();
+                enableRescoutButton();
+            } catch (Exception e){
+                AlertManager.error(e);
+                default_fields();
+                set_indicator_color(unsaved_color);
+                disableRescoutButton();
+            }
         }
 
         asm.start();
@@ -323,11 +336,10 @@ public class MatchScoutingFragment extends Fragment {
 
     public void default_fields(){
         for(int i = 0; i < DataManager.match_latest_values.length; i++){
-            inputType input = DataManager.match_latest_values[i];
+            FieldType input = DataManager.match_latest_values[i];
             input.setViewValue(input.default_value);
 
-            titles[i].setBackgroundColor(0x00000000);
-            titles[i].setTextColor(default_text_color);
+            titles[i].enable();
         }
     }
 
@@ -336,7 +348,9 @@ public class MatchScoutingFragment extends Fragment {
     public void get_fields(){
 
         ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.match_values, DataManager.match_transferValues);
-        dataType[] types = psdr.data.array;
+        RawDataType[] types = psdr.data.array;
+        fileUsernames = psdr.username;
+
 
         for(int i = 0; i < DataManager.match_latest_values.length; i++){
 //            types[i] = latest_values[i].getViewValue();
@@ -347,14 +361,8 @@ public class MatchScoutingFragment extends Fragment {
                 DataManager.match_latest_values[i].setViewValue(DataManager.match_latest_values[i].default_value);
             }
 
+            titles[i].setEnabled(DataManager.match_latest_values[i].isBlank);
 
-            if(DataManager.match_latest_values[i].isBlank){
-                titles[i].setBackgroundColor(0xffff0000);
-                titles[i].setTextColor(0xff000000);
-            }else{
-                titles[i].setBackgroundColor(0x00000000);
-                titles[i].setTextColor(default_text_color);
-            }
         }
     }
 
@@ -362,15 +370,37 @@ public class MatchScoutingFragment extends Fragment {
 
     public void save_fields(){
 
-        dataType[] types = new dataType[DataManager.match_latest_values.length];
+        RawDataType[] types = new RawDataType[DataManager.match_latest_values.length];
 
         for(int i = 0; i < DataManager.match_latest_values.length; i++){
             types[i] = DataManager.match_latest_values[i].getViewValue();
         }
 
-        if(ScoutingDataWriter.save(DataManager.match_values.length-1, username, filename, types))
+        if(ScoutingDataWriter.save(DataManager.match_values.length-1, ScoutingDataWriter.checkAddName(fileUsernames, username), filename, types))
             System.out.println("Saved!");
         else
             System.out.println("Error saving");
     }
+
+    private void enableRescoutButton(){
+        set_indicator_color(rescout ? rescout_color : saved_color);
+        binding.fileIndicator.setOnLongClickListener(v -> {
+            rescout = !rescout;
+            if(rescout){
+                set_indicator_color(rescout_color);
+                DataManager.rescout_list.add(filename);
+                DataManager.save_rescout_list();
+            }else{
+                set_indicator_color(saved_color);
+                DataManager.rescout_list.remove(filename);
+                DataManager.save_rescout_list();
+            }
+
+            return true;
+        });
+    }
+
+    private void disableRescoutButton(){
+        binding.fileIndicator.setOnLongClickListener(null);
+    }
 }

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

@@ -0,0 +1,244 @@
+package com.ridgebotics.ridgescout.ui.scouting;
+
+import static com.ridgebotics.ridgescout.utility.AutoSaveManager.AUTO_SAVE_DELAY;
+import static com.ridgebotics.ridgescout.utility.Colors.rescout_color;
+import static com.ridgebotics.ridgescout.utility.Colors.saved_color;
+import static com.ridgebotics.ridgescout.utility.Colors.unsaved_color;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_latest_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_transferValues;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_values;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.material.divider.MaterialDivider;
+import com.ridgebotics.ridgescout.ui.views.ToggleTitleView;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+import com.ridgebotics.ridgescout.databinding.FragmentScoutingPitBinding;
+import com.ridgebotics.ridgescout.scoutingData.ScoutingDataWriter;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+import com.ridgebotics.ridgescout.utility.AutoSaveManager;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+import java.util.ArrayList;
+import java.util.function.Function;
+
+// Fragment for pit scouting data editing
+public class PitScoutingFragment extends Fragment {
+
+    FragmentScoutingPitBinding binding;
+
+    private static frcTeam team;
+    public static void setTeam(frcTeam tmpteam){
+        team = tmpteam;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentScoutingPitBinding.inflate(inflater, container, false);
+
+        username = SettingsManager.getUsername();
+        DataManager.reload_pit_fields();
+
+        if(pit_latest_values == null) {
+            AlertManager.addSimpleError("Error loading pit fields!");
+            return binding.getRoot();
+        }
+
+        if(DataManager.scoutNotice.isEmpty())
+            binding.scoutingNoticeBox.setVisibility(View.GONE);
+        else
+            binding.scoutingNoticeText.setText(DataManager.scoutNotice);
+
+        loadTeam();
+
+        return binding.getRoot();
+    }
+    boolean edited = false;
+    boolean rescout = false;
+
+    String filename;
+    String username;
+
+    String fileUsernames = "";
+    ToggleTitleView[] titles;
+
+    AutoSaveManager asm = new AutoSaveManager(this::save, AUTO_SAVE_DELAY);
+
+    ArrayList<RawDataType> rawDataTypes;
+
+    public void save(){
+        edited = false;
+        enableRescoutButton();
+
+        RawDataType[] types = new RawDataType[pit_latest_values.length];
+
+        for(int i = 0; i < pit_latest_values.length; i++){
+            types[i] = pit_latest_values[i].getViewValue();
+        }
+
+        if(ScoutingDataWriter.save(pit_values.length-1, ScoutingDataWriter.checkAddName(fileUsernames, username), filename, types)) {
+            System.out.println("Saved!");
+            AlertManager.toast("Saved " + filename);
+        }else
+            System.out.println("Error saving");
+    }
+
+    public void set_indicator_color(int color){
+        binding.pitFileIndicator.setBackgroundColor(color);
+    }
+
+    public void update_asm(){
+//        v.getBackground().setColorFilter(Color.parseColor("#00ff00"), PorterDuff.Mode.DARKEN);
+        edited = true;
+        set_indicator_color(unsaved_color);
+        disableRescoutButton();
+        asm.update();
+    }
+
+
+    public void loadTeam(){
+//        clear_fields();
+
+        binding.pitFileIndicator.setVisibility(View.VISIBLE);
+        binding.pitsTeamCard.setVisibility(View.VISIBLE);
+        binding.pitBarTeamNum.setText(String.valueOf(team.teamNumber));
+        binding.pitUsername.setText(SettingsManager.getUsername());
+        binding.pitsTeamCard.fromTeam(team);
+
+        filename = evcode + "-" + team.teamNumber + ".pitscoutdata";
+        rescout = DataManager.rescout_list.contains(filename);
+
+        if(asm.isRunning){
+            asm.stop();
+        }
+
+        create_fields();
+
+        if(!FileEditor.fileExist(filename)){
+            default_fields();
+            set_indicator_color(unsaved_color);
+            disableRescoutButton();
+        }else{
+            try {
+                get_fields();
+
+                enableRescoutButton();
+
+            } catch (Exception e){
+                AlertManager.error(e);
+                default_fields();
+                set_indicator_color(unsaved_color);
+            }
+        }
+
+        binding.pitFileIndicator.bringToFront();
+
+        asm.start();
+
+    }
+
+    private void enableRescoutButton(){
+        set_indicator_color(rescout ? rescout_color : saved_color);
+        binding.pitFileIndicator.setOnLongClickListener(v -> {
+            rescout = !rescout;
+            if(rescout){
+                set_indicator_color(rescout_color);
+                DataManager.rescout_list.add(filename);
+                DataManager.save_rescout_list();
+            }else{
+                set_indicator_color(saved_color);
+                DataManager.rescout_list.remove(filename);
+                DataManager.save_rescout_list();
+            }
+
+            return true;
+        });
+    }
+
+    private void disableRescoutButton(){
+        binding.pitFileIndicator.setOnLongClickListener(null);
+    }
+
+
+    private void create_fields() {
+        if(asm.isRunning){
+            asm.stop();
+        }
+
+        titles = new ToggleTitleView[pit_latest_values.length];
+
+        for(int i = 0 ; i < pit_latest_values.length; i++) {
+            binding.pitScoutArea.addView(new MaterialDivider(getContext()));
+
+            ToggleTitleView ttv = new ToggleTitleView(getContext());
+            ttv.setTitle(pit_latest_values[i].name);
+            ttv.setDescription(pit_latest_values[i].description);
+            titles[i] = ttv;
+            binding.pitScoutArea.addView(ttv);
+
+
+            int fi = i;
+            ttv.setOnToggleListener(enabled -> {
+                update_asm();
+
+                if(enabled){
+                    pit_latest_values[fi].nullify();
+                }else{
+                    pit_latest_values[fi].setViewValue(pit_latest_values[fi].default_value);
+                }
+            });
+
+            View v = pit_latest_values[i].createView(getContext(), new Function<RawDataType, Integer>() {
+                @Override
+                public Integer apply(RawDataType dataType) {
+//                    edited = true;
+                    if(asm.isRunning)
+                        update_asm();
+                    return 0;
+                }
+            });
+
+            binding.pitScoutArea.addView(v);
+        }
+    }
+
+    public void default_fields(){
+        for(int i = 0; i < pit_latest_values.length; i++){
+            FieldType input = pit_latest_values[i];
+            input.setViewValue(input.default_value);
+            titles[i].enable();
+        }
+    }
+
+    public void get_fields(){
+
+        ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, pit_values, pit_transferValues);
+        RawDataType[] types = psdr.data.array;
+        fileUsernames = psdr.username;
+
+
+        for(int i = 0; i < pit_latest_values.length; i++){
+            pit_latest_values[i].setViewValue(types[i]);
+
+            if(pit_latest_values[i].isBlank){
+                titles[i].disable();
+            }else{
+                titles[i].enable();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.ridgebotics.ridgescout.ui.scouting;
+
+import static com.ridgebotics.ridgescout.utility.Colors.color_found;
+import static com.ridgebotics.ridgescout.utility.Colors.color_not_found;
+import static com.ridgebotics.ridgescout.utility.Colors.color_rescout;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TableLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.databinding.FragmentTeamSelectorBinding;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.ui.views.TeamListOption;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+import java.util.Arrays;
+
+// Fragment for choosing which team to pit scout
+public class PitSelectorFragment extends Fragment {
+    private FragmentTeamSelectorBinding binding;
+
+    private static onTeamSelected onSelect = new onTeamSelected() {@Override public void onSelect(PitSelectorFragment self, frcTeam team) {}};
+
+    public interface onTeamSelected {
+        void onSelect(PitSelectorFragment self, frcTeam team);
+    }
+    public static void setOnSelect(onTeamSelected tmponSelect){
+        onSelect = tmponSelect;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        binding = FragmentTeamSelectorBinding.inflate(inflater, container, false);
+
+//        event = fileEditor.g
+        DataManager.reload_event();
+
+        if(evcode == null || evcode.equals("unset")){
+            AlertManager.addSimpleError("You somehow have not loaded an event!");
+            return binding.getRoot();
+        }
+
+        load_teams();
+
+
+        return binding.getRoot();
+    }
+
+    public void load_teams(){
+//        binding.pitFileIndicator.setVisibility(View.GONE);
+//        binding.pitTeamName.setVisibility(View.GONE);
+//        binding.pitTeamDescription.setVisibility(View.GONE);
+//
+//        clear_fields();
+
+
+        int[] teamNums = new int[event.teams.size()];
+
+        for(int i = 0 ; i < event.teams.size(); i++){
+            teamNums[i] = event.teams.get(i).teamNumber;
+        }
+
+        Arrays.sort(teamNums);
+
+        TableLayout table = new TableLayout(getContext());
+        table.setStretchAllColumns(true);
+        binding.teams.addView(table);
+
+
+        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;
+
+//            TableRow tr = new TableRow(getContext());
+//            TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
+//                    FrameLayout.LayoutParams.WRAP_CONTENT,
+//                    FrameLayout.LayoutParams.WRAP_CONTENT
+//            );
+//            rowParams.setMargins(20,20,20,20);
+//            tr.setLayoutParams(rowParams);
+//            tr.setPadding(20,20,20,20);
+//            table.addView(tr);
+
+            TeamListOption teamRow = new TeamListOption(getContext());
+            table.addView(teamRow);
+            teamRow.fromTeam(team);
+
+
+            String filename = evcode + "-" + team.teamNumber + ".pitscoutdata";
+
+            if (FileEditor.fileExist(filename)) {
+                final boolean[] rescout = {DataManager.rescout_list.contains(filename)};
+
+                teamRow.setColor(DataManager.rescout_list.contains(filename) ? color_rescout : color_found);
+
+                teamRow.setOnLongClickListener(v -> {
+                    rescout[0] = !rescout[0];
+                    if(rescout[0]){
+                        DataManager.rescout_list.add(filename);
+                        teamRow.setColor(color_rescout);
+                        DataManager.save_rescout_list();
+                    }else{
+                        DataManager.rescout_list.remove(filename);
+                        teamRow.setColor(color_found);
+                        DataManager.save_rescout_list();
+                    }
+
+
+                    return true;
+                });
+            } else {
+                teamRow.setColor(color_not_found);
+                teamRow.setOnLongClickListener(v -> true);
+            }
+
+
+            frcTeam finalTeam = team;
+            teamRow.setOnClickListener(v -> onSelect.onSelect(this, finalTeam));
+        }
+    }
+
+}

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

@@ -0,0 +1,162 @@
+package com.ridgebotics.ridgescout.ui.scouting;
+
+import static android.widget.LinearLayout.VERTICAL;
+import static androidx.navigation.fragment.FragmentKt.findNavController;
+
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.types.frcEvent;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+import com.ridgebotics.ridgescout.databinding.FragmentScoutingBinding;
+import com.ridgebotics.ridgescout.utility.DataManager;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+// Main dashbord page
+public class ScoutingFragment extends Fragment {
+
+    private FragmentScoutingBinding binding;
+    private boolean is_main_page = true;
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentScoutingBinding.inflate(inflater, container, false);
+
+        binding.buttons.setVisibility(View.VISIBLE);
+
+        DataManager.reload_event();
+
+        if(SettingsManager.getCustomEvents()){
+            binding.eventAddButton.setVisibility(View.VISIBLE);
+            binding.eventAddButton.setOnClickListener(view -> {
+                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle("Chose event name");
+
+                LinearLayout layout = new LinearLayout(getContext());
+                layout.setOrientation(VERTICAL);
+                EditText eventName = new EditText(getContext());
+                eventName.setHint("Event Name");
+                EditText eventCode = new EditText(getContext());
+                eventCode.setHint("Event Code");
+                layout.addView(eventName);
+                layout.addView(eventCode);
+
+
+                builder.setPositiveButton("Create", (dialog, which) -> {
+                    String name = eventName.getText().toString();
+                    String code = eventCode.getText().toString();
+                    if(name.isEmpty() || code.isEmpty()) return;
+
+                    frcEvent event = new frcEvent();
+                    event.name = name;
+                    event.eventCode = code;
+                    event.teams = new ArrayList<>();
+                    event.matches = new ArrayList<>();
+
+                    FileEditor.setEvent(event);
+
+
+                });
+                builder.setNeutralButton("Cancel", (dialog, which) -> {});
+
+                builder.setView(layout);
+                builder.create().show();
+            });
+        }
+
+        if(event == null){
+            binding.noEventError.setVisibility(View.VISIBLE);
+
+            binding.textMatchAlliance.setVisibility(View.GONE);
+            binding.textName.setVisibility(View.GONE);
+            binding.textNextMatch.setVisibility(View.GONE);
+            binding.textRescoutIndicator.setVisibility(View.GONE);
+
+            binding.matchScoutingButton.setEnabled(false);
+            binding.pitScoutingButton.setEnabled(false);
+            binding.eventButton.setEnabled(false);
+            is_main_page = false;
+            return binding.getRoot();
+        }
+
+        if(event.matches.isEmpty()){
+            binding.matchScoutingButton.setEnabled(false);
+        }
+
+        if(event.teams.isEmpty()){
+            binding.pitScoutingButton.setEnabled(false);
+        }
+
+        binding.matchScoutingButton.setOnClickListener(v -> {
+            findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_match_scouting);
+        });
+
+        binding.pitScoutingButton.setOnClickListener(v -> {
+            PitSelectorFragment.setOnSelect((self, team) -> {
+                PitScoutingFragment.setTeam(team);
+                findNavController(self).navigate(R.id.action_navigation_scouting_pit_selector_to_navigation_pit_scouting);
+            });
+            findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_scouting_pit_selector);
+        });
+
+        binding.eventButton.setOnClickListener(v -> {
+            findNavController(this).navigate(R.id.action_navigation_scouting_to_navigation_scouting_event);
+        });
+
+
+        binding.textName.setText("Welcome, " + SettingsManager.getUsername() + "!");
+
+        int matchNum = SettingsManager.getMatchNum();
+        int nextMatch = event.getNextTeamMatch(SettingsManager.getTeamNum(), matchNum).matchIndex;
+
+        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();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if(getView() == null){
+            return;
+        }
+
+        getView().setFocusableInTouchMode(true);
+        getView().requestFocus();
+        getView().setOnKeyListener((v, keyCode, event) -> {
+
+            if (event.getAction() == KeyEvent.ACTION_UP
+                    && keyCode == KeyEvent.KEYCODE_BACK
+                    && !is_main_page){
+
+                is_main_page = true;
+
+                return true;
+            }
+            return false;
+        });
+    }
+
+}

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

@@ -0,0 +1,423 @@
+package com.ridgebotics.ridgescout.ui.settings;
+
+import static android.text.InputType.TYPE_CLASS_NUMBER;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TableLayout;
+import android.widget.TextView;
+
+import com.ridgebotics.ridgescout.types.input.CheckboxType;
+import com.ridgebotics.ridgescout.types.input.DropdownType;
+import com.ridgebotics.ridgescout.types.input.FieldposType;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+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.utility.AlertManager;
+
+import java.lang.reflect.Field;
+import java.util.UUID;
+
+// Class to help with fields editor fragment, containing the defaults for each field.
+public class FieldEditorHelper {
+    private enum parameterTypeEnum {
+        paramNumber,
+        paramString,
+        paramStringArray,
+        paramNumberArray
+    }
+
+    public static class parameterType {
+        public String name;
+        public parameterTypeEnum id;
+    }
+
+    public static class paramNumber extends parameterType{
+        public int val;
+        public paramNumber(String name, int val){
+            this.name = name + " (Number)";
+            this.val = val;
+            this.id = parameterTypeEnum.paramNumber;
+        }
+    }
+
+    public static class paramString extends parameterType {
+        public String val;
+        public paramString(String name, String val){
+            this.name = name + " (String)";
+            this.val = val;
+            this.id = parameterTypeEnum.paramString;
+        }
+    }
+
+    public static class paramStringArray extends parameterType{
+        public String[] val;
+        public paramStringArray(String name, String[] val){
+            this.name = name + " (String array)";
+            this.val = val;
+            this.id = parameterTypeEnum.paramStringArray;
+        }
+    }
+
+//    public static class paramNumberArray extends parameterType{
+//        public int[] val;
+//        public paramNumberArray(String name, int[] val){
+//            this.name = name + " (Number array)";
+//            this.val = val;
+//            this.id = parameterTypeEnum.paramNumberArray;
+//        }
+//    }
+
+    public static final parameterType[] defaultSliderParams = new parameterType[]{
+            new paramString("Name", "New Slider"),
+            new paramString("Description", ""),
+            new paramNumber("Min", 0),
+            new paramNumber("Max", 10),
+            new paramNumber("Default Value", 5)
+    };
+    public static final parameterType[] defaultDropdownParams = new parameterType[]{
+            new paramString("Name", "New Dropdown"),
+            new paramString("Description", ""),
+            new paramStringArray("Default Value", new String[]{"Zero","One","Two","Three"}),
+            new paramNumber("Default Option", 0),
+    };
+    public static final parameterType[] defaultTextParams = new parameterType[]{
+            new paramString("Name", "New Text"),
+            new paramString("Description", ""),
+            new paramString("Default Value", "")
+    };
+    public static final parameterType[] defaultTallyParams = new parameterType[]{
+            new paramString("Name", "New Tally"),
+            new paramString("Description", ""),
+            new paramNumber("Default Value", 0)
+    };
+    public static final parameterType[] defaultNumberParams = new parameterType[]{
+            new paramString("Name", "New Number"),
+            new paramString("Description", ""),
+            new paramNumber("Default Value", 0)
+    };
+    public static final parameterType[] defaultCheckboxParam = new parameterType[]{
+            new paramString("Name", "New Checkbox"),
+            new paramString("Description", ""),
+            new paramNumber("Default Value ( 1 or 0 )", 0)
+    };
+    public static final parameterType[] defaultFieldPosParam = new parameterType[]{
+            new paramString("Name", "New Field Position"),
+            new paramString("Description", ""),
+            new paramNumber("Default X", 0),
+            new paramNumber("Default Y", 0)
+    };
+
+
+    private static parameterType[] getSliderParams(SliderType s){
+        return new parameterType[]{
+            new paramString("Name", s.name),
+            new paramString("Description", s.description),
+            new paramNumber("Min", s.min),
+            new paramNumber("Max", s.max),
+            new paramNumber("Default Value", (int) s.default_value)
+        };
+    }
+
+    private static parameterType[] getDropdownParams(DropdownType s){
+        return new parameterType[]{
+                new paramString("Name", s.name),
+                new paramString("Description", s.description),
+                new paramStringArray("Default Value",s.text_options),
+                new paramNumber("Default Option", (int) s.default_value),
+        };
+    }
+
+    private static parameterType[] getTextParams(TextType s){
+        return new parameterType[]{
+                new paramString("Name", s.name),
+                new paramString("Description", s.description),
+                new paramString("Default Value", (String) s.default_value)
+        };
+    }
+
+    private static parameterType[] getTallyParams(TallyType s){
+        return new parameterType[]{
+                new paramString("Name", s.name),
+                new paramString("Description", s.description),
+                new paramNumber("Default Value", (int) s.default_value)
+        };
+    }
+
+    private static parameterType[] getNumberParams(NumberType s){
+        return new parameterType[]{
+                new paramString("Name", s.name),
+                new paramString("Description", s.description),
+                new paramNumber("Default Value", (int) s.default_value)
+        };
+    }
+
+    private static parameterType[] getCheckboxParam(CheckboxType s){
+        return new parameterType[]{
+                new paramString("Name", s.name),
+                new paramString("Description", s.description),
+                new paramNumber("Default Value ( 1 or 0 )", (int) s.default_value)
+        };
+    }
+
+    private static parameterType[] getFieldPosParam(FieldposType s){
+        return new parameterType[]{
+                new paramString("Name", s.name),
+                new paramString("Description", s.description),
+                new paramNumber("Default X", ((int[]) s.default_value)[0]),
+                new paramNumber("Default Y", ((int[]) s.default_value)[1])
+        };
+    }
+
+
+
+    public static void setSliderParams(SliderType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.min = ((paramNumber) types[2]).val;
+        s.max = ((paramNumber) types[3]).val;
+        s.default_value = ((paramNumber) types[4]).val;
+    }
+
+    public static void setDropdownParams(DropdownType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.text_options = ((paramStringArray) types[2]).val;
+        s.default_value = ((paramNumber) types[3]).val;
+    }
+
+    public static void setTextParams(TextType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.default_value = ((paramString) types[2]).val;
+    }
+
+    public static void setTallyParams(TallyType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.default_value = ((paramNumber) types[2]).val;
+    }
+
+    public static void setNumberParams(NumberType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.default_value = ((paramNumber) types[2]).val;
+    }
+
+    public static void setCheckboxParam(CheckboxType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.default_value = ((paramNumber) types[2]).val;
+    }
+
+    public static void setFieldPosParam(FieldposType s, parameterType[] types){
+        s.name = ((paramString) types[0]).val;
+        s.description = ((paramString) types[1]).val;
+        s.default_value = new int[]{
+                ((paramNumber) types[2]).val,
+                ((paramNumber) types[3]).val
+        };
+    }
+
+
+    private static void setInputParameter(FieldType t, parameterType[] types){
+        switch (t.getInputType()){
+            case TALLY:
+                setTallyParams((TallyType) t, types);
+                break;
+            case SLIDER:
+                setSliderParams((SliderType) t, types);
+                break;
+            case DROPDOWN:
+                setDropdownParams((DropdownType) t, types);
+                break;
+            case NOTES_INPUT:
+                setTextParams((TextType) t, types);
+                break;
+            case NUMBER:
+                setNumberParams((NumberType) t, types);
+                break;
+            case CHECKBOX:
+                setCheckboxParam((CheckboxType) t, types);
+                break;
+            case FIELDPOS:
+                setFieldPosParam((FieldposType) t, types);
+                break;
+        }
+    }
+
+
+
+    private static parameterType[] getParamsFromInputType(FieldType t){
+        switch (t.getInputType()){
+            case TALLY:
+                return getTallyParams((TallyType) t);
+            case SLIDER:
+                return getSliderParams((SliderType) t);
+            case DROPDOWN:
+                return getDropdownParams((DropdownType) t);
+            case NOTES_INPUT:
+                return getTextParams((TextType) t);
+            case NUMBER:
+                return getNumberParams((NumberType) t);
+            case CHECKBOX:
+                return getCheckboxParam((CheckboxType) t);
+            case FIELDPOS:
+                return getFieldPosParam((FieldposType) t);
+        }
+        return new parameterType[]{};
+    }
+
+
+
+    private static View createNumberEdit(Context c, int value){
+        EditText text = new EditText(c);
+        text.setInputType(TYPE_CLASS_NUMBER);
+        text.setText(String.valueOf(value));
+        text.setLayoutParams(new LinearLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        ));
+        return text;
+    }
+
+    private static View createStringEdit(Context c, String 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 createStringArrayEdit(Context c, String[] value){
+        EditText text = new EditText(c);
+        text.setText(String.join("\n", 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){
+            case paramNumber:
+                return createNumberEdit(c, ((paramNumber) t).val);
+            case paramString:
+                return createStringEdit(c, ((paramString) t).val);
+            case paramStringArray:
+                return createStringArrayEdit(c, ((paramStringArray) t).val);
+        }
+        return null;
+    }
+
+
+    private static boolean readEdit(View v, parameterType t){
+        try{
+            String val;
+            switch (t.id) {
+                case paramNumber:
+                    val = ((EditText) v).getText().toString();
+                    if(val.isEmpty() || val.isBlank()) return false;
+                    ((paramNumber) t).val = Integer.parseInt(val);
+                    break;
+                case paramString:
+                    val = ((EditText) v).getText().toString();
+                    //if(val.isEmpty() || val.isBlank()) return false;
+                    ((paramString) t).val = val;
+                    break;
+                case paramStringArray:
+                    val = ((EditText) v).getText().toString();
+                    if(val.isEmpty() || val.isBlank()) return false;
+                    ((paramStringArray) t).val = val.split("\n");
+                    break;
+            }
+        } catch (Exception e) {
+            AlertManager.error(e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public static FieldType createNewFieldType(int n){
+        switch(n){
+            case 0:
+                SliderType slider = new SliderType();
+                slider.UUID = UUID.randomUUID().toString();
+                setSliderParams(slider, defaultSliderParams);
+                return slider;
+            case 1:
+                TextType textType = new TextType();
+                textType.UUID = UUID.randomUUID().toString();
+                setTextParams(textType, defaultTextParams);
+                return textType;
+            case 2:
+                DropdownType dropdownType = new DropdownType();
+                dropdownType.UUID = UUID.randomUUID().toString();
+                setDropdownParams(dropdownType, defaultDropdownParams);
+                return dropdownType;
+            case 3:
+                TallyType tallyType = new TallyType();
+                tallyType.UUID = UUID.randomUUID().toString();
+                setTallyParams(tallyType, defaultTallyParams);
+                return tallyType;
+            case 4:
+                NumberType numberType = new NumberType();
+                numberType.UUID = UUID.randomUUID().toString();
+                setNumberParams(numberType, defaultNumberParams);
+                return numberType;
+            case 5:
+                CheckboxType checkboxType = new CheckboxType();
+                checkboxType.UUID = UUID.randomUUID().toString();
+                setCheckboxParam(checkboxType, defaultCheckboxParam);
+                return checkboxType;
+            case 6:
+                FieldposType fieldposType = new FieldposType();
+                fieldposType.UUID = UUID.randomUUID().toString();
+                setFieldPosParam(fieldposType, defaultFieldPosParam);
+                return fieldposType;
+        }
+        return null;
+    }
+
+
+    private parameterType[] types;
+    private View[] views;
+    private FieldType t;
+    public FieldEditorHelper(Context c, FieldType t, TableLayout parentView, parameterType[] tmptypes){
+        this.types = tmptypes;
+        this.t = t;
+        views = new View[types.length];
+        for(int i = 0; i < types.length; i++){
+            TextView tv = new TextView(c);
+            tv.setText(types[i].name);
+            tv.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+            tv.setTextSize(20);
+            parentView.addView(tv);
+
+            views[i] = createEdit(c, types[i]);
+            parentView.addView(views[i]);
+        }
+    }
+    public FieldEditorHelper(Context c, FieldType t, TableLayout parentView){
+        this(c,t,parentView,getParamsFromInputType(t));
+    }
+
+    public boolean save(){
+        for(int i = 0; i < types.length; i++){
+            if(!readEdit(views[i], types[i]))
+                return false;
+        }
+        setInputParameter(t, types);
+        return true;
+    }
+
+}

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

@@ -0,0 +1,311 @@
+package com.ridgebotics.ridgescout.ui.settings;
+
+import static com.ridgebotics.ridgescout.utility.Colors.background_color;
+import static com.ridgebotics.ridgescout.utility.Colors.unfocused_background_color;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ScrollView;
+import android.widget.TableLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.Navigation;
+
+import com.ridgebotics.ridgescout.MainActivity;
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.databinding.FragmentSettingsFieldsBinding;
+import com.ridgebotics.ridgescout.scoutingData.Fields;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+import com.ridgebotics.ridgescout.ui.views.CustomSpinnerView;
+import com.ridgebotics.ridgescout.ui.views.FieldDisplay;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+// Fragment that shows the field editor.
+public class FieldsFragment extends Fragment {
+    FragmentSettingsFieldsBinding binding;
+
+    private static String filename;
+    public static void set_filename(String tmpfilename){
+        filename = tmpfilename;
+    }
+
+    private int index = -1;
+
+    private boolean edited = false;
+
+    List<FieldType> values;
+    List<FieldDisplay> views;
+
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentSettingsFieldsBinding.inflate(inflater, container, false);
+
+        binding.upButton.setEnabled(false);
+        binding.downButton.setEnabled(false);
+        binding.saveButton.setEnabled(false);
+
+        FieldType[][] tmp_values = Fields.load(filename);
+        if(tmp_values == null || tmp_values.length == 0) return binding.getRoot();
+
+        values = new ArrayList(List.of(tmp_values[tmp_values.length-1]));
+        views = new ArrayList<>();
+
+        for(int i = 0; i < values.size(); i++){
+            createFieldDisplay(values.get(i));
+        }
+
+        // Up and down buttons
+        binding.upButton.setOnClickListener(v -> {
+            if(index <= 0) return;
+            Collections.swap(values, index, index-1);
+            Collections.swap(views, index, index-1);
+            index--;
+            updateRowOrder();
+        });
+        binding.downButton.setOnClickListener(v -> {
+            if(index >= values.size()-1) return;
+            Collections.swap(values, index, index+1);
+            Collections.swap(views, index, index+1);
+            index++;
+            updateRowOrder();
+        });
+
+        // Add Field button
+        binding.addButton.setOnClickListener(v -> {
+            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+            builder.setTitle("Select Type");
+
+            final CustomSpinnerView dropdown = new CustomSpinnerView(getContext());
+            List<String> options = new ArrayList<>();
+
+            options.add("Slider");
+            options.add("Text");
+            options.add("Dropdown");
+            options.add("Tally");
+            options.add("Number");
+            options.add("Checkbox");
+            options.add("Field Position");
+
+            dropdown.setOptions(options, 0);
+            dropdown.setTitle("Type");
+
+            builder.setView(dropdown);
+
+            builder.setNegativeButton("Cancel", (dialog, which) -> dialog.cancel());
+            builder.setPositiveButton("OK", (dialog, which) -> addField(dropdown.getIndex()));
+
+            builder.show();
+        });
+
+        // Back button listener
+        ((MainActivity) getActivity()).setOnBackPressed(() -> {
+            if(!edited) return true;
+
+            AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+            alert.setTitle("Warning!");
+            alert.setMessage("You have not saved your progress!");
+            alert.setPositiveButton("Return", null);
+            alert.setNeutralButton("Quit without saving", (dialogInterface, i) -> {
+                edited = false;
+                if(getActivity() != null)
+                    getActivity().onBackPressed();
+            });
+            alert.setCancelable(true);
+
+            alert.create().show();
+
+            return false;
+        });
+
+        binding.saveButton.setOnClickListener(l -> save());
+
+        if(tmp_values.length > 1)
+            binding.revertButton.setOnClickListener(v -> revertPopup());
+        else
+            binding.revertButton.setEnabled(false);
+
+
+        return binding.getRoot();
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void createFieldDisplay(FieldType field){
+        final FieldDisplay fd = new FieldDisplay(getContext());
+        views.add(fd);
+
+        fd.setField(field);
+        fd.setColor(unfocused_background_color);
+        fd.coloredBackground.setOnTouchListener((view, motionEvent) -> {
+            FieldsFragment.this.setFocus(fd, false);
+            return true;
+        });
+        fd.editButton.setOnClickListener(v -> openEditor(fd));
+
+        binding.fieldsArea.addView(fd);
+    }
+    private void updateRowOrder(){
+        enableSaving();
+        binding.fieldsArea.removeAllViews();
+        for(int i = 0; i < views.size(); i++){
+            binding.fieldsArea.addView(views.get(i));
+        }
+
+        binding.upButton.setEnabled(index != -1 && index > 0);
+        binding.downButton.setEnabled(index != -1 && index < views.size()-1);
+    }
+
+    private void setFocus(FieldDisplay fd, boolean scroll){
+        index = views.indexOf(fd);
+        for(int a = 0; a < values.size(); a++) {
+            views.get(a).setColor(unfocused_background_color);
+            views.get(a).hideButtons();
+        }
+        fd.setColor(background_color);
+        fd.showButtons();
+
+        binding.upButton.setEnabled(index != -1 && index > 0);
+        binding.downButton.setEnabled(index != -1 && index < views.size()-1);
+        if(scroll)
+            binding.scrollView.post(() -> binding.scrollView.scrollTo(0, fd.getTop()));
+    }
+
+    private void openEditor(FieldDisplay fd){
+        FieldType field = fd.getField();
+
+        ScrollView sv = new ScrollView(getContext());
+        TableLayout table = new TableLayout(getContext());
+        table.setStretchAllColumns(true);
+        table.setPadding(10, 10, 10, 10);
+
+        sv.addView(table);
+
+        TextView UUID = new TextView(getContext());
+        UUID.setText("Type: " + field.get_type_name() + "\nUUID: " + field.UUID);
+
+        table.addView(UUID);
+
+        FieldEditorHelper f = new FieldEditorHelper(getContext(), field, table);
+
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        alert.setTitle("Edit " + field.name);
+        alert.setView(sv);
+        alert.setCancelable(false);
+        alert.setNeutralButton("Cancel", (dialogInterface, i) -> {});
+        alert.setPositiveButton("Save", (dialogInterface, i) -> {
+            f.save();
+            fd.setField(field);
+            enableSaving();
+        });
+
+        AlertDialog dialog = alert.create();
+        dialog.show();
+
+        Button deleteButton = new Button(getContext());
+        deleteButton.setText("DELETE");
+        deleteButton.setOnClickListener(l -> {
+            AlertDialog.Builder alert2 = new AlertDialog.Builder(getContext());
+            alert2.setTitle("Warning!");
+            alert2.setMessage("This may destroy any data after being saved!");
+            alert2.setPositiveButton("Return", (dialogInterface, i) -> {});
+            alert2.setNeutralButton("DELETE", (dialogInterface, i) -> {
+                removeField(field);
+                dialog.cancel();
+            });
+
+            alert2.setCancelable(true);
+            alert2.create().show();
+        });
+
+        table.addView(deleteButton);
+    }
+
+    private void enableSaving(){
+        edited = true;
+        binding.saveButton.setEnabled(true);
+    }
+
+    private void addField(int n){
+        FieldType field = FieldEditorHelper.createNewFieldType(n);
+
+        values.add(field);
+        createFieldDisplay(field);
+        setFocus(views.get(views.size()-1), true);
+        enableSaving();
+    }
+
+    private void removeField(FieldType field){
+        int fieldIndex = values.indexOf(field);
+
+        views.remove(fieldIndex);
+        values.remove(fieldIndex);
+
+        index = -1;
+
+        updateRowOrder();
+    }
+
+    private void save(){
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        alert.setTitle("Warning!");
+        alert.setMessage("Changing or removing some values will result in lost data! but you can revert at any time.");
+        alert.setNeutralButton("Save", (dialog, which) -> {
+            FieldType[][] currentValues = Fields.load(filename);
+            assert currentValues != null;
+            FieldType[][] newValues = new FieldType[currentValues.length+1][];
+
+            System.arraycopy(currentValues, 0, newValues, 0, currentValues.length);
+
+            System.out.println("Length: " + values.size());
+
+            newValues[currentValues.length] = new FieldType[values.size()];
+           for(int i = 0; i < values.size(); i++) {
+               FieldType value = values.get(i);
+               newValues[currentValues.length][i] = value;
+           }
+
+            if(Fields.save(filename, newValues))
+                AlertManager.toast("Saved");
+
+            Navigation.findNavController((Activity) getContext(), R.id.nav_host_fragment_activity_main).navigate(R.id.action_navigation_data_fields_to_navigation_settings);
+        });
+        alert.setNegativeButton("Cancel", null);
+        alert.setCancelable(true);
+        alert.create().show();
+    }
+
+    public void revertPopup(){
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        alert.setTitle("Warning!");
+        alert.setMessage("If there is any data scouted with this version of the fields, it will cause conflicts!\nYou should know what you are doing");
+        alert.setNeutralButton("Revert and delete version", (dialog, which) -> {
+            FieldType[][] currentValues = Fields.load(filename);
+            assert currentValues != null;
+            FieldType[][] newValues = new FieldType[currentValues.length-1][];
+
+            System.arraycopy(currentValues, 0, newValues, 0, currentValues.length - 1);
+
+            if(Fields.save(filename, newValues))
+                AlertManager.toast("Saved");
+
+            Navigation.findNavController((Activity) getContext(), R.id.nav_host_fragment_activity_main).navigate(R.id.action_navigation_data_fields_to_navigation_settings);
+        });
+        alert.setNegativeButton("Cancel", null);
+        alert.setCancelable(true);
+        alert.create().show();
+    }
+}

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

@@ -0,0 +1,513 @@
+package com.ridgebotics.ridgescout.ui.settings;
+
+import static android.view.View.VISIBLE;
+import static androidx.navigation.fragment.FragmentKt.findNavController;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.AllyPosKey;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.CustomEventsKey;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.EnableQuickAllianceChangeKey;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.FieldImageKey;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.MatchNumKey;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.SelEVCodeKey;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.TeamNumKey;
+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.getEditor;
+import static com.ridgebotics.ridgescout.utility.SettingsManager.prefs;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.databinding.FragmentSettingsBinding;
+import com.ridgebotics.ridgescout.scoutingData.Fields;
+import com.ridgebotics.ridgescout.ui.views.CustomSpinnerView;
+import com.ridgebotics.ridgescout.ui.views.TallyCounterView;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+// Fragment to edit settings, aswell as redirect to the fields editor.
+public class SettingsFragment extends Fragment {
+    private FragmentSettingsBinding binding;
+
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+
+        binding = FragmentSettingsBinding.inflate(inflater, container, false);
+        View root = binding.getRoot();
+
+        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;
+    }
+
+    private void reloadSettings(){
+        String[] alliance_pos_list = new String[]{"red-1", "red-2", "red-3",
+                "blue-1", "blue-2", "blue-3"};
+
+        SettingsManager manager = new SettingsManager(getContext());
+
+
+        manager.addItem(new CheckboxSettingsItem(CustomEventsKey, "Custom Events"));
+
+        StringSettingsItem FTPServer = new StringSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPServer, "FTP Server (Sync)");
+        manager.addItem(FTPServer);
+        CheckboxSettingsItem FTPSendMetaFiles = new CheckboxSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPSendMetaFiles, "Sync meta files");
+        manager.addItem(FTPSendMetaFiles);
+        CheckboxSettingsItem FTPEnabled = new CheckboxSettingsItem(com.ridgebotics.ridgescout.utility.SettingsManager.FTPEnabled, "FTP Enabled", FTPServer, 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 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;
+        boolean hasEvent = false;
+
+        if(!DataManager.getevcode().equals("unset")){
+            DataManager.reload_event();
+            max = DataManager.event.matches.size();
+            hasEvent = true;
+        }
+
+        TallySettingsItem matchNum = new TallySettingsItem(MatchNumKey, "Match Number", max);
+        matchNum.setEnabled(hasEvent);
+        manager.addItem(matchNum);
+
+        DropdownSettingsItem eventCode = new DropdownSettingsItem(SelEVCodeKey, "Event Code", FileEditor.getEventList().toArray(new String[0]));
+        eventCode.reloadOnChange(true);
+        manager.addItem(eventCode);
+
+        manager.addItem(new StringSettingsItem(UnameKey, "Username"));
+        manager.addItem(new NumberSettingsItem(TeamNumKey, "Team Number", 0, 99999));
+
+        binding.SettingsTable.removeAllViews();
+        manager.getView(binding.SettingsTable);
+
+        if(!DataManager.getevcode().equals("unset")){
+            Button editNoticeButton = new Button(getContext());
+            editNoticeButton.setText("Edit Scout Notice");
+            binding.SettingsTable.addView(editNoticeButton);
+            editNoticeButton.setOnClickListener(v->editNotice());
+        }
+
+    }
+
+
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+
+    private void editNotice(){
+        ScrollView sv = new ScrollView(getContext());
+        EditText editText = new EditText(getContext());
+        editText.setText(DataManager.scoutNotice);
+        sv.addView(editText);
+
+
+        AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+        alert.setTitle("Edit Notice");
+        alert.setView(sv);
+        alert.setNeutralButton("Cancel", null);
+        alert.setPositiveButton("Save", (dialogInterface, i) -> {
+            DataManager.scoutNotice = editText.getText().toString();
+            DataManager.save_scout_notice();
+        });
+        alert.setCancelable(false);
+
+        alert.create().show();
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public abstract class SettingsItem<T> {
+        private String key;
+        private String title;
+        private T defaultValue;
+        public View view;
+
+        public SettingsItem(String key, String title, T defaultValue) {
+            this.key = key;
+            this.title = title;
+            this.defaultValue = defaultValue;
+        }
+
+        private boolean reloadOnChange = false;
+        public void reloadOnChange(boolean enabled){
+            reloadOnChange = enabled;
+        }
+        public boolean isReloadOnChange(){
+            return reloadOnChange;
+        }
+
+        public abstract View createView(Context context);
+        public abstract T getValue();
+
+        public String getKey() { return key; }
+        public String getTitle() { return title; }
+        public T getDefaultValue() { return defaultValue; }
+        public abstract void setEnabled(boolean enabled);
+    }
+
+    public class StringSettingsItem extends SettingsItem<String> {
+        public StringSettingsItem(String key, String title) {
+            super(key, title, prefs.getString(key, (String) defaults.get(key)));
+        }
+
+        TextInputEditText editText;
+
+        @Override
+        public void setEnabled(boolean enabled){
+            editText.setEnabled(enabled);
+        }
+
+        @Override
+        public View createView(Context context) {
+            TextInputLayout textInputLayout = new TextInputLayout(context);
+            textInputLayout.setLayoutParams(new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT
+            ));
+
+            editText = new TextInputEditText(context);
+            editText.setText(getValue());
+
+            editText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void afterTextChanged(Editable s) {
+                    getEditor().putString(getKey(), s.toString()).apply();
+                    if(isReloadOnChange()) reloadSettings();
+                }
+
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            });
+
+            textInputLayout.addView(editText);
+            return textInputLayout;
+        }
+
+        @Override
+        public String getValue() {
+            return prefs.getString(getKey(), (String) defaults.get(getKey()));
+        }
+    }
+
+    public class NumberSettingsItem extends SettingsItem<Integer> {
+        private int min;
+        private int max;
+
+        public NumberSettingsItem(String key, String title, int min, int max) {
+            super(key, title, prefs.getInt(key, (int) defaults.get(key)));
+            this.min = min;
+            this.max = max;
+        }
+
+        TextInputEditText editText;
+
+        @Override
+        public void setEnabled(boolean enabled){
+            editText.setEnabled(enabled);
+        }
+
+        @Override
+        public View createView(Context context) {
+            TextView titleView = new TextView(context);
+            titleView.setText(getTitle());
+            titleView.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Subtitle1);
+
+            TextInputLayout textInputLayout = new TextInputLayout(context);
+            editText = new TextInputEditText(context);
+
+            editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+            editText.setText(String.valueOf(getValue()));
+
+            editText.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void afterTextChanged(Editable s) {
+                    try {
+                        int value = Integer.parseInt(s.toString());
+                        if (value >= min && value <= max) {
+                            getEditor().putInt(getKey(), value).apply();
+                        }
+                    } catch (NumberFormatException e) {
+                        editText.setText(String.valueOf(getDefaultValue()));
+                    }
+                    if(isReloadOnChange()) reloadSettings();
+                }
+
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            });
+
+            textInputLayout.addView(editText);
+            textInputLayout.addView(titleView);
+            return textInputLayout;
+        }
+
+        @Override
+        public Integer getValue() {
+            return prefs.getInt(getKey(), (int) defaults.get(getKey()));
+        }
+    }
+
+    public class TallySettingsItem extends SettingsItem<Integer> {
+        private int max;
+
+        public TallySettingsItem(String key, String title, int max) {
+            super(key, title, prefs.getInt(key, (int) defaults.get(key)));
+            this.max = max;
+        }
+
+        TallyCounterView tally;
+        private boolean enabled;
+
+        @Override
+        public void setEnabled(boolean enabled){
+            this.enabled = enabled;
+            if(tally != null)
+                tally.setEnabled(enabled);
+        }
+
+        @Override
+        public View createView(Context context) {
+            LinearLayout ll = new LinearLayout(getContext());
+            ll.setOrientation(LinearLayout.VERTICAL);
+
+            tally = new TallyCounterView(getContext());
+
+            int value = getValue()+1;
+            if(value >= max){
+                value = max;
+                getEditor().putInt(getKey(), Math.max(0,max-1)).apply();
+            }
+
+            tally.setValue(value);
+            tally.setBounds(1, max);
+
+            tally.setOnCountChangedListener(count -> {
+                getEditor().putInt(getKey(), Math.max(0,count-1)).apply();
+                if(isReloadOnChange()) reloadSettings();
+            });
+            tally.setEnabled(enabled);
+
+            TextView tv = new TextView(getContext());
+            tv.setText(getTitle());
+            tv.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Headline6);
+            tv.setGravity(Gravity.CENTER);
+            ll.addView(tv);
+
+            ll.addView(tally);
+
+
+
+
+            return ll;
+        }
+
+        @Override
+        public Integer getValue() {
+            return prefs.getInt(getKey(), (int) defaults.get(getKey()));
+        }
+    }
+
+    public class DropdownSettingsItem extends SettingsItem<String> {
+        private String[] options;
+
+        private boolean enabled = true;
+
+        @Override
+        public void setEnabled(boolean enabled){
+            this.enabled = enabled;
+        }
+
+        public DropdownSettingsItem(String key, String title, String[] options) {
+            super(key, title, prefs.getString(key, (String) defaults.get(key)));
+            this.options = options;
+        }
+
+        @Override
+        public View createView(Context context) {
+            CustomSpinnerView dropdown = new CustomSpinnerView(getContext());
+            dropdown.setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+            ));
+
+
+            ArrayList<String> optionsList = new ArrayList<>(Arrays.asList(options));
+
+            dropdown.setTitle(getTitle());
+            dropdown.setOptions(optionsList, getValue());
+            dropdown.setOption(getValue());
+
+            dropdown.setOnClickListener((item, index) -> {
+                getEditor().putString(getKey(), item).apply();
+                if(isReloadOnChange()) reloadSettings();
+            });
+
+            return dropdown;
+        }
+
+        @Override
+        public String getValue() {
+            return prefs.getString(getKey(), (String) defaults.get(getKey()));
+        }
+    }
+
+    public class CheckboxSettingsItem extends SettingsItem<Boolean> {
+        private List<SettingsItem<?>> controlledItems;
+
+        public CheckboxSettingsItem(String key, String title, @Nullable SettingsItem<?>... controlledItems) {
+            super(key, title, prefs.getBoolean(key, (Boolean) defaults.get(key)));
+            this.controlledItems = (controlledItems != null) ? Arrays.asList(controlledItems) : new ArrayList<>();
+        }
+
+        MaterialCheckBox checkBox;
+
+        @Override
+        public void setEnabled(boolean enabled){
+            checkBox.setEnabled(enabled);
+            for (SettingsItem<?> item : controlledItems) {
+                item.setEnabled(enabled && checkBox.isChecked());
+            }
+        }
+
+        @Override
+        public View createView(Context context) {
+            checkBox = new MaterialCheckBox(context);
+            checkBox.setText(getTitle());
+            checkBox.setChecked(getValue());
+            checkBox.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Subtitle1);
+            checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                getEditor().putBoolean(getKey(), isChecked).apply();
+                for (SettingsItem<?> item : controlledItems) {
+                    item.setEnabled(isChecked);
+                }
+                if(isReloadOnChange()) reloadSettings();
+            });
+
+            for (SettingsItem<?> item : controlledItems) {
+                item.setEnabled(getValue());
+            }
+
+            return checkBox;
+        }
+
+        @Override
+        public Boolean getValue() {
+            return prefs.getBoolean(getKey(), (Boolean) defaults.get(getKey()));
+        }
+    }
+
+    public class SettingsManager {
+        private Context context;
+        private HashMap<String, Object> settings;
+        private List<SettingsItem<?>> items;
+//        private LinearLayout container;
+
+        public SettingsManager(Context context) {
+            this.context = context;
+            this.items = new ArrayList<>();
+//            this.container = new LinearLayout(context);
+//            this.container.setOrientation(LinearLayout.VERTICAL);
+//            this.container.setLayoutParams(new LinearLayout.LayoutParams(
+//                    LinearLayout.LayoutParams.MATCH_PARENT,
+//                    LinearLayout.LayoutParams.WRAP_CONTENT
+//            ));
+        }
+
+        private final List<View> views = new ArrayList<>();
+        public void addItem(SettingsItem<?> item) {
+            items.add(item);
+
+            LinearLayout itemContainer = new LinearLayout(context);
+            itemContainer.setOrientation(LinearLayout.VERTICAL);
+            itemContainer.setPadding(32, 0, 32, 8);
+
+            View view = item.createView(context);
+            itemContainer.addView(view);
+
+            item.view = view;
+
+            views.add(itemContainer);
+        }
+
+        public void getView(LinearLayout layout) {
+            for(int i = views.size()-1; i >= 0; i--)
+                layout.addView(views.get(i));
+        }
+    }
+}

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

@@ -0,0 +1,138 @@
+package com.ridgebotics.ridgescout.ui.transfer;
+
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.DataManager.event;
+import static com.ridgebotics.ridgescout.utility.DataManager.match_latest_values;
+import static com.ridgebotics.ridgescout.utility.DataManager.pit_latest_values;
+import static com.ridgebotics.ridgescout.utility.SharePrompt.shareContent;
+
+import android.content.Context;
+
+import com.ridgebotics.ridgescout.scoutingData.ScoutingDataWriter;
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.types.frcMatch;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+
+// Static class to export matches to a string.
+public class CSVExport {
+    private static String[] alliances = {"red", "blue"};
+
+    private static String safeCSV(String input){
+        return input.replace("\n", "").replace(",", ".").replace(";", ".");
+    }
+
+    public static void exportMatches(Context c){
+        DataManager.reload_event();
+        DataManager.reload_match_fields();
+
+        String data = "";
+
+        data += ("num,alliance,alliance_position,teamnum,");
+        for(int i = 0; i < match_latest_values.length; i++){
+            data += (match_latest_values[i].name + ",");
+        }
+        data += ("\n");
+
+
+        for(int matchNum = 1; matchNum <= event.matches.size(); matchNum++){
+        for(int allianceIndex = 0; allianceIndex <= 1; allianceIndex++){
+            String alliance = alliances[allianceIndex];
+        for(int alliancePos = 1; alliancePos <= 3; alliancePos++){
+            data += (matchNum + ",");
+            data += (alliance + ",");
+            data += (alliancePos + ",");
+
+            frcMatch match = event.matches.get(matchNum-1);
+            int teamNum = 0;
+
+            if(allianceIndex == 0){
+                teamNum = match.redAlliance[alliancePos-1];
+            }else{
+                teamNum = match.blueAlliance[alliancePos-1];
+            }
+
+            data += (teamNum + ",");
+
+            String filename = evcode+"-"+matchNum+"-"+alliance+"-"+alliancePos+"-"+teamNum+".matchscoutdata";
+            if(!FileEditor.fileExist(filename)){
+                data += ("null,".repeat(match_latest_values.length));
+            }else{
+                try {
+                    String tempData = "";
+                    ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.match_values, DataManager.match_transferValues);
+                    RawDataType[] matchData = psdr.data.array;
+                    FieldType[] types = psdr.data.values[psdr.data.values.length-1];
+                    for (int i = 0; i < types.length; i++) {
+                        tempData += (safeCSV(types[i].toString(matchData[i])) + ",");
+                    }
+                    data += tempData;
+                } catch (Exception e){
+                    e.printStackTrace();
+                    data += ("null,".repeat(match_latest_values.length));
+                }
+
+            }
+
+            data += ("\n");
+        }}}
+
+        shareContent(c, evcode+"-matches.csv", data, "text/plain");
+    }
+
+
+
+    public static void exportPits(Context c){
+        DataManager.reload_event();
+        DataManager.reload_pit_fields();
+
+        String data = "";
+
+        data += ("teamnum,teamname,city,stateOrProv,school,country,startingYear,");
+        for(int i = 0; i < pit_latest_values.length; i++){
+            data += (pit_latest_values[i].name + ",");
+        }
+        data += ("\n");
+
+
+        for(int teamIndex = 0; teamIndex < event.teams.size(); teamIndex++){
+            frcTeam team = event.teams.get(teamIndex);
+
+            data += (team.teamNumber + ",");
+            data += (team.teamName + ",");
+            data += (team.city + ",");
+            data += (team.stateOrProv + ",");
+            data += (team.school + ",");
+            data += (team.country + ",");
+            data += (team.startingYear + ",");
+
+            String filename = evcode+"-"+team.teamNumber+".pitscoutdata";
+            if(!FileEditor.fileExist(filename)){
+                data += ("null,".repeat(pit_latest_values.length));
+            }else{
+                try {
+                    String tempData = "";
+                    ScoutingDataWriter.ParsedScoutingDataResult psdr = ScoutingDataWriter.load(filename, DataManager.pit_values, DataManager.pit_transferValues);
+                    RawDataType[] teamData = psdr.data.array;
+                    FieldType[] types = psdr.data.values[psdr.data.values.length-1];
+                    for (int i = 0; i < types.length; i++) {
+                        tempData += (safeCSV(types[i].toString(teamData[i])) + ",");
+                    }
+                    data += tempData;
+                } catch (Exception e){
+                    e.printStackTrace();
+                    data += ("null,".repeat(pit_latest_values.length));
+                }
+
+            }
+
+            data += ("\n");
+        }
+
+//        System.out.print(data);
+
+        shareContent(c, evcode+"-pits.csv", data, "text/plain");
+    }
+}

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

@@ -0,0 +1,269 @@
+package com.ridgebotics.ridgescout.ui.transfer;
+
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.FileEditor.baseDir;
+
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+// Class to synchronise data over FTP.
+public class FTPSync extends Thread {
+    public static final String remoteBasePath = "/RidgeScout/";
+    public static final String timestampsFilename = "timestamps";
+
+
+
+    public static long lastSyncTime = 0;
+    private static Date curSyncTime;
+    private static final long millisTolerance = 1000;
+
+    private boolean after(Date a, Date b){
+        return a.getTime() - b.getTime() > millisTolerance;
+    }
+
+
+    public interface onResult {
+        void onResult(boolean error, int upCount, int downCount);
+    }
+    public interface UpdateIndicator {
+        void onText(String text);
+    }
+    private static UpdateIndicator updateIndicator = text -> {};
+    public static String text = "";
+    private static void setUpdateIndicator(String m_text){
+        text = m_text;
+        updateIndicator.onText(m_text);
+    }
+    public static void setOnUpdateIndicator(UpdateIndicator m_updateIndicator){
+        updateIndicator = m_updateIndicator;
+    }
+
+    private static onResult onResult = (error, upCount, downCount) -> {};
+    public static void setOnResult(onResult result){
+        onResult = result;
+    }
+
+    private static boolean isRunning = false;
+    public static boolean getIsRunning(){return isRunning;}
+
+    public static void sync(){
+//        DataManager.reload_event();
+        FTPSync ftpSync = new FTPSync();
+
+        curSyncTime = new Date();
+
+        ftpSync.start();
+    }
+
+    FTPClient ftpClient;
+
+    private int upCount = 0;
+    private int downCount = 0;
+
+    private void downloadFile(String remoteFile, File localFile) throws IOException {
+        try (FileOutputStream fos = new FileOutputStream(localFile)) {
+            ftpClient.retrieveFile(remoteBasePath + remoteFile, fos);
+        }
+    }
+
+    private void uploadFile(File localFile) throws IOException {
+        try (FileInputStream fis = new FileInputStream(localFile)) {
+            ftpClient.storeFile(remoteBasePath + localFile.getName(), fis);
+        }
+    }
+
+    private FTPFile findRemoteFile(FTPFile[] remoteFiles, String fileName) {
+        for (FTPFile file : remoteFiles) {
+            if (file.getName().equals(fileName)) {
+                return file;
+            }
+        }
+        return null;
+    }
+
+    private Date getUtcTimestamp(FTPFile file) {
+        return file.getTimestamp().getTime();
+    }
+
+    private Date getLocalFileUtcTimestamp(File file) {
+        return new Date(file.lastModified());
+    }
+
+    private void setLocalFileTimestamp(File file, Date date) {
+        file.setLastModified(date.getTime());
+    }
+
+
+    public void run() {
+        isRunning = true;
+        boolean sendMetaFiles = SettingsManager.getFTPSendMetaFiles();
+
+        // Meta files
+        List<String> meta_string_array = Arrays.asList(
+                "matches.fields",
+                "pits.fields",
+                evcode+".eventdata"
+        );
+
+        try {
+            // Login to FTP
+            ftpClient = new FTPClient();
+            InetAddress address = InetAddress.getByName(SettingsManager.getFTPServer());
+            ftpClient.connect(address);
+            ftpClient.login("anonymous", null);
+            ftpClient.enterLocalPassiveMode();
+            ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+
+            File localDir = new File(baseDir);
+            File[] localFiles = localDir.listFiles();
+            Map<String, Date> remoteTimestamps = getTimestamps();
+
+            // Loop through local files and send all that are more recent
+            if (localFiles != null) {
+                for (int i = 0; i < localFiles.length; i++) {
+                    File localFile = localFiles[i];
+                    setUpdateIndicator("Uploading " + (i+1) + "/" + localFiles.length);
+
+                    if(localFile.isDirectory()) continue;
+                    // Remove timestamts file
+                    if(localFile.getName().equals(timestampsFilename)) continue;
+                    // Remove meta files if the option is disabled
+                    if(!sendMetaFiles && meta_string_array.contains(localFile.getName())) continue;
+
+                    Date remoteTimestamp = remoteTimestamps.get(localFile.getName());
+
+                    Date localTimeStamp = getLocalFileUtcTimestamp(localFile);
+
+                    if (remoteTimestamp == null || after(localTimeStamp, remoteTimestamp)) {
+                        uploadFile(localFile);
+                        System.out.println("Uploaded" + localFile.getName());
+
+                        setLocalFileTimestamp(localFile, curSyncTime);
+                        remoteTimestamps.put(localFile.getName(), curSyncTime);
+                        upCount++;
+                    }else{
+                        System.out.println("Did not upload");
+                    }
+                }
+            }
+
+            Set<String> keySet = remoteTimestamps.keySet();
+            Iterator<String> keyIt = keySet.iterator();
+            for (int i = 0; i < keySet.size(); i++) {
+                String remoteFile = keyIt.next();
+                setUpdateIndicator("Downloading " + (i+1) + "/" + keySet.size());
+
+                File localFile = new File(baseDir, remoteFile);
+                if(remoteFile.equals(timestampsFilename)) continue;
+                // Remove meta files if the option is disabled
+                if(!sendMetaFiles && meta_string_array.contains(remoteFile)) continue;
+
+//                    Date t1 = getLocalFileUtcTimestamp(localFile);
+//                    Date t2 = getUtcTimestamp(remoteFile);
+////
+//                    System.out.println("- " + t1 + (t1.after(t2) ? ">" : "<") + t2);
+
+                Date localTimeStamp = getLocalFileUtcTimestamp(localFile);
+                Date remoteTimestamp = remoteTimestamps.get(remoteFile);
+
+
+
+                if (!localFile.exists() || (after(remoteTimestamp, localTimeStamp) && !localTimeStamp.equals(remoteTimestamp))) {
+                    downloadFile(remoteFile, localFile);
+
+                    System.out.println("Downloaded " + localFile.getName());
+
+                    if(!localFile.exists()) System.out.println("Not exist");
+                    else if(after(remoteTimestamp, localTimeStamp)) System.out.println("Before: " + (localTimeStamp.getTime()-remoteTimestamp.getTime()));
+
+//                        Date d = getUtcTimestamp(remoteFile);
+                    setLocalFileTimestamp(localFile, remoteTimestamps.get(localFile.getName()));
+//                    remoteTimestamps.put(remoteFile, curSyncTime);
+                    downCount++;
+                }else{
+                    System.out.println("Did not download");
+                }
+            }
+
+            setTimestamps(remoteTimestamps);
+
+        } catch (Exception e) {
+            AlertManager.error("Failed Syncing!", e);
+            onResult.onResult(true, upCount, downCount);
+            setUpdateIndicator("ERROR!");
+        } finally {
+            onResult.onResult(false, upCount, downCount);
+            setUpdateIndicator("Finished");
+        }
+
+        isRunning = false;
+    }
+
+    private boolean setTimestamps(Map<String, Date> timestamps){
+        try {
+            ByteBuilder bb = new ByteBuilder();
+            String[] filenames = timestamps.keySet().toArray(new String[0]);
+
+            for(int i = 0; i < filenames.length; i++){
+                bb.addString(filenames[i]);
+                bb.addLong(timestamps.get(filenames[i]).getTime());
+            }
+
+            FileEditor.writeFile(timestampsFilename, bb.build());
+
+            uploadFile(new File(baseDir + timestampsFilename));
+            return true;
+        } catch (ByteBuilder.buildingException | IOException e) {
+            AlertManager.error("Failed Syncing!", e);
+            return false;
+        }
+    }
+
+    private Map<String, Date> getTimestamps() {
+        try {
+            downloadFile(timestampsFilename, new File(baseDir + timestampsFilename));
+
+            byte[] data = FileEditor.readFile(timestampsFilename);
+
+            if(data == null || data.length == 0)
+                return new HashMap<>();
+
+            BuiltByteParser bbp = new BuiltByteParser(data);
+            List<BuiltByteParser.parsedObject> pa = bbp.parse();
+
+            Map<String, Date> output = new HashMap<>();
+            for(int i = 0; i < pa.size(); i+=2){
+//                System.out.println((long) pa.get(i).get());
+                output.put(
+                        (String) pa.get(i).get(),
+                        new Date((long) pa.get(i+1).get())
+                );
+            }
+            return output;
+
+        }catch (IOException | BuiltByteParser.byteParsingExeption e){
+            AlertManager.error("Failed Syncing!", e);
+            return new HashMap<>();
+        }
+    }
+}

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

@@ -1,18 +1,18 @@
-package com.astatin3.scoutingapp2025.ui.transfer;
+package com.ridgebotics.ridgescout.ui.transfer;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.astatin3.scoutingapp2025.MainActivity;
-import com.astatin3.scoutingapp2025.types.file;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-import com.astatin3.scoutingapp2025.utility.DataManager;
-import com.astatin3.scoutingapp2025.utility.SharePrompt;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
+import com.ridgebotics.ridgescout.MainActivity;
+import com.ridgebotics.ridgescout.types.ScoutingFile;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.SharePrompt;
+import com.ridgebotics.ridgescout.utility.FileEditor;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -20,28 +20,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+// Class to create the share and receive popups to transfer scouting data.
 public class FileBundle {
-    private static final Intent FILE_SELECT_CODE = new Intent();
-
-    public static void send(String[] files, Context c){
-        try {
-            ByteBuilder b = new ByteBuilder();
-
-            for(int i = 0; i < files.length; i++){
-                if(!fileEditor.fileExist(files[i])) continue;
-    //            byte[] data = fileEditor.readFile(files[i]);
-                file f = new file(files[i]);
-                b.addRaw(file.typecode, f.encode());
-            }
-
-            byte[] data = b.build();
-            send(data, c);
-
-        } catch (ByteBuilder.buildingException e) {
-            AlertManager.error(e);
-        }
-    }
-
     public static void send(byte[] data, Context c){
         String filename = DataManager.getevcode() + "-" + System.currentTimeMillis() + ".scoutbundle";
         SharePrompt.shareContent(c, filename, data, "application/ridgescout");
@@ -58,6 +38,7 @@ public class FileBundle {
         MainActivity.setResultRelay(new MainActivity.activityResultRelay() {
             @Override
             public void onActivityResult(int requestCode, int resultCode, Intent data) {
+                if(data == null) return;
                 Uri uri = data.getData();
                 if(uri == null) return;
 
@@ -90,18 +71,18 @@ public class FileBundle {
 
             for(int i = 0; i < parsedObjectList.size(); i++){
                 BuiltByteParser.parsedObject pa = parsedObjectList.get(i);
-                if(pa.getType() != file.typecode) continue;
-                file f = file.decode((byte[]) pa.get());
+                if(pa.getType() != ScoutingFile.typecode) continue;
+                ScoutingFile f = ScoutingFile.decode((byte[]) pa.get());
                 if(f == null) continue;
                 filenames.add(f.filename);
-                fileEditor.writeFile(f.filename, f.data);
+                FileEditor.writeFile(f.filename, f.data);
             }
 
             AlertManager.alert("Saved",
                     String.join("\n", filenames));
 
-        }catch (BuiltByteParser.byteParsingExeption e){
-            AlertManager.error(e);
+        }catch (Exception e){
+            AlertManager.error("Failed saving files!", e);
         }
     }
 }

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

@@ -1,11 +1,14 @@
-package com.astatin3.scoutingapp2025.ui.transfer;
+package com.ridgebotics.ridgescout.ui.transfer;
 
-import static com.astatin3.scoutingapp2025.utility.DataManager.evcode;
+import static com.ridgebotics.ridgescout.utility.Colors.fileselector_selected_color;
+import static com.ridgebotics.ridgescout.utility.Colors.fileselector_unselected_color;
+import static com.ridgebotics.ridgescout.utility.DataManager.evcode;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
@@ -15,19 +18,19 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferFileSelectorBinding;
-import com.astatin3.scoutingapp2025.types.file;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.ByteBuilder;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferFileSelectorBinding;
+import com.ridgebotics.ridgescout.types.ScoutingFile;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.ByteBuilder;
+import com.ridgebotics.ridgescout.utility.DataManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+// Class to show a file browseer
 public class FileSelectorFragment extends Fragment {
-    private static final int background_color = 0x5000ff00;
-    private static final int unselected_background_color = 0x2000ff00;
 
     private static on_file_select onSelect = files -> {};
 
@@ -41,6 +44,7 @@ public class FileSelectorFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = FragmentTransferFileSelectorBinding.inflate(inflater, container, false);
 
+        DataManager.reload_event();
 
         meta_string_array = new String[]{
                 "matches.fields",
@@ -48,7 +52,7 @@ public class FileSelectorFragment extends Fragment {
                 evcode+".eventdata"
         };
 
-        String[] files = fileEditor.getEventFiles(evcode);
+        String[] files = FileEditor.getEventFiles(evcode);
 
         Boolean[] selected_arr = new Boolean[files.length];
         Arrays.fill(selected_arr, Boolean.TRUE);
@@ -64,7 +68,11 @@ public class FileSelectorFragment extends Fragment {
             tr.setPadding(20,20,20,20);
             binding.fileSelectorTable.addView(tr);
 
-            tr.setBackgroundColor(background_color);
+            tr.setBackgroundColor(fileselector_selected_color);
+
+            CheckBox checkBox = new CheckBox(getContext());
+            checkBox.setChecked(true);
+            tr.addView(checkBox);
 
             TextView tv = new TextView(getContext());
             tv.setText(String.valueOf(files[i]));
@@ -76,7 +84,15 @@ public class FileSelectorFragment extends Fragment {
                 boolean sel = !selected_arr[fi];
                 selected_arr[fi] = sel;
 
-                tr.setBackgroundColor(sel ? background_color : unselected_background_color);
+                tr.setBackgroundColor(sel ? fileselector_selected_color : fileselector_unselected_color);
+                ((CheckBox) tr.getChildAt(0)).setChecked(sel);
+            });
+            checkBox.setOnClickListener(view -> {
+                boolean sel = !selected_arr[fi];
+                selected_arr[fi] = sel;
+
+                tr.setBackgroundColor(sel ? fileselector_selected_color : fileselector_unselected_color);
+                ((CheckBox) tr.getChildAt(0)).setChecked(sel);
             });
         }
 
@@ -88,9 +104,12 @@ public class FileSelectorFragment extends Fragment {
             Arrays.fill(selected_arr, Boolean.TRUE);
 
             for(int i = 0; i < files.length; i++){
-                View child = binding.fileSelectorTable.getChildAt(i);
-                child.setBackgroundColor(background_color);
-                child.setVisibility(is_in_search_param(files[i], search_param, match_num_nums) ? View.VISIBLE : View.GONE);
+                TableRow child = (TableRow) binding.fileSelectorTable.getChildAt(i);
+                child.setBackgroundColor(fileselector_selected_color);
+                boolean sel = is_in_search_param(files[i], search_param, match_num_nums);
+                child.setVisibility(sel ? View.VISIBLE : View.GONE);
+                ((CheckBox) child.getChildAt(0)).setChecked(sel);
+
             }
 
             return false;
@@ -103,6 +122,7 @@ public class FileSelectorFragment extends Fragment {
                 View child = binding.fileSelectorTable.getChildAt(i);
                 if(child.getVisibility() == View.VISIBLE && selected_arr[i])
                     filenames.add(files[i]);
+
             }
             onSelect.onSelect(get_bytes_of_filenames(filenames));
         });
@@ -176,8 +196,21 @@ public class FileSelectorFragment extends Fragment {
             ByteBuilder b = new ByteBuilder();
 
             for(int i = 0; i < filenames.size(); i++){
-                file f = new file(filenames.get(i));
-                b.addRaw(file.typecode, f.encode());
+                ScoutingFile f = new ScoutingFile(filenames.get(i));
+
+                if(!FileEditor.fileExist(f.filename)) {
+                    AlertManager.addSimpleError("File " + f.filename + " Does not exist!");
+                    continue;
+                };
+
+                byte[] bytes = f.encode();
+
+                if(bytes == null || bytes.length == 0) {
+                    AlertManager.addSimpleError("File " + f.filename + " Has no data!");
+                    continue;
+                };
+
+                b.addRaw(ScoutingFile.typecode, bytes);
             }
 
             return b.build();

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

@@ -1,5 +1,13 @@
-package com.astatin3.scoutingapp2025.ui.transfer;
+package com.ridgebotics.ridgescout.ui.transfer;
 
+import static androidx.navigation.fragment.FragmentKt.findNavController;
+import static com.ridgebotics.ridgescout.utility.Colors.tba_blue;
+import static com.ridgebotics.ridgescout.utility.Colors.tba_red;
+import static com.ridgebotics.ridgescout.utility.Colors.tba_toggle_background;
+import static com.ridgebotics.ridgescout.utility.FileEditor.TBAAddress;
+import static com.ridgebotics.ridgescout.utility.FileEditor.TBAHeader;
+
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -14,54 +22,83 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferTbaBinding;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.RequestTask;
-import com.astatin3.scoutingapp2025.types.frcEvent;
-import com.astatin3.scoutingapp2025.types.frcMatch;
-import com.astatin3.scoutingapp2025.types.frcTeam;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
-import com.astatin3.scoutingapp2025.utility.JSONUtil;
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferTbaBinding;
+import com.ridgebotics.ridgescout.types.frcEvent;
+import com.ridgebotics.ridgescout.types.frcMatch;
+import com.ridgebotics.ridgescout.types.frcTeam;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.ImageRequestTask;
+import com.ridgebotics.ridgescout.utility.JSONUtil;
+import com.ridgebotics.ridgescout.utility.RequestTask;
+import com.ridgebotics.ridgescout.utility.FileEditor;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Comparator;
-import java.util.Date;
 
-public class TBAFragment extends Fragment {
-    private final String TBAAddress = "https://www.thebluealliance.com/api/v3/";
-    private final String TBAHeader = "X-TBA-Auth-Key: tjEKSZojAU2pgbs2mBt06SKyOakVhLutj3NwuxLTxPKQPLih11aCIwRIVFXKzY4e";
+// Class to download data from a specific event and encode it.
+public class TBAEventFragment extends Fragment {
 
-    private android.widget.TableLayout Table;
+    private TableLayout Table;
     private FragmentTransferTbaBinding binding;
 
-    private static final int year = 2024;
+    private final int year = SettingsManager.getYearNum();
+
+    private ProgressDialog loadingDialog;
+
+    private static JSONObject eventData = null;
+    public static void setEventData(JSONObject j){
+        eventData = j;
+    }
+
 
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
 
         binding = FragmentTransferTbaBinding.inflate(inflater, container, false);
 
+        final String matchKey;
+        try {
+            matchKey = eventData.getString("key");
+        } catch (JSONException e) {
+            AlertManager.error("Failed loading event key!", e);
+            return binding.getRoot();
+        }
+
         Table = binding.matchTable;
 
         Table.setStretchAllColumns(true);
 
-        TableRow tr = new TableRow(getContext());
-        addTableText(tr, "Loading Events...");
-        Table.addView(tr);
+        startLoading("Loading Teams and Matches...");
+        Table.removeAllViews();
+        Table.setStretchAllColumns(true);
+        Table.bringToFront();
+
+        TableRow tr1 = new TableRow(getContext());
+        addTableText(tr1, "Downloading Teams...");
+        Table.addView(tr1);
 
         final RequestTask rq = new RequestTask();
-        rq.onResult(s -> {
-            eventTable(s);
+        rq.onResult(teamsStr -> {
+            TableRow tr11 = new TableRow(getContext());
+            addTableText(tr11, "Downloading Matches...");
+            Table.addView(tr11);
+
+            final RequestTask rq1 = new RequestTask();
+            rq1.onResult(matchesStr -> {
+                matchTable(matchesStr, teamsStr, eventData);
+                stopLoading();
+                return null;
+            });
+            rq1.execute((TBAAddress + "event/" + matchKey + "/matches"), TBAHeader);
             return null;
         });
-        rq.execute(TBAAddress + "events/"+year, TBAHeader);
+        rq.execute((TBAAddress + "event/" + matchKey + "/teams"), TBAHeader);
 
         return binding.getRoot();
     }
@@ -74,121 +111,6 @@ public class TBAFragment extends Fragment {
         tr.addView(text);
     }
 
-    public void eventTable(String dataString){
-        Table.removeAllViews();
-        Table.setStretchAllColumns(true);
-        Table.bringToFront();
-
-        Date currentTime = Calendar.getInstance().getTime();
-
-        try {
-            JSONArray data = new JSONArray(dataString);
-
-            Table.setStretchAllColumns(true);
-            Table.bringToFront();
-
-            boolean toggle = false;
-
-            for(int i=0;i<data.length();i++){
-                TableRow tr = new TableRow(getContext());
-                TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
-                        TableRow.LayoutParams.WRAP_CONTENT,
-                        TableRow.LayoutParams.WRAP_CONTENT
-                );
-                rowParams.setMargins(20,20,20,20);
-                tr.setLayoutParams(rowParams);
-                tr.setPadding(20,20,20,20);
-                tr.setBackgroundColor(0x30000000);
-
-
-                JSONObject j = data.getJSONObject(i);
-
-                String matchKey = j.getString("key");
-                String name = j.getString("short_name");
-
-                // Sometimes, a short name is not present on TBA Events
-                if(name.isEmpty()){
-                    name = j.getString("name");
-                }
-
-                TextView tv = new TextView(getContext());
-                tv.setGravity(Gravity.CENTER_VERTICAL);
-                tv.setTextSize(12);
-                tv.setText(j.getString("key"));
-                tr.addView(tv);
-
-                tv = new TextView(getContext());
-                tv.setTextSize(18);
-                tv.setText(name);
-                tr.addView(tv);
-
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                try {
-                    Date startDate = format.parse(j.getString("start_date"));
-                    Date endDate = format.parse(j.getString("end_date"));
-                    if(currentTime.after(endDate)){
-                        tr.setBackgroundColor(0x30FF0000);
-                    }else if(currentTime.before(startDate)){
-                        tr.setBackgroundColor(0x3000FF00);
-                    }else if(currentTime.after(startDate) && currentTime.before(endDate)){
-                        tr.setBackgroundColor(0x30FFFF00);
-                    }
-                } catch (Exception e) {
-                    AlertManager.error(e);
-                }
-
-
-                tr.setOnClickListener(v -> {
-                    Table.removeAllViews();
-                    Table.setStretchAllColumns(true);
-                    Table.bringToFront();
-
-                    TableRow tr1 = new TableRow(getContext());
-                    addTableText(tr1, "Downloading Teams...");
-                    Table.addView(tr1);
-
-                    final RequestTask rq = new RequestTask();
-                    rq.onResult(teamsStr -> {
-                        TableRow tr11 = new TableRow(getContext());
-                        addTableText(tr11, "Downloading Matches...");
-                        Table.addView(tr11);
-
-                        final RequestTask rq1 = new RequestTask();
-                        rq1.onResult(matchesStr -> {
-                            matchTable(matchesStr, teamsStr, j);
-                            return null;
-                        });
-                        rq1.execute((TBAAddress + "event/" + matchKey + "/matches"), TBAHeader);
-                        return null;
-                    });
-                    rq.execute((TBAAddress + "event/" + matchKey + "/teams"), TBAHeader);
-                });
-
-//                tr.addView(cl);
-                Table.addView(tr, rowParams);
-
-                toggle = !toggle;
-            }
-        }catch (JSONException j){
-            AlertManager.alert("Error", "Invalid JSON");
-        }
-    }
-
-    static class matchComparator implements Comparator<JSONObject>
-    {
-
-        public int compare(JSONObject a, JSONObject b)
-        {
-            try {
-                return a.getInt("match_number") - b.getInt("match_number");
-            }catch (JSONException j){
-                return 0;
-            }
-        }
-    }
-
-
-
     public void matchTable(String matchesString, String teamsString, JSONObject eventData){
         Table.removeAllViews();
         Table.setStretchAllColumns(true);
@@ -342,11 +264,7 @@ public class TBAFragment extends Fragment {
             final ArrayList<frcMatch> matchesOBJ = new ArrayList<>();
 
             btn.setOnClickListener(v -> {
-                if(saveData(matchesOBJ, teamData, eventData)){
-                    AlertManager.alert("Info", "Saved!");
-                }else{
-                    AlertManager.alert("Error", "Error saving files.");
-                }
+                saveData(matchesOBJ, teamData, eventData);
             });
 
 
@@ -407,7 +325,7 @@ public class TBAFragment extends Fragment {
                 tr = new TableRow(getContext());
 
                 if (toggle) {
-                    tr.setBackgroundColor(0x30000000);
+                    tr.setBackgroundColor(tba_toggle_background);
                 }
 
                 addTableText(tr, String.valueOf(matchCount));
@@ -426,12 +344,12 @@ public class TBAFragment extends Fragment {
                         String str = redAlliance.getString(b).substring(3);
                         redKeys[b] = Integer.parseInt(str);
                         text.setText(str);
-                        text.setBackgroundColor(0x50ff0000);
+                        text.setBackgroundColor(tba_red);
                     }else{
                         String str = blueAlliance.getString(b-3).substring(3);
                         blueKeys[b-3] = Integer.parseInt(str);
                         text.setText(str);
-                        text.setBackgroundColor(0x500000ff);
+                        text.setBackgroundColor(tba_blue);
                     }
                 }
 
@@ -456,49 +374,88 @@ public class TBAFragment extends Fragment {
 //            });
 
         }catch (JSONException j){
-            AlertManager.error(j);
-            AlertManager.alert("Error", "Invalid JSON");
+            AlertManager.error("Failed Downloading", j);
+            stopLoading();
         }
     }
 
     private boolean saveData(ArrayList<frcMatch> matchData, JSONArray teamData, JSONObject eventData){
-        try {
-            final String matchKey = eventData.getString("key");
-            String matchName = eventData.getString("short_name");
+        startLoading("Saving data...");
 
-            // Sometimes, a short name is not present on TBA Events
-            if(matchName.isEmpty()){
-                matchName = eventData.getString("name");
+        Thread t = new Thread(() -> {
+            try {
+                final String matchKey = eventData.getString("key");
+                String matchName = eventData.getString("short_name");
+
+                // Sometimes, a short name is not present on TBA Events
+                if (matchName.isEmpty()) {
+                    matchName = eventData.getString("name");
+                }
+
+                ArrayList<frcTeam> teams = new ArrayList<>();
+                for (int i = 0; i < teamData.length(); i++) {
+                    frcTeam teamObj = new frcTeam();
+                    JSONObject team = teamData.getJSONObject(i);
+
+                    teamObj.teamNumber = team.getInt("team_number");
+                    teamObj.teamName = team.getString("nickname");
+                    teamObj.city = team.getString("city");
+                    teamObj.stateOrProv = team.getString("state_prov");
+                    teamObj.school = team.getString("school_name");
+                    teamObj.country = team.getString("country");
+                    teamObj.startingYear = team.getInt("rookie_year");
+
+                    ImageRequestTask imageRequestTask = new ImageRequestTask();
+
+                    imageRequestTask.onResult(bitmap -> {
+                        teamObj.bitmap = bitmap;
+                        teamObj.teamColor = frcTeam.findPrimaryColor(bitmap);
+                        teams.add(teamObj);
+
+                        return null;
+                    });
+                    imageRequestTask.execute("https://www.thebluealliance.com/avatar/" + year + "/frc" + teamObj.teamNumber + ".png");
+                }
+
+                while (teams.size() != teamData.length()) {
+                    Thread.sleep(100);
+                }
+
+                frcEvent event = new frcEvent();
+                event.name = matchName;
+                event.eventCode = matchKey;
+                event.teams = teams;
+                event.matches = matchData;
+
+                FileEditor.setEvent(event);
+                AlertManager.toast("Saved!");
+
+                getActivity().runOnUiThread(() -> findNavController(this).navigate(R.id.action_navigation_tba_event_to_navigation_transfer));
+                stopLoading();
+
+            }catch(Exception j) {
+                AlertManager.error(j);
+                stopLoading();
             }
+        });
+        t.start();
 
+        return false;
+    }
 
-            ArrayList<frcTeam> teams = new ArrayList<>();
-            for(int i=0;i<teamData.length();i++){
-                frcTeam teamObj = new frcTeam();
-                JSONObject team = teamData.getJSONObject(i);
+    private void startLoading(String title){
+        getActivity().runOnUiThread(() -> {
+            if(loadingDialog != null && loadingDialog.isShowing())
+                loadingDialog.dismiss();
+            loadingDialog = ProgressDialog.show(getActivity(), title, "Please wait...");
+        });
+    }
 
-                teamObj.teamNumber = team.getInt("team_number");
-                teamObj.teamName = team.getString("nickname");
-                teamObj.city = team.getString("city");
-                teamObj.stateOrProv = team.getString("state_prov");
-                teamObj.school = team.getString("school_name");
-                teamObj.country = team.getString("country");
-                teamObj.startingYear = team.getInt("rookie_year");
-
-                teams.add(teamObj);
-            }
-
-            frcEvent event = new frcEvent();
-            event.name = matchName;
-            event.eventCode = matchKey;
-            event.teams = teams;
-            event.matches = matchData;
-
-            return fileEditor.setEvent(event);
-        }catch (JSONException j){
-            AlertManager.error(j);
-            AlertManager.alert("Error", "Invalid JSON");
-            return false;
-        }
+    private void stopLoading(){
+        getActivity().runOnUiThread(() -> {
+            if (loadingDialog != null)
+                loadingDialog.cancel();
+            loadingDialog = null;
+        });
     }
 }

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

@@ -0,0 +1,227 @@
+package com.ridgebotics.ridgescout.ui.transfer;
+
+import static androidx.navigation.fragment.FragmentKt.findNavController;
+import static com.ridgebotics.ridgescout.utility.Colors.tba_current;
+import static com.ridgebotics.ridgescout.utility.Colors.tba_next;
+import static com.ridgebotics.ridgescout.utility.Colors.tba_previous;
+import static com.ridgebotics.ridgescout.utility.FileEditor.TBAAddress;
+import static com.ridgebotics.ridgescout.utility.FileEditor.TBAHeader;
+
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferTbaBinding;
+import com.ridgebotics.ridgescout.ui.views.TBAEventOption;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.RequestTask;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+// Class to select an event from TBA and redirect to TBAEventFragment.java.
+public class TBASelectorFragment extends Fragment {
+
+    private android.widget.TableLayout Table;
+    private FragmentTransferTbaBinding binding;
+
+    private final int year = SettingsManager.getYearNum();
+
+    private ProgressDialog loadingDialog;
+
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        binding = FragmentTransferTbaBinding.inflate(inflater, container, false);
+
+        Table = binding.matchTable;
+
+        Table.setStretchAllColumns(true);
+
+        TableRow tr = new TableRow(getContext());
+        addTableText(tr, "Loading Events...");
+        Table.addView(tr);
+
+        startLoading("Loading Events...");
+
+        final RequestTask rq = new RequestTask();
+        rq.onResult(s -> {
+            if(s == null || s.isEmpty()) {
+                AlertManager.error("Could not fetch event!");
+                stopLoading();
+                return null;
+            }
+            eventTable(s);
+            return null;
+        });
+        rq.execute(TBAAddress + "events/"+year, TBAHeader);
+
+        return binding.getRoot();
+    }
+
+    private void addTableText(TableRow tr, String textStr){
+        TextView text = new TextView(getContext());
+        text.setTextSize(18);
+        text.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); // Text align center
+        text.setText(textStr);
+        tr.addView(text);
+    }
+
+    public static int getEventTypeWeight(String type){
+        switch(type){
+            case "Preseason": return -3;
+            case "District": return -2;
+            case "Regional": return -1;
+            case "District Championship Division": return 0;
+            case "District Championship": return 1;
+            case "Championship Divison": return 2;
+            case "Championship Finals": return 3;
+            case "Offseason": return 4;
+        }
+
+        return 0;
+    }
+
+    public void eventTable(String dataString){
+
+        Table.removeAllViews();
+        Table.setStretchAllColumns(true);
+        Table.bringToFront();
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date currentTime = Calendar.getInstance().getTime();
+
+        try {
+            JSONArray events = new JSONArray(dataString);
+
+            List<JSONObject> data = new ArrayList<>();
+            for(int i = 0; i < events.length(); i++){
+                data.add(events.getJSONObject(i));
+            }
+
+            // Sort events by date, and then type
+            data.sort((a, b) -> {
+                try {
+//                    return (int) (currentTime.getTime() - format.parse(a.getString("start_date")).getTime())
+//                            -
+//                            (int) (currentTime.getTime() - format.parse(b.getString("start_date")).getTime());
+
+                    int diff = format.parse(a.getString("start_date")).compareTo(format.parse(b.getString("start_date"))) * 10;
+
+                    if(diff == 0){
+                        diff = getEventTypeWeight(a.getString("event_type_string")) - getEventTypeWeight(b.getString("event_type_string"));
+                    }
+
+                    if(diff == 0){
+                        diff = a.getString("key").compareTo(b.getString("key"));
+                    }
+
+                    return diff;
+                } catch (ParseException | JSONException e) {
+                    AlertManager.error(e);
+                    return 0;
+                }
+            });
+
+
+            boolean toggle = false;
+
+            for(int i=0;i<data.size();i++){
+                JSONObject j = data.get(i);
+
+                TBAEventOption row = new TBAEventOption(getContext());
+
+
+//                TableRow tr = new TableRow(getContext());
+//                TableLayout.LayoutParams rowParams = new TableLayout.LayoutParams(
+//                        TableRow.LayoutParams.WRAP_CONTENT,
+//                        TableRow.LayoutParams.WRAP_CONTENT
+//                );
+//                rowParams.setMargins(20,20,20,20);
+//                tr.setLayoutParams(rowParams);
+//                tr.setPadding(20,20,20,20);
+                row.setBackgroundColor(0x30000000);
+
+                String name = j.getString("short_name");
+
+                // Sometimes, a short name is not present on TBA Events
+                if(name.isEmpty()){
+                    name = j.getString("name");
+                }
+
+                String eventType = j.getString("event_type_string");
+                if(eventType.equals("District") || eventType.equals("Regional"))
+                    eventType = "Week " + (j.getInt("week")+1) + " " + eventType;
+
+                row.setName(name);
+                row.setCode(j.getString("key"));
+                row.setType(eventType);
+
+                try {
+                    Date startDate = format.parse(j.getString("start_date"));
+                    Date endDate = format.parse(j.getString("end_date"));
+                    if(currentTime.after(endDate)){
+                        row.setColor(tba_previous);
+                    }else if(currentTime.before(startDate)){
+                        row.setColor(tba_next);
+                    }else if(currentTime.after(startDate) && currentTime.before(endDate)){
+                        row.setColor(tba_current);
+                    }
+                } catch (Exception e) {
+                    AlertManager.error("Failed finding start and end dates!", e);
+                    stopLoading();
+                }
+
+
+                row.setOnClickListener(v -> {
+                    TBAEventFragment.setEventData(j);
+                    findNavController(this).navigate(R.id.action_navigation_tba_selector_to_navigation_tba_event);
+                });
+
+//                tr.addView(cl);
+                Table.addView(row);
+
+
+                toggle = !toggle;
+            }
+
+            stopLoading();
+        }catch (JSONException j){
+            AlertManager.error("Failed Downloading", j);
+            stopLoading();
+        }
+    }
+    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/TransferFragment.java

@@ -1,9 +1,8 @@
-package com.astatin3.scoutingapp2025.ui.transfer;
+package com.ridgebotics.ridgescout.ui.transfer;
 
 import static androidx.navigation.fragment.FragmentKt.findNavController;
 
 import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,12 +12,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.R;
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferBinding;
-import com.astatin3.scoutingapp2025.ui.transfer.bluetooth.BluetoothSenderFragment;
-import com.astatin3.scoutingapp2025.ui.transfer.codes.CodeGeneratorView;
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferBinding;
+import com.ridgebotics.ridgescout.ui.transfer.bluetooth.BluetoothSenderFragment;
+import com.ridgebotics.ridgescout.ui.transfer.codes.CodeGeneratorView;
 
+// Class to do transference.
 public class TransferFragment extends Fragment {
     private FragmentTransferBinding binding;
 
@@ -31,9 +32,6 @@ public class TransferFragment extends Fragment {
 
     String evcode;
 
-    private static final int background_color = 0x5000ff00;
-    private static final int unselected_background_color = 0x2000ff00;
-
 //    private Bundle b;
 
     @Nullable
@@ -45,32 +43,50 @@ public class TransferFragment extends Fragment {
 
         binding = FragmentTransferBinding.inflate(inflater, container, false);
 
-        evcode = latestSettings.settings.get_evcode();
+        evcode = SettingsManager.getEVCode();
 
         binding.downloadButton.setOnClickListener(v -> {
             start_download();
         });
 
         binding.TBAButton.setOnClickListener(v -> {
-            binding.noEventError.setVisibility(View.GONE);
-            AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
-            alert.setTitle("Warning");
-            alert.setMessage("This action requires internet.");
-            alert.setCancelable(true);
-
-            alert.setPositiveButton("Ok", (dialog, which) -> {
-                findNavController(this).navigate(R.id.action_navigation_transfer_to_navigation_tba);
-            });
-
-            alert.setNegativeButton("Cancel", null);
-            alert.create().show();
+            findNavController(this).navigate(R.id.action_navigation_transfer_to_navigation_tba_selector);
         });
 
+
+        if(!SettingsManager.getWifiMode()) {
+            binding.TBAButton.setEnabled(false);
+            binding.SyncButton.setEnabled(false);
+        }
+
+        if(!SettingsManager.getFTPEnabled()) {
+            binding.SyncButton.setEnabled(false);
+        }
+
+        binding.SyncButton.setOnClickListener(v -> {
+            binding.SyncButton.setEnabled(false);
+            FTPSync.sync();
+        });
+
+        if(FTPSync.getIsRunning())
+            binding.SyncButton.setEnabled(false);
+
+        FTPSync.setOnResult((error, upcount, downcount) -> {
+            if (getActivity() != null)
+                getActivity().runOnUiThread(() -> {
+                    binding.SyncButton.setEnabled(true);
+                    AlertManager.toast((!error ? "Synced! " : "Error Syncing. ") + upcount + " Up " + downcount + " Down");
+                });
+        });
+
+        binding.syncIndicator.setText(FTPSync.text);
+        FTPSync.setOnUpdateIndicator(text -> {if(getActivity() != null) getActivity().runOnUiThread(() -> binding.syncIndicator.setText(text));});
+
         if(evcode.equals("unset")){
             binding.noEventError.setVisibility(View.VISIBLE);
-            binding.uploadButton.setVisibility(View.GONE);
-            binding.CSVButton.setVisibility(View.GONE);
-            binding.downloadButton.setVisibility(View.VISIBLE);
+            binding.uploadButton.setEnabled(false);
+            binding.CSVButton.setEnabled(false);
+            binding.downloadButton.setEnabled(true);
             return binding.getRoot();
         }
 
@@ -82,33 +98,15 @@ public class TransferFragment extends Fragment {
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
             builder.setTitle("Chose data");
 
-            builder.setNegativeButton("Pit data", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    CSVExport.exportPits(getContext());
-                }
-            });
+            builder.setNegativeButton("Pit data", (dialog, which) -> CSVExport.exportPits(getContext()));
 
-            builder.setPositiveButton("Match data", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    CSVExport.exportMatches(getContext());
-                }
-            });
+            builder.setPositiveButton("Match data", (dialog, which) -> CSVExport.exportMatches(getContext()));
 
-            builder.setNeutralButton("Cancel", new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.cancel();
-                }
-            });
+            builder.setNeutralButton("Cancel", (dialog, which) -> dialog.cancel());
 
             builder.show();
         });
 
-        if(!latestSettings.settings.get_wifi_mode())
-            binding.TBAButton.setVisibility(View.GONE);
-
         return binding.getRoot();
     }
 

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

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.transfer;
+package com.ridgebotics.ridgescout.ui.transfer;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -9,8 +9,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferSelectorBinding;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferSelectorBinding;
 
+// The transfer method selector
 public class TransferSelectorFragment extends Fragment {
 
     // Declaring three blank funcs in one line lol
@@ -30,17 +31,11 @@ public class TransferSelectorFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         binding = FragmentTransferSelectorBinding.inflate(inflater, container, false);
 
-        binding.codesButton.setOnClickListener(view -> {
-            onselect.onSelectCodes(this);
-        });
+        binding.codesButton.setOnClickListener(view -> onselect.onSelectCodes(this));
 
-        binding.bluetoothButton.setOnClickListener(view -> {
-            onselect.onSelectBluetooth(this);
-        });
+        binding.bluetoothButton.setOnClickListener(view -> onselect.onSelectBluetooth(this));
 
-        binding.fileBundleButton.setOnClickListener(view -> {
-            onselect.onSelectFileBundle(this);
-        });
+        binding.fileBundleButton.setOnClickListener(view -> onselect.onSelectFileBundle(this));
 
         return binding.getRoot();
     }

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/bluetooth/BluetoothReceiver.java

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.transfer.bluetooth;
+package com.ridgebotics.ridgescout.ui.transfer.bluetooth;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -12,20 +12,18 @@ import android.os.Build;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import com.astatin3.scoutingapp2025.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.AlertManager;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
+// Helper class for bluetooth reciever.
 public class BluetoothReceiver {
     private static final UUID MY_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
     private static final String NAME = "BluetoothReceiverApp";
-    private static final int REQUEST_ENABLE_BT = 1;
-    private static final int REQUEST_PERMISSIONS = 2;
 
     private Context context;
     private BluetoothAdapter bluetoothAdapter;
@@ -75,9 +73,9 @@ public class BluetoothReceiver {
                 permissionsNeeded.add(Manifest.permission.BLUETOOTH_ADMIN);
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                    permissionsNeeded.add(Manifest.permission.ACCESS_FINE_LOCATION);
-                }
+//                if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+//                    permissionsNeeded.add(Manifest.permission.ACCESS_FINE_LOCATION);
+//                }
             }
         }
 
@@ -95,11 +93,11 @@ public class BluetoothReceiver {
             boolean hasBasicPermissions = ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
                     ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED;
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                return hasBasicPermissions && ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-            } else {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//                return hasBasicPermissions && ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+//            } else {
                 return hasBasicPermissions;
-            }
+//            }
         }
     }
 

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/bluetooth/BluetoothReceiverFragment.java

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.transfer.bluetooth;
+package com.ridgebotics.ridgescout.ui.transfer.bluetooth;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,17 +11,18 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferBluetoothReceiverBinding;
-import com.astatin3.scoutingapp2025.types.file;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferBluetoothReceiverBinding;
+import com.ridgebotics.ridgescout.types.ScoutingFile;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.BuiltByteParser;
+import com.ridgebotics.ridgescout.utility.FileEditor;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.DataFormatException;
 
+// Class to receive bluetooth transmissions from other devices
 public class BluetoothReceiverFragment extends Fragment {
     private BluetoothReceiver bluetoothReceiver;
     private Button startListeningButton;
@@ -68,12 +69,12 @@ public class BluetoothReceiverFragment extends Fragment {
         statusTextView = binding.statusTextView;
 
         if (!bluetoothReceiver.isBluetoothSupported()) {
-            AlertManager.error("Bluetooth is not supported on this device");
+            AlertManager.addSimpleError("Bluetooth is not supported on this device");
             return binding.getRoot();
         }
 
         if (!bluetoothReceiver.isBluetoothEnabled()) {
-            AlertManager.error("Please enable Bluetooth");
+            AlertManager.addSimpleError("Please enable Bluetooth");
         }
 
         startListeningButton.setOnClickListener(v -> {
@@ -97,7 +98,7 @@ public class BluetoothReceiverFragment extends Fragment {
             recievedBytes = new ArrayList<>();
 
         } catch (IOException e) {
-            AlertManager.error("Failed to start listening: " + e.getMessage());
+            AlertManager.error("Failed to start listening", e);
         }
     }
 
@@ -108,14 +109,14 @@ public class BluetoothReceiverFragment extends Fragment {
             startListeningButton.setEnabled(true);
             stopListeningButton.setEnabled(false);
         } catch (IOException e) {
-            AlertManager.error("Failed to stop listening: " + e.getMessage());
+            AlertManager.error("Failed to stop listening: " + e.getMessage(), e);
         }
     }
 
     private List<byte[]> recievedBytes;
 
     private void receiveData(byte[] data, int bytes) {
-        byte[] newBytes = fileEditor.getByteBlock(data, 0, bytes);
+        byte[] newBytes = FileEditor.getByteBlock(data, 0, bytes);
         System.out.println("Recieved " + bytes + " Bytes over bluetooth!");
         recievedBytes.add(newBytes);
     }
@@ -125,16 +126,16 @@ public class BluetoothReceiverFragment extends Fragment {
         String result_filenames = "";
         try {
 
-            byte[] resultBytes = fileEditor.combineByteArrays(recievedBytes);
-            resultBytes = fileEditor.blockUncompress(resultBytes);
+            byte[] resultBytes = FileEditor.combineByteArrays(recievedBytes);
+            resultBytes = FileEditor.blockUncompress(resultBytes);
 
 
             BuiltByteParser bbp = new BuiltByteParser(resultBytes);
             ArrayList<BuiltByteParser.parsedObject> result = bbp.parse();
 
             for (int i = 0; i < result.size(); i++) {
-                if (result.get(i).getType() != file.typecode) continue;
-                file f = file.decode((byte[]) result.get(i).get());
+                if (result.get(i).getType() != ScoutingFile.typecode) continue;
+                ScoutingFile f = ScoutingFile.decode((byte[]) result.get(i).get());
 
                 if (f != null) {
                     System.out.println(f.filename);

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/bluetooth/BluetoothSender.java

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.transfer.bluetooth;
+package com.ridgebotics.ridgescout.ui.transfer.bluetooth;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -12,7 +12,7 @@ import android.os.Build;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import com.astatin3.scoutingapp2025.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.AlertManager;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -21,10 +21,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
+// Helper class with sending bluetooth scouting data
 public class BluetoothSender {
     private static final UUID MY_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
-    private static final int REQUEST_ENABLE_BT = 1;
-    private static final int REQUEST_PERMISSIONS = 2;
 
     private Context context;
     private BluetoothAdapter bluetoothAdapter;
@@ -70,7 +69,7 @@ public class BluetoothSender {
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                    permissionsNeeded.add(Manifest.permission.ACCESS_FINE_LOCATION);
+//                    permissionsNeeded.add(Manifest.permission.ACCESS_FINE_LOCATION);
                 }
             }
         }
@@ -89,11 +88,11 @@ public class BluetoothSender {
             boolean hasBasicPermissions = ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
                     ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED;
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                return hasBasicPermissions && ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-            } else {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//                return hasBasicPermissions && ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+//            } else {
                 return hasBasicPermissions;
-            }
+//            }
         }
     }
 

app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/bluetooth/BluetoothSenderFragment.java

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.transfer.bluetooth;
+package com.ridgebotics.ridgescout.ui.transfer.bluetooth;
 
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothDevice;
@@ -15,14 +15,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferBluetoothSenderBinding;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferBluetoothSenderBinding;
+import com.ridgebotics.ridgescout.utility.AlertManager;
+import com.ridgebotics.ridgescout.utility.FileEditor;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Set;
 
+// Class to send scouting data over bluetooth.
 public class BluetoothSenderFragment extends Fragment {
     private BluetoothSender bluetoothSender;
     private ListView deviceListView;
@@ -101,10 +102,10 @@ public class BluetoothSenderFragment extends Fragment {
 
     private void sendData() {
         try {
-            byte[] compressed = fileEditor.blockCompress(data_to_send);
+            byte[] compressed = FileEditor.blockCompress(data_to_send, FileEditor.lengthHeaderBytes);
 
             for(int i = 0; i < Math.ceil((double) compressed.length/1024); i++){
-                bluetoothSender.sendData(fileEditor.getByteBlock(compressed, i*1024, (i+1)*1024));
+                bluetoothSender.sendData(FileEditor.getByteBlock(compressed, i*1024, (i+1)*1024));
             }
 
             bluetoothSender.close();

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

@@ -1,11 +1,9 @@
-package com.astatin3.scoutingapp2025.ui.transfer.codes;
+package com.ridgebotics.ridgescout.ui.transfer.codes;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,12 +13,11 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferCodeSenderBinding;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
+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.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
@@ -33,6 +30,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Random;
 
+// Class to show the code transfer thing.
 public class CodeGeneratorView extends Fragment {
     private ImageView qrImage;
     private SeekBar qrSpeedSlider;
@@ -79,7 +77,7 @@ public class CodeGeneratorView extends Fragment {
         qrIndexN = binding.qrIndexN;
         qrIndexD = binding.qrIndexD;
 
-        String compressed = new String(fileEditor.blockCompress(data), StandardCharsets.ISO_8859_1);
+        String compressed = new String(FileEditor.blockCompress(data, FileEditor.lengthHeaderBytes), StandardCharsets.ISO_8859_1);
 
         if(compressed.isEmpty()){
             AlertManager.alert("Error!", "Empty data!");
@@ -193,10 +191,10 @@ public class CodeGeneratorView extends Fragment {
             try {
 //                alert("test", ""+Math.ceil((double)data.length()/(double)qrSize));
                 qrBitmaps.add(generateQrCode(
-                    fileEditor.byteToChar(fileEditor.internalDataVersion) +
-                                String.valueOf(fileEditor.byteToChar(randID)) +
-                                fileEditor.byteToChar(i) +
-                                fileEditor.byteToChar(qrCount - 1) +
+                    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));

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

@@ -1,7 +1,11 @@
-package com.astatin3.scoutingapp2025.ui.transfer.codes;
+package com.ridgebotics.ridgescout.ui.transfer.codes;
 
 // From https://github.com/dlazaro66/QRCodeReaderView/blob/master/samples/src/main/java/com/example/qr_readerexample/PointsOverlayView.java
 
+import static com.ridgebotics.ridgescout.utility.Colors.code_scanned_color;
+import static com.ridgebotics.ridgescout.utility.Colors.code_selected_color;
+import static com.ridgebotics.ridgescout.utility.Colors.code_unscanned_color;
+
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -13,6 +17,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
+// Shows the progress of receiving data over codes.
 public class CodeOverlayView extends View {
 
         PointF[] points;
@@ -37,7 +42,7 @@ public class CodeOverlayView extends View {
 
         private void init() {
             paint = new Paint();
-            paint.setColor(Color.YELLOW);
+            paint.setColor(code_selected_color);
             paint.setStyle(Paint.Style.FILL);
         }
 
@@ -69,12 +74,12 @@ public class CodeOverlayView extends View {
 
                     final int num = barColors[i];
 
-                    int c = Color.RED;
+                    int c = code_unscanned_color;
 
                     if(num == 2){
-                        c = Color.GREEN;
+                        c = code_scanned_color;
                     }else if(num == 1){
-                        c = Color.YELLOW;
+                        c = code_selected_color;
                     }
 
                     final Paint p = new Paint();

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

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.transfer.codes;
+package com.ridgebotics.ridgescout.ui.transfer.codes;
 
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
+// Background task for code scanning, to not slow down the scanner.
 public class CodeScanTask extends AsyncTask<String, String, String>{
     private Function<String, String> resultFunction = null;
     private Bitmap image;

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

@@ -1,14 +1,14 @@
-package com.astatin3.scoutingapp2025.ui.transfer.codes;
+package com.ridgebotics.ridgescout.ui.transfer.codes;
 
 import static androidx.core.math.MathUtils.clamp;
 
+import android.Manifest;
 import android.app.AlertDialog;
-import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.media.Image;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Surface;
@@ -27,16 +27,16 @@ import androidx.camera.core.ImageProxy;
 import androidx.camera.core.Preview;
 import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferCodeReceiverBinding;
-import com.astatin3.scoutingapp2025.databinding.FragmentTransferCodeSenderBinding;
-import com.astatin3.scoutingapp2025.types.file;
-import com.astatin3.scoutingapp2025.utility.AlertManager;
-import com.astatin3.scoutingapp2025.utility.BuiltByteParser;
-import com.astatin3.scoutingapp2025.utility.fileEditor;
+import com.ridgebotics.ridgescout.databinding.FragmentTransferCodeReceiverBinding;
+import com.ridgebotics.ridgescout.types.ScoutingFile;
+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 java.nio.ByteBuffer;
@@ -47,7 +47,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-//public class scannerView extends androidx.appcompat.widget.AppCompatImageView {
+// Recieves data from the camera, scanning codes.
 public class CodeScannerView extends Fragment {
     private CodeOverlayView CodeOverlayView;
     private Handler uiHandler;
@@ -119,10 +119,10 @@ public class CodeScannerView extends Fragment {
             if(data != null){
 //                    alert("test", ""+fileEditor.byteFromChar(data.charAt(0)));
                 compileData(
-                    fileEditor.byteFromChar(data.charAt(0)),
-                    fileEditor.byteFromChar(data.charAt(1)),
-                    fileEditor.byteFromChar(data.charAt(2)),
-                    (fileEditor.byteFromChar(data.charAt(3))+1),
+                    FileEditor.byteFromChar(data.charAt(0)),
+                    FileEditor.byteFromChar(data.charAt(1)),
+                    FileEditor.byteFromChar(data.charAt(2)),
+                    (FileEditor.byteFromChar(data.charAt(3))+1),
                     data.substring(4)
                 );
             }
@@ -152,6 +152,9 @@ public class CodeScannerView extends Fragment {
 
         this.lifecycle = getViewLifecycleOwner();
 
+        if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(getActivity(), new String[]{Manifest.permission.CAMERA}, 1);
+        }
 
 
         uiHandler = new Handler();
@@ -280,8 +283,8 @@ public class CodeScannerView extends Fragment {
     private int randID;
     private int prevQrIndex;
     private void compileData(int dataVersion, int randID, int qrIndex, int qrCount, String qrData){
-        if(dataVersion != fileEditor.internalDataVersion){
-            alert("Error", "Incorrect data version ("+dataVersion+" != "+fileEditor.internalDataVersion+")");
+        if(dataVersion != FileEditor.internalDataVersion){
+            alert("Error", "Incorrect data version ("+dataVersion+" != "+ FileEditor.internalDataVersion+")");
             return;
         }
 
@@ -317,7 +320,7 @@ public class CodeScannerView extends Fragment {
 
             try {
                 byte[] compiledBytes = compiledString.getBytes(StandardCharsets.ISO_8859_1);
-                byte[] resultBytes = fileEditor.blockUncompress(compiledBytes);
+                byte[] resultBytes = FileEditor.blockUncompress(compiledBytes);
 
 
                 String result_filenames = "";
@@ -326,8 +329,8 @@ public class CodeScannerView extends Fragment {
                 ArrayList<BuiltByteParser.parsedObject> result = bbp.parse();
 
                 for(int i = 0; i < result.size(); i++){
-                    if(result.get(i).getType() != file.typecode) continue;
-                    file f = file.decode((byte[]) result.get(i).get());
+                    if(result.get(i).getType() != ScoutingFile.typecode) continue;
+                    ScoutingFile f = ScoutingFile.decode((byte[]) result.get(i).get());
 
                     if(f != null)
                         if(f.write())

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

@@ -0,0 +1,204 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewTreeObserver;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+
+// Unused. AI-generated dynamic wallpaper for 2025 season.
+public class BackgroundView extends View {
+    private List<Circle> circles;
+    private Paint whitePaint;
+    private Paint greenPaint;
+    private Random random;
+
+    // Physics simulation constants
+    private static final float GRAVITY = 9.8f;
+    private static final float DAMPING = 0.5f;
+    private static final float CIRCLE_SPAWN_INTERVAL = 500; // milliseconds
+    private long lastSpawnTime = 0;
+
+    // Screen dimensions
+    private int screenWidth;
+    private int screenHeight;
+
+    public BackgroundView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize();
+    }
+
+    private void initialize() {
+        // Setup paints
+        whitePaint = new Paint();
+        whitePaint.setColor(Color.WHITE);
+        whitePaint.setStyle(Paint.Style.STROKE);
+        whitePaint.setStrokeWidth(2);
+
+        greenPaint = new Paint();
+        greenPaint.setColor(Color.GREEN);
+        greenPaint.setStyle(Paint.Style.FILL);
+
+        circles = new ArrayList<>();
+        random = new Random();
+
+        // Get screen dimensions after layout
+        ViewTreeObserver vto = getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                screenWidth = getWidth();
+                screenHeight = getHeight();
+                getViewTreeObserver().removeOnGlobalLayoutListener(this);
+            }
+        });
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        // Spawn new circles periodically
+        long currentTime = System.currentTimeMillis();
+        if (currentTime - lastSpawnTime > CIRCLE_SPAWN_INTERVAL) {
+            spawnCircle();
+            lastSpawnTime = currentTime;
+        }
+
+        // First pass: detect all collisions
+        List<Collision> collisions = new ArrayList<>();
+        for (int i = 0; i < circles.size(); i++) {
+            Circle circle = circles.get(i);
+
+            // Wall and floor collisions
+            if (circle.x - circle.radius < 0) {
+                circle.x = circle.radius;
+                circle.velocityX *= -DAMPING;
+            }
+            if (circle.x + circle.radius > screenWidth) {
+                circle.x = screenWidth - circle.radius;
+                circle.velocityX *= -DAMPING;
+            }
+            if (circle.y + circle.radius > screenHeight) {
+                circle.y = screenHeight - circle.radius;
+                circle.velocityY = 0;
+            }
+
+            // Detect collisions with other circles
+            for (int j = i + 1; j < circles.size(); j++) {
+                Circle otherCircle = circles.get(j);
+                float dx = otherCircle.x - circle.x;
+                float dy = otherCircle.y - circle.y;
+                float distance = (float) Math.sqrt(dx * dx + dy * dy);
+
+                if (distance < circle.radius + otherCircle.radius) {
+                    collisions.add(new Collision(circle, otherCircle, dx, dy, distance));
+                }
+            }
+            
+            // Apply gravity
+            circle.velocityY += GRAVITY * 0.1f;
+        }
+
+        // Second pass: resolve collisions
+        for (Collision collision : collisions) {
+            Circle c1 = collision.circle1;
+            Circle c2 = collision.circle2;
+            float dx = collision.dx;
+            float dy = collision.dy;
+            float distance = collision.distance;
+
+            // Calculate overlap
+            float overlap = (c1.radius + c2.radius - distance) / 2;
+
+            // Separate circles
+            float separationX = overlap * dx / distance;
+            float separationY = overlap * dy / distance;
+
+            c1.x -= separationX;
+            c1.y -= separationY;
+            c2.x += separationX;
+            c2.y += separationY;
+
+            // Dampen velocities
+            c1.velocityX *= DAMPING;
+            c1.velocityY *= DAMPING;
+            c2.velocityX *= DAMPING;
+            c2.velocityY *= DAMPING;
+        }
+
+        // Draw and update circles
+        Iterator<Circle> iterator = circles.iterator();
+        while (iterator.hasNext()) {
+            Circle circle = iterator.next();
+
+            // Update position
+            circle.x += circle.velocityX;
+            circle.y += circle.velocityY;
+
+            // Draw circle
+            Paint paint = circle.isGreen ? greenPaint : whitePaint;
+            canvas.drawCircle(circle.x, circle.y, circle.radius, paint);
+
+            // Remove circles that have fallen off screen
+            if (circle.y > screenHeight + circle.radius) {
+                iterator.remove();
+            }
+        }
+
+        // Trigger redraw
+        invalidate();
+    }
+
+    // Collision tracking class
+    private static class Collision {
+        Circle circle1, circle2;
+        float dx, dy, distance;
+
+        Collision(Circle c1, Circle c2, float dx, float dy, float distance) {
+            this.circle1 = c1;
+            this.circle2 = c2;
+            this.dx = dx;
+            this.dy = dy;
+            this.distance = distance;
+        }
+    }
+
+    private void spawnCircle() {
+        // More likely to spawn white circles
+        boolean isGreen = random.nextFloat() < 0.2f;
+
+        float radius = isGreen ?
+                120:  // Green: 20-60
+                80;   // White: 10-30
+
+        float x = random.nextFloat() * screenWidth;
+        float velocityX = (random.nextFloat() - 0.5f) * 5;
+
+        circles.add(new Circle(x, -radius, radius, velocityX, 0, isGreen));
+    }
+
+    // Circle class to represent individual circles
+    private static class Circle {
+        float x, y;
+        float radius;
+        float velocityX, velocityY;
+        boolean isGreen;
+
+        Circle(float x, float y, float radius, float velocityX, float velocityY, boolean isGreen) {
+            this.x = x;
+            this.y = y;
+            this.radius = radius;
+            this.velocityX = velocityX;
+            this.velocityY = velocityY;
+            this.isGreen = isGreen;
+        }
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import static com.ridgebotics.ridgescout.utility.Colors.candlestick_color;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+// Shows the scale for a candlestick chart.
+public class CandlestickHeader extends View {
+
+    private float absoluteMin = 0;
+    private float absoluteMax = 100;
+
+    // Number of scale marks to show
+    private final int SCALE_MARKS = 5;
+
+    // Padding and dimensions
+    private final int PADDING_LEFT = 50;
+    private final int PADDING_RIGHT = 50;
+    private final int PADDING_TOP = 10;
+    private final int PADDING_BOTTOM = 10;
+    private final int TICK_HEIGHT = 10;
+
+    private Paint linePaint;
+    private Paint textPaint;
+
+    public CandlestickHeader(Context context) {
+        super(context);
+        init();
+    }
+
+    public CandlestickHeader(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public CandlestickHeader(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        linePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        linePaint.setColor(candlestick_color);
+        linePaint.setStrokeWidth(2f);
+        linePaint.setStyle(Paint.Style.STROKE);
+
+        textPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        textPaint.setColor(candlestick_color);
+        textPaint.setTextSize(30f);
+        textPaint.setTextAlign(Paint.Align.CENTER);
+    }
+
+    /**
+     * Set the scale range for the header
+     *
+     * @param absoluteMin Absolute minimum of the dataset
+     * @param absoluteMax Absolute maximum of the dataset
+     */
+    public void setScale(float absoluteMin, float absoluteMax) {
+        this.absoluteMin = absoluteMin;
+        this.absoluteMax = absoluteMax;
+        invalidate();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int desiredWidth = 600;
+        int desiredHeight = 80; // Height for the scale with labels
+
+        int width = resolveSize(desiredWidth, widthMeasureSpec);
+        int height = resolveSize(desiredHeight, heightMeasureSpec);
+
+        setMeasuredDimension(width, height);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        int width = getWidth();
+        int height = getHeight();
+
+        // Draw horizontal axis
+        float y = height - PADDING_BOTTOM;
+        canvas.drawLine(PADDING_LEFT, y, width - PADDING_RIGHT, y, linePaint);
+
+        // Calculate interval between scale marks
+        float availableWidth = width - PADDING_LEFT - PADDING_RIGHT;
+        float intervalValue = (absoluteMax - absoluteMin) / (SCALE_MARKS - 1);
+        float intervalPixels = availableWidth / (SCALE_MARKS - 1);
+
+        // Draw scale marks and labels
+        for (int i = 0; i < SCALE_MARKS; i++) {
+            float x = PADDING_LEFT + (intervalPixels * i);
+            float value = absoluteMin + (intervalValue * i);
+
+            // Draw tick mark
+            canvas.drawLine(x, y, x, y - TICK_HEIGHT, linePaint);
+
+            // Draw label
+            canvas.drawText(String.format("%.1f", value), x, y - TICK_HEIGHT - 10, textPaint);
+        }
+    }
+}

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

@@ -0,0 +1,214 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import static com.ridgebotics.ridgescout.utility.Colors.candlestick_color;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.ridgebotics.ridgescout.types.data.RawDataType;
+import com.ridgebotics.ridgescout.ui.data.DataProcessing;
+
+import java.util.List;
+
+// A single candlestick chart row.
+public class CandlestickView extends View {
+
+    // Data points
+    private float min = 0;
+    private float max = 0;
+    private float lowerQuartile = 0;
+    private float upperQuartile = 0;
+    public float average = 0;
+
+    // Dataset absolute bounds for scaling
+    private float absoluteMin = 0;
+    private float absoluteMax = 100;
+
+    // Padding and dimensions
+    private final int PADDING_LEFT = 50;
+    private final int PADDING_RIGHT = 50;
+    private final int PADDING_TOP = 20;
+    private final int PADDING_BOTTOM = 20;
+    private final int CANDLESTICK_HEIGHT = 60;
+    private final int WHISKER_HEIGHT = 10;
+
+    // Paint objects
+    private Paint boxPaint;
+    private Paint whiskerPaint;
+    private Paint averagePaint;
+    private Paint textPaint;
+
+    public CandlestickView(Context context) {
+        super(context);
+        init();
+    }
+
+    public CandlestickView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public CandlestickView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        // Initialize paint objects
+        boxPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        boxPaint.setColor(candlestick_color);
+        boxPaint.setStyle(Paint.Style.STROKE);
+        boxPaint.setStrokeWidth(2f);
+
+        whiskerPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        whiskerPaint.setColor(candlestick_color);
+        whiskerPaint.setStrokeWidth(2f);
+        whiskerPaint.setStyle(Paint.Style.STROKE);
+
+        averagePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        averagePaint.setColor(candlestick_color);
+        averagePaint.setStrokeWidth(3f);
+
+        textPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        textPaint.setColor(candlestick_color);
+        textPaint.setTextSize(30f);
+    }
+
+    /**
+     * Set data for the candlestick chart
+     *
+     * @param min Minimum value
+     * @param lowerQuartile Lower quartile value
+     * @param average Average value
+     * @param upperQuartile Upper quartile value
+     * @param max Maximum value
+     * @param absoluteMin Absolute minimum of the dataset
+     * @param absoluteMax Absolute maximum of the dataset
+     */
+    public void setData(float min, float lowerQuartile, float average,
+                        float upperQuartile, float max,
+                        float absoluteMin, float absoluteMax) {
+        this.min = min;
+        this.lowerQuartile = lowerQuartile;
+        this.average = average;
+        this.upperQuartile = upperQuartile;
+        this.max = max;
+        this.absoluteMin = absoluteMin;
+        this.absoluteMax = absoluteMax;
+
+        // Request redraw
+        invalidate();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int desiredWidth = 600;
+        int desiredHeight = CANDLESTICK_HEIGHT + PADDING_TOP + PADDING_BOTTOM;
+
+        int width = resolveSize(desiredWidth, widthMeasureSpec);
+        int height = resolveSize(desiredHeight, heightMeasureSpec);
+
+        setMeasuredDimension(width, height);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        int width = getWidth();
+        int height = getHeight();
+
+        // Calculate scaling factor for data points
+        float availableWidth = width - PADDING_LEFT - PADDING_RIGHT;
+        float scale = availableWidth / (absoluteMax - absoluteMin);
+
+        // Calculate vertical center of the view
+        int centerY = height / 2;
+
+        // Calculate scaled positions
+        float scaledMin = PADDING_LEFT + (min - absoluteMin) * scale;
+        float scaledLQ = PADDING_LEFT + (lowerQuartile - absoluteMin) * scale;
+        float scaledAvg = PADDING_LEFT + (average - absoluteMin) * scale;
+        float scaledUQ = PADDING_LEFT + (upperQuartile - absoluteMin) * scale;
+        float scaledMax = PADDING_LEFT + (max - absoluteMin) * scale;
+
+        // Draw the box (interquartile range)
+        if(lowerQuartile != upperQuartile) {
+            RectF box = new RectF(
+                    scaledLQ,
+                    centerY - CANDLESTICK_HEIGHT / 2,
+                    scaledUQ,
+                    centerY + CANDLESTICK_HEIGHT / 2);
+            canvas.drawRect(box, boxPaint);
+        }
+
+        // Draw whiskers (min to lower quartile and upper quartile to max)
+        // Left whisker
+        canvas.drawLine(scaledMin, centerY, scaledLQ, centerY, whiskerPaint);
+        canvas.drawLine(
+                scaledMin,
+                centerY - WHISKER_HEIGHT,
+                scaledMin,
+                centerY + WHISKER_HEIGHT,
+                whiskerPaint);
+
+        // Right whisker
+        canvas.drawLine(scaledUQ, centerY, scaledMax, centerY, whiskerPaint);
+        canvas.drawLine(
+                scaledMax,
+                centerY - WHISKER_HEIGHT,
+                scaledMax,
+                centerY + WHISKER_HEIGHT,
+                whiskerPaint);
+
+        // Draw average line
+        canvas.drawLine(
+                scaledAvg,
+                centerY - CANDLESTICK_HEIGHT / 2,
+                scaledAvg,
+                centerY + CANDLESTICK_HEIGHT / 2,
+                averagePaint);
+
+        // Draw labels
+//        canvas.drawText(String.format("%.1f", min), scaledMin - 20, centerY - CANDLESTICK_HEIGHT / 2 - 10, textPaint);
+//        canvas.drawText(String.format("%.1f", max), scaledMax - 20, centerY - CANDLESTICK_HEIGHT / 2 - 10, textPaint);
+//        canvas.drawText(String.format("%.1f", average), scaledAvg - 20, centerY + CANDLESTICK_HEIGHT / 2 + 30, textPaint);
+    }
+
+    public int teamNum;
+
+    public void fromTeamData(List<RawDataType> teamData, Integer teamNum, float absmin, float absmax){
+        this.teamNum = teamNum;
+        int[] tmp_loc_bounds = DataProcessing.getNumberBounds(teamData);
+        int locmin = tmp_loc_bounds[0];
+        int locmax = tmp_loc_bounds[1];
+
+        float avg = 0;
+
+        for(int i = 0; i < teamData.size(); i++){
+            avg += (int) teamData.get(i).get();
+        }
+
+        avg /= teamData.size();
+
+        float[] teamDataArray = new float[teamData.size()];
+        for(int i = 0; i < teamData.size(); i++){
+            teamDataArray[i] = (int) teamData.get(i).get();
+        }
+
+        float lowerQuartile = 0;
+        float upperQuartile = 0;
+
+        if(teamDataArray.length != 0) {
+            lowerQuartile = DataProcessing.calculatePercentile(teamDataArray, 25);
+            upperQuartile = DataProcessing.calculatePercentile(teamDataArray, 75);
+        }
+
+        System.out.println(locmin + ", " + lowerQuartile  + ", " + avg  + ", " + upperQuartile  + ", " + locmax);
+        setData(locmin, lowerQuartile, avg, upperQuartile, locmax, absmin, absmax);
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.CheckBox;
+import android.widget.TableLayout;
+
+import androidx.annotation.Nullable;
+
+import com.google.android.material.divider.MaterialDivider;
+
+import java.util.List;
+
+// The notification view of a Custom dropdown notification
+public class CustomSpinnerPopup extends TableLayout {
+
+    public CustomSpinnerPopup(Context context) {
+        super(context);
+    }
+
+    public CustomSpinnerPopup(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public interface OnOptionSelectedListener {
+        void onOptionSelected(String option);
+    }
+
+    public CustomSpinnerPopup init(List<String> options, OnOptionSelectedListener onOptionSelectedListener, int defaultOption){
+        CheckBox[] checkBoxes = new CheckBox[options.size()];
+        setPadding(16, 16, 16, 16);
+        for(int i = 0; i < options.size(); i++){
+            final CheckBox cb = new CheckBox(getContext());
+            cb.setText(options.get(i));
+            cb.setTextAppearance(com.google.android.material.R.style.TextAppearance_MaterialComponents_Headline5);
+            cb.setChecked(i == defaultOption);
+
+            if(i > 0)
+                addView(new MaterialDivider(getContext()));
+
+            addView(cb);
+            checkBoxes[i] = cb;
+
+            final int fi = i;
+            cb.setOnClickListener(a -> {
+                onOptionSelectedListener.onOptionSelected(options.get(fi));
+                for (CheckBox checkBox : checkBoxes)
+                    checkBox.setChecked(false);
+                cb.setChecked(true);
+            });
+        }
+
+        return this;
+    }
+
+//    public static CustomSpinnerPopup newInstance(ArrayList<String> options) {
+//        CustomSpinnerPopup dialog = new CustomSpinnerPopup();
+//        Bundle args = new Bundle();
+//        args.putStringArrayList("options", options);
+//
+//
+//
+////        dialog.setArguments(args);
+//        return dialog;
+//    }
+
+//    @Override
+//    public void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setStyle(DialogFragment.STYLE_NORMAL, R.style.FullScreenDialogStyle);
+//        if (getArguments() != null) {
+//            options = getArguments().getStringArrayList("options");
+//        }
+//    }
+//
+//    @Nullable
+//    @Override
+//    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+//                             @Nullable Bundle savedInstanceState) {
+//        View view = inflater.inflate(R.layout.view_custom_spinner_popup, container, false);
+//
+//        // Setup toolbar
+//        MaterialToolbar toolbar = view.findViewById(R.id.toolbar);
+//        toolbar.setNavigationOnClickListener(v -> dismiss());
+//        toolbar.setTitle("Select an Option");
+//
+//        // Setup RecyclerView
+//        recyclerView = view.findViewById(R.id.recyclerView);
+//        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+//        adapter = new CustomSpinnerOptionsAdapter(options, option -> {
+//            if (listener != null) {
+//                listener.onOptionSelected(option);
+//            }
+//            dismiss();
+//        });
+//        recyclerView.setAdapter(adapter);
+//
+//        return view;
+//    }
+//
+
+
+
+}
+

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

@@ -0,0 +1,123 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import static android.app.PendingIntent.getActivity;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.ridgebotics.ridgescout.R;
+
+import java.util.List;
+
+// The dropdown element of a custom spinner view.
+public class CustomSpinnerView extends LinearLayout {
+
+    public interface onClickListener {
+        void onClick(String item, int index);
+    }
+
+    public CustomSpinnerView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public CustomSpinnerView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    private List<String> options;
+    private onClickListener onClickListener;
+
+    private TextView title;
+    private TextView item;
+
+    private int index = -1;
+
+    public void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.view_custom_spinner, this, true);
+
+        title = findViewById(R.id.title);
+        item = findViewById(R.id.item);
+    }
+
+    public void setOnClickListener(onClickListener listener){
+        this.onClickListener = listener;
+    }
+
+
+    public void setOptions(List<String> options, String defaultOption){
+        setOptions(options, options.indexOf(defaultOption));
+    }
+
+    public void setOptions(List<String> options, int defaultOption){
+        this.options = options;
+        this.index = defaultOption;
+
+        if(defaultOption != -1)
+            this.item.setText(options.get(defaultOption));
+
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+
+        ScrollView sv = new ScrollView(getContext());
+//        sv.setLayoutDirection(ScrollView.SCROLL_AXIS_VERTICAL);
+
+        LinearLayout ll = new LinearLayout(getContext());
+        ll.setOrientation(LinearLayout.VERTICAL);
+        sv.addView(ll);
+
+        builder.setPositiveButton("OK", (dialog, which) -> {});
+        CustomSpinnerPopup popup = new CustomSpinnerPopup(getContext()).init(options, option -> {
+//            dialog.();
+            if(!isEnabled()) return;
+            item.setText(option);
+            index = options.indexOf(option);
+            if(onClickListener != null) {
+                onClickListener.onClick(option, options.indexOf(option));
+            }
+        }, index);
+
+        ll.addView(popup);
+
+//        popup.setLayoutDirection(0);
+        builder.setView(sv);
+        AlertDialog dialog = builder.create();
+
+
+//        popup.setOnOptionSelectedListener();
+
+        this.setOnClickListener(v -> {
+            if(!isEnabled()) return;
+            dialog.show();
+        });
+    }
+
+    public void setTitle(String text){
+        title.setText(text);
+    }
+
+    public void setOption(String option) {
+        item.setText(option);
+        index = options.indexOf(option);
+    }
+
+    public void setOption(int index) {
+        item.setText(options.get(index));
+        this.index = index;
+    }
+
+    public int getIndex(){
+        return index;
+    }
+    public String getOption(){
+        return options.get(index);
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+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.TableRow;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+
+public class FieldBorderedRow extends TableRow {
+    public FieldBorderedRow(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public FieldBorderedRow(Context context) {
+        super(context);
+        init(context);
+    }
+    private ConstraintLayout box;
+    private View coloredBackground;
+
+    public void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.view_field_border_row, this, true);
+
+
+        box =  findViewById(R.id.field_option_box);
+        coloredBackground = findViewById(R.id.field_option_background);
+    }
+
+    public void setColor(int color){
+        Drawable drawable = box.getBackground();
+        drawable.mutate();
+        drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+
+        float[] hsv = new float[3];
+        Color.colorToHSV(color,hsv);
+
+        coloredBackground.setBackgroundColor(
+                Color.HSVToColor(127, new float[]{
+                        hsv[0],
+                        Math.min(hsv[1], 0.75f),
+                        Math.min(hsv[2], 0.5f)
+                })
+        );
+    }
+
+    public void fromField(FieldType field){
+        ((TextView) findViewById(R.id.field_option_name)).setText(field.name);
+        ((TextView) findViewById(R.id.field_option_type)).setText(field.get_type_name());
+    }
+
+    @Override
+    public void addView(View v){
+        box.addView(v);
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+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.Button;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.types.input.FieldType;
+
+// Shows a display of the view in the view editor.
+public class FieldDisplay extends ConstraintLayout {
+    public FieldDisplay(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public FieldDisplay(Context context) {
+        super(context);
+        init(context);
+    }
+
+    private FieldType field;
+
+    public Button editButton;
+
+//    private View fieldView;
+    private ConstraintLayout box;
+    public View coloredBackground;
+    private LinearLayout fieldDisplayBox;
+
+    public void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.view_field_display, this, true);
+
+        box =  findViewById(R.id.field_box);
+        fieldDisplayBox = findViewById(R.id.field_display_box);
+        coloredBackground = findViewById(R.id.field_background);
+
+        editButton = findViewById(R.id.button_edit);
+
+    }
+
+    private ToggleTitleView toggleTitleView;
+    private View fieldView;
+
+    public void setField(FieldType field){
+        this.field = field;
+
+//        titleText.setText(field.name);
+//        typeText.setText(field.get_type_name());
+
+        toggleTitleView = new ToggleTitleView(getContext());
+        toggleTitleView.setTitle(field.name);
+        toggleTitleView.setDescription(field.description);
+        fieldView = field.createView(getContext(), dataType -> 0);
+
+        fieldDisplayBox.removeAllViews();
+        fieldDisplayBox.addView(toggleTitleView);
+        fieldDisplayBox.addView(fieldView);
+
+    }
+
+//    public void setField(View newView){
+//        if(fieldView != null)
+//            box.removeView(fieldView);
+//        box.addView(newView);
+//        fieldView = newView;
+//    }
+
+
+//    public void fromTeam(frcTeam team){
+//        setTeamNumber(team.teamNumber);
+//        setTeamName(team.teamName);
+//
+//        if(team.bitmap != null) {
+//            setTeamLogo(team.bitmap);
+//        }else{
+//            hideLogo();
+//        }
+//
+//        setColor(team.getTeamColor());
+//    }
+    public void showButtons(){
+        findViewById(R.id.buttons).setVisibility(View.VISIBLE);
+    }
+
+    public void hideButtons(){
+        findViewById(R.id.buttons).setVisibility(View.GONE);
+    }
+
+    public FieldType getField(){
+        return field;
+    }
+
+    public void setColor(int color){
+        Drawable drawable = box.getBackground();
+        drawable.mutate();
+        drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+
+        float[] hsv = new float[3];
+        Color.colorToHSV(color,hsv);
+
+        coloredBackground.setBackgroundColor(
+                Color.HSVToColor(127, new float[]{
+                        hsv[0],
+                        Math.min(hsv[1]  - 0.25f, 0.75f),
+                        Math.min(hsv[2] - 0.25f, 0.5f)
+                })
+        );
+    }
+}

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

@@ -0,0 +1,124 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.ridgebotics.ridgescout.R;
+import com.ridgebotics.ridgescout.utility.SettingsManager;
+
+// Custom view to display a field position.
+public class FieldPosView extends FrameLayout {
+    private int x = -1;
+    private int y = -1;
+    private Paint paint;
+    private static final float POINT_RADIUS = 10f;
+    private ImageView imageView;
+    private boolean enabled = true;
+
+    public interface onTapListener {
+        void onUpdate(int[] pos);
+    };
+
+    public FieldPosView(Context context) {
+        super(context);
+        init(context, pos -> {});
+    }
+
+    public FieldPosView(Context context, onTapListener tapListener) {
+        super(context);
+        init(context, tapListener);
+    }
+
+    public FieldPosView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, pos -> {});
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void init(Context context, onTapListener tl) {
+        // Initialize paint
+        paint = new Paint();
+        paint.setColor(Color.RED);
+        paint.setStyle(Paint.Style.FILL);
+
+
+        // Create and add ImageView
+        imageView = new ImageView(context);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                LayoutParams.MATCH_PARENT,
+                LayoutParams.MATCH_PARENT
+        );
+        imageView.setLayoutParams(params);
+        imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        imageView.setAdjustViewBounds(true);
+        addView(imageView);
+
+        // Set touch listener
+        setOnTouchListener((v, event) -> {
+            if (enabled && event.getAction() == MotionEvent.ACTION_DOWN) {
+                x = (int) ((event.getX()/getWidth())*255);
+                y = (int) ((event.getY()/getHeight())*255);
+                tl.onUpdate(getPos());
+                invalidate();
+                return true;
+            }
+            return false;
+        });
+
+        switch(SettingsManager.getFieldImageIndex()){
+            case "2025":
+                setImageResource(R.drawable.field_2025);
+                break;
+            case "2025 (Flipped)":
+                setImageResource(R.drawable.field_2025_flipped);
+                break;
+        }
+
+    }
+
+    public void setPos(int[] pos){
+        if(pos.length == 0) return;
+        x = pos[0];
+        y = pos[1];
+        invalidate();
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        if (x >= 0 && y >= 0) {
+            canvas.drawCircle(
+                    ((float) x /255)*getWidth(),
+                    ((float) y /255)*getHeight(),
+                POINT_RADIUS, paint);
+        }
+    }
+
+    public void setImageResource(int resId) {
+        imageView.setImageResource(resId);
+    }
+
+    public void setImageDrawable(Drawable drawable) {
+        imageView.setImageDrawable(drawable);
+    }
+
+    public void setImageBitmap(Bitmap bitmap) {
+        imageView.setImageBitmap(bitmap);
+    }
+
+    public int[] getPos() {
+        return new int[]{
+                x,
+                y
+        };
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.ridgebotics.ridgescout.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MultiFieldPosView extends FrameLayout {
+    private Paint paint;
+    private static final float POINT_RADIUS = 10f;
+    private ImageView imageView;
+    private List<Integer[]> points = new ArrayList<>();
+
+    public MultiFieldPosView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public MultiFieldPosView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void init(Context context) {
+        // Initialize paint
+        paint = new Paint();
+        paint.setColor(Color.RED);
+        paint.setStyle(Paint.Style.FILL);
+
+
+        // Create and add ImageView
+        imageView = new ImageView(context);
+        LayoutParams params = new LayoutParams(
+                LayoutParams.MATCH_PARENT,
+                LayoutParams.MATCH_PARENT
+        );
+        imageView.setLayoutParams(params);
+        imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        imageView.setAdjustViewBounds(true);
+        addView(imageView);
+
+        setImageResource(R.drawable.field_2025);
+
+    }
+
+    public void addPos(int[] pos){
+        if(pos.length != 2) return;
+        points.add(new Integer[]{
+            pos[0],
+            pos[1]
+        });
+        invalidate();
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        for(int i = 0; i < points.size(); i++){
+            int x = points.get(i)[0];
+            int y = points.get(i)[1];
+            if (x >= 0 && y >= 0) {
+                canvas.drawCircle(
+                        ((float) x / 255) * getWidth(),
+                        ((float) y / 255) * getHeight(),
+                        POINT_RADIUS, paint);
+                }
+        }
+    }
+
+    public void setImageResource(int resId) {
+        imageView.setImageResource(resId);
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.ridgebotics.ridgescout.ui.views;
+
+import android.content.Context;
+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.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.ridgebotics.ridgescout.R;
+
+// Class for custom view displaying an event in the TBASelector.java
+public class TBAEventOption extends LinearLayout {
+    public TBAEventOption(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public TBAEventOption(Context context) {
+        super(context);
+        init(context);
+    }
+
+    private TextView eventCode;
+    private TextView eventName;
+    private TextView eventType;
+
+    private ConstraintLayout box;
+    private View coloredBackground;
+
+    public void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.view_tba_event, this, true);
+
+        eventCode = findViewById(R.id.tba_event_code);
+        eventName = findViewById(R.id.tba_event_name);
+        eventType = findViewById(R.id.tba_event_type);
+
+
+        box =  findViewById(R.id.tba_event_box);
+        coloredBackground = findViewById(R.id.tba_event_background);
+    }
+
+    public void setCode(String code){
+        eventCode.setText(String.valueOf(code));
+    }
+
+    public void setName(String name){
+        eventName.setText(name);
+    }
+    public void setType(String name){
+        eventType.setText(name);
+    }
+
+
+//    public void fromTeam(frcTeam team){
+//        setTeamNumber(team.teamNumber);
+//        setTeamName(team.teamName);
+//
+//        if(team.bitmap != null) {
+//            setTeamLogo(team.bitmap);
+//        }else{
+//            hideLogo();
+//        }
+//
+//        setColor(team.getTeamColor());
+//    }
+
+    public void setColor(int color){
+        Drawable drawable = box.getBackground();
+        drawable.mutate();
+        drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+
+        float[] hsv = new float[3];
+        Color.colorToHSV(color,hsv);
+
+        coloredBackground.setBackgroundColor(
+                Color.HSVToColor(127, new float[]{
+                        hsv[0],
+                        Math.min(hsv[1], 0.75f),
+                        Math.min(hsv[2], 0.5f)
+                })
+        );
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.astatin3.scoutingapp2025.ui.scouting;
+package com.ridgebotics.ridgescout.ui.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -7,14 +7,17 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.astatin3.scoutingapp2025.R;
+import com.ridgebotics.ridgescout.R;
 
+// Unused. This would be almost the same as the Fieldpos field, except it would support multiple positions.
 public class TallyCounterView extends LinearLayout {
     private int count = 0;
     private TextView countDisplay;
     private Button minusButton;
     private Button plusButton;
     private OnCountChangedListener onCountChangedListener;
+    private int min = 0;
+    private int max = -1;
 
     public interface OnCountChangedListener {
         void onCountChanged(int newCount);
@@ -45,20 +48,26 @@ public class TallyCounterView extends LinearLayout {
         updateDisplay();
 
         minusButton.setOnClickListener(v -> {
-            if(count > 0) {
+            if(count > min) {
                 count--;
                 updateDisplay();
             }
         });
 
         plusButton.setOnClickListener(v -> {
-            count++;
-            updateDisplay();
+            if(max == -1 || count < max){
+                count++;
+                updateDisplay();
+            }
         });
     }
 
     private void updateDisplay() {
         countDisplay.setText(String.valueOf(count));
+
+        minusButton.setEnabled(count > min);
+        plusButton.setEnabled(max == -1 || count < max);
+
         if (onCountChangedListener != null) {
             onCountChangedListener.onCountChanged(count);
         }
@@ -69,6 +78,12 @@ public class TallyCounterView extends LinearLayout {
         updateDisplay();
     }
 
+    public void setBounds(int min, int max){
+        this.min = min;
+        this.max = max;
+        updateDisplay();
+    }
+
     public int getValue() {
         return count;
     }