diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java index 5e83a7a..09a426b 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java @@ -1,5 +1,6 @@ package com.example.scoutingapp; +import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -42,16 +43,12 @@ public class EndActivity extends AppCompatActivity { public void onClick(View view) { Submit submit = new Submit(); - //Writes test Data to the String getTeamNumber - //submit.getTeamNumberTest(); - //Makes the CSV file - //submit.CSVmake(EndActivity.this); //Writes data to file to make google sheet read it as a list - File csvFile = new File(getExternalFilesDir(null), "match_data.csv"); + File csvFile = new File(getFilesDir(), "match_data.csv"); List> data = submit.parseCSVToList(csvFile); submit.parseCSVToList(csvFile); //Uploads the Data to the Google sheet - //submit.uploadCSV(EndActivity.this); + submit.uploadSheets(EndActivity.this); } }); @@ -68,4 +65,7 @@ public class EndActivity extends AppCompatActivity { } + + } + diff --git a/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java b/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java index f8b2c84..431afbd 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java @@ -29,7 +29,7 @@ public class Submit { //adds account info InputStream serviceAccountStream = context.getResources().openRawResource(R.raw.info); ServiceAccountCredentials credentials = ServiceAccountCredentials.fromStream(serviceAccountStream); - //Srts up the google sheet API and json factury for use later + //Sets up the google sheet API and json factory for use later Sheets sheetsService = new Sheets.Builder( GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(),