Changed the layouts of auto and tele

This commit is contained in:
25lacorazzan 2025-02-04 12:01:24 -05:00
parent be5e87c1c0
commit a6a9ac5c77
67 changed files with 2589 additions and 2553 deletions

View File

@ -124,6 +124,17 @@
<option name="screenX" value="2220" />
<option name="screenY" value="1080" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm2q" />
<option name="id" value="dm2q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S23 Plus" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@ -267,6 +278,17 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="motorola" />
<option name="codename" value="maui" />
<option name="id" value="maui" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="moto g play - 2023" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="google" />

View File

@ -1,4 +1,4 @@
#Thu Jan 23 13:52:38 EST 2025
#Tue Feb 04 11:55:17 EST 2025
com.example.scoutingapp-main-33\:/drawable/ic_launcher_background.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.xml.flat
com.example.scoutingapp-main-33\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_foreground.xml.flat
com.example.scoutingapp-main-33\:/drawable/screenshot_2025_01_16_115155.png=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_screenshot_2025_01_16_115155.png.flat

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
#Thu Jan 23 13:52:38 EST 2025
#Tue Feb 04 11:55:17 EST 2025
com.example.scoutingapp-main-5\:/drawable/ic_launcher_background.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_background.xml
com.example.scoutingapp-main-5\:/drawable/ic_launcher_foreground.xml=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\ic_launcher_foreground.xml
com.example.scoutingapp-main-5\:/drawable/screenshot_2025_01_16_115155.png=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\screenshot_2025_01_16_115155.png

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
#Thu Jan 23 13:52:42 EST 2025
#Tue Feb 04 11:57:20 EST 2025
base.0=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
base.1=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
base.2=C\:\\Users\\25lacorazzan\\AndroidStudioProjects\\Reefscape-Scouting-App\\ScoutingApp\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex

View File

@ -17,16 +17,12 @@ id cb_CanLeave
id cb_algaeReef
id cb_coralPickup
id deleteButton
id imageView
id imageView2
id linearLayout
id main
id nextButton
id textView
id tv_L1
id tv_L2
id tv_L3
id tv_L4
id tv_Net
id tv_Net2
id textView2
id textView3
layout activity_auto
layout activity_end
layout activity_main

View File

@ -1,8 +1,4 @@
[
{
"merged": "com.example.scoutingapp-debug-31:/drawable_screenshot_2025_01_16_115155.png.flat",
"source": "com.example.scoutingapp-main-33:/drawable/screenshot_2025_01_16_115155.png"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-hdpi_ic_launcher.webp.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-hdpi\\ic_launcher.webp"
@ -11,14 +7,14 @@
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher.webp.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher.webp"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_ic_launcher_foreground.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\ic_launcher_foreground.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\xml_data_extraction_rules.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\xml\\data_extraction_rules.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xxhdpi_ic_launcher.webp.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xxhdpi\\ic_launcher.webp"
@ -55,22 +51,30 @@
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_main.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_main.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\drawable_screenshot_2025_01_16_115155.png.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\drawable\\screenshot_2025_01_16_115155.png"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-mdpi_ic_launcher_round.webp.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-mdpi\\ic_launcher_round.webp"
},
{
"merged": "com.example.scoutingapp-debug-31:/layout_activity_tele.xml.flat",
"source": "com.example.scoutingapp-main-33:/layout/activity_tele.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-anydpi-v26_ic_launcher_round.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-anydpi-v26\\ic_launcher_round.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_tele.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_tele.xml"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\mipmap-xhdpi_ic_launcher_round.webp.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\mipmap-xhdpi\\ic_launcher_round.webp"
},
{
"merged": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-debug-31:\\layout_activity_auto.xml.flat",
"source": "C:\\Users\\25lacorazzan\\.gradle\\daemon\\8.7\\com.example.scoutingapp-main-33:\\layout\\activity_auto.xml"

View File

@ -7,104 +7,167 @@
android:layout_height="match_parent"
tools:context=".AutoActivity">
<ImageView
android:id="@+id/imageView2"
android:layout_width="264dp"
android:layout_height="423dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
<Button
android:id="@+id/button_L4"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="-5dp"
android:backgroundTint="#40FF5722"
android:text="@string/l4"
android:textAlignment="center"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/can_remove_algae"
app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
app:layout_constraintStart_toStartOf="parent" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/coral_pickup"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L3"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l3"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l2"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L1"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l1"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:text="@string/net"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/auto"
android:textSize="48sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Processor"
android:layout_width="150sp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/processor"
android:textSize="20sp"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/net"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<CheckBox
android:id="@+id/cb_CanLeave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_remove_algae" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/coral_pickup" />
</LinearLayout>
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/can_leave"
app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
app:layout_constraintStart_toStartOf="parent" />
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Hold button to \ndecrement"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Next"
@ -112,102 +175,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:backgroundTint="#F94C00"
android:backgroundTint="#FF5722"
android:text="@string/next_hold"
android:textColor="#000000"
app:cornerRadius="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView"
android:layout_width="150dp"
android:layout_height="450dp"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:contentDescription="@string/image_of_field"
android:src="@drawable/screenshot_2025_01_16_115155"
app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_Next" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/auto"
android:textSize="40sp"
app:layout_constraintBottom_toTopOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_L4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_L3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="156dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_L2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="264dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_L1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="364dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_Net"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
app:layout_constraintEnd_toStartOf="@+id/button_Net"
app:layout_constraintTop_toTopOf="@+id/button_Net" />
<TextView
android:id="@+id/tv_Net2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="@+id/button_Processor"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintTop_toTopOf="@+id/button_Processor" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -5,100 +5,169 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".TeleActivity">
tools:context=".AutoActivity">
<ImageView
android:id="@+id/imageView2"
android:layout_width="264dp"
android:layout_height="423dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
<Button
android:id="@+id/button_L4"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="L4"
android:textAlignment="center"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="-5dp"
android:backgroundTint="#40FF5722"
android:text="@string/l4"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="Can Remove Algae"
app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
app:layout_constraintStart_toStartOf="parent" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="Coral Pickup"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L3"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="L3"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l3"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="L2"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l2"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L1"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="L1"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l1"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="Net"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Tele"
android:textSize="48sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Processor"
android:layout_width="150sp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="Processor"
android:textSize="20sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/processor"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/net"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<CheckBox
android:id="@+id/cb_CanLeave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_remove_algae" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/coral_pickup" />
</LinearLayout>
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="Can Leave"
app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
app:layout_constraintStart_toStartOf="parent" />
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Hold button to \ndecrement"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Next"
@ -106,34 +175,10 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="Next (Hold)"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView"
android:layout_width="277dp"
android:layout_height="476dp"
android:layout_marginStart="8dp"
android:layout_marginTop="64dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
app:layout_constraintEnd_toStartOf="@+id/button_L2"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
tools:srcCompat="@tools:sample/avatars" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tele"
android:textSize="40sp"
app:layout_constraintBottom_toTopOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
android:backgroundTint="#FF5722"
android:text="@string/next_hold"
android:textColor="#000000"
app:cornerRadius="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@ -6,7 +6,7 @@
<string name="auto">Auto</string>
<string name="can_leave">Can Leave</string>
<string name="can_remove_algae">Can Remove Algae</string>
<string name="coralScored">%dx</string>
<string name="coralScored">%s%dx</string>
<string name="coral_pickup">Coral Pickup</string>
<string name="image_of_field">Image of field</string>
<string name="l1">L1</string>

View File

@ -3345,7 +3345,7 @@ int id ifRoom 0x7f0800e9
int id ignore 0x7f0800ea
int id ignoreRequest 0x7f0800eb
int id image 0x7f0800ec
int id imageView 0x7f0800ed
int id imageView2 0x7f080210
int id immediateStop 0x7f0800ee
int id included 0x7f0800ef
int id indeterminate 0x7f0800f0
@ -3364,6 +3364,7 @@ int id legacy 0x7f0800fc
int id line1 0x7f0800fd
int id line3 0x7f0800fe
int id linear 0x7f0800ff
int id linearLayout 0x7f080212
int id listMode 0x7f080100
int id list_item 0x7f080101
int id m3_side_sheet 0x7f080102
@ -3576,7 +3577,8 @@ int id textSpacerNoButtons 0x7f0801d0
int id textSpacerNoTitle 0x7f0801d1
int id textStart 0x7f0801d2
int id textTop 0x7f0801d3
int id textView 0x7f0801d4
int id textView2 0x7f080211
int id textView3 0x7f080213
int id text_input_end_icon 0x7f0801d5
int id text_input_error_icon 0x7f0801d6
int id text_input_start_icon 0x7f0801d7
@ -3605,12 +3607,6 @@ int id transition_position 0x7f0801ed
int id transition_scene_layoutid_cache 0x7f0801ee
int id transition_transform 0x7f0801ef
int id triangle 0x7f0801f0
int id tv_L1 0x7f0801f1
int id tv_L2 0x7f0801f2
int id tv_L3 0x7f0801f3
int id tv_L4 0x7f0801f4
int id tv_Net 0x7f0801f5
int id tv_Net2 0x7f0801f6
int id unchecked 0x7f0801f7
int id uniform 0x7f0801f8
int id unlabeled 0x7f0801f9

View File

@ -3346,7 +3346,7 @@ id ifRoom
id ignore
id ignoreRequest
id image
id imageView
id imageView2
id immediateStop
id included
id indeterminate
@ -3365,6 +3365,7 @@ id legacy
id line1
id line3
id linear
id linearLayout
id listMode
id list_item
id m3_side_sheet
@ -3577,7 +3578,8 @@ id textSpacerNoButtons
id textSpacerNoTitle
id textStart
id textTop
id textView
id textView2
id textView3
id text_input_end_icon
id text_input_error_icon
id text_input_start_icon
@ -3606,12 +3608,6 @@ id transition_position
id transition_scene_layoutid_cache
id transition_transform
id triangle
id tv_L1
id tv_L2
id tv_L3
id tv_L4
id tv_Net
id tv_Net2
id unchecked
id uniform
id unlabeled

View File

@ -30,12 +30,12 @@ public class AutoActivity extends AppCompatActivity {
private boolean canLeave = false;
private boolean coralPickup = false;
private TextView l4TV;
private TextView l3TV;
private TextView l2TV;
private TextView l1TV;
private TextView processorTV;
private TextView netTV;
private Button l4Button;
private Button l3Button;
private Button l2Button;
private Button l1Button;
private Button processorButton;
private Button netButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -48,25 +48,18 @@ public class AutoActivity extends AppCompatActivity {
return insets;
});
Button l4Button = (Button) findViewById(R.id.button_L4);
Button l3Button = (Button) findViewById(R.id.button_L3);
Button l2Button = (Button) findViewById(R.id.button_L2);
Button l1Button = (Button) findViewById(R.id.button_L1);
Button processorButton = (Button) findViewById(R.id.button_Processor);
Button netButton = (Button) findViewById(R.id.button_Net);
l4Button = (Button) findViewById(R.id.button_L4);
l3Button = (Button) findViewById(R.id.button_L3);
l2Button = (Button) findViewById(R.id.button_L2);
l1Button = (Button) findViewById(R.id.button_L1);
processorButton = (Button) findViewById(R.id.button_Processor);
netButton = (Button) findViewById(R.id.button_Net);
Button nextButton = (Button) findViewById(R.id.button_Next);
CheckBox coralPickupBox = (CheckBox) findViewById(R.id.cb_coralPickup);
CheckBox reefPickupBox = (CheckBox) findViewById(R.id.cb_algaeReef);
CheckBox canLeaveBox = (CheckBox) findViewById(R.id.cb_CanLeave);
l4TV = (TextView) findViewById(R.id.tv_L4);
l3TV = (TextView) findViewById(R.id.tv_L3);
l2TV = (TextView) findViewById(R.id.tv_L2);
l1TV = (TextView) findViewById(R.id.tv_L1);
processorTV = (TextView) findViewById(R.id.tv_Net2);
netTV = (TextView) findViewById(R.id.tv_Net);
//When clicked, add 1 to the scored and update the text for L4
l4Button.setOnClickListener((v) -> {
l4Scored++;
@ -153,33 +146,33 @@ public class AutoActivity extends AppCompatActivity {
//Methods that update the score count
private void updateL4Text() {
l4TV.setText(String.format(getResources().getString(R.string.coralScored), l4Scored));
l4Button.setText(String.format(getResources().getString(R.string.coralScored), "L4 : ", l4Scored));
}
private void updateL3Text() {
l3TV.setText(String.format(getResources().getString(R.string.coralScored), l3Scored));
l3Button.setText(String.format(getResources().getString(R.string.coralScored), "L3 : ", l3Scored));
}
private void updateL2Text() {
l2TV.setText(String.format(getResources().getString(R.string.coralScored), l2Scored));
l2Button.setText(String.format(getResources().getString(R.string.coralScored), "L2 : ", l2Scored));
}
private void updateL1Text() {
l1TV.setText(String.format(getResources().getString(R.string.coralScored), l1Scored));
l1Button.setText(String.format(getResources().getString(R.string.coralScored), "L1 : ", l1Scored));
}
private void updateProcessorText() {
processorTV.setText(String.format(getResources().getString(R.string.coralScored), processorScored));
processorButton.setText(String.format(getResources().getString(R.string.coralScored), "Processor\n", processorScored));
}
private void updateNetText() {
netTV.setText(String.format(getResources().getString(R.string.coralScored), netScored));
netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored));
}
public void CSVmake(Context context) {
//adds the strings
String CSVLine = String.format(
"%s %s %s %s %s %s %s",
"Auto, %s, %s, %s, %s, %s, %s, %s",
l4Scored,
l3Scored,
l2Scored,

View File

@ -51,7 +51,7 @@ public class EndActivity extends AppCompatActivity {
List<List<Object>> data = submit.parseCSVToList(csvFile);
submit.parseCSVToList(csvFile);
//Uploads the Data to the Google sheet
//submit.uploadCSV(EndActivity.this);
submit.uploadSheets(EndActivity.this);
}
});

View File

@ -30,43 +30,36 @@ public class TeleActivity extends AppCompatActivity {
private boolean canLeave = false;
private boolean coralPickup = false;
private TextView l4TV;
private TextView l3TV;
private TextView l2TV;
private TextView l1TV;
private TextView processorTV;
private TextView netTV;
private Button l4Button;
private Button l3Button;
private Button l2Button;
private Button l1Button;
private Button processorButton;
private Button netButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_auto);
setContentView(R.layout.activity_tele);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
Button l4Button = (Button) findViewById(R.id.button_L4);
Button l3Button = (Button) findViewById(R.id.button_L3);
Button l2Button = (Button) findViewById(R.id.button_L2);
Button l1Button = (Button) findViewById(R.id.button_L1);
Button processorButton = (Button) findViewById(R.id.button_Processor);
Button netButton = (Button) findViewById(R.id.button_Net);
l4Button = (Button) findViewById(R.id.button_L4);
l3Button = (Button) findViewById(R.id.button_L3);
l2Button = (Button) findViewById(R.id.button_L2);
l1Button = (Button) findViewById(R.id.button_L1);
processorButton = (Button) findViewById(R.id.button_Processor);
netButton = (Button) findViewById(R.id.button_Net);
Button nextButton = (Button) findViewById(R.id.button_Next);
CheckBox coralPickupBox = (CheckBox) findViewById(R.id.cb_coralPickup);
CheckBox reefPickupBox = (CheckBox) findViewById(R.id.cb_algaeReef);
CheckBox canLeaveBox = (CheckBox) findViewById(R.id.cb_CanLeave);
l4TV = (TextView) findViewById(R.id.tv_L4);
l3TV = (TextView) findViewById(R.id.tv_L3);
l2TV = (TextView) findViewById(R.id.tv_L2);
l1TV = (TextView) findViewById(R.id.tv_L1);
processorTV = (TextView) findViewById(R.id.tv_Net2);
netTV = (TextView) findViewById(R.id.tv_Net);
//When clicked, add 1 to the scored and update the text for L4
l4Button.setOnClickListener((v) -> {
l4Scored++;
@ -137,7 +130,6 @@ public class TeleActivity extends AppCompatActivity {
nextButton.setOnLongClickListener((v) -> {
//submit data
csvMake();
Intent intent = new Intent(this, EndActivity.class);
startActivity(intent);
return true;
@ -154,45 +146,43 @@ public class TeleActivity extends AppCompatActivity {
//Methods that update the score count
private void updateL4Text() {
l4TV.setText(String.format(getResources().getString(R.string.coralScored), l4Scored));
l4Button.setText(String.format(getResources().getString(R.string.coralScored), "L4", l4Scored));
}
private void updateL3Text() {
l3TV.setText(String.format(getResources().getString(R.string.coralScored), l3Scored));
l3Button.setText(String.format(getResources().getString(R.string.coralScored), "L3", l3Scored));
}
private void updateL2Text() {
l2TV.setText(String.format(getResources().getString(R.string.coralScored), l2Scored));
l2Button.setText(String.format(getResources().getString(R.string.coralScored), "L2", l2Scored));
}
private void updateL1Text() {
l1TV.setText(String.format(getResources().getString(R.string.coralScored), l1Scored));
l1Button.setText(String.format(getResources().getString(R.string.coralScored), "L1", l1Scored));
}
private void updateProcessorText() {
processorTV.setText(String.format(getResources().getString(R.string.coralScored), processorScored));
processorButton.setText(String.format(getResources().getString(R.string.coralScored), "Processor", processorScored));
}
private void updateNetText() {
netTV.setText(String.format(getResources().getString(R.string.coralScored), netScored));
netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net", netScored));
}
public void csvMake() {
public void CSVmake(Context context) {
//adds the strings
String CSVLine = String.format(
"%s %s %s %s %s %s %s %s %s",
"Tele, %s, %s, %s, %s, %s, %s, %s",
l4Scored,
l3Scored,
l2Scored,
l1Scored,
processorScored,
netScored,
reefPickup,
canLeave,
coralPickup
);
//makes the file
File csvFile = new File(this.getFilesDir(), "match_data.csv");
File csvFile = new File(context.getFilesDir(), "match_data.csv");
//writes to file
try (FileWriter writer = new FileWriter(csvFile, true)) {
writer.append(CSVLine).append("\n");

View File

@ -7,104 +7,167 @@
android:layout_height="match_parent"
tools:context=".AutoActivity">
<ImageView
android:id="@+id/imageView2"
android:layout_width="264dp"
android:layout_height="423dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
<Button
android:id="@+id/button_L4"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="-5dp"
android:backgroundTint="#40FF5722"
android:text="@string/l4"
android:textAlignment="center"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/can_remove_algae"
app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
app:layout_constraintStart_toStartOf="parent" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/coral_pickup"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L3"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l3"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l2"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L1"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l1"
android:textSize="40sp"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:backgroundTint="#F94C00"
android:text="@string/net"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/auto"
android:textSize="48sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Processor"
android:layout_width="150sp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:backgroundTint="#F94C00"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/processor"
android:textSize="20sp"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/net"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<CheckBox
android:id="@+id/cb_CanLeave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_remove_algae" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/coral_pickup" />
</LinearLayout>
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="@string/can_leave"
app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
app:layout_constraintStart_toStartOf="parent" />
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Hold button to \ndecrement"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Next"
@ -112,102 +175,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:backgroundTint="#F94C00"
android:backgroundTint="#FF5722"
android:text="@string/next_hold"
android:textColor="#000000"
app:cornerRadius="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView"
android:layout_width="150dp"
android:layout_height="450dp"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:contentDescription="@string/image_of_field"
android:src="@drawable/screenshot_2025_01_16_115155"
app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_Next" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/auto"
android:textSize="40sp"
app:layout_constraintBottom_toTopOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_L4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_L3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="156dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_L2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="264dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_L1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="364dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintEnd_toStartOf="@+id/button_L3"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView
android:id="@+id/tv_Net"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
app:layout_constraintEnd_toStartOf="@+id/button_Net"
app:layout_constraintTop_toTopOf="@+id/button_Net" />
<TextView
android:id="@+id/tv_Net2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/coralScored"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="@+id/button_Processor"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintTop_toTopOf="@+id/button_Processor" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -5,100 +5,169 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".TeleActivity">
tools:context=".AutoActivity">
<ImageView
android:id="@+id/imageView2"
android:layout_width="264dp"
android:layout_height="423dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
<Button
android:id="@+id/button_L4"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="L4"
android:textAlignment="center"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="-5dp"
android:backgroundTint="#40FF5722"
android:text="@string/l4"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="Can Remove Algae"
app:layout_constraintBottom_toTopOf="@+id/cb_coralPickup"
app:layout_constraintStart_toStartOf="parent" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="Coral Pickup"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L3"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="L3"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l3"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="L2"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l2"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/button_L1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_L1"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="L1"
android:textSize="40sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#40FF5722"
android:text="@string/l1"
android:textColor="#000000"
android:textSize="60sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toBottomOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:text="Net"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/button_Processor"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Tele"
android:textSize="48sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Processor"
android:layout_width="150sp"
android:layout_height="100dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="Processor"
android:textSize="20sp"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/processor"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<Button
android:id="@+id/button_Net"
android:layout_width="0dp"
android:layout_height="0dp"
android:backgroundTint="#402196F3"
android:text="@string/net"
android:textColor="#000000"
android:textSize="34sp"
app:cornerRadius="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toStartOf="@+id/button_Processor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<CheckBox
android:id="@+id/cb_CanLeave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave" />
<CheckBox
android:id="@+id/cb_algaeReef"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_remove_algae" />
<CheckBox
android:id="@+id/cb_coralPickup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/coral_pickup" />
</LinearLayout>
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="8dp"
android:text="Can Leave"
app:layout_constraintBottom_toTopOf="@+id/cb_algaeReef"
app:layout_constraintStart_toStartOf="parent" />
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Hold button to \ndecrement"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_Next"
@ -106,34 +175,10 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="Next (Hold)"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView"
android:layout_width="277dp"
android:layout_height="476dp"
android:layout_marginStart="8dp"
android:layout_marginTop="64dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/cb_CanLeave"
app:layout_constraintEnd_toStartOf="@+id/button_L2"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
tools:srcCompat="@tools:sample/avatars" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tele"
android:textSize="40sp"
app:layout_constraintBottom_toTopOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
android:backgroundTint="#FF5722"
android:text="@string/next_hold"
android:textColor="#000000"
app:cornerRadius="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@ -13,5 +13,5 @@
<string name="coral_pickup">Coral Pickup</string>
<string name="auto">Auto</string>
<string name="image_of_field">Image of field</string>
<string name="coralScored">%dx</string>
<string name="coralScored">%s%dx</string>
</resources>