From f3297756eb2969617ebd5fb109d890447eedae66 Mon Sep 17 00:00:00 2001 From: wildercayden Date: Mon, 10 Feb 2025 11:58:45 -0500 Subject: [PATCH 1/2] Made a way to open google sheet and fixed the upload --- .../java/com/example/scoutingapp/EndActivity.java | 13 +++++-------- .../main/java/com/example/scoutingapp/Submit.java | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) 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 cb209a4..1977d36 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/EndActivity.java @@ -1,14 +1,12 @@ package com.example.scoutingapp; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.view.View; import android.widget.Button; -import org.json.JSONException; - - import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; @@ -61,13 +59,12 @@ public class EndActivity extends AppCompatActivity { } }); - Button Delete = (Button) findViewById(R.id.deleteButton); - Delete.setOnClickListener(new View.OnClickListener() { + Button Sheet = (Button) findViewById(R.id.Sheet); + Sheet.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - Submit submit = new Submit(); - //Deletes the CSV file (Currently for testing but feature might stay but with some features to make it harder to do it on accident) - submit.deleteCSVFile(EndActivity.this); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://docs.google.com/spreadsheets/d/1ky5LBTpnEeBEEaaF7z6UWdh-E7YmOSeij4dYdR2PU4A/edit?gid=0#gid=0")); + startActivity(browserIntent); } }); 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 1dd3075..3d724d8 100644 --- a/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java +++ b/ScoutingApp/app/src/main/java/com/example/scoutingapp/Submit.java @@ -58,6 +58,7 @@ public class Submit { .execute(); Log.d("GoogleSheets", "Data uploaded to Google Sheets successfully."); + deleteCSVFile(context); } catch (Exception e) { Log.d("GoogleSheets", "Error uploading data", e); renameFile(context, csvFileString); From b916e574c214b70d1f47db5a7e56e1092d82cc72 Mon Sep 17 00:00:00 2001 From: wildercayden Date: Mon, 10 Feb 2025 12:02:49 -0500 Subject: [PATCH 2/2] Changed delete button to a button to open the sheet in the defult brower --- ScoutingApp/app/src/main/res/layout/activity_end.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ScoutingApp/app/src/main/res/layout/activity_end.xml b/ScoutingApp/app/src/main/res/layout/activity_end.xml index 352f5ba..46ca7a7 100644 --- a/ScoutingApp/app/src/main/res/layout/activity_end.xml +++ b/ScoutingApp/app/src/main/res/layout/activity_end.xml @@ -18,10 +18,10 @@ app:layout_constraintTop_toTopOf="parent" />