From 12009282d4e3717f4250cbe2fce85ea3ef69967f Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Sun, 31 Jan 2021 18:57:27 +0100
Subject: [PATCH] - Better implementation of Tools.ignoreNotch to work with all
 activities.

---
 .../src/main/java/net/kdt/pojavlaunch/BaseActivity.java   | 8 ++++++++
 .../java/net/kdt/pojavlaunch/CustomControlsActivity.java  | 4 +---
 .../src/main/java/net/kdt/pojavlaunch/MainActivity.java   | 2 --
 .../main/java/net/kdt/pojavlaunch/PojavLoginActivity.java | 4 +---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
index c5ea4d0fe..1b7710b3a 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
@@ -5,6 +5,8 @@ import android.os.*;
 import androidx.appcompat.app.*;
 import net.kdt.pojavlaunch.utils.*;
 
+import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
+
 public class BaseActivity extends AppCompatActivity
 {
     @Override
@@ -24,4 +26,10 @@ public class BaseActivity extends AppCompatActivity
         super.startActivity(i);
         new Throwable("StartActivity").printStackTrace();
     }
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        Tools.ignoreNotch(PREF_IGNORE_NOTCH,this);
+    }
 }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
index 16d25621b..f5e219067 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
@@ -18,7 +18,7 @@ import java.io.*;
 import net.kdt.pojavlaunch.prefs.*;
 import net.kdt.pojavlaunch.customcontrols.*;
 
-import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
+
 
 public class CustomControlsActivity extends BaseActivity
 {
@@ -35,8 +35,6 @@ public class CustomControlsActivity extends BaseActivity
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.control_mapping);
-		
-		Tools.ignoreNotch(PREF_IGNORE_NOTCH, this);
 
 		mPref = PreferenceManager.getDefaultSharedPreferences(this);
 
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index 11259ebab..0af7d43f7 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -11,7 +11,6 @@ import java.io.*;
 import com.google.gson.*;
 
 import static net.kdt.pojavlaunch.prefs.LauncherPreferences.DEFAULT_PREF;
-import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
 
 public class MainActivity extends BaseMainActivity {
     private ControlLayout mControlLayout;
@@ -24,7 +23,6 @@ public class MainActivity extends BaseMainActivity {
         super.onCreate(savedInstanceState);
         initLayout(R.layout.main_with_customctrl);
 
-        Tools.ignoreNotch(PREF_IGNORE_NOTCH, this);
 
         mClickListener = new View.OnClickListener(){
             @Override
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index c5874aabc..89aafbb76 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -66,7 +66,6 @@ import net.kdt.pojavlaunch.prefs.LauncherPreferences;
 import net.kdt.pojavlaunch.utils.JREUtils;
 import net.kdt.pojavlaunch.utils.LocaleUtils;
 import net.kdt.pojavlaunch.value.MinecraftAccount;
-import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
@@ -99,8 +98,7 @@ public class PojavLoginActivity extends BaseActivity
     @Override
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState); // false);
-        
-        Tools.ignoreNotch(PREF_IGNORE_NOTCH, this);
+
         Tools.updateWindowSize(this);
         /*
         ControlData.pixelOf2dp = (int) Tools.dpToPx(2);