fixed merge conflict
This commit is contained in:
commit
27bf7ba8af
55
.idea/caches/deviceStreaming.xml
generated
55
.idea/caches/deviceStreaming.xml
generated
@ -47,6 +47,17 @@
|
||||
<option name="screenX" value="1840" />
|
||||
<option name="screenY" value="2944" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="34" />
|
||||
<option name="brand" value="samsung" />
|
||||
<option name="codename" value="a15" />
|
||||
<option name="id" value="a15" />
|
||||
<option name="manufacturer" value="Samsung" />
|
||||
<option name="name" value="A15" />
|
||||
<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" />
|
||||
@ -69,6 +80,17 @@
|
||||
<option name="screenX" value="1080" />
|
||||
<option name="screenY" value="2400" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="34" />
|
||||
<option name="brand" value="motorola" />
|
||||
<option name="codename" value="arcfox" />
|
||||
<option name="id" value="arcfox" />
|
||||
<option name="manufacturer" value="Motorola" />
|
||||
<option name="name" value="razr plus 2024" />
|
||||
<option name="screenDensity" value="360" />
|
||||
<option name="screenX" value="1080" />
|
||||
<option name="screenY" value="1272" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="33" />
|
||||
<option name="brand" value="samsung" />
|
||||
@ -223,6 +245,28 @@
|
||||
<option name="screenX" value="720" />
|
||||
<option name="screenY" value="1600" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="34" />
|
||||
<option name="brand" value="samsung" />
|
||||
<option name="codename" value="g0q" />
|
||||
<option name="id" value="g0q" />
|
||||
<option name="manufacturer" value="Samsung" />
|
||||
<option name="name" value="SM-S906U1" />
|
||||
<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" />
|
||||
<option name="codename" value="gta7lite" />
|
||||
<option name="id" value="gta7lite" />
|
||||
<option name="manufacturer" value="Samsung" />
|
||||
<option name="name" value="Galaxy Tab A7 Lite" />
|
||||
<option name="screenDensity" value="179" />
|
||||
<option name="screenX" value="800" />
|
||||
<option name="screenY" value="1340" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="33" />
|
||||
<option name="brand" value="samsung" />
|
||||
@ -345,6 +389,17 @@
|
||||
<option name="screenY" value="384" />
|
||||
<option name="type" value="WEAR_OS" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="34" />
|
||||
<option name="brand" value="samsung" />
|
||||
<option name="codename" value="r11q" />
|
||||
<option name="id" value="r11q" />
|
||||
<option name="manufacturer" value="Samsung" />
|
||||
<option name="name" value="SM-S711U" />
|
||||
<option name="screenDensity" value="450" />
|
||||
<option name="screenX" value="1080" />
|
||||
<option name="screenY" value="2340" />
|
||||
</PersistentDeviceSelectionData>
|
||||
<PersistentDeviceSelectionData>
|
||||
<option name="api" value="30" />
|
||||
<option name="brand" value="google" />
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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">
|
||||
|
||||
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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
|
||||
|
Binary file not shown.
Binary file not shown.
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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">
|
||||
|
||||
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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
|
||||
|
@ -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
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -17,7 +17,6 @@ import androidx.core.view.WindowInsetsCompat;
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
|
||||
public class AutoActivity extends AppCompatActivity {
|
||||
private int l4Scored = 0;
|
||||
@ -140,7 +139,7 @@ public class AutoActivity extends AppCompatActivity {
|
||||
|
||||
nextButton.setOnLongClickListener((v) -> {
|
||||
//submit data
|
||||
CSVmake(AutoActivity.this);
|
||||
CSVmake();
|
||||
Intent intent = new Intent(this, TeleActivity.class);
|
||||
intent.putExtra(Event_Key, eventString);
|
||||
intent.putExtra(Match_key, matchString);
|
||||
@ -183,38 +182,32 @@ public class AutoActivity extends AppCompatActivity {
|
||||
netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored));
|
||||
}
|
||||
|
||||
|
||||
public void CSVmake(Context context) {
|
||||
String CSVLine = String.format(
|
||||
"%b,%b,%b",
|
||||
public void CSVmake() {
|
||||
//adds the strings
|
||||
String csvLine = String.format(
|
||||
"%s,%s,%s,Auto,%s,%s,%s,%s,%s,%s,%s,%s,%s,",
|
||||
eventString,
|
||||
matchString,
|
||||
TeamString,
|
||||
l4Scored,
|
||||
l3Scored,
|
||||
l2Scored,
|
||||
l1Scored,
|
||||
processorScored,
|
||||
netScored,
|
||||
reefPickup,
|
||||
canLeave,
|
||||
coralPickup
|
||||
);
|
||||
|
||||
File csvFile = new File(context.getFilesDir(), eventString + matchString + TeamString + ".csv");
|
||||
//makes the file
|
||||
File csvFile = new File(this.getFilesDir(), eventString+matchString+TeamString+".csv");
|
||||
Log.d("CSVFile", "File created/written at: " + csvFile.getAbsolutePath());
|
||||
|
||||
try (PrintWriter pwriter = new PrintWriter(new FileWriter(csvFile), true)) {
|
||||
pwriter.append(eventString).append(",");
|
||||
pwriter.append(matchString).append(",");
|
||||
pwriter.append(TeamString).append(",");
|
||||
pwriter.append("auto").append(",");
|
||||
|
||||
pwriter.print(l4Scored); pwriter.print(",");
|
||||
pwriter.print(l3Scored); pwriter.print(",");
|
||||
pwriter.print(l2Scored); pwriter.print(",");
|
||||
pwriter.print(l1Scored); pwriter.print(",");
|
||||
pwriter.print(netScored); pwriter.print(",");
|
||||
pwriter.print(processorScored); pwriter.print(",");
|
||||
|
||||
pwriter.append(CSVLine).append("\n");
|
||||
|
||||
Log.d("CSVSuccess", "CSV written successfully at: " + csvFile.getAbsolutePath());
|
||||
//writes to file
|
||||
try (FileWriter writer = new FileWriter(csvFile, true)) {
|
||||
writer.write(csvLine);
|
||||
Log.d("CSVFilePath", csvFile.getAbsolutePath());
|
||||
} catch (IOException e) {
|
||||
Log.e("CSVFail", "CSV didn't make", e);
|
||||
Log.d("CSVFail", "CSV didn't make");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
@ -19,10 +19,6 @@ import java.util.List;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public class EndActivity extends AppCompatActivity {
|
||||
private String eventString, matchString, TeamString;
|
||||
public static final String Event_Key = "EVENTCONFIRM";
|
||||
|
@ -49,11 +49,11 @@ public class Submit {
|
||||
//the ID for the google sheet
|
||||
String spreadsheetId = "1ky5LBTpnEeBEEaaF7z6UWdh-E7YmOSeij4dYdR2PU4A";
|
||||
//starting point
|
||||
String range = "Sheet1!a2:O2";
|
||||
String range = "Data!a2:O2";
|
||||
//inserts data to the sheet
|
||||
sheetsService.spreadsheets().values()
|
||||
.append(spreadsheetId, range, body)
|
||||
.setValueInputOption("RAW")
|
||||
.setValueInputOption("USER_ENTERED")
|
||||
.setInsertDataOption("INSERT_ROWS")
|
||||
.execute();
|
||||
|
||||
|
@ -17,7 +17,6 @@ import androidx.core.view.WindowInsetsCompat;
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
|
||||
public class TeleActivity extends AppCompatActivity {
|
||||
private int l4Scored = 0;
|
||||
@ -139,7 +138,7 @@ public class TeleActivity extends AppCompatActivity {
|
||||
|
||||
nextButton.setOnLongClickListener((v) -> {
|
||||
//submit data
|
||||
CSVmake(TeleActivity.this);
|
||||
csvMake();
|
||||
Intent intent = new Intent(this, EndActivity.class);
|
||||
intent.putExtra(Event_Key, eventString);
|
||||
intent.putExtra(Match_key, matchString);
|
||||
@ -182,35 +181,30 @@ public class TeleActivity extends AppCompatActivity {
|
||||
netButton.setText(String.format(getResources().getString(R.string.coralScored), "Net\n", netScored));
|
||||
}
|
||||
|
||||
public void CSVmake(Context context) {
|
||||
public void csvMake() {
|
||||
//adds the strings
|
||||
String CSVLine = String.format(
|
||||
"%b,%b,%b",
|
||||
"Tele,%s,%s,%s,%s,%s,%s,%s,%s,%s",
|
||||
l4Scored,
|
||||
l3Scored,
|
||||
l2Scored,
|
||||
l1Scored,
|
||||
processorScored,
|
||||
netScored,
|
||||
reefPickup,
|
||||
canLeave,
|
||||
coralPickup
|
||||
);
|
||||
|
||||
File csvFile = new File(context.getFilesDir(), eventString + matchString + TeamString + ".csv");
|
||||
//makes the file
|
||||
File csvFile = new File(this.getFilesDir(), eventString+matchString+TeamString+".csv");
|
||||
Log.d("CSVFile", "File created/written at: " + csvFile.getAbsolutePath());
|
||||
|
||||
try (PrintWriter pwriter = new PrintWriter(new FileWriter(csvFile), true)) {
|
||||
pwriter.append(eventString).append(",");
|
||||
pwriter.append(matchString).append(",");
|
||||
pwriter.append(TeamString).append(",");
|
||||
pwriter.append("auto").append(",");
|
||||
|
||||
pwriter.print(l4Scored); pwriter.print(",");
|
||||
pwriter.print(l3Scored); pwriter.print(",");
|
||||
pwriter.print(l2Scored); pwriter.print(",");
|
||||
pwriter.print(l1Scored); pwriter.print(",");
|
||||
pwriter.print(netScored); pwriter.print(",");
|
||||
pwriter.print(processorScored); pwriter.print(",");
|
||||
|
||||
pwriter.append(CSVLine).append("\n");
|
||||
|
||||
Log.d("CSVSuccess", "CSV written successfully at: " + csvFile.getAbsolutePath());
|
||||
//writes to file
|
||||
try (FileWriter writer = new FileWriter(csvFile, true)) {
|
||||
writer.append(CSVLine).append("\n");
|
||||
Log.d("CSVFilePath", csvFile.getAbsolutePath());
|
||||
} catch (IOException e) {
|
||||
Log.e("CSVFail", "CSV didn't make", e);
|
||||
Log.d("CSVFail", "CSV didn't make");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -14,4 +14,6 @@
|
||||
<string name="auto">Auto</string>
|
||||
<string name="image_of_field">Image of field</string>
|
||||
<string name="coralScored">%s%dx</string>
|
||||
<string name="tele">Tele</string>
|
||||
<string name="hold_button_to_ndecrement">Hold button to \ndecrement</string>
|
||||
</resources>
|
Loading…
Reference in New Issue
Block a user