diff --git a/Generator/.idea/planningMode.xml b/Generator/.idea/planningMode.xml index e0804ea..d2b444b 100644 --- a/Generator/.idea/planningMode.xml +++ b/Generator/.idea/planningMode.xml @@ -7,6 +7,7 @@ + diff --git a/Generator/app/release/app-release.apk b/Generator/app/release/app-release.apk index 5bffa37..77cc792 100644 Binary files a/Generator/app/release/app-release.apk and b/Generator/app/release/app-release.apk differ diff --git a/Generator/app/release/baselineProfiles/0/app-release.dm b/Generator/app/release/baselineProfiles/0/app-release.dm index 982c850..c9c5789 100644 Binary files a/Generator/app/release/baselineProfiles/0/app-release.dm and b/Generator/app/release/baselineProfiles/0/app-release.dm differ diff --git a/Generator/app/release/baselineProfiles/1/app-release.dm b/Generator/app/release/baselineProfiles/1/app-release.dm index f96910c..075aef5 100644 Binary files a/Generator/app/release/baselineProfiles/1/app-release.dm and b/Generator/app/release/baselineProfiles/1/app-release.dm differ diff --git a/Generator/app/src/main/AndroidManifest.xml b/Generator/app/src/main/AndroidManifest.xml index faec459..679caab 100644 --- a/Generator/app/src/main/AndroidManifest.xml +++ b/Generator/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + + + + \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/Data.java b/Generator/app/src/main/java/com/example/generator/Data.java index c4a700f..bc49882 100644 --- a/Generator/app/src/main/java/com/example/generator/Data.java +++ b/Generator/app/src/main/java/com/example/generator/Data.java @@ -1,13 +1,11 @@ package com.example.generator; -import org.apache.commons.codec.binary.Hex; - public class Data { private String base64; private int numPos; - private String colorP; - private String colorS; + private String colorP= "Orange"; + private String colorS = "Green"; private String eventn1; private String eventn2; @@ -18,6 +16,18 @@ public class Data { private String eventa2; private String eventa3; private String eventa4; + + private String ScoreOb1; + private String ScoreOb2; + private String ScoreOb3; + private String ScoreOb4; + private String ScoreOb5; + private String ScoreOb6; + private String ScoreOb7; + private String ScoreOb8; + private String ScoreOb9; + private String NumScoreOb = "0"; + public String getBase64() { return base64; } @@ -25,9 +35,11 @@ public class Data { public void setBase64(String base64) { this.base64 = base64; } + public void setNumPos(int numPos) { this.numPos = Math.max(0, numPos); } + public int getNumPos() { return Math.max(0, numPos); } @@ -64,7 +76,6 @@ public class Data { this.eventa1 = eventa1; } - public String getEventn2() { return eventn2; } @@ -81,7 +92,6 @@ public class Data { this.eventa2 = eventa2; } - public String getEventn3() { return eventn3; } @@ -94,16 +104,17 @@ public class Data { return eventa3; } - public void setEventa3(String eventa1) { + + public void setEventa3(String eventa3) { this.eventa3 = eventa3; } - public String getEventn4() { return eventn4; } - public void setEventn4(String eventn1) { + + public void setEventn4(String eventn4) { this.eventn4 = eventn4; } @@ -114,5 +125,79 @@ public class Data { public void setEventa4(String eventa4) { this.eventa4 = eventa4; } + public void setNumScoreOb(String NumScoreOb) { + this.NumScoreOb = NumScoreOb; + } -} + public String getNumScoreOb() { + return NumScoreOb; + } + + public void setScoreOb1(String ScoreOb1) { + this.ScoreOb1 = ScoreOb1; + } + + public String getScoreOb1() { + return ScoreOb1; + } + + public void setScoreOb2(String ScoreOb2) { + this.ScoreOb2 = ScoreOb2; + } + + public String getScoreOb2() { + return ScoreOb2; + } + + public void setScoreOb3(String ScoreOb3) { + this.ScoreOb3 = ScoreOb3; + } + + public String getScoreOb3() { + return ScoreOb3; + } + + public void setScoreOb4(String ScoreOb4) { + this.ScoreOb4 = ScoreOb4; + } + + public String getScoreOb4() { + return ScoreOb4; + } + + public void setScoreOb5(String ScoreOb5) {this.ScoreOb5 = ScoreOb5; + } + + public String getScoreOb5() { + return ScoreOb5; + } + + public void setScoreOb6(String ScoreOb6) { + this.ScoreOb6 = ScoreOb6; + } + + public String getScoreOb6() { + return ScoreOb6; + } + + public void setScoreOb7(String ScoreOb7) {this.ScoreOb7 = ScoreOb7; + } + + public String getScoreOb7() { + return ScoreOb7; + } + + public void setScoreOb8(String ScoreOb8) {this.ScoreOb8 = ScoreOb8; + } + + public String getScoreOb8() { + return ScoreOb8; + } + + public void setScoreOb9(String ScoreOb9) {this.ScoreOb9 = ScoreOb9; + } + + public String getScoreOb9() { + return ScoreOb9; + } +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/DebugActivity.java b/Generator/app/src/main/java/com/example/generator/DebugActivity.java new file mode 100644 index 0000000..d19d0d9 --- /dev/null +++ b/Generator/app/src/main/java/com/example/generator/DebugActivity.java @@ -0,0 +1,69 @@ +package com.example.generator; + +import android.content.Intent; +import android.os.Bundle; +import android.widget.Button; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class DebugActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_debug); + 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; + }); + Button Main = (Button) findViewById(R.id.mainM); + Button Event = (Button) findViewById(R.id.Events); + Button Color = (Button) findViewById(R.id.Color); + Button MakeStart = (Button) findViewById(R.id.MakeStarting); + Button StartPreview = (Button) findViewById(R.id.StartingPreview); + Button MakeAuto = (Button) findViewById(R.id.MakeAuto); + Button MakeAuto2 = (Button) findViewById(R.id.MakeAuto2); + + Main.setOnClickListener((v) -> { + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + }); + + Event.setOnClickListener((v) -> { + Intent intent = new Intent(this, EventsActivity.class); + startActivity(intent); + }); + + Color.setOnClickListener((v) -> { + Intent intent = new Intent(this, ColorActivity.class); + startActivity(intent); + }); + + MakeStart.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeStartingActivity.class); + startActivity(intent); + }); + + StartPreview.setOnClickListener((v) -> { + Intent intent = new Intent(this, StartingPreview.class); + startActivity(intent); + }); + + MakeAuto.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeAutoActivity.class); + startActivity(intent); + }); + + MakeAuto2.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeAutoActivity2.class); + startActivity(intent); + }); + + } +} \ 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 ccce3ce..aa89a4d 100644 --- a/Generator/app/src/main/java/com/example/generator/EventsActivity.java +++ b/Generator/app/src/main/java/com/example/generator/EventsActivity.java @@ -2,7 +2,6 @@ package com.example.generator; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.widget.Button; import android.widget.EditText; import android.widget.Toast; @@ -48,8 +47,8 @@ public class EventsActivity extends AppCompatActivity { - Button backButton = (Button) findViewById(R.id.button_back); - Button nextButton = (Button) findViewById(R.id.button_next); + Button backButton = (Button) findViewById(R.id.backButton); + Button nextButton = (Button) findViewById(R.id.nextButton); backButton.setOnClickListener((v) -> { Intent intent = new Intent(this, MainActivity.class); startActivity(intent); diff --git a/Generator/app/src/main/java/com/example/generator/MainActivity.java b/Generator/app/src/main/java/com/example/generator/MainActivity.java index 2b1b6f6..fa0bcaf 100644 --- a/Generator/app/src/main/java/com/example/generator/MainActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MainActivity.java @@ -1,14 +1,24 @@ package com.example.generator; +import static android.view.View.INVISIBLE; +import static android.view.View.VISIBLE; + +import static java.security.AccessController.getContext; + import android.content.Intent; +import android.content.pm.ApplicationInfo; import android.os.Bundle; +import android.os.Debug; +import android.view.View; import android.widget.Button; +import android.widget.EditText; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import androidx.multidex.BuildConfig; public class MainActivity extends AppCompatActivity { @@ -24,11 +34,19 @@ public class MainActivity extends AppCompatActivity { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); - Button makeButton = (Button) findViewById(R.id.button_next); + Button makeButton = (Button) findViewById(R.id.nextButton); makeButton.setOnClickListener((v) -> { Intent intent = new Intent(this, EventsActivity.class); startActivity(intent); }); + Button DebugButton = (Button) findViewById(R.id.Debug); + //DebugButton.setVisibility(View.GONE); + DebugButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, DebugActivity.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 4874168..e2b26c4 100644 --- a/Generator/app/src/main/java/com/example/generator/MakeAutoActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MakeAutoActivity.java @@ -1,18 +1,41 @@ package com.example.generator; import android.content.Intent; +import android.content.res.ColorStateList; import android.os.Bundle; -import android.widget.Button; +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; +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 MakeAutoActivity 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); @@ -24,16 +47,102 @@ public class MakeAutoActivity extends AppCompatActivity { return insets; }); + EditText ScoreObjects = (EditText) findViewById(R.id.NumScorObject); + EditText Ob1 = (EditText) findViewById(R.id.NumOfButton1); + EditText Ob2 = (EditText) findViewById(R.id.scoreOb2); + EditText Ob3 = (EditText) findViewById(R.id.scoreOb3); + EditText Ob4 = (EditText) findViewById(R.id.scoreOb4); + EditText Ob5 = (EditText) findViewById(R.id.scoreOb5); + EditText Ob6 = (EditText) findViewById(R.id.scoreOb6); + EditText Ob7 = (EditText) findViewById(R.id.scoreOb7); + EditText Ob8 = (EditText) findViewById(R.id.scoreOb8); + EditText Ob9 = (EditText) findViewById(R.id.scoreOb9); + Ob1.setVisibility(View.GONE); + Ob2.setVisibility(View.GONE); + Ob3.setVisibility(View.GONE); + Ob4.setVisibility(View.GONE); + Ob5.setVisibility(View.GONE); + Ob6.setVisibility(View.GONE); + Ob7.setVisibility(View.GONE); + Ob8.setVisibility(View.GONE); + Ob9.setVisibility(View.GONE); - Button backButton = (Button) findViewById(R.id.button_back); - Button nextButton = (Button) findViewById(R.id.button_next); + + + MaterialButton backButton = findViewById(R.id.backButton); + MaterialButton nextButton = findViewById(R.id.nextButton); backButton.setOnClickListener((v) -> { Intent intent = new Intent(this, StartingPreview.class); startActivity(intent); }); - nextButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, MakeAutoActivity.class); + 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, StartingPreview.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.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + boolean handled = false; + if (actionId == EditorInfo.IME_ACTION_DONE) { + String ScoreNum = ScoreObjects.getText().toString(); + View[] objectives = { + Ob1, Ob2, Ob3, Ob4, Ob5, + Ob6, Ob7, Ob8, Ob9 + }; + + 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); + } + handled = true; + } + return handled; + } + }); } - } \ No newline at end of file +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/MakeAutoActivity2.java b/Generator/app/src/main/java/com/example/generator/MakeAutoActivity2.java new file mode 100644 index 0000000..2c4f2e0 --- /dev/null +++ b/Generator/app/src/main/java/com/example/generator/MakeAutoActivity2.java @@ -0,0 +1,112 @@ +package com.example.generator; + +import android.content.Intent; +import android.content.res.ColorStateList; +import android.os.Bundle; +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 MakeAutoActivity2 extends AppCompatActivity { + + 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_auto2); + 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 Ob1 = (EditText) findViewById(R.id.NumOfButton1); + EditText Ob2 = (EditText) findViewById(R.id.NumOfButton2); + EditText Ob3 = (EditText) findViewById(R.id.NumOfButton3); + EditText Ob4 = (EditText) findViewById(R.id.NumOfButton4); + EditText Ob5 = (EditText) findViewById(R.id.NumOfButton5); + EditText Ob6 = (EditText) findViewById(R.id.NumOfButton6); + EditText Ob7 = (EditText) findViewById(R.id.NumOfButton7); + EditText Ob8 = (EditText) findViewById(R.id.NumOfButton8); + EditText Ob9 = (EditText) findViewById(R.id.NumOfButton9); + + String ScoreNum = EventsActivity.Data.getNumScoreOb(); + View[] objectives = { + Ob1, Ob2, Ob3, Ob4, Ob5, + Ob6, Ob7, Ob8, Ob9 + }; + 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); + } + + Ob1.setHint(EventsActivity.Data.getScoreOb1()); + Ob2.setHint(EventsActivity.Data.getScoreOb2()); + Ob3.setHint(EventsActivity.Data.getScoreOb3()); + Ob4.setHint(EventsActivity.Data.getScoreOb4()); + Ob5.setHint(EventsActivity.Data.getScoreOb5()); + Ob6.setHint(EventsActivity.Data.getScoreOb6()); + Ob7.setHint(EventsActivity.Data.getScoreOb7()); + Ob8.setHint(EventsActivity.Data.getScoreOb8()); + Ob9.setHint(EventsActivity.Data.getScoreOb9()); + + if (EventsActivity.Data.getColorS() != null) { + ColorS = EventsActivity.Data.getColorS(); + } + if (EventsActivity.Data.getColorP() != null) { + ColorP = EventsActivity.Data.getColorP(); + } + + MaterialButton backButton = findViewById(R.id.backButton); + MaterialButton nextButton = findViewById(R.id.nextButton); + backButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeAutoActivity.class); + startActivity(intent); + }); + nextButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MakeAutoActivity.class); + startActivity(intent); + }); + + + 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); + } + if (EventsActivity.Data.getColorS() != null) { + ColorS = EventsActivity.Data.getColorS(); + } + if (EventsActivity.Data.getColorP() != null) { + ColorP = EventsActivity.Data.getColorP(); + } + } +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/MakeStartingActivity.java b/Generator/app/src/main/java/com/example/generator/MakeStartingActivity.java index fc7f8f8..003f9a0 100644 --- a/Generator/app/src/main/java/com/example/generator/MakeStartingActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MakeStartingActivity.java @@ -143,19 +143,19 @@ public class MakeStartingActivity extends AppCompatActivity { } imageView = findViewById(R.id.imageView); - Button nextButton = (Button) findViewById(R.id.button_next); - Button backButton = (Button) findViewById(R.id.button_back); + Button nextButton = (Button) findViewById(R.id.nextButton); + Button backButton = (Button) findViewById(R.id.backButton); Button chooseButton = (Button) findViewById(R.id.button_image); numPosEdit = findViewById(R.id.numPos); if (mainColorResP != 0) { - // 1. Convert the Resource ID (R.color...) into the actual ARGB color integer + int actualColor = ContextCompat.getColor(this, mainColorResP); // 2. Turn that color into a ColorStateList ColorStateList tintList = ColorStateList.valueOf(actualColor); - // 3. Apply ONLY the tint so you keep your rounded button styling + ViewCompat.setBackgroundTintList(nextButton, tintList); ViewCompat.setBackgroundTintList(backButton, tintList); ViewCompat.setBackgroundTintList(chooseButton, tintList); @@ -164,7 +164,7 @@ public class MakeStartingActivity extends AppCompatActivity { backButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, MainActivity.class); + Intent intent = new Intent(this, ColorActivity.class); startActivity(intent); }); diff --git a/Generator/app/src/main/java/com/example/generator/PreviewAutoActivity.java b/Generator/app/src/main/java/com/example/generator/PreviewAutoActivity.java new file mode 100644 index 0000000..7d29f43 --- /dev/null +++ b/Generator/app/src/main/java/com/example/generator/PreviewAutoActivity.java @@ -0,0 +1,25 @@ +package com.example.generator; + +import android.os.Bundle; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class PreviewAutoActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_preview_auto); + 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; + }); + + } +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/StartingPreview.java b/Generator/app/src/main/java/com/example/generator/StartingPreview.java index 9f45bc4..116c7bf 100644 --- a/Generator/app/src/main/java/com/example/generator/StartingPreview.java +++ b/Generator/app/src/main/java/com/example/generator/StartingPreview.java @@ -1,5 +1,6 @@ package com.example.generator; +import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.Bitmap; @@ -7,8 +8,8 @@ import android.graphics.BitmapFactory; import android.os.Bundle; import android.util.Base64; import android.util.Log; +import android.view.ContextThemeWrapper; import android.view.View; -import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; import android.widget.RadioButton; @@ -21,16 +22,13 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import com.google.android.material.button.MaterialButton; public class StartingPreview extends AppCompatActivity { - private int mainColorResP = 0; - private int bgTintResP = 0; private String ColorP = ""; - private int mainColorResS = 0; - private int bgTintResS = 0; private String ColorS = ""; - private EditText numPosEdit; + private int mainColorResP = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -43,84 +41,24 @@ public class StartingPreview extends AppCompatActivity { return insets; }); - - - switch (EventsActivity.Data.getColorS()) { - case "Orange": - ColorS = "Orange"; - mainColorResS = R.color.orangeMain; - bgTintResS = R.color.orangeMain_bg; - break; - case "Green": - ColorS = "Green"; - mainColorResS = R.color.greenMain; - bgTintResS = R.color.greenMain_bg; - break; - case "Blue": - ColorS = "Blue"; - mainColorResS = R.color.blueMain; - bgTintResS = R.color.blueMain_bg; - break; - case "Pink": - ColorS = "Pink"; - mainColorResS = R.color.pinkMain; - bgTintResS = R.color.pinkMain_bg; - break; - case "Purple": - ColorS = "Purple"; - mainColorResS = R.color.purpleMain; - bgTintResS = R.color.purpleMain_bg; - break; - case "Red": - ColorS = "Red"; - mainColorResS = R.color.redMain; - bgTintResS = R.color.redMain_bg; - break; - case "Yellow": - ColorS = "Yellow"; - mainColorResS = R.color.yellowMain; - bgTintResS = R.color.yellowMain_bg; - break; + if (EventsActivity.Data.getColorS() != null) { + ColorS = EventsActivity.Data.getColorS(); + } + if (EventsActivity.Data.getColorP() != null) { + ColorP = EventsActivity.Data.getColorP(); } - switch (EventsActivity.Data.getColorP ()) { - case "Orange": - ColorP = "Orange"; - mainColorResP = R.color.orangeMain; - bgTintResP = R.color.orangeMain_bg; - break; - case "Green": - ColorP = "Green"; - mainColorResP = R.color.greenMain; - bgTintResP = R.color.greenMain_bg; - break; - case "Blue": - ColorP = "Blue"; - mainColorResP = R.color.blueMain; - bgTintResP = R.color.blueMain_bg; - break; - case "Pink": - ColorP = "Pink"; - mainColorResP = R.color.pinkMain; - bgTintResP = R.color.pinkMain_bg; - break; - case "Purple": - ColorP = "Purple"; - mainColorResP = R.color.purpleMain; - bgTintResP = R.color.purpleMain_bg; - break; - case "Red": - ColorP = "Red"; - mainColorResP = R.color.redMain; - bgTintResP = R.color.redMain_bg; - break; - case "Yellow": - ColorP = "Yellow"; - mainColorResP = R.color.yellowMain; - bgTintResP = R.color.yellowMain_bg; - break; + 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; } + ImageView imageView2 = findViewById(R.id.imageView2); String imageBase64 = EventsActivity.Data.getBase64(); @@ -135,41 +73,51 @@ public class StartingPreview extends AppCompatActivity { } } + RadioGroup radioGroup = findViewById(R.id.radioGroup); - int totalPositions; - totalPositions = EventsActivity.Data.getNumPos(); + int totalPositions = EventsActivity.Data.getNumPos(); int whiteColor = ContextCompat.getColor(this, R.color.white); - int mainColor = ContextCompat.getColor(this, R.color.orangeMain); - ColorStateList buttonTintList = ColorStateList.valueOf(mainColor); - RadioGroup.LayoutParams layoutParams = new RadioGroup.LayoutParams( - RadioGroup.LayoutParams.MATCH_PARENT, - RadioGroup.LayoutParams.WRAP_CONTENT - ); + int activeMainColor = ContextCompat.getColor(this, mainColorResP); + ColorStateList buttonTintList = ColorStateList.valueOf(activeMainColor); for (int i = 1; i <= totalPositions; i++) { RadioButton radioButton = new RadioButton(this); - radioButton.setId(View.generateViewId()); radioButton.setText("Starting Position " + i); radioButton.setTextSize(20); radioButton.setTextColor(whiteColor); - radioButton.setButtonTintList(buttonTintList); - - radioGroup.addView(radioButton); - } - Button backButton = (Button) findViewById(R.id.backButton); - Button nextButton = (Button) findViewById(R.id.buttonNext); + + MaterialButton backButton = findViewById(R.id.backButton); + MaterialButton nextButton = findViewById(R.id.buttonNext); + MaterialButton backButtonFake = findViewById(R.id.BackButtonFake); + MaterialButton nextButtonFake = findViewById(R.id.ButtonNextFake); + + if (mainColorResP != 0) { + int actualColor = ContextCompat.getColor(this, mainColorResP); + ColorStateList tintList = ColorStateList.valueOf(actualColor); + + ViewCompat.setBackgroundTintList(nextButton, tintList); + ViewCompat.setBackgroundTintList(backButton, tintList); + ViewCompat.setBackgroundTintList(nextButtonFake, tintList); + ViewCompat.setBackgroundTintList(backButtonFake, tintList); + + nextButton.setStrokeWidth(0); + backButton.setStrokeWidth(0); + nextButtonFake.setStrokeWidth(0); + backButtonFake.setStrokeWidth(0); + } + backButton.setOnClickListener((v) -> { Intent intent = new Intent(this, MakeStartingActivity.class); startActivity(intent); }); + nextButton.setOnClickListener((v) -> { Intent intent = new Intent(this, MakeAutoActivity.class); startActivity(intent); }); - } - } \ No newline at end of file +} \ No newline at end of file diff --git a/Generator/app/src/main/res/layout/activity_color.xml b/Generator/app/src/main/res/layout/activity_color.xml index 74c81ce..3b26289 100644 --- a/Generator/app/src/main/res/layout/activity_color.xml +++ b/Generator/app/src/main/res/layout/activity_color.xml @@ -9,7 +9,7 @@ tools:context=".ColorActivity">