diff --git a/app/src/main/java/com/example/game2d/ChalkActivity.java b/app/src/main/java/com/example/game2d/ChalkActivity.java index 62c9fb05cd820255c2f95ce8418465be2cb40227..bc20b584493e63f9e915d00d06c88cb00613473a 100644 --- a/app/src/main/java/com/example/game2d/ChalkActivity.java +++ b/app/src/main/java/com/example/game2d/ChalkActivity.java @@ -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(); diff --git a/app/src/main/java/com/example/game2d/ChalkGameActivity.java b/app/src/main/java/com/example/game2d/ChalkGameActivity.java index 8c76a144890fa03b923b373bb3227ae10ad28954..8cb6f39c566630ad5a8fe936bff95a7372e79d77 100644 --- a/app/src/main/java/com/example/game2d/ChalkGameActivity.java +++ b/app/src/main/java/com/example/game2d/ChalkGameActivity.java @@ -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(); diff --git a/app/src/main/java/com/example/game2d/ChalkIntroActivity.java b/app/src/main/java/com/example/game2d/ChalkIntroActivity.java index 617f609b93acfab6fcda61d832236d028f573d1f..7fcee4bc141301598a16d0ccd488a39feae5c9fd 100644 --- a/app/src/main/java/com/example/game2d/ChalkIntroActivity.java +++ b/app/src/main/java/com/example/game2d/ChalkIntroActivity.java @@ -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 diff --git a/app/src/main/java/com/example/game2d/ChalkQuizPause.java b/app/src/main/java/com/example/game2d/ChalkQuizPause.java index 3c234e1270b1420a01f227fe7763de1973040420..8a9bc6a3df78673381d363a7d29414e4b2dc7702 100644 --- a/app/src/main/java/com/example/game2d/ChalkQuizPause.java +++ b/app/src/main/java/com/example/game2d/ChalkQuizPause.java @@ -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() { diff --git a/app/src/main/java/com/example/game2d/ChalkResultActivity.java b/app/src/main/java/com/example/game2d/ChalkResultActivity.java index da32dd22f3cd472f7cf1d24266017d50727706e0..7a7a517369082eb08abc79d3ec505ac29c1bcecc 100644 --- a/app/src/main/java/com/example/game2d/ChalkResultActivity.java +++ b/app/src/main/java/com/example/game2d/ChalkResultActivity.java @@ -5,6 +5,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.TextView; @@ -27,7 +29,13 @@ public class ChalkResultActivity extends AppCompatActivity { // @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_name_result); // + setContentView(R.layout.activity_name_result); + + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); newscore = (TextView) findViewById(R.id.score); bestscore = (TextView) findViewById(R.id.highestscore); diff --git a/app/src/main/java/com/example/game2d/CharacterActivity.java b/app/src/main/java/com/example/game2d/CharacterActivity.java index d28792962c2a5325ca4e61d839eda2013201a3a5..9a99d8f461732f8485a0061181d570a2c236aff8 100644 --- a/app/src/main/java/com/example/game2d/CharacterActivity.java +++ b/app/src/main/java/com/example/game2d/CharacterActivity.java @@ -4,6 +4,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.TextView; @@ -18,7 +20,13 @@ public class CharacterActivity extends AppCompatActivity { // @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_character_selection); // + setContentView(R.layout.activity_character_selection); + + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); overridePendingTransition(0, 0); // Continue button diff --git a/app/src/main/java/com/example/game2d/CreditActivity.java b/app/src/main/java/com/example/game2d/CreditActivity.java index 51daf63ee8a8f39a418015fab0c188795611bbd1..9ad4b137c1eb534d2d8984090974afe349042451 100644 --- a/app/src/main/java/com/example/game2d/CreditActivity.java +++ b/app/src/main/java/com/example/game2d/CreditActivity.java @@ -4,6 +4,8 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import androidx.appcompat.app.AppCompatActivity; @@ -15,7 +17,13 @@ public class CreditActivity extends AppCompatActivity { // //for back button protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_credit); // + setContentView(R.layout.activity_credit); + + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); // back button Button back_button = (Button) findViewById(R.id.back_btn); diff --git a/app/src/main/java/com/example/game2d/NameActivity.java b/app/src/main/java/com/example/game2d/NameActivity.java index 5b17835b80650b0027f6944490db007b13d6beed..d2c65085ad7adaf86ed5dc7d7d4d6bd050554907 100644 --- a/app/src/main/java/com/example/game2d/NameActivity.java +++ b/app/src/main/java/com/example/game2d/NameActivity.java @@ -12,6 +12,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; @@ -43,6 +45,12 @@ public class NameActivity extends AppCompatActivity implements View.OnClickListe super.onCreate(savedInstanceState); setContentView(R.layout.activity_name); + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); + //for pop up intro layout = findViewById(R.id.nameActivity); // relative is the id of the layout of the page CreatepopUpwindow(); diff --git a/app/src/main/java/com/example/game2d/NameIntroActivity.java b/app/src/main/java/com/example/game2d/NameIntroActivity.java index b76b78a0adcdd45a64523867a97954bad6c7992e..00774dea88b48b34d9d63d1d7f0f4d85459d583a 100644 --- a/app/src/main/java/com/example/game2d/NameIntroActivity.java +++ b/app/src/main/java/com/example/game2d/NameIntroActivity.java @@ -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 NameIntroActivity extends AppCompatActivity { @@ -14,6 +16,12 @@ public class NameIntroActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_name_intro); + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); + Button readButton = findViewById(R.id.openNameList); readButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/example/game2d/NamePause.java b/app/src/main/java/com/example/game2d/NamePause.java index 98e3f32a04ce346a5f24469406fbd2fa4d864f34..84fc2ed634cb42823a02327195bb513185c0f1d0 100644 --- a/app/src/main/java/com/example/game2d/NamePause.java +++ b/app/src/main/java/com/example/game2d/NamePause.java @@ -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 NamePause extends AppCompatActivity { @@ -15,6 +17,12 @@ public class NamePause extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_name_pause); + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); + resumeButton = findViewById(R.id.nameResumeButton); resumeButton.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/example/game2d/NameResultActivity.java b/app/src/main/java/com/example/game2d/NameResultActivity.java index fe178be2526dfe59b8f25bcaee95ddedbb5b683d..8020add77697dd0ae4186a68023a0b032a67c3ab 100644 --- a/app/src/main/java/com/example/game2d/NameResultActivity.java +++ b/app/src/main/java/com/example/game2d/NameResultActivity.java @@ -4,6 +4,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.TextView; @@ -26,7 +28,13 @@ public class NameResultActivity extends AppCompatActivity { // @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_name_result); // + setContentView(R.layout.activity_name_result); + + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); newscore = (TextView) findViewById(R.id.score); bestscore = (TextView) findViewById(R.id.highestscore); diff --git a/app/src/main/java/com/example/game2d/PauseWindow.java b/app/src/main/java/com/example/game2d/PauseWindow.java index eb3fc762065e2773dfca68f73f7d6272c33f8b5c..5124ad991bf1779c9ae86641893f028691a3e63d 100644 --- a/app/src/main/java/com/example/game2d/PauseWindow.java +++ b/app/src/main/java/com/example/game2d/PauseWindow.java @@ -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 PauseWindow extends AppCompatActivity { @@ -15,6 +17,12 @@ public class PauseWindow extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_pause_window); + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); + resumeButton = findViewById(R.id.chalkGameResumeButton); resumeButton.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/example/game2d/SplashActivity.java b/app/src/main/java/com/example/game2d/SplashActivity.java index 9ad1cf177f87bff321b45e8b285f6635e709aaae..909cec15f707d6aa615d51ff940030e436f58ca8 100644 --- a/app/src/main/java/com/example/game2d/SplashActivity.java +++ b/app/src/main/java/com/example/game2d/SplashActivity.java @@ -4,6 +4,8 @@ package com.example.game2d; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.view.Window; +import android.view.WindowManager; import androidx.appcompat.app.AppCompatActivity; @@ -12,6 +14,12 @@ public class SplashActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_splash); + + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); new Handler().postDelayed(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/com/example/game2d/StartActivity.java b/app/src/main/java/com/example/game2d/StartActivity.java index 28060987d0a9bbf63eba7c74d0a7758d2f671b42..e7005829e0674aaaaf3abd603b36a5089f487567 100644 --- a/app/src/main/java/com/example/game2d/StartActivity.java +++ b/app/src/main/java/com/example/game2d/StartActivity.java @@ -3,6 +3,8 @@ package com.example.game2d; import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.Button; import android.widget.ImageButton; @@ -17,6 +19,13 @@ public class StartActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start); + + Window window = getWindow(); + window.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ); + overridePendingTransition(0, 0); play = (Button) findViewById(R.id.imageButton); diff --git a/local.properties b/local.properties index 88f3134f800951cc53951ad6654836a970cc5ee4..06648116a0040ad37f6418ed3de58e4316db854b 100644 --- a/local.properties +++ b/local.properties @@ -5,7 +5,6 @@ # For customization when using a Version Control System, please read the # header note. #Sat Apr 22 19:53:34 EDT 2023 -sdk.dir=/home/elena/Android/Sdk -# sdk.dir=/Users/joharper/Library/Android/sdk +sdk.dir=/Users/prnv15/Library/Android/sdk >>>>>>>=fa0b39785e340f2e4603d94bdc597d48bc674390 <<<<<<<=HEAD