Commit 54abf5dd authored by Ethan Liang's avatar Ethan Liang
Browse files

Merge remote-tracking branch 'origin/top-secret' into top-secret

parents 4039ff83 b7c04f9b

app/src/main/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -13,10 +13,12 @@ 
        tools:targetApi="31">

        <activity

            android:name=".ChalkIntroActivity"

            android:exported="false" />

            android:exported="false"

            android:screenOrientation="landscape" />

        <activity

            android:name=".NameIntroActivity"

            android:exported="false" />

            android:exported="false"

            android:screenOrientation="landscape" />

        <activity

            android:name=".SplashActivity"

            android:exported="true"

app/src/main/java/com/example/game2d/ChalkActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ import android.view.Gravity; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Button;

import android.widget.ImageButton;

import android.widget.PopupWindow;
@@ -42,6 +44,12 @@ public class ChalkActivity extends AppCompatActivity implements View.OnClickList 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_chalk);



        Window window = getWindow();

        window.setFlags(

                WindowManager.LayoutParams.FLAG_FULLSCREEN,

                WindowManager.LayoutParams.FLAG_FULLSCREEN

        );



        //for pop up intro

        layout = findViewById(R.id.chalkActivity); // relative is the id of the layout of the page

        CreatepopUpwindow();

app/src/main/java/com/example/game2d/ChalkGameActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ import android.os.Bundle; 
import android.os.Handler;

import android.view.MotionEvent;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Button;



import java.util.Timer;
@@ -20,6 +22,13 @@ public class ChalkGameActivity extends AppCompatActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        Window window = getWindow();

        window.setFlags(

                WindowManager.LayoutParams.FLAG_FULLSCREEN,

                WindowManager.LayoutParams.FLAG_FULLSCREEN

        );



        gameView = new ChalkGameClass(this);

        setContentView(gameView);

        Timer timer = new Timer();

app/src/main/java/com/example/game2d/ChalkIntroActivity.java

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity; 
import android.content.Intent;

import android.os.Bundle;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Button;



public class ChalkIntroActivity extends AppCompatActivity {
@@ -14,6 +16,12 @@ public class ChalkIntroActivity extends AppCompatActivity { 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_chalk_intro);



        Window window = getWindow();

        window.setFlags(

                WindowManager.LayoutParams.FLAG_FULLSCREEN,

                WindowManager.LayoutParams.FLAG_FULLSCREEN

        );



        Button answerButton = findViewById(R.id.answerQuestion);

        answerButton.setOnClickListener(new View.OnClickListener() {

            @Override

app/src/main/java/com/example/game2d/ChalkQuizPause.java

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity; 
import android.content.Intent;

import android.os.Bundle;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Button;



public class ChalkQuizPause extends AppCompatActivity {
@@ -15,6 +17,12 @@ public class ChalkQuizPause extends AppCompatActivity { 
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_chalk_quiz_pause);



        Window window = getWindow();

        window.setFlags(

                WindowManager.LayoutParams.FLAG_FULLSCREEN,

                WindowManager.LayoutParams.FLAG_FULLSCREEN

        );



        resumeButton = findViewById(R.id.chalkResumeButton);



        resumeButton.setOnClickListener(new View.OnClickListener() {