updated UI and stuff

ScoutingApp/.idea/caches/deviceStreaming.xml

@@ -63,6 +63,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="SC-53C" />
+          <option name="id" value="SC-53C" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A53 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="28" />
           <option name="brand" value="DOCOMO" />
@@ -208,6 +220,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15xtfn" />
+          <option name="id" value="a15xtfn" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A15 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="35" />
           <option name="brand" value="samsung" />
@@ -244,6 +268,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16xeea" />
+          <option name="id" value="a16xeea" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A16 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -388,6 +424,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="1272" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="aruba" />
+          <option name="id" value="aruba" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto e20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="motorola" />
@@ -424,6 +472,18 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b5qsqw" />
+          <option name="id" value="b5qsqw" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Flip 5" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="748" />
+          <option name="screenY" value="720" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -436,6 +496,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2640" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b6qsqw" />
+          <option name="id" value="b6qsqw" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Flip 6" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2640" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="36" />
           <option name="brand" value="google" />
@@ -942,6 +1014,23 @@
           <option name="screenX" value="1600" />
           <option name="screenY" value="2560" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="accessStatus">
+            <list>
+              <option value="EULA_NOT_ACCEPTED" />
+            </list>
+          </option>
+          <option name="api" value="36" />
+          <option name="brand" value="HONOR" />
+          <option name="codename" value="honor_lab_hnmbhx" />
+          <option name="id" value="honor_lab_hnmbhx" />
+          <option name="labId" value="honor" />
+          <option name="manufacturer" value="HONOR" />
+          <option name="name" value="Magic V5" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="2172" />
+          <option name="screenY" value="2352" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="google" />

ScoutingApp/app/build/intermediates/apk/debug/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "app-debug.apk"
     }
   ],

ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Tue Mar 10 18:32:16 EDT 2026
+#Fri Apr 03 15:31:57 EDT 2026
 com.example.scoutingapp-main-38\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background.png.flat
 com.example.scoutingapp-main-38\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__025_reefscape_transparent_background_blue.webp.flat
 com.example.scoutingapp-main-38\:/drawable/fieldwithstartingpos.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_fieldwithstartingpos.webp.flat

ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Tue Mar 10 18:32:17 EDT 2026
+#Fri Apr 03 15:31:58 EDT 2026
 com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background.png=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background.png
 com.example.scoutingapp-main-5\:/drawable/_025_reefscape_transparent_background_blue.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_025_reefscape_transparent_background_blue.webp
 com.example.scoutingapp-main-5\:/drawable/fieldwithstartingpos.webp=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\fieldwithstartingpos.webp

ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="black">#FF000000</color>
-    <color name="ic_launcher_background">#000000</color>
-    <color name="white">#FFFFFFFF</color>
-    <string name="app_name">Scouting App</string>
-    <string name="auto">Auto</string>
-    <string name="can_leave">Can\'t Leave</string>
-    <string name="can_remove_algae">Can Remove Algae</string>
-    <string name="coralScored">%s%dx</string>
-    <string name="coral_pickup">Coral Pickup</string>
-    <string name="hold_button_to_ndecrement">Hold button to \ndecrement</string>
-    <string name="image_of_field">Image of field</string>
-    <string name="l0">No climb</string>
-    <string name="l1">L1</string>
-    <string name="l2">L2</string>
-    <string name="l3">L3</string>
-    <string name="l4">L4</string>
-    <string name="net">Net</string>
-    <string name="next_hold">Next (Hold)</string>
-    <string name="processor">Processor</string>
-    <string name="submit">Submit</string>
-    <string name="tele">Tele</string>
-    <style name="Base.Theme.ScoutingApp" parent="Theme.Material3.DayNight.NoActionBar">
-        
-        
-    </style>
-    <style name="Theme.ScoutingApp" parent="Base.Theme.ScoutingApp"/>
-</resources>

ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Wed Mar 11 20:32:47 EDT 2026
+#Fri Apr 03 15:32:05 EDT 2026
 base.0=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
 base.1=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
 base.2=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex

ScoutingApp/app/build/intermediates/incremental/packageRelease/tmp/release/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Mar 17 15:59:28 EDT 2026
+#Fri Mar 27 19:52:26 EDT 2026
 base.0=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\dex\\release\\mergeDexRelease\\classes.dex
 base.1=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\global_synthetics_dex\\release\\mergeReleaseGlobalSynthetics\\classes.dex
 base.2=C\:\\Users\\cayde\\Desktop\\ScoutingApp\\ScoutingApp\\app\\build\\intermediates\\desugar_lib_dex\\release\\l8DexDesugarLibRelease\\classes1000.dex

ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "linked-resources-binary-format-debug.ap_"
     }
   ],

ScoutingApp/app/build/intermediates/linked_resources_binary_format/release/processReleaseResources/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "linked-resources-binary-format-release.ap_"
     }
   ],

ScoutingApp/app/build/intermediates/lint-cache/lintVitalAnalyzeRelease/maven.google/master-index.xml

@@ -146,6 +146,7 @@
   <androidx.viewpager2/>
   <androidx.wear/>
   <androidx.wear.compose/>
+  <androidx.wear.compose.remote/>
   <androidx.wear.protolayout/>
   <androidx.wear.tiles/>
   <androidx.wear.watchface/>

ScoutingApp/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt

@@ -1,7 +1,14 @@
 R_DEF: Internal format may change without notice
 local
+color alliance_blue
+color alliance_red
 color black
+color gray_hint
 color ic_launcher_background
+color main
+color main_bg
+color second
+color second_bg
 color white
 drawable _025_reefscape_transparent_background
 drawable _025_reefscape_transparent_background_blue
@@ -18,9 +25,9 @@ id ButtonSettings
 id Climb
 id Eventtext
 id Hub
-id Hub10
+id Hub15
 id Hub25
-id Hub5
+id Hub50
 id Match
 id Matchedit
 id Name
@@ -47,7 +54,6 @@ id buttonMEFAL
 id buttonNECMP
 id buttonNHDUR
 id buttonNext
-id buttonSave
 id buttonSubmit
 id button_Next
 id cb_CanLeave
@@ -82,24 +88,64 @@ mipmap ic_launcher
 mipmap ic_launcher_foreground
 mipmap ic_launcher_round
 raw info
+string app_description
 string app_name
 string auto
+string back
+string back_hold
+string blue
 string can_leave
 string can_remove_algae
-string coralScored
+string climb
 string coral_pickup
+string event_1
+string event_2
+string event_cmptx
+string event_necmp
+string fill_everything_error
+string google_sheet
 string hold_button_to_ndecrement
+string hub_15
+string hub_25
+string hub_50
+string hub_reset
 string image_of_field
+string invalid_match_error
 string l0
 string l1
 string l2
 string l3
 string l4
+string match
+string match_number
+string match_number_required_toast
+string name_hint
 string net
+string next
 string next_hold
+string notes
+string offline_mode
+string offline_mode_title
+string online_mode_toast
+string practice
 string processor
+string red
+string robot_died
+string settings
+string sheets_api_hint
+string starting_position_1
+string starting_position_2
+string starting_position_3
+string starting_position_4
+string starting_position_5
 string submit
+string submit_data
+string submit_old_data
+string tba_api_hint
+string team_2648
+string team_number_hint
 string tele
+string upload_failed_toast
 style Base.Theme.ScoutingApp
 style Theme.ScoutingApp
 xml backup_rules

ScoutingApp/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.example.scoutingapp"
-4    android:versionCode="4"
+4    android:versionCode="5"
-5    android:versionName="2.2" >
+5    android:versionName="2.3" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/manifest_merge_blame_file/release/processReleaseMainManifest/manifest-merger-blame-release-report.txt

@@ -1,8 +1,8 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 3    package="com.example.scoutingapp"
-4    android:versionCode="4"
+4    android:versionCode="5"
-5    android:versionName="2.2" >
+5    android:versionName="2.3" >
 6
 7    <uses-sdk
 8        android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.scoutingapp"
-    android:versionCode="4"
+    android:versionCode="5"
-    android:versionName="2.2" >
+    android:versionName="2.3" >
 
     <uses-sdk
         android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/merged_manifest/release/processReleaseMainManifest/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.scoutingapp"
-    android:versionCode="4"
+    android:versionCode="5"
-    android:versionName="2.2" >
+    android:versionName="2.3" >
 
     <uses-sdk
         android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/merged_manifests/debug/processDebugManifest/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.scoutingapp"
-    android:versionCode="4"
+    android:versionCode="5"
-    android:versionName="2.2" >
+    android:versionName="2.3" >
 
     <uses-sdk
         android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/merged_manifests/debug/processDebugManifest/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "AndroidManifest.xml"
     }
   ],

ScoutingApp/app/build/intermediates/merged_manifests/release/processReleaseManifest/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.scoutingapp"
-    android:versionCode="4"
+    android:versionCode="5"
-    android:versionName="2.2" >
+    android:versionName="2.3" >
 
     <uses-sdk
         android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/merged_manifests/release/processReleaseManifest/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "AndroidManifest.xml"
     }
   ],

ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json

@@ -19,6 +19,10 @@
         "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-debug-36:\\drawable_loop.png.flat",
         "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-main-38:\\drawable\\loop.png"
     },
+    {
+        "merged": "com.example.scoutingapp-debug-36:/layout_activity_tele.xml.flat",
+        "source": "com.example.scoutingapp-main-38:/layout/activity_tele.xml"
+    },
     {
         "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-debug-36:\\xml_data_extraction_rules.xml.flat",
         "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-main-38:\\xml\\data_extraction_rules.xml"
@@ -79,10 +83,6 @@
         "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-debug-36:\\drawable_imageautotele.webp.flat",
         "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-main-38:\\drawable\\imageautotele.webp"
     },
-    {
-        "merged": "com.example.scoutingapp-debug-36:/layout_activity_starting.xml.flat",
-        "source": "com.example.scoutingapp-main-38:/layout/activity_starting.xml"
-    },
     {
         "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-debug-36:\\mipmap-xhdpi_ic_launcher_foreground.webp.flat",
         "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-main-38:\\mipmap-xhdpi\\ic_launcher_foreground.webp"
@@ -140,8 +140,8 @@
         "source": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-main-38:\\mipmap-mdpi\\ic_launcher.webp"
     },
     {
-        "merged": "com.example.scoutingapp-debug-36:/layout_activity_end.xml.flat",
+        "merged": "com.example.scoutingapp-debug-36:/layout_activity_auto.xml.flat",
-        "source": "com.example.scoutingapp-main-38:/layout/activity_end.xml"
+        "source": "com.example.scoutingapp-main-38:/layout/activity_auto.xml"
     },
     {
         "merged": "C:\\Users\\cayde\\.gradle\\daemon\\8.13\\com.example.scoutingapp-debug-36:\\drawable__025_reefscape_transparent_background_blue.webp.flat",

ScoutingApp/app/build/intermediates/optimized_processed_res/release/optimizeReleaseResources/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "resources-release-optimize.ap_"
     }
   ],

ScoutingApp/app/build/intermediates/packaged_manifests/debug/processDebugManifestForPackage/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.scoutingapp"
-    android:versionCode="4"
+    android:versionCode="5"
-    android:versionName="2.2" >
+    android:versionName="2.3" >
 
     <uses-sdk
         android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/packaged_manifests/debug/processDebugManifestForPackage/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "AndroidManifest.xml"
     }
   ],

ScoutingApp/app/build/intermediates/packaged_manifests/release/processReleaseManifestForPackage/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.scoutingapp"
-    android:versionCode="4"
+    android:versionCode="5"
-    android:versionName="2.2" >
+    android:versionName="2.3" >
 
     <uses-sdk
         android:minSdkVersion="23"

ScoutingApp/app/build/intermediates/packaged_manifests/release/processReleaseManifestForPackage/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
+      "versionCode": 5,
-      "versionName": "2.2",
+      "versionName": "2.3",
       "outputFile": "AndroidManifest.xml"
     }
   ],

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_auto.xml

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@color/black"
     tools:context=".AutoActivity">
 
     <TextView
@@ -13,8 +13,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="2648"
+        android:text="@string/team_2648"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout"
         app:layout_constraintEnd_toStartOf="@+id/matchNumber"
@@ -26,8 +26,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="01"
+        android:text="0"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout"
         app:layout_constraintEnd_toEndOf="parent"
@@ -40,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/auto"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="48sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/can_leave"
-            android:textColor="#FFFFFF"
+            app:buttonTint="@color/main"
+            android:textColor="@color/white"
             tools:ignore="VisualLintButtonSize" />
 
         <CheckBox
@@ -70,8 +71,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Climb"
+            android:text="@string/climb"
-            android:textColor="#FFFFFF"
+            app:buttonTint="@color/main"
+            android:textColor="@color/white"
             tools:ignore="VisualLintButtonSize" />
 
     </LinearLayout>
@@ -84,7 +86,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:text="@string/hold_button_to_ndecrement"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/textView2"
         app:layout_constraintTop_toTopOf="parent" />
@@ -95,8 +97,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Next(Hold)"
+        android:text="@string/next_hold"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -108,8 +110,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Back(Hold)"
+        android:text="@string/back_hold"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button_Next"
@@ -119,69 +121,72 @@
         android:id="@+id/Hub"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
+        android:layout_marginEnd="4dp"
-        android:text="Hub back to 0"
+        android:backgroundTint="@color/second_bg"
-        android:textColor="@android:color/white"
+        android:text="@string/hub_reset"
+        android:textColor="@color/white"
         android:textSize="15sp"
         app:cornerRadius="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/Hub5"
+        app:layout_constraintBottom_toTopOf="@+id/Hub15"
         app:layout_constraintEnd_toStartOf="@+id/textView2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:strokeColor="#FF5722"
+        app:strokeColor="@color/second"
         app:strokeWidth="5dp" />
 
 
 
     <Button
-        android:id="@+id/Hub5"
+        android:id="@+id/Hub15"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
+        android:backgroundTint="@color/second_bg"
-        android:text="hub +5 : 0x"
+        app:strokeColor="@color/second"
-        android:textColor="@android:color/white"
+        android:text="@string/hub_15"
-        android:textSize="20sp"
+        android:textColor="@color/white"
-        app:cornerRadius="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/Hub10"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2"
-        app:strokeColor="#FF5722"
-        app:strokeWidth="5dp" />
-
-    <Button
-        android:id="@+id/Hub10"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
-        android:text="hub +10 : 0x"
-        android:textColor="@android:color/white"
         android:textSize="20sp"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/Hub25"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/Hub5"
+        app:layout_constraintTop_toBottomOf="@+id/textView2"
-        app:strokeColor="#FF5722"
         app:strokeWidth="5dp" />
 
+
+
     <Button
         android:id="@+id/Hub25"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
+        android:backgroundTint="@color/second_bg"
-        android:text="hub +25 : 0x"
+        app:strokeColor="@color/second"
-        android:textColor="@android:color/white"
+        android:text="@string/hub_25"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        app:cornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/Hub50"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/Hub15"
+        app:strokeWidth="5dp" />
+
+    <Button
+        android:id="@+id/Hub50"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:backgroundTint="@color/second_bg"
+        app:strokeColor="@color/second"
+        android:text="@string/hub_50"
+        android:textColor="@color/white"
         android:textSize="20sp"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/teamnumber"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/Hub10"
+        app:layout_constraintTop_toBottomOf="@+id/Hub25"
-        app:strokeColor="#FF5722"
         app:strokeWidth="5dp" />
 
 

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_end.xml

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@color/black"
     tools:context=".EndActivity">
 
     <LinearLayout
@@ -36,8 +36,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Submit Data"
+        android:text="@string/submit_data"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -49,8 +49,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Back(Hold)"
+        android:text="@string/back_hold"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/Submit_button"
@@ -60,9 +60,11 @@
         android:id="@+id/Notes"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Notes"
+        android:hint="@string/notes"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
+        android:maxLines="1"
+        android:inputType="text|textCapSentences"
         app:layout_constraintTop_toTopOf="parent"
         tools:layout_editor_absoluteX="1dp" />
 
@@ -71,8 +73,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="2648"
+        android:text="@string/team_2648"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/BackButton"
         app:layout_constraintEnd_toStartOf="@+id/matchNumber"
@@ -83,8 +85,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="01"
+        android:text="0"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/Submit_button"
         app:layout_constraintEnd_toEndOf="parent"
@@ -103,32 +105,32 @@
         <RadioButton
             android:id="@+id/radioButtonL0"
             android:layout_width="match_parent"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
             android:layout_height="wrap_content"
             android:text="@string/l0"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
         <RadioButton
             android:id="@+id/radioButtonL1"
             android:layout_width="match_parent"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
             android:layout_height="wrap_content"
             android:text="@string/l1"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
         <RadioButton
             android:id="@+id/radioButtonL2"
             android:layout_width="match_parent"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
             android:layout_height="wrap_content"
             android:text="@string/l2"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
         <RadioButton
             android:id="@+id/radioButtonL3"
             android:layout_width="match_parent"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
             android:layout_height="wrap_content"
             android:text="@string/l3"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
     </RadioGroup>
 </androidx.constraintlayout.widget.ConstraintLayout>

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@color/black"
     tools:context=".MainActivity">
 
     <Button
@@ -14,8 +14,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="The Google Sheet"
+        android:text="@string/google_sheet"
         app:cornerRadius="0dp"
         app:layout_constraintEnd_toStartOf="@+id/ButtonSettings"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,8 +27,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Offline Mode"
+        android:text="@string/offline_mode"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/ButtonNext"
         app:layout_constraintEnd_toStartOf="@+id/Practice"
@@ -40,8 +40,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Practice"
+        android:text="@string/practice"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/ButtonNext"
         app:layout_constraintEnd_toEndOf="parent"
@@ -52,8 +52,8 @@
         android:id="@+id/textInputLayout2"
         android:layout_width="409dp"
         android:layout_height="wrap_content"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -67,8 +67,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="1dp"
         android:layout_marginEnd="1dp"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -80,11 +80,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:hint="Match Number"
+        android:hint="@string/match_number"
         android:inputType="number"
         android:textAlignment="center"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintTop_toBottomOf="@+id/TextPine"
         tools:layout_editor_absoluteX="-1dp"
         android:imeOptions="actionDone" />
@@ -109,7 +109,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="#F71000"
+            android:background="@color/alliance_red"
             android:orientation="vertical">
 
             <RadioButton
@@ -117,34 +117,34 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                app:buttonTint="#0084ff"
+                app:buttonTint="@color/alliance_blue"
                 android:text="0"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/white" />
 
             <RadioButton
                 android:id="@+id/red2Button"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                app:buttonTint="#0084ff"
+                app:buttonTint="@color/alliance_blue"
                 android:text="0"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/white" />
 
             <RadioButton
                 android:id="@+id/red3Button"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                app:buttonTint="#0084ff"
+                app:buttonTint="@color/alliance_blue"
                 android:text="0"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/white" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="#0084ff"
+            android:background="@color/alliance_blue"
             android:orientation="vertical">
 
             <RadioButton
@@ -152,27 +152,27 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                app:buttonTint="#F71000"
+                app:buttonTint="@color/alliance_red"
                 android:text="0"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/white" />
 
             <RadioButton
                 android:id="@+id/blue2Button"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                app:buttonTint="#F71000"
+                app:buttonTint="@color/alliance_red"
                 android:text="0"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/white" />
 
             <RadioButton
                 android:id="@+id/blue3Button"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                app:buttonTint="#F71000"
+                app:buttonTint="@color/alliance_red"
                 android:text="0"
-                android:textColor="@android:color/white" />
+                android:textColor="@color/white" />
         </LinearLayout>
     </LinearLayout>
 
@@ -182,9 +182,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:text="Scouting App for FRC team 2648"
+        android:text="@string/app_description"
         android:textAlignment="center"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -197,8 +197,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Next"
+        android:text="@string/next"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -211,8 +211,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Settings"
+        android:text="@string/settings"
         app:cornerRadius="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/Sheet"
@@ -224,8 +224,8 @@
         android:layout_height="48dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Submit Old data"
+        android:text="@string/submit_old_data"
         app:cornerRadius="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_offline.xml

@@ -6,15 +6,15 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@color/black"
     tools:context=".OfflineActivity">
 
     <Button
         android:id="@+id/Practice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Practice"
+        android:text="@string/practice"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/ButtonNext"
         app:layout_constraintEnd_toEndOf="parent"
@@ -27,8 +27,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Settings"
+        android:text="@string/settings"
         app:cornerRadius="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,8 +39,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Next"
+        android:text="@string/next"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -51,8 +51,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Back"
+        android:text="@string/back"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/ButtonNext"
@@ -63,11 +63,11 @@
         android:layout_width="0dp"
         android:layout_height="45dp"
         android:ems="10"
-        android:hint="Team Number"
+        android:hint="@string/team_number_hint"
         android:inputType="number"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
-        android:backgroundTint="#FFFFFF"
+        android:backgroundTint="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -79,8 +79,8 @@
         android:id="@+id/textInputLayout2"
         android:layout_width="409dp"
         android:layout_height="wrap_content"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -92,10 +92,10 @@
         android:id="@+id/Matchedit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Match"
+        android:hint="@string/match"
         android:inputType="number"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintBottom_toTopOf="@+id/TeamNumber"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -105,8 +105,8 @@
         android:id="@+id/Eventtext"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Offline mode"
+        android:text="@string/offline_mode_title"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/Matchedit"
         app:layout_constraintEnd_toEndOf="parent"
@@ -118,8 +118,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#F71000"
+        android:backgroundTint="@color/alliance_red"
-        android:text="Red"
+        android:text="@string/red"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/ButtonNext"
         app:layout_constraintEnd_toStartOf="@+id/Blue"
@@ -130,8 +130,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:backgroundTint="#0084ff"
+        android:backgroundTint="@color/alliance_blue"
-        android:text="Blue"
+        android:text="@string/blue"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/ButtonNext"
         app:layout_constraintEnd_toEndOf="parent"

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_settings.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
-    android:background="#000000"
+    android:background="@color/black"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".SettingsActivity">
@@ -12,8 +12,8 @@
         android:id="@+id/buttonNHDUR"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="NHDUR"
+        android:text="@string/event_2"
         app:layout_constraintBottom_toTopOf="@+id/buttonNext"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,8 +24,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="NECMP"
+        android:text="@string/event_necmp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/buttonNHDUR" />
@@ -35,8 +35,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="CMPTX"
+        android:text="@string/event_cmptx"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/buttonNECMP" />
@@ -46,8 +46,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="MEFAL"
+        android:text="@string/event_1"
         app:layout_constraintBottom_toTopOf="@+id/buttonNHDUR"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -56,37 +56,21 @@
         android:id="@+id/buttonNext"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Next"
+        android:text="@string/next"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/buttonSave" />
-
-    <Button
-        android:id="@+id/buttonSave"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
-        android:backgroundTint="#FF5722"
-        android:text="Save"
-        app:cornerRadius="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/buttonNext"
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/Name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Name"
+        android:hint="@string/name_hint"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintBottom_toTopOf="@+id/TBA"
         app:layout_constraintTop_toTopOf="parent"
         tools:layout_editor_absoluteX="0dp"
@@ -97,9 +81,9 @@
         android:id="@+id/TBA"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="TBA_API"
+        android:hint="@string/tba_api_hint"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintBottom_toTopOf="@+id/Sheets"
         app:layout_constraintTop_toBottomOf="@+id/Name"
         tools:layout_editor_absoluteX="0dp"
@@ -109,9 +93,9 @@
         android:id="@+id/Sheets"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="SheetsAPI"
+        android:hint="@string/sheets_api_hint"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintBottom_toTopOf="@+id/Match"
         app:layout_constraintTop_toBottomOf="@+id/TBA"
         tools:layout_editor_absoluteX="0dp"
@@ -121,9 +105,9 @@
         android:id="@+id/Match"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Match"
+        android:hint="@string/match"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
-        android:textColorHint="#AAAAAA"
+        android:textColorHint="@color/gray_hint"
         app:layout_constraintTop_toBottomOf="@+id/Sheets"
         tools:layout_editor_absoluteX="16dp"
         android:imeOptions="actionDone"/>

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_starting.xml

@@ -5,7 +5,7 @@
     android:id="@+id/Match"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@color/black"
     tools:context=".startingActivity">
 
     <TextView
@@ -13,8 +13,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="2648"
+        android:text="@string/team_2648"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/ButtonNext"
         app:layout_constraintEnd_toStartOf="@+id/matchNumber"
@@ -25,8 +25,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="01"
+        android:text="0"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         android:textSize="34sp"
         app:layout_constraintBottom_toTopOf="@+id/BackButton"
         app:layout_constraintEnd_toEndOf="parent"
@@ -44,41 +44,41 @@
             android:id="@+id/Rbutton1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Starting Postion 1"
+            android:text="@string/starting_position_1"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
         <RadioButton
             android:id="@+id/Rbutton2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Starting Postion 2"
+            android:text="@string/starting_position_2"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
         <RadioButton
             android:id="@+id/Rbutton3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
-            android:text="Starting Postion 3"
+            android:text="@string/starting_position_3"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
         <RadioButton
             android:id="@+id/Rbutton4"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
-            android:text="Starting Postion 4"
+            android:text="@string/starting_position_4"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
         <RadioButton
             android:id="@+id/Rbutton5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:buttonTint="#FF5722"
+            app:buttonTint="@color/main"
-            android:text="Starting Postion 5"
+            android:text="@string/starting_position_5"
-            android:textColor="@android:color/white" />
+            android:textColor="@color/white" />
 
     </RadioGroup>
 
@@ -88,8 +88,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Next"
+        android:text="@string/next"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -101,8 +101,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Back(Hold)"
+        android:text="@string/back_hold"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/ButtonNext"

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_tele.xml

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="@color/black"
     tools:context=".TeleActivity">
 
 
@@ -14,9 +14,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="2648"
+        android:text="@string/team_2648"
         android:textSize="34sp"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout"
         app:layout_constraintEnd_toStartOf="@+id/matchNumber"
         app:layout_constraintStart_toStartOf="parent" />
@@ -26,9 +26,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="01"
+        android:text="0"
+        android:textColor="@color/white"
         android:textSize="34sp"
-        android:textColor="#FFFFFF"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/teamnumber" />
@@ -40,7 +40,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/tele"
         android:textSize="48sp"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -59,8 +59,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Robot Died?"
+            android:text="@string/robot_died"
-            android:textColor="#FFFFFF"
+            app:buttonTint="@color/main"
+            android:textColor="@color/white"
             tools:ignore="VisualLintButtonSize" />
 
     </LinearLayout>
@@ -73,7 +74,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:text="@string/hold_button_to_ndecrement"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/textView2"
         app:layout_constraintTop_toTopOf="parent" />
@@ -84,8 +85,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Next(Hold)"
+        android:text="@string/next_hold"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -97,8 +98,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:backgroundTint="#FF5722"
+        android:backgroundTint="@color/main"
-        android:text="Back(Hold)"
+        android:text="@string/back_hold"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/button_Next"
@@ -109,69 +110,70 @@
         android:id="@+id/Hub"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
+        android:layout_marginEnd="4dp"
-        android:text="Hub back to 0"
+        android:backgroundTint="@color/main_bg"
-        android:textColor="@android:color/white"
+        android:text="@string/hub_reset"
+        android:textColor="@color/white"
         android:textSize="15sp"
         app:cornerRadius="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/Hub5"
+        app:layout_constraintBottom_toTopOf="@+id/Hub15"
         app:layout_constraintEnd_toStartOf="@+id/textView2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:strokeColor="#FF5722"
+        app:strokeColor="@color/main"
         app:strokeWidth="5dp" />
 
 
 
     <Button
-        android:id="@+id/Hub5"
+        android:id="@+id/Hub15"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
+        android:backgroundTint="@color/main_bg"
-        android:text="hub +5 : 0x"
+        app:strokeColor="@color/main"
-        android:textColor="@android:color/white"
+        android:text="@string/hub_15"
-        android:textSize="20sp"
+        android:textColor="@color/white"
-        app:cornerRadius="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/Hub10"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2"
-        app:strokeColor="#FF5722"
-        app:strokeWidth="5dp" />
-
-    <Button
-        android:id="@+id/Hub10"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
-        android:text="hub +10 : 0x"
-        android:textColor="@android:color/white"
         android:textSize="20sp"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/Hub25"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/Hub5"
+        app:layout_constraintTop_toBottomOf="@+id/textView2"
-        app:strokeColor="#FF5722"
         app:strokeWidth="5dp" />
 
     <Button
         android:id="@+id/Hub25"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:backgroundTint="#40FF5722"
+        android:backgroundTint="@color/main_bg"
-        android:text="hub +25 : 0x"
+        app:strokeColor="@color/main"
-        android:textColor="@android:color/white"
+        android:text="@string/hub_15"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        app:cornerRadius="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/Hub50"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/Hub15"
+        app:strokeWidth="5dp" />
+
+    <Button
+        android:id="@+id/Hub50"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:backgroundTint="@color/main_bg"
+        app:strokeColor="@color/main"
+        android:text="@string/hub_50"
+        android:textColor="@color/white"
         android:textSize="20sp"
         app:cornerRadius="0dp"
         app:layout_constraintBottom_toTopOf="@+id/teamnumber"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/Hub10"
+        app:layout_constraintTop_toBottomOf="@+id/Hub25"
-        app:strokeColor="#FF5722"
         app:strokeWidth="5dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml

@@ -1,26 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="alliance_blue">#0084ff</color>
+    <color name="alliance_red">#F71000</color>
     <color name="black">#FF000000</color>
+    <color name="gray_hint">#AAAAAA</color>
     <color name="ic_launcher_background">#000000</color>
+    <color name="main">#FF5722</color>
+    <color name="main_bg">#40FF5722</color>
+    <color name="second">#0EE906</color>
+    <color name="second_bg">#400EE906</color>
     <color name="white">#FFFFFFFF</color>
+    <string name="app_description">Scouting App for FRC team 2648</string>
     <string name="app_name">Scouting App</string>
     <string name="auto">Auto</string>
+    <string name="back">Back</string>
+    <string name="back_hold">Back (Hold)</string>
+    <string name="blue">Blue</string>
     <string name="can_leave">Can\'t Leave</string>
     <string name="can_remove_algae">Can Remove Algae</string>
-    <string name="coralScored">%s%dx</string>
+    <string name="climb">Climb</string>
     <string name="coral_pickup">Coral Pickup</string>
+    <string name="event_1">MEFAL</string>
+    <string name="event_2">NHDUR</string>
+    <string name="event_cmptx">CMPTX</string>
+    <string name="event_necmp">NECMP</string>
+    <string name="fill_everything_error">Fill in Everything, check settings</string>
+    <string name="google_sheet">The Google Sheet</string>
     <string name="hold_button_to_ndecrement">Hold button to \ndecrement</string>
+    <string name="hub_15">Hub +15: %1$d</string>
+    <string name="hub_25">Hub +25: %1$d</string>
+    <string name="hub_50">Hub +50: %1$d</string>
+    <string name="hub_reset">Hub back to 0</string>
     <string name="image_of_field">Image of field</string>
+    <string name="invalid_match_error">Invalid Match Number, Check settings</string>
     <string name="l0">No climb</string>
     <string name="l1">L1</string>
     <string name="l2">L2</string>
     <string name="l3">L3</string>
     <string name="l4">L4</string>
+    <string name="match">Match</string>
+    <string name="match_number">Match Number</string>
+    <string name="match_number_required_toast">Fill in MATCH NUMBER for teams</string>
+    <string name="name_hint">Name</string>
     <string name="net">Net</string>
+    <string name="next">Next</string>
     <string name="next_hold">Next (Hold)</string>
+    <string name="notes">Notes</string>
+    <string name="offline_mode">Offline Mode/Manual</string>
+    <string name="offline_mode_title">Offline mode</string>
+    <string name="online_mode_toast">Online mode</string>
+    <string name="practice">Practice</string>
     <string name="processor">Processor</string>
+    <string name="red">Red</string>
+    <string name="robot_died">Robot Died?</string>
+    <string name="settings">Settings</string>
+    <string name="sheets_api_hint">SheetsAPI</string>
+    <string name="starting_position_1">Starting Position 1</string>
+    <string name="starting_position_2">Starting Position 2</string>
+    <string name="starting_position_3">Starting Position 3</string>
+    <string name="starting_position_4">Starting Position 4</string>
+    <string name="starting_position_5">Starting Position 5</string>
     <string name="submit">Submit</string>
+    <string name="submit_data">Submit Data</string>
+    <string name="submit_old_data">Submit Old data</string>
+    <string name="tba_api_hint">TBA_API</string>
+    <string name="team_2648">2648</string>
+    <string name="team_number_hint">Team Number</string>
     <string name="tele">Tele</string>
+    <string name="upload_failed_toast">Online failed to upload</string>
     <style name="Base.Theme.ScoutingApp" parent="Theme.Material3.DayNight.NoActionBar">