update for edge-to-edge

Author: kasnder

app/src/main/AndroidManifest.xml

@@ -155,7 +155,7 @@
             android:exported="true"
             android:label="@string/title_activity_detail"
             android:parentActivityName="eu.faircode.netguard.ActivityMain"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.EdgeToEdge">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="eu.faircode.netguard.ActivityMain" />

app/src/main/java/eu/faircode/netguard/ApplicationEx.java

@@ -31,15 +31,16 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.ViewCompat;
@@ -48,6 +49,7 @@
 import androidx.preference.PreferenceManager;
 
 import net.kollnig.missioncontrol.BuildConfig;
+import net.kollnig.missioncontrol.DetailsActivity;
 import net.kollnig.missioncontrol.R;
 
 import org.acra.ACRA;
@@ -121,28 +123,43 @@ public void onCreate() {
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override
             public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+                if (activity.getClass() == DetailsActivity.class)
+                    return;
+
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-                    View content = activity.findViewById(android.R.id.content);
+                    android.widget.FrameLayout content = activity.findViewById(android.R.id.content);
+
+                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+                    boolean dark = prefs.getBoolean("dark_theme", false);
+
+                    // On Android 15+, setStatusBarColor is ignored
+                    // Set window background to primary color - this shows behind the status bar
+                    int primaryColor = ContextCompat.getColor(activity, R.color.colorPrimary);
+                    activity.getWindow().setBackgroundDrawable(new ColorDrawable(primaryColor));
+
+                    // Set status bar icons to light (white) since our background is dark
+                    View decor = activity.getWindow().getDecorView();
+                    WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightStatusBars(false);
+                    WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightNavigationBars(!dark);
+
                     ViewCompat.setOnApplyWindowInsetsListener(content, new OnApplyWindowInsetsListener() {
                         @NonNull
                         @Override
                         public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
                             Insets bars = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout() | WindowInsetsCompat.Type.ime());
 
-                            TypedValue tv = new TypedValue();
-                            activity.getTheme().resolveAttribute(R.attr.colorPrimaryDark, tv, true);
-
                             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
                             boolean dark = prefs.getBoolean("dark_theme", false);
 
-                            activity.getWindow().getDecorView().setBackgroundColor(tv.data);
-                            content.setBackgroundColor(dark ? Color.parseColor("#ff121212") : Color.WHITE);
+                            // Apply padding to android.R.id.content for system bars
+                            v.setPadding(bars.left, bars.top, bars.right, bars.bottom);
 
-                            int actionBarHeight = Util.dips2pixels(56, activity);
-                            View decor = activity.getWindow().getDecorView();
-                            WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightStatusBars(false);
-                            WindowCompat.getInsetsController(activity.getWindow(), decor).setAppearanceLightNavigationBars(!dark);
-                            v.setPadding(bars.left, bars.top + actionBarHeight, bars.right, bars.bottom);
+                            // Set background on the actual layout (first child), not on the content frame
+                            // This way the padding area shows the window background (primary color)
+                            if (content.getChildCount() > 0) {
+                                View child = content.getChildAt(0);
+                                child.setBackgroundColor(dark ? Color.parseColor("#ff121212") : Color.WHITE);
+                            }
 
                             return insets;
                         }

app/src/main/java/net/kollnig/missioncontrol/DetailsActivity.java

@@ -38,9 +38,16 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.NavUtils;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 import com.opencsv.CSVWriter;
@@ -120,8 +127,17 @@ protected void onActivityResult(int requestCode, int resultCode, final Intent da
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // Enable edge-to-edge content
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
         setContentView(R.layout.activity_details);
 
+        // Status bar appearance
+        WindowInsetsControllerCompat insetsController = new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+        insetsController.setAppearanceLightStatusBars(false);
+        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimary));
+        }
+
         running = true;
 
         // Receive about details
@@ -153,6 +169,28 @@ protected void onCreate(Bundle savedInstanceState) {
         getSupportActionBar().setDisplayShowTitleEnabled(false);
         toolbar.setTitle(getString(R.string.app_info));
         toolbar.setSubtitle(appName);
+
+        // Apply window insets so content avoids status/navigation bars
+        AppBarLayout appBar = findViewById(R.id.appbar);
+        final int appBarInitialLeft = appBar.getPaddingLeft();
+        final int appBarInitialTop = appBar.getPaddingTop();
+        final int appBarInitialRight = appBar.getPaddingRight();
+        final int appBarInitialBottom = appBar.getPaddingBottom();
+        ViewCompat.setOnApplyWindowInsetsListener(appBar, (v, insets) -> {
+            Insets sysBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+            v.setPadding(appBarInitialLeft, appBarInitialTop + sysBars.top, appBarInitialRight, appBarInitialBottom);
+            return insets;
+        });
+
+        final int pagerInitialLeft = viewPager.getPaddingLeft();
+        final int pagerInitialTop = viewPager.getPaddingTop();
+        final int pagerInitialRight = viewPager.getPaddingRight();
+        final int pagerInitialBottom = viewPager.getPaddingBottom();
+        ViewCompat.setOnApplyWindowInsetsListener(viewPager, (v, insets) -> {
+            Insets sysBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+            v.setPadding(pagerInitialLeft + sysBars.left, pagerInitialTop, pagerInitialRight + sysBars.right, pagerInitialBottom + sysBars.bottom);
+            return insets;
+        });
     }
 
     @Override

app/src/main/res/layout/activity_details.xml

@@ -4,25 +4,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:mContext="net.kollnig.missioncontrol.DetailsActivity">
+    tools:context="net.kollnig.missioncontrol.DetailsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:background="?attr/colorPrimary">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:title="@string/app_info"/>
+            android:background="@android:color/transparent"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            app:title="@string/app_info"
+            app:titleTextColor="@android:color/white"
+            app:subtitleTextColor="@android:color/white" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            />
+            app:tabTextColor="@android:color/white"
+            app:tabSelectedTextColor="@android:color/white"
+            app:tabIndicatorColor="@android:color/white" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager2.widget.ViewPager2
@@ -31,4 +38,4 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/values/styles.xml

@@ -22,6 +22,14 @@
     </style>
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
+    <!-- Edge-to-edge variant for DetailsActivity -->
+    <style name="AppTheme.EdgeToEdge" parent="AppTheme.NoActionBar">
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+
     <style name="PrimaryFlatButton" parent="Theme.AppCompat.Light">
         <item name="android:buttonStyle">
             @style/Widget.AppCompat.Button.Borderless.Colored