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 e8c29f8..974348e 100644 --- a/Generator/app/src/main/java/com/example/generator/Data.java +++ b/Generator/app/src/main/java/com/example/generator/Data.java @@ -15,8 +15,8 @@ public class Data { public void setNumPos(int numPos) { this.numPos = Math.max(0, numPos); } - public String getNumPos() { - return String.valueOf(numPos); + public int getNumPos() { + return Math.max(0, numPos); } 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 1a0835f..ccff61b 100644 --- a/Generator/app/src/main/java/com/example/generator/StartingPreview.java +++ b/Generator/app/src/main/java/com/example/generator/StartingPreview.java @@ -1,14 +1,21 @@ package com.example.generator; +import android.content.Intent; +import android.content.res.ColorStateList; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; import android.util.Base64; import android.util.Log; +import android.view.View; +import android.widget.Button; import android.widget.ImageView; +import android.widget.RadioButton; +import android.widget.RadioGroup; 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; @@ -40,5 +47,41 @@ public class StartingPreview extends AppCompatActivity { } } + RadioGroup radioGroup = findViewById(R.id.radioGroup); + int totalPositions; + totalPositions = makeActivity.Data.getNumPos(); + + int whiteColor = ContextCompat.getColor(this, R.color.white); + int mainColor = ContextCompat.getColor(this, R.color.main); + ColorStateList buttonTintList = ColorStateList.valueOf(mainColor); + RadioGroup.LayoutParams layoutParams = new RadioGroup.LayoutParams( + RadioGroup.LayoutParams.MATCH_PARENT, + RadioGroup.LayoutParams.WRAP_CONTENT + ); + + 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); + backButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, makeActivity.class); + startActivity(intent); + }); + nextButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + }); } -} \ No newline at end of file + } \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/makeActivity.java b/Generator/app/src/main/java/com/example/generator/makeActivity.java index 8335490..3fe64db 100644 --- a/Generator/app/src/main/java/com/example/generator/makeActivity.java +++ b/Generator/app/src/main/java/com/example/generator/makeActivity.java @@ -79,7 +79,6 @@ public class makeActivity extends AppCompatActivity { } else { Data.setNumPos(numPos); Data.setBase64(Base64img); - Log.d("Pos", Data.getNumPos()); Intent intent = new Intent(this, StartingPreview.class); intent.putExtra("EXTRA_IMAGE_BASE64", Base64img); startActivity(intent); @@ -107,13 +106,13 @@ public class makeActivity extends AppCompatActivity { byte[] imageBytes = outputStream.toByteArray(); return Base64.encodeToString(imageBytes, Base64.DEFAULT); - } catch (Exception e) { e.printStackTrace(); Toast.makeText(this, "Failed to convert image", Toast.LENGTH_SHORT).show(); return ""; } + } } \ No newline at end of file diff --git a/Generator/app/src/main/res/layout/activity_starting_preview.xml b/Generator/app/src/main/res/layout/activity_starting_preview.xml index 107d7c6..695709c 100644 --- a/Generator/app/src/main/res/layout/activity_starting_preview.xml +++ b/Generator/app/src/main/res/layout/activity_starting_preview.xml @@ -17,7 +17,6 @@ android:textAlignment="center" android:textColor="@color/white" android:textSize="24sp" - app:layout_constraintBottom_toTopOf="@+id/button_next" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -43,49 +42,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/notes"> - - - - - - - - - - - +