Merge remote-tracking branch 'origin/main'

frc4911 · Jan 16, 2024 · a449284 · a449284
2 parents 81e23e5 + 793238d
commit a449284
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 395 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/...cscoutingapp/ExampleInstrumentedTest.java → ...cscoutingapp/ExampleInstrumentedTest.java b/...cscoutingapp/ExampleInstrumentedTest.java → ...cscoutingapp/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.example.a2022frcscoutingapp;
+package com.example.a2023frcscoutingapp;
 
 import android.content.Context;
 

diff --git a/app/src/main/java/com/example/a2022frcscoutingapp/MainActivity.java b/app/src/main/java/com/example/a2022frcscoutingapp/MainActivity.java
@@ -45,6 +45,9 @@
 //ignore all the commented out things :)
 public class MainActivity extends AppCompatActivity {
 
+
+
+
     public static final String FIlE_NAME_KEY = "standard";
 
     private static RatingBar rDefenseBar;
@@ -153,6 +156,34 @@ public class MainActivity extends AppCompatActivity {
     private boolean broken_parts;
     private boolean partially_dead;
 
+
+    /////new variables
+    private int trap;
+
+    private int spotlight;
+
+    private boolean melody;
+
+    private String Climb_end = "C";
+
+    private String Park_end = "P";
+
+    private String Nothing_end = "N";
+
+    private boolean Card_red;
+
+    private boolean Card_yellow;
+
+    private boolean disabled;
+
+
+    private boolean no_robot_problem;
+    private boolean broken_parts;
+    private boolean partially_dead;
+
+
+
+
     private String[] climbDisplayText = {"No Climb", "Touching", "Leveled", "In Community"};
 
     private Map<Integer, List<String>> matchMap = new HashMap<>();