From 8ec5b1f791b7c519f0c134d8c266350f7b83259b Mon Sep 17 00:00:00 2001 From: Astatin3 <77305074+Astatin3@users.noreply.github.com> Date: Thu, 4 Jul 2024 20:55:29 -0600 Subject: [PATCH] Mostly random stuff --- README.md | 8 +++--- .../types/input/sliderType.java | 4 +-- .../scoutingapp2025/ui/data/dataFragment.java | 18 +++++++------ .../scoutingapp2025/ui/data/teamsView.java | 8 +++--- app/src/main/res/layout/fragment_data.xml | 26 ++++++++++--------- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index cfb18ef..0f072a0 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ # ScoutingApp2025 -1 Ridgebotics 2025 scouting app in Android +Ridgebotics 2025 scouting app in Android TODO: -- Make a word cloud for the compiled mode of +- Make a word cloud for the compiled mode of notes input type - Make pit and match data field builder UIs. I don't want to have to keep editing a variable +- Add "history" view type to the teams view menu. -- Add more types of data fields. - Make the "Compile" menu +- The compile menu should be a shortcut to view all the team's stats from the upcoming match, from the teams view - Make the file browser UI - Fix the code scanning progress indicator +- Add more types of data fields. - Make server software to allow for easy sync over wifi - Make practice mode diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java index 32cece8..2b8fdf6 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/types/input/sliderType.java @@ -87,11 +87,11 @@ public class sliderType extends inputType { Slider slider = new Slider(parent.getContext()); float slider_position = (float) ((int) data.get()-min) / (max-min); - float step_size = (float) 1/max; + float step_size = (float) 1/(max-min); int round_position = Math.round(slider_position / step_size); slider.setValue(round_position*step_size); - slider.setStepSize((float) 1 / max); + slider.setStepSize((float) 1 / (max-min)); slider.setEnabled(false); parent.addView(slider); } diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/dataFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/dataFragment.java index 4c57079..f757366 100644 --- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/dataFragment.java +++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/data/dataFragment.java @@ -33,6 +33,8 @@ public class dataFragment extends Fragment { String evcode = latestSettings.settings.get_evcode(); + + if(evcode.equals("unset")){ binding.noEventError.setVisibility(View.VISIBLE); binding.buttons.setVisibility(View.GONE); @@ -42,17 +44,17 @@ public class dataFragment extends Fragment { frcEvent event = frcEvent.decode(fileEditor.readFile(evcode + ".eventdata")); - binding.overviewView.setOnClickListener(v -> { + binding.statusButton.setOnClickListener(v -> { binding.buttons.setVisibility(View.GONE); - binding.overviewView.setVisibility(View.VISIBLE); - binding.overviewView.start(binding, event); + binding.statusView.setVisibility(View.VISIBLE); + binding.statusView.start(binding, event); submenu = true; }); - binding.searchButton.setOnClickListener(v -> { + binding.teamsButton.setOnClickListener(v -> { binding.buttons.setVisibility(View.GONE); - binding.searchView.setVisibility(View.VISIBLE); - binding.searchView.init(binding, event); + binding.teamsView.setVisibility(View.VISIBLE); + binding.teamsView.init(binding, event); submenu = true; }); @@ -63,8 +65,8 @@ public class dataFragment extends Fragment { public void show_ui(){ binding.buttons.setVisibility(View.VISIBLE); - binding.overviewView.setVisibility(View.GONE); - binding.searchView.setVisibility(View.GONE); + binding.statusView.setVisibility(View.GONE); + binding.teamsView.setVisibility(View.GONE); submenu = false; } 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 df4fe33..65cf24a 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 @@ -61,11 +61,11 @@ public class teamsView extends ConstraintLayout { pit_transferValues = transferType.get_transfer_values(pit_values); - binding.searchArea.removeAllViews(); + binding.teamsArea.removeAllViews(); TableLayout table = new TableLayout(getContext()); table.setStretchAllColumns(true); - binding.searchArea.addView(table); + binding.teamsArea.addView(table); // binding.searchTable.addView(table); @@ -116,7 +116,7 @@ public class teamsView extends ConstraintLayout { } public void loadTeam(frcTeam team, boolean compiled_mode) { - binding.searchArea.removeAllViews(); + binding.teamsArea.removeAllViews(); LinearLayout ll = new LinearLayout(getContext()); ll.setLayoutParams(new LinearLayout.LayoutParams( @@ -124,7 +124,7 @@ public class teamsView extends ConstraintLayout { ViewGroup.LayoutParams.WRAP_CONTENT )); ll.setOrientation(LinearLayout.VERTICAL); - binding.searchArea.addView(ll); + binding.teamsArea.addView(ll); CheckBox cb = new CheckBox(getContext()); cb.setLayoutParams(new FrameLayout.LayoutParams( diff --git a/app/src/main/res/layout/fragment_data.xml b/app/src/main/res/layout/fragment_data.xml index 2e9b4ab..88383b7 100644 --- a/app/src/main/res/layout/fragment_data.xml +++ b/app/src/main/res/layout/fragment_data.xml @@ -20,19 +20,19 @@ android:id="@+id/status_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Overview" + android:text="status" android:textSize="34sp" - app:layout_constraintBottom_toTopOf="@+id/searchButton" + app:layout_constraintBottom_toTopOf="@+id/teamsButton" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.307" />