diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml
index 2800d045..60ea70d0 100644
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -1380,8 +1380,8 @@
-
-
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17818a66..94b95100 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,7 @@
-
-
-
+
@@ -18,16 +16,16 @@
- {
+ "lastFilter": {
+ "state": "OPEN",
+ "assignee": "wildercayden"
}
-}]]>
+}
{
@@ -39,20 +37,20 @@
- {
+ "keyToString": {
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "android.gradle.sync.needed": "true",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "git-widget-placeholder": "main",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "C:/Users/cayde/Desktop/ScoutingApp"
}
-}]]>
+}
diff --git a/Generator/app/src/main/java/com/example/generator/Tab1.java b/Generator/app/src/main/java/com/example/generator/Tab1.java
index f41fc9d4..c71b73b4 100644
--- a/Generator/app/src/main/java/com/example/generator/Tab1.java
+++ b/Generator/app/src/main/java/com/example/generator/Tab1.java
@@ -1,8 +1,10 @@
package com.example.generator;
+import android.media.metrics.Event;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -13,6 +15,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
+import java.util.Arrays;
+
public class Tab1 extends Fragment {
private static final String ARG_POSITION = "tab_position";
@@ -28,6 +32,7 @@ public class Tab1 extends Fragment {
fragment.setArguments(args);
return fragment;
}
+ public int[] NumButtonOb = new int[9];
@Nullable
@Override
@@ -36,13 +41,26 @@ public class Tab1 extends Fragment {
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_tab1, container, false);
+
int tabPosition = getArguments() != null ? getArguments().getInt(ARG_POSITION, 0) : 0;
TextView elementTitle = view.findViewById(R.id.text1);
- elementTitle.setText("Element " + (tabPosition + 1));
+ elementTitle.setText("Object " + (tabPosition + 1));
+ NumButtonOb = EventsActivity.Data.getNumButtonOb();
+
+
+ EditText ToAdd = view.findViewById(R.id.toAdd);
+ EditText ToAdd2 = view.findViewById(R.id.toAdd2);
+ EditText ToAdd3 = view.findViewById(R.id.toAdd3);
+ EditText ToAdd4 = view.findViewById(R.id.toAdd4);
+ EditText ToAdd5 = view.findViewById(R.id.toAdd5);
+ EditText ToAdd6 = view.findViewById(R.id.toAdd6);
+ EditText ToAdd7 = view.findViewById(R.id.toAdd7);
+ EditText ToAdd8 = view.findViewById(R.id.toAdd8);
+ EditText ToAdd9 = view.findViewById(R.id.toAdd9);
EditText numOfButton = view.findViewById(R.id.numOfButton);
- View[] objectives = {
+ View[] buttons = {
view.findViewById(R.id.toAdd),
view.findViewById(R.id.toAdd2),
view.findViewById(R.id.toAdd3),
@@ -53,10 +71,19 @@ public class Tab1 extends Fragment {
view.findViewById(R.id.toAdd8),
view.findViewById(R.id.toAdd9)
};
+ for (int o = 0; o < buttons.length; o++) {
+ buttons[o].setVisibility(o < NumButtonOb[tabPosition] ? View.VISIBLE : View.GONE);
+ }
+ if (NumButtonOb[tabPosition] == 0) {
+
+ }else {
+ numOfButton.setText(String.valueOf(NumButtonOb[tabPosition]));
+ }
numOfButton.addTextChangedListener(new TextWatcher() {
@Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ }
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -64,16 +91,36 @@ public class Tab1 extends Fragment {
EventsActivity.Data.setNumScoreOb(input);
int score = input.isEmpty() ? 0 : Integer.parseInt(input);
+ NumButtonOb = EventsActivity.Data.getNumButtonOb();
+ NumButtonOb[tabPosition] = score;
+ EventsActivity.Data.setNumButtonOb(NumButtonOb);
+ Log.d("score", Arrays.toString(NumButtonOb));
- for (int o = 0; o < objectives.length; o++) {
- objectives[o].setVisibility(o < score ? View.VISIBLE : View.GONE);
+
+ for (int o = 0; o < buttons.length; o++) {
+ buttons[o].setVisibility(o < NumButtonOb[tabPosition] ? View.VISIBLE : View.GONE);
}
}
@Override
- public void afterTextChanged(Editable s) {}
+ public void afterTextChanged(Editable s) {
+ }
});
+ ToAdd.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {}
+ });
return view;
}
-}
\ No newline at end of file
+}