diff --git a/Generator/app/src/main/AndroidManifest.xml b/Generator/app/src/main/AndroidManifest.xml index 625f8aec..96967085 100644 --- a/Generator/app/src/main/AndroidManifest.xml +++ b/Generator/app/src/main/AndroidManifest.xml @@ -59,6 +59,10 @@ android:name=".MakeTeleActivity" android:exported="false" android:windowSoftInputMode="adjustResize" /> + \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/ColorActivity.java b/Generator/app/src/main/java/com/example/generator/ColorActivity.java index 90a6a324..0d64bc79 100644 --- a/Generator/app/src/main/java/com/example/generator/ColorActivity.java +++ b/Generator/app/src/main/java/com/example/generator/ColorActivity.java @@ -205,4 +205,4 @@ public class ColorActivity extends AppCompatActivity { public void onNothingSelected(AdapterView parentView) {} }); } -} +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/EventsActivity.java b/Generator/app/src/main/java/com/example/generator/EventsActivity.java index aa89a4d4..e6947710 100644 --- a/Generator/app/src/main/java/com/example/generator/EventsActivity.java +++ b/Generator/app/src/main/java/com/example/generator/EventsActivity.java @@ -63,24 +63,24 @@ public class EventsActivity extends AppCompatActivity { String Eventa2 = eventa2.getText().toString(); String Eventa3 = eventa3.getText().toString(); String Eventa4 = eventa4.getText().toString(); - if (Eventn1.matches("") || + if (Eventn1.matches("") || Eventn2.matches("") || Eventa1.matches("") || Eventa2.matches("")) { Toast.makeText(this, "fill at least events 1 and 2", Toast.LENGTH_LONG).show(); } else { - Data.setEventn1(Eventn1); - Data.setEventn2(Eventn2); - Data.setEventn3(Eventn3); - Data.setEventn4(Eventn4); + Data.setEventn1(Eventn1); + Data.setEventn2(Eventn2); + Data.setEventn3(Eventn3); + Data.setEventn4(Eventn4); - Data.setEventa1(Eventa1); - Data.setEventa2(Eventa2); - Data.setEventa3(Eventa3); - Data.setEventa4(Eventa4); + Data.setEventa1(Eventa1); + Data.setEventa2(Eventa2); + Data.setEventa3(Eventa3); + Data.setEventa4(Eventa4); - Intent intent = new Intent(this, ColorActivity.class); - startActivity(intent); } + Intent intent = new Intent(this, ColorActivity.class); + startActivity(intent); } }); } } \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/MakeAutoActivity.java b/Generator/app/src/main/java/com/example/generator/MakeAutoActivity.java index 95e26c0d..5dbc04b9 100644 --- a/Generator/app/src/main/java/com/example/generator/MakeAutoActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MakeAutoActivity.java @@ -5,12 +5,8 @@ import android.content.res.ColorStateList; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; -import android.view.KeyEvent; import android.view.View; -import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import android.widget.TextView; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; @@ -21,8 +17,6 @@ import androidx.core.view.WindowInsetsCompat; import com.google.android.material.button.MaterialButton; -import java.util.Arrays; - public class MakeAutoActivity extends AppCompatActivity { diff --git a/Generator/app/src/main/java/com/example/generator/MakeCheckActivity.java b/Generator/app/src/main/java/com/example/generator/MakeCheckActivity.java new file mode 100644 index 00000000..c9820a90 --- /dev/null +++ b/Generator/app/src/main/java/com/example/generator/MakeCheckActivity.java @@ -0,0 +1,138 @@ +package com.example.generator; + +import android.content.Intent; +import android.content.res.ColorStateList; +import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.widget.EditText; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +import com.google.android.material.button.MaterialButton; + + +public class MakeCheckActivity extends AppCompatActivity { + + private EditText ScoreObjects; + private EditText Ob1; + private EditText Ob2; + private EditText Ob3; + private EditText Ob4; + private EditText Ob5; + private EditText Ob6; + private EditText Ob7; + private EditText Ob8; + private EditText Ob9; + + private String ColorP = ""; + private String ColorS = ""; + private int mainColorResP = 0; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_make_check); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + EditText ScoreObjects = (EditText) findViewById(R.id.NumCheckBox); + EditText Ob1 = (EditText) findViewById(R.id.CheckBox1); + EditText Ob2 = (EditText) findViewById(R.id.CheckBox2); + EditText Ob3 = (EditText) findViewById(R.id.CheckBox3); + EditText Ob4 = (EditText) findViewById(R.id.CheckBox4); + Ob1.setVisibility(View.GONE); + Ob2.setVisibility(View.GONE); + Ob3.setVisibility(View.GONE); + Ob4.setVisibility(View.GONE); + + + + MaterialButton backButton = findViewById(R.id.backButton); + MaterialButton nextButton = findViewById(R.id.nextButton); + backButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeAutoActivity.class); + startActivity(intent); + }); + if (EventsActivity.Data.getColorS() != null) { + ColorS = EventsActivity.Data.getColorS(); + } + if (EventsActivity.Data.getColorP() != null) { + ColorP = EventsActivity.Data.getColorP(); + } + + switch (ColorP) { + case "Green": mainColorResP = R.color.greenMain; break; + case "Blue": mainColorResP = R.color.blueMain; break; + case "Pink": mainColorResP = R.color.pinkMain; break; + case "Purple": mainColorResP = R.color.purpleMain; break; + case "Red": mainColorResP = R.color.redMain; break; + case "Yellow": mainColorResP = R.color.yellowMain; break; + default: mainColorResP = R.color.orangeMain; break; + } + + + if (mainColorResP != 0) { + int actualColor = ContextCompat.getColor(this, mainColorResP); + ColorStateList tintList = ColorStateList.valueOf(actualColor); + + ViewCompat.setBackgroundTintList(nextButton, tintList); + ViewCompat.setBackgroundTintList(backButton, tintList); + + nextButton.setStrokeWidth(0); + backButton.setStrokeWidth(0); + } + + backButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeStartingActivity.class); + startActivity(intent); + }); + + nextButton.setOnClickListener((v) -> { + EventsActivity.Data.setScoreOb1(Ob1.getText().toString()); + EventsActivity.Data.setScoreOb2(Ob2.getText().toString()); + EventsActivity.Data.setScoreOb3(Ob3.getText().toString()); + EventsActivity.Data.setScoreOb4(Ob4.getText().toString()); + EventsActivity.Data.setScoreOb5(Ob5.getText().toString()); + EventsActivity.Data.setScoreOb6(Ob6.getText().toString()); + EventsActivity.Data.setScoreOb7(Ob7.getText().toString()); + EventsActivity.Data.setScoreOb8(Ob8.getText().toString()); + EventsActivity.Data.setScoreOb9(Ob9.getText().toString()); + EventsActivity.Data.setNumScoreOb(ScoreObjects.getText().toString()); + Intent intent = new Intent(this, MakeAutoActivity2.class); + startActivity(intent); + }); + + ScoreObjects.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) { + String ScoreNum = ScoreObjects.getText().toString(); + View[] objectives = { + Ob1, Ob2, Ob3, Ob4 + }; + + int score = ScoreNum.isEmpty() ? 0 : Integer.parseInt(ScoreNum); + + for (int i = 0; i < objectives.length; i++) { + objectives[i].setVisibility(i < score ? View.VISIBLE : View.GONE); + } + } + + @Override + public void afterTextChanged(Editable s) {} + }); + } +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/MakeTeleActivity.java b/Generator/app/src/main/java/com/example/generator/MakeTeleActivity.java index 43463c28..8e14e033 100644 --- a/Generator/app/src/main/java/com/example/generator/MakeTeleActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MakeTeleActivity.java @@ -72,7 +72,7 @@ public class MakeTeleActivity extends AppCompatActivity { startActivity(intent); }); nextButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, MakeAutoActivity.class); + Intent intent = new Intent(this, MakeCheckActivity.class); startActivity(intent); }); diff --git a/Generator/app/src/main/res/layout/activity_make_check.xml b/Generator/app/src/main/res/layout/activity_make_check.xml new file mode 100644 index 00000000..f6893cc8 --- /dev/null +++ b/Generator/app/src/main/res/layout/activity_make_check.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + +