Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-08 16:28:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Start work on finishing field editor

Browse Source
This commit is contained in:
Astatin3
2024-07-18 11:57:30 -06:00
parent e92691e337
commit 5be19880d4
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/astatin3/scoutingapp2025/ui/data/fieldsView.java
+14 -9
View File
@@ -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) {
}
}
app/src/main/java/com/astatin3/scoutingapp2025/ui/data/teamsView.java
+4 -1
View File
@@ -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));
app/src/main/res/layout/fragment_data.xml
+14 -4
View File
@@ -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">
<Button
android:id="@+id/status_button"
@@ -34,10 +35,10 @@
android:layout_height="wrap_content"
android:text="teams"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@id/compileButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_button"
app:layout_constraintBottom_toTopOf="@id/compileButton" />
app:layout_constraintTop_toBottomOf="@id/status_button" />
<Button
android:id="@+id/compileButton"
@@ -142,12 +143,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="60dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<Button
android:id="@+id/add_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="+"
android:textSize="48sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fields_select_buttons"
android:layout_width="match_parent"
@@ -183,6 +192,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"