From f4a8925d9e4d7a22b3b0fe4f3f2f0cca0e55f6da Mon Sep 17 00:00:00 2001 From: Astatin3 <77305074+Astatin3@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:10:31 -0600 Subject: [PATCH] Format TBA Events better (I don't know android) --- .../scoutingapp2025/ui/TBA/TBAFragment.java | 2 - .../scoutingapp2025/ui/transfer/TBAView.java | 103 +++++++++++++----- .../ui/transfer/TransferFragment.java | 1 - app/src/main/res/layout/fragment_transfer.xml | 5 +- 4 files changed, 79 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java index 96d53b3..913fc3d 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/TBA/TBAFragment.java @@ -45,8 +45,6 @@ public class TBAFragment extends Fragment { } - - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java index da83c65..e00f01b 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TBAView.java @@ -3,17 +3,22 @@ package com.astatin3.scoutingapp2025.ui.transfer; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.util.AttributeSet; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ScrollView; +import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.ConstraintSet; import com.astatin3.scoutingapp2025.R; import com.astatin3.scoutingapp2025.RequestTask; @@ -24,8 +29,13 @@ import com.astatin3.scoutingapp2025.ui.JSONUtil; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.w3c.dom.Text; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Comparator; +import java.util.Date; import java.util.function.Function; public class TBAView extends ScrollView { @@ -79,6 +89,8 @@ public class TBAView extends ScrollView { } public void eventTable(String dataString){ + Date currentTime = Calendar.getInstance().getTime(); + try { JSONArray data = new JSONArray(dataString); @@ -87,25 +99,63 @@ public class TBAView extends ScrollView { boolean toggle = false; - TableRow tr = new TableRow(getContext()); - addTableText(tr, "Key"); - addTableText(tr, "Title"); - addTableText(tr, "Type"); - - Table.addView(tr); +// TableRow tr = new TableRow(getContext()); +// addTableText(tr, "Key"); +// addTableText(tr, "Title"); +// addTableText(tr, "Type"); +// +// Table.addView(tr); for(int i=0;i + android:layout_height="match_parent" + tools:visibility="gone">