diff --git a/Generator/app/build.gradle.kts b/Generator/app/build.gradle.kts index 2209bcf..013b1b0 100644 --- a/Generator/app/build.gradle.kts +++ b/Generator/app/build.gradle.kts @@ -41,6 +41,7 @@ android { } dependencies { + implementation(libs.activity.ktx) implementation(libs.appcompat) implementation(libs.material) implementation(libs.activity) diff --git a/Generator/app/src/main/AndroidManifest.xml b/Generator/app/src/main/AndroidManifest.xml index f82b5e0..88d560e 100644 --- a/Generator/app/src/main/AndroidManifest.xml +++ b/Generator/app/src/main/AndroidManifest.xml @@ -33,6 +33,10 @@ + \ 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 5c8106a..a3eb4a0 100644 --- a/Generator/app/src/main/java/com/example/generator/ColorActivity.java +++ b/Generator/app/src/main/java/com/example/generator/ColorActivity.java @@ -45,7 +45,7 @@ public class ColorActivity extends AppCompatActivity { Button backButton = (Button) findViewById(R.id.button_back); Button nextButton = (Button) findViewById(R.id.button_next); backButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, MainActivity.class); + Intent intent = new Intent(this, EventsActivity.class); startActivity(intent); }); nextButton.setOnClickListener((v) -> { diff --git a/Generator/app/src/main/java/com/example/generator/EventsActivity.java b/Generator/app/src/main/java/com/example/generator/EventsActivity.java new file mode 100644 index 0000000..685d111 --- /dev/null +++ b/Generator/app/src/main/java/com/example/generator/EventsActivity.java @@ -0,0 +1,37 @@ +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 EventsActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_events); + 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 backButton = (Button) findViewById(R.id.button_back); + Button nextButton = (Button) findViewById(R.id.button_next); + backButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + }); + nextButton.setOnClickListener((v) -> { + 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/MainActivity.java b/Generator/app/src/main/java/com/example/generator/MainActivity.java index 2deb20a..2dd91c1 100644 --- a/Generator/app/src/main/java/com/example/generator/MainActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MainActivity.java @@ -24,7 +24,7 @@ public class MainActivity extends AppCompatActivity { }); Button makeButton = (Button) findViewById(R.id.button_next); makeButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, ColorActivity.class); + Intent intent = new Intent(this, EventsActivity.class); startActivity(intent); }); } diff --git a/Generator/app/src/main/res/layout/activity_events.xml b/Generator/app/src/main/res/layout/activity_events.xml new file mode 100644 index 0000000..44b7180 --- /dev/null +++ b/Generator/app/src/main/res/layout/activity_events.xml @@ -0,0 +1,37 @@ + + + + +