From 5be19880d41a7700bb77e2940db64f2001dedad9 Mon Sep 17 00:00:00 2001
From: Astatin3 <77305074+Astatin3@users.noreply.github.com>
Date: Thu, 18 Jul 2024 11:57:30 -0600
Subject: [PATCH] Start work on finishing field editor
---
.../scoutingapp2025/ui/data/fieldsView.java | 23 +++++++++++--------
.../scoutingapp2025/ui/data/teamsView.java | 5 +++-
app/src/main/res/layout/fragment_data.xml | 18 +++++++++++----
3 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/fieldsView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/fieldsView.java
index 2a826e8..2b8e4f9 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/fieldsView.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/fieldsView.java
@@ -3,7 +3,6 @@ package com.astatin3.scoutingapp2025.ui.data;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.FrameLayout;
-import android.widget.ScrollView;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;
@@ -11,12 +10,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.astatin3.scoutingapp2025.SettingsVersionStack.latestSettings;
import com.astatin3.scoutingapp2025.databinding.FragmentDataBinding;
import com.astatin3.scoutingapp2025.scoutingData.fields;
-import com.astatin3.scoutingapp2025.scoutingData.transfer.transferType;
-import com.astatin3.scoutingapp2025.types.frcEvent;
-import com.astatin3.scoutingapp2025.types.frcTeam;
import com.astatin3.scoutingapp2025.types.input.inputType;
public class fieldsView extends ConstraintLayout {
@@ -28,6 +23,7 @@ public class fieldsView extends ConstraintLayout {
}
FragmentDataBinding binding;
String filename;
+ private static final int background_color = 0x5000ff00;
inputType[][] values;
@@ -35,6 +31,7 @@ public class fieldsView extends ConstraintLayout {
this.binding = binding;
binding.fieldsSelectButtons.setVisibility(VISIBLE);
+ binding.addButton.setVisibility(GONE);
binding.fieldsArea.removeAllViews();
binding.fieldsSelectButtons.bringToFront();
@@ -42,18 +39,20 @@ public class fieldsView extends ConstraintLayout {
binding.matchScoutingButton.setOnClickListener(v -> {
binding.fieldsSelectButtons.setVisibility(GONE);
+ binding.addButton.setVisibility(VISIBLE);
filename = fields.matchFieldsFilename;
- load_fields();
+ load_field_menu();
});
binding.pitScoutingButton.setOnClickListener(v -> {
binding.fieldsSelectButtons.setVisibility(GONE);
+ binding.addButton.setVisibility(VISIBLE);
filename = fields.pitsFieldsFilename;
- load_fields();
+ load_field_menu();
});
}
- private void load_fields() {
+ private void load_field_menu() {
values = fields.load(filename);
for(int i = 0; i < values.length; i++){
@@ -69,7 +68,7 @@ public class fieldsView extends ConstraintLayout {
tr.setPadding(20,20,20,20);
binding.fieldsArea.addView(tr);
- tr.setBackgroundColor(0x1000ff00);
+ tr.setBackgroundColor(background_color);
TextView tv = new TextView(getContext());
tv.setText("v" + i);
@@ -82,9 +81,15 @@ public class fieldsView extends ConstraintLayout {
tr.addView(tv);
// frcTeam finalTeam = team;
+ int fi = i;
tr.setOnClickListener(v -> {
// loadTeam(finalTeam, latestSettings.settings.get_compiled_mode());
+ load_fields(values[fi]);
});
}
}
+
+ private void load_fields(inputType[] version_values) {
+
+ }
}
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/teamsView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/teamsView.java
index de74e01..e293169 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/teamsView.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/teamsView.java
@@ -37,6 +37,9 @@ public class teamsView extends ConstraintLayout {
}
com.astatin3.scoutingapp2025.databinding.FragmentDataBinding binding;
+
+ private static final int background_color = 0x5000ff00;
+
String evcode;
frcEvent event;
@@ -96,7 +99,7 @@ public class teamsView extends ConstraintLayout {
tr.setPadding(20,20,20,20);
table.addView(tr);
- tr.setBackgroundColor(0x1000ff00);
+ tr.setBackgroundColor(background_color);
TextView tv = new TextView(getContext());
tv.setText(String.valueOf(team.teamNumber));
diff --git a/app/src/main/res/layout/fragment_data.xml b/app/src/main/res/layout/fragment_data.xml
index d2db874..70f4a68 100644
--- a/app/src/main/res/layout/fragment_data.xml
+++ b/app/src/main/res/layout/fragment_data.xml
@@ -14,7 +14,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toTopOf="parent"
+ tools:visibility="gone">
+ app:layout_constraintTop_toBottomOf="@id/status_button" />