Correction of quick fix for #477 \"Rendering under status bar in Andr…

…oid 15\": disable edge-to-ege display for now
nilsbraden · Nov 12, 2024 · c5ec60e · c5ec60e
1 parent dcb3057
commit c5ec60e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 6 deletions.
diff --git a/ttrssreader/src/fdroid/java/org/ttrssreader/gui/MenuFlavorActivity.java b/ttrssreader/src/fdroid/java/org/ttrssreader/gui/MenuFlavorActivity.java
@@ -18,11 +18,21 @@
 package org.ttrssreader.gui;
 
 
+import android.os.Bundle;
+import org.ttrssreader.R;
+
 import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * This class is empty since we don't want to use the play services library here!
  */
 public abstract class MenuFlavorActivity extends AppCompatActivity {
 
+	@Override
+	protected void onCreate(Bundle instance) {
+		// Call before the DecorView is accessed in setContentView, see https://medium.com/androiddevelopers/insets-handling-tips-for-android-15s-edge-to-edge-enforcement-872774e8839b
+		getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
+		super.onCreate(instance);
+	}
 }
diff --git a/ttrssreader/src/main/java/org/ttrssreader/gui/AboutActivity.java b/ttrssreader/src/main/java/org/ttrssreader/gui/AboutActivity.java
@@ -34,7 +34,7 @@
 
 import static org.ttrssreader.R.id.AboutActivity_ThanksText;
 
-public class AboutActivity extends Activity {
+public class AboutActivity extends MenuFlavorActivity {
 
 	//	private static final String TAG = AboutActivity.class.getSimpleName();
 

diff --git a/ttrssreader/src/main/java/org/ttrssreader/gui/EditPluginActivity.java b/ttrssreader/src/main/java/org/ttrssreader/gui/EditPluginActivity.java
@@ -36,8 +36,12 @@ public final class EditPluginActivity extends AbstractPluginActivity {
 
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
 		setTheme(Controller.getInstance().getThemeResource());
+
+		// Call before the DecorView is accessed in setContentView, see https://medium.com/androiddevelopers/insets-handling-tips-for-android-15s-edge-to-edge-enforcement-872774e8839b
+		getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
+		super.onCreate(savedInstanceState);
 		Controller.getInstance().initializeThemeMode();
 		mDamageReport.initialize();
 		setContentView(R.layout.localeplugin);

diff --git a/ttrssreader/src/main/java/org/ttrssreader/gui/MediaPlayerActivity.java b/ttrssreader/src/main/java/org/ttrssreader/gui/MediaPlayerActivity.java
@@ -27,7 +27,7 @@
 import org.ttrssreader.controllers.Controller;
 import org.ttrssreader.utils.PostMortemReportExceptionHandler;
 
-public class MediaPlayerActivity extends Activity {
+public class MediaPlayerActivity extends MenuFlavorActivity {
 
 	//	private static final String TAG = MediaPlayerActivity.class.getSimpleName();
 

diff --git a/ttrssreader/src/main/java/org/ttrssreader/preferences/PreferencesActivity.java b/ttrssreader/src/main/java/org/ttrssreader/preferences/PreferencesActivity.java
@@ -23,6 +23,7 @@
 
 import org.ttrssreader.R;
 import org.ttrssreader.controllers.Controller;
+import org.ttrssreader.gui.MenuFlavorActivity;
 import org.ttrssreader.preferences.fragments.PreferencesFragment;
 import org.ttrssreader.utils.AsyncTask;
 import org.ttrssreader.utils.PostMortemReportExceptionHandler;
@@ -38,7 +39,7 @@
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
-public class PreferencesActivity extends AppCompatActivity implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+public class PreferencesActivity extends MenuFlavorActivity implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
 
 	//	private static final String TAG = PreferencesActivity.class.getSimpleName();
 

diff --git a/ttrssreader/src/main/res/values/values.xml → ...reader/src/main/res/values-v35/styles.xml b/ttrssreader/src/main/res/values/values.xml → ...reader/src/main/res/values-v35/styles.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <resources>
-    <!-- TODO: Remove once activities handle insets. -->
     <style name="OptOutEdgeToEdgeEnforcement">
         <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>

diff --git a/ttrssreader/src/main/res/values/styles.xml b/ttrssreader/src/main/res/values/styles.xml
@@ -28,5 +28,7 @@
         <item name="android:windowBackground">@drawable/splash</item>
     </style>
 
+    <style name="OptOutEdgeToEdgeEnforcement">
+    </style>
 
 </resources>
diff --git a/ttrssreader/src/play/java/org/ttrssreader/gui/MenuFlavorActivity.java b/ttrssreader/src/play/java/org/ttrssreader/gui/MenuFlavorActivity.java
@@ -42,6 +42,9 @@ public abstract class MenuFlavorActivity extends AppCompatActivity implements Pr
 
 	@Override
 	protected void onCreate(Bundle instance) {
+		// Call before the DecorView is accessed in setContentView, see https://medium.com/androiddevelopers/insets-handling-tips-for-android-15s-edge-to-edge-enforcement-872774e8839b
+		getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
 		super.onCreate(instance);
 		if (Controller.getInstance().useProviderInstaller())
 			ProviderInstaller.installIfNeededAsync(this, this);