wildercayden/ScoutingApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
24nicholsl
2025-02-14 12:55:29 -05:00
parent 43545afe20 f33a0080bd
commit 27bf7ba8af
60 changed files with 193 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_0/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_1/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_2/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_3/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_4/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_5/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_6/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_7/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_8/graph.bin Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_50ea05747660538aa33f38e7f0c16548f0f6edfe9cc27dca0400ccffcab99c6a_bucket_9/graph.bin Normal file
View File

Binary file not shown.

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

@@ -8,6 +8,7 @@
<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="l1">L1</string>
<string name="l2">L2</string>
@@ -17,6 +18,7 @@
<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">

BIN
ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$1.class
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.class
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class
View File

Binary file not shown.

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

@@ -44,6 +44,7 @@ string can_leave
string can_remove_algae
string coralScored
string coral_pickup
string hold_button_to_ndecrement
string image_of_field
string l1
string l2
@@ -53,6 +54,7 @@ string net
string next_hold
string processor
string submit
string tele
style Base.Theme.ScoutingApp
style Theme.ScoutingApp
xml backup_rules

BIN
ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_auto.xml.flat
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_tele.xml.flat
View File

Binary file not shown.

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

@@ -14,7 +14,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
app:srcCompat="@drawable/screenshot_2025_01_16_115155"
tools:ignore="ContentDescription" />
<Button
android:id="@+id/button_L4"
@@ -32,7 +33,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_L3"
@@ -48,7 +50,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_L2"
@@ -64,7 +67,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_L1"
@@ -80,7 +84,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<TextView
android:id="@+id/textView2"
@@ -107,7 +112,8 @@
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_Net"
@@ -123,7 +129,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<LinearLayout
android:id="@+id/linearLayout"
@@ -139,21 +146,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave" />
android:text="@string/can_leave"
tools:ignore="VisualLintButtonSize" />
<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" />
android:text="@string/can_remove_algae"
tools:ignore="VisualLintButtonSize" />
<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" />
android:text="@string/coral_pickup"
tools:ignore="VisualLintButtonSize" />
</LinearLayout>
<TextView
@@ -163,7 +173,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Hold button to \ndecrement"
android:text="@string/hold_button_to_ndecrement"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"

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

@@ -14,7 +14,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView2"
app:srcCompat="@drawable/screenshot_2025_01_16_115155" />
app:srcCompat="@drawable/screenshot_2025_01_16_115155"
tools:ignore="ContentDescription" />
<Button
android:id="@+id/button_L4"
@@ -32,7 +33,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/imageView2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_L3"
@@ -48,7 +50,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L4"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_L2"
@@ -64,7 +67,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L3"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_L1"
@@ -80,14 +84,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button_L2"
app:strokeColor="#FF5722"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Tele"
android:text="@string/tele"
android:textSize="48sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -107,7 +112,8 @@
app:layout_constraintStart_toEndOf="@+id/button_Net"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<Button
android:id="@+id/button_Net"
@@ -123,7 +129,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2"
app:strokeColor="#2196F3"
app:strokeWidth="5dp" />
app:strokeWidth="5dp"
tools:ignore="VisualLintButtonSize" />
<LinearLayout
android:id="@+id/linearLayout"
@@ -139,21 +146,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/can_leave" />
android:text="@string/can_leave"
tools:ignore="VisualLintButtonSize" />
<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" />
android:text="@string/can_remove_algae"
tools:ignore="VisualLintButtonSize" />
<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" />
android:text="@string/coral_pickup"
tools:ignore="VisualLintButtonSize" />
</LinearLayout>
<TextView
@@ -163,7 +173,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Hold button to \ndecrement"
android:text="@string/hold_button_to_ndecrement"
app:layout_constraintBottom_toTopOf="@+id/imageView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView2"

2
ScoutingApp/app/build/intermediates/packaged_res/debug/packageDebugResources/values/values.xml
View File

@@ -8,6 +8,7 @@
<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="l1">L1</string>
<string name="l2">L2</string>
@@ -17,6 +18,7 @@
<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">

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/95f93c05d30d7785fe9286d20e83e97ae80dee1af06f3edd8770cf6e441963bd_8.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity$1.dex
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity$2.dex
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_0.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_1.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_2.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_3.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_5.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_6.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_7.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_8.jar Normal file
View File

Binary file not shown.

BIN
ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/ffa35585a39a82cb3d009501aaa12733e69e562cdd3db14c0e4dbf8ee83a4aff_9.jar Normal file
View File

Binary file not shown.

2
ScoutingApp/app/build/intermediates/runtime_symbol_list/debug/processDebugResources/R.txt
View File

@@ -3898,6 +3898,7 @@ int string exposed_dropdown_menu_content_description 0x7f100036
int string fab_transformation_scrim_behavior 0x7f100037
int string fab_transformation_sheet_behavior 0x7f100038
int string hide_bottom_view_on_scroll_behavior 0x7f100039
int string hold_button_to_ndecrement 0x7f1000b5
int string icon_content_description 0x7f10003a
int string image_of_field 0x7f10003b
int string item_view_role_description 0x7f10003c
@@ -4021,6 +4022,7 @@ int string side_sheet_accessibility_pane_title 0x7f1000b1
int string side_sheet_behavior 0x7f1000b2
int string status_bar_notification_info_overflow 0x7f1000b3
int string submit 0x7f1000b4
int string tele 0x7f1000b6
int style AlertDialog_AppCompat 0x7f110000
int style AlertDialog_AppCompat_Light 0x7f110001
int style Animation_AppCompat_Dialog 0x7f110002

2
ScoutingApp/app/build/intermediates/symbol_list_with_package_name/debug/processDebugResources/package-aware-r.txt
View File

@@ -3899,6 +3899,7 @@ string exposed_dropdown_menu_content_description
string fab_transformation_scrim_behavior
string fab_transformation_sheet_behavior
string hide_bottom_view_on_scroll_behavior
string hold_button_to_ndecrement
string icon_content_description
string image_of_field
string item_view_role_description
@@ -4022,6 +4023,7 @@ string side_sheet_accessibility_pane_title
string side_sheet_behavior
string status_bar_notification_info_overflow
string submit
string tele
style AlertDialog_AppCompat
style AlertDialog_AppCompat_Light
style Animation_AppCompat_Dialog