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

Added radio buttions and checks for wifi in submit

Browse Source
This commit is contained in:
wildercayden 2025-02-14 14:17:52 -05:00 committed by GitHub
parent f33a0080bd
commit 7d2b776caf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 104 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ScoutingApp/app/src/main/java/com/example/scoutingapp/AutoActivity.java
View File

@ -36,10 +36,11 @@ public class AutoActivity extends AppCompatActivity {
private Button l1Button;
private Button processorButton;
private Button netButton;
private String eventString, matchString, TeamString;
private String eventString, matchString, TeamString, startingPostionString;
public static final String Event_Key = "EVENTCONFIRM";
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
public static final String Postion_key = "POSTIONKEY";
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -55,6 +56,7 @@ public class AutoActivity extends AppCompatActivity {
eventString = intentinput.getStringExtra(MainActivity.Event_Key);
matchString = intentinput.getStringExtra(MainActivity.Match_key);
TeamString = intentinput.getStringExtra(MainActivity.Team_key);
startingPostionString = intentinput.getStringExtra(MainActivity.Postion_key);
l4Button = (Button) findViewById(R.id.button_L4);
@ -144,6 +146,7 @@ public class AutoActivity extends AppCompatActivity {
intent.putExtra(Event_Key, eventString);
intent.putExtra(Match_key, matchString);
intent.putExtra(Team_key, TeamString);
intent.putExtra(Postion_key, startingPostionString);
startActivity(intent);
return true;
});

57
ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java
View File

@ -7,7 +7,9 @@ import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.annotation.NonNull;
@ -36,6 +38,8 @@ public class MainActivity extends AppCompatActivity {
private String Match_numberString;
private String EventString;
private String TeamString;
private String startingPostionString;
public static final String Postion_key = "POSTIONKEY";
public static final String Event_Key = "EVENTCONFIRM";
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
@ -61,12 +65,17 @@ public class MainActivity extends AppCompatActivity {
nextButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Submit submit = new Submit();
submit.renameFileagain(MainActivity.this, "unuploaded.csv");
Match_numberString = Match_number.getText().toString();
EventString = Event.getText().toString();
TeamString = Team.getText().toString();
makeIntent();
if ((Match_numberString == null || Match_numberString.isEmpty()) ||
(EventString == null || EventString.isEmpty()) ||
(TeamString == null || TeamString.isEmpty()) ||
(startingPostionString == null || startingPostionString.isEmpty())){
Toast.makeText(getApplicationContext(), "Fill in EVERYTHING", Toast.LENGTH_SHORT).show();
}else {
makeIntent();
}
}
});
@ -75,7 +84,43 @@ public class MainActivity extends AppCompatActivity {
public void onClick(View view) {
Submit submit = new Submit();
submit.uploadSheets(MainActivity.this, "unuploaded.csv");
submit.uploadSheets(MainActivity.this, EventString+Match_number+TeamString+".csv");
}
});
RadioButton Rbutton1 = findViewById(R.id.Rbutton1);
Rbutton1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startingPostionString = "1";
}
});
RadioButton Rbutton2 = findViewById(R.id.Rbutton2);
Rbutton2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startingPostionString = "2";
}
});
RadioButton Rbutton3 = findViewById(R.id.Rbutton3);
Rbutton3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startingPostionString = "3";
}
});
RadioButton Rbutton4 = findViewById(R.id.Rbutton4);
Rbutton4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startingPostionString = "4";
}
});
RadioButton Rbutton5 = findViewById(R.id.Rbutton5);
Rbutton5.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
startingPostionString = "5";
}
});
@ -154,14 +199,18 @@ public class MainActivity extends AppCompatActivity {
}
}
private void makeIntent()
{
Intent intent = new Intent(this, AutoActivity.class);
intent.putExtra(Event_Key, EventString);
intent.putExtra(Match_key, Match_numberString);
intent.putExtra(Team_key, TeamString);
intent.putExtra(Postion_key, startingPostionString);
startActivity(intent);
}
}

53
ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java
View File

@ -2,7 +2,12 @@ package com.example.scoutingapp;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.os.Build;
import android.util.Log;
import android.widget.Toast;
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
import com.google.api.client.json.gson.GsonFactory;
@ -24,6 +29,13 @@ import java.util.List;
public class Submit {
void uploadSheets(Context context, String csvFileString) {
if (!isWifiConnected(context)) {
Log.e("NetworkError", "No Wi-Fi connection. Cannot upload.");
Toast.makeText(context, "upload failed, Upload later", Toast.LENGTH_SHORT).show();
return;
}
new Thread(() -> {
try {
//adds account info
@ -52,16 +64,15 @@ public class Submit {
String range = "Data!a2:O2";
//inserts data to the sheet
sheetsService.spreadsheets().values()
.append(spreadsheetId, range, body)
.append(spreadsheetId, range, body)
.setValueInputOption("USER_ENTERED")
.setInsertDataOption("INSERT_ROWS")
.execute();
Log.d("GoogleSheets", "Data uploaded to Google Sheets successfully.");
deleteCSVFile(context);
deleteCSVFile(context, csvFileString);
} catch (Exception e) {
Log.d("GoogleSheets", "Error uploading data", e);
renameFile(context, csvFileString);
Log.e("GoogleSheetFailed", "Failed to upload");
}
}).start();
}
@ -81,7 +92,7 @@ public class Submit {
}
public void deleteCSVFile(Context context) {
public void deleteCSVFile(Context context, String csvFileString) {
// Get the directory containing the files
File directory = context.getFilesDir();
@ -89,20 +100,24 @@ public class Submit {
File[] files = directory.listFiles();
if (files != null) {
// Iterate through each file in the directory
for (File file : files) {
// Deletes the file
if (file.delete()) {
Log.d("CSVDelete", file.getName() + " deleted successfully.");
} else {
Log.d("CSVDelete", "Failed to delete " + file.getName());
// Check if the file name matches the given string
if (file.getName().equals(csvFileString)) {
if (file.delete()) {
Log.d("CSVDelete", file.getName() + " deleted successfully.");
} else {
Log.d("CSVDelete", "Failed to delete " + file.getName());
}
return; // Exit after deleting the file
}
}
Log.d("CSVDelete", "File " + csvFileString + " not found.");
} else {
Log.d("CSVDelete", "No files found in the directory.");
}
}
public void renameFile(Context context, String csvFileString) {
File csvFile = new File(context.getFilesDir(), csvFileString);
@ -111,7 +126,7 @@ public class Submit {
return;
}
File renamedFile = new File(context.getFilesDir(), "unuploaded.csv");
File renamedFile = new File(context.getFilesDir(), csvFileString);
if (csvFile.renameTo(renamedFile)) {
Log.d("CSVRename", "File renamed successfully to: " + renamedFile.getAbsolutePath());
@ -136,4 +151,16 @@ public class Submit {
Log.d("CSVRenameFail", "File renaming failed. Possible reasons: file is in use, permission issue, or incorrect file path.");
}
}
}
public boolean isWifiConnected(Context context) {
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (cm != null) {
android.net.Network network = cm.getActiveNetwork();
if (network == null) return false;
NetworkCapabilities capabilities = cm.getNetworkCapabilities(network);
return capabilities != null && capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI);
}
return false;
}
}

10
ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java
View File

@ -36,10 +36,11 @@ public class TeleActivity extends AppCompatActivity {
private Button l1Button;
private Button processorButton;
private Button netButton;
private String eventString, matchString, TeamString;
private String eventString, matchString, TeamString, startingPostionString;
public static final String Event_Key = "EVENTCONFIRM";
public static final String Match_key = "MATCHCONFIRM";
public static final String Team_key = "TEAMCONFIRM";
public static final String Postion_key = "POSTIONKEY";
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -55,6 +56,8 @@ public class TeleActivity extends AppCompatActivity {
eventString = intentinput.getStringExtra(AutoActivity.Event_Key);
matchString = intentinput.getStringExtra(AutoActivity.Match_key);
TeamString = intentinput.getStringExtra(AutoActivity.Team_key);
startingPostionString = intentinput.getStringExtra(AutoActivity.Postion_key);
l4Button = (Button) findViewById(R.id.button_L4);
l3Button = (Button) findViewById(R.id.button_L3);
@ -184,7 +187,7 @@ public class TeleActivity extends AppCompatActivity {
public void csvMake() {
//adds the strings
String CSVLine = String.format(
"Tele,%s,%s,%s,%s,%s,%s,%s,%s,%s",
"Tele,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s",
l4Scored,
l3Scored,
l2Scored,
@ -193,7 +196,8 @@ public class TeleActivity extends AppCompatActivity {
netScored,
reefPickup,
canLeave,
coralPickup
coralPickup,
startingPostionString
);
//makes the file