From 37ce5d8356b352d70a4ece104f5e25d510384cf7 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Wed, 28 May 2025 17:09:14 +0200
Subject: [PATCH 1/2] feat:3375: implement manualy
 LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT for A15 compatibility

---
 .../e/advancedprivacy/main/MainActivity.kt    | 42 +++++++++++++++++++
 app/src/main/res/values/themes.xml            |  9 ++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt b/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
index fbe5cf8b..ac28afe6 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
@@ -20,12 +20,54 @@ package foundation.e.advancedprivacy.main
 
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
+import androidx.activity.enableEdgeToEdge
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavDeepLinkBuilder
 import androidx.navigation.findNavController
 import foundation.e.advancedprivacy.R
+import timber.log.Timber
 
 class MainActivity : FragmentActivity(R.layout.activity_main) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById<View>(R.id.nav_host_fragment)) { v, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout())
+            // Apply the insets as a margin to the view. This solution sets
+            // only the bottom, left, and right dimensions, but you can apply whichever
+            // insets are appropriate to your layout. You can also update the view padding
+            // if that's more appropriate.
+            v.updateLayoutParams<MarginLayoutParams> {
+                topMargin = insets.top
+                leftMargin = insets.left
+                Timber.d("DebugInset - insets: $insets")
+                bottomMargin = insets.bottom
+                rightMargin = insets.right
+            }
+
+            // Return CONSUMED if you don't want the window insets to keep passing
+            // down to descendant views.
+
+//            windowInsets
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        enableEdgeToEdge()
+//        super.onCreate(savedInstanceState)
+//    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         findNavController(R.id.nav_host_fragment).handleDeepLink(intent)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7c1e4c38..8ef6daa1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,13 +1,17 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Theme.AdvancedPrivacy" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/accent</item>
         <item name="colorAccent">@color/accent</item>
 
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">@color/primary</item>
-        <item name="android:navigationBarColor">@color/primary</item>
+
+        <!-- Edge to edge config: https://developer.android.com/develop/ui/views/layout/edge-to-edge-manually#change-color -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:navigationBarDividerColor">@color/primary</item>
         <item name="android:windowLightNavigationBar">@bool/is_day</item>
         <item name="android:windowLightStatusBar">@bool/is_day</item>
@@ -16,7 +20,6 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-
     <style name="Theme.InvisibleActivity" parent="Theme.AdvancedPrivacy">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
-- 
GitLab


From e9266e172e98afed32eb2f7bbfa9049296b1b6c4 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Wed, 28 May 2025 18:27:17 +0200
Subject: [PATCH 2/2] feat:3375: Improve bottom inset for gesture navigation

---
 .../e/advancedprivacy/common/InsetsHelpers.kt | 30 +++++++++++++++++++
 .../features/dashboard/DashboardFragment.kt   |  5 +++-
 .../features/debug/DebugActivity.kt           | 19 ++++++++++++
 .../InternetPrivacyFragment.kt                |  5 +++-
 .../features/location/FakeLocationFragment.kt |  5 +++-
 .../features/trackers/ListsTabPagerAdapter.kt |  3 ++
 .../apptrackers/AppTrackersFragment.kt        |  5 +++-
 .../trackerdetails/TrackerDetailsFragment.kt  |  4 +++
 .../e/advancedprivacy/main/MainActivity.kt    | 26 +++-------------
 .../main/res/layout/apptrackers_fragment.xml  |  3 +-
 .../main/res/layout/fragment_dashboard.xml    |  2 ++
 .../res/layout/fragment_fake_location.xml     |  3 +-
 .../fragment_internet_activity_policy.xml     | 17 +++++++++++
 app/src/main/res/layout/topbar.xml            |  4 ++-
 .../res/layout/trackerdetails_fragment.xml    |  2 ++
 15 files changed, 104 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/foundation/e/advancedprivacy/common/InsetsHelpers.kt

diff --git a/app/src/main/java/foundation/e/advancedprivacy/common/InsetsHelpers.kt b/app/src/main/java/foundation/e/advancedprivacy/common/InsetsHelpers.kt
new file mode 100644
index 00000000..3fea931d
--- /dev/null
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/InsetsHelpers.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2025 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package foundation.e.advancedprivacy.common
+
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+
+fun setInsetAsBottomPadding(view: View) {
+    ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout())
+        v.updatePadding(bottom = insets.bottom)
+        WindowInsetsCompat.CONSUMED
+    }
+}
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
index dec15104..52cc6a40 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2021 - 2025 E FOUNDATION
  * Copyright (C) 2023-2024 MURENA SAS
- * Copyright (C) 2021 E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.BigNumberFormatter
 import foundation.e.advancedprivacy.common.NavToolbarFragment
 import foundation.e.advancedprivacy.common.extensions.safeNavigate
+import foundation.e.advancedprivacy.common.setInsetAsBottomPadding
 import foundation.e.advancedprivacy.databinding.FragmentDashboardBinding
 import foundation.e.advancedprivacy.domain.entities.FeatureMode
 import foundation.e.advancedprivacy.domain.entities.FeatureState
@@ -53,6 +54,8 @@ class DashboardFragment : NavToolbarFragment(R.layout.fragment_dashboard) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentDashboardBinding.bind(view)
 
+        setInsetAsBottomPadding(binding.container)
+
         with(binding.dataBlockedTrackers) {
             primaryMessage.apply {
                 setText(R.string.dashboard_data_blocked_trackers_primary)
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/debug/DebugActivity.kt b/app/src/main/java/foundation/e/advancedprivacy/features/debug/DebugActivity.kt
index 911436e0..388fa2cd 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/debug/DebugActivity.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/debug/DebugActivity.kt
@@ -18,7 +18,14 @@
 package foundation.e.advancedprivacy.features.debug
 
 import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.FragmentActivity
+import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.databinding.DebugActivityBinding
 
 // Hidden debug tools activity for AdvancedPrivacy
@@ -28,6 +35,18 @@ class DebugActivity : FragmentActivity() {
     private lateinit var binding: DebugActivityBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById<View>(R.id.nav_host_fragment)) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout())
+            v.updateLayoutParams<MarginLayoutParams> {
+                topMargin = insets.top
+                leftMargin = insets.left
+                bottomMargin = insets.bottom
+                rightMargin = insets.right
+            }
+            WindowInsetsCompat.CONSUMED
+        }
 
         binding = DebugActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
index f9f57006..f23bfb28 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2021 - 2025 E FOUNDATION
  * Copyright (C) 2023 MURENA SAS
- * Copyright (C) 2021 - 2024 E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.common.setInsetAsBottomPadding
 import foundation.e.advancedprivacy.common.setToolTipForAsterisk
 import foundation.e.advancedprivacy.databinding.FragmentInternetActivityPolicyBinding
 import foundation.e.advancedprivacy.domain.entities.FeatureState
@@ -52,6 +53,8 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentInternetActivityPolicyBinding.bind(view)
 
+        setInsetAsBottomPadding(binding.container)
+
         binding.apps.apply {
             layoutManager = LinearLayoutManager(requireContext())
             setHasFixedSize(true)
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt
index e16f5d28..187c8128 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2021 - 2025 E FOUNDATION
  * Copyright (C) 2023 MURENA SAS
- * Copyright (C) 2021 - 2024 E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ import com.google.android.material.textfield.TextInputLayout.END_ICON_CUSTOM
 import com.google.android.material.textfield.TextInputLayout.END_ICON_NONE
 import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.common.setInsetAsBottomPadding
 import foundation.e.advancedprivacy.common.setToolTipForAsterisk
 import foundation.e.advancedprivacy.databinding.FragmentFakeLocationBinding
 import foundation.e.advancedprivacy.domain.entities.LocationMode
@@ -107,6 +108,8 @@ class FakeLocationFragment : NavToolbarFragment(R.layout.fragment_fake_location)
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentFakeLocationBinding.bind(view)
 
+        setInsetAsBottomPadding(binding.container)
+
         binding.mapView.setup(savedInstanceState) { mapLibreMap ->
             this.mapLibreMap = mapLibreMap
             mapLibreMap.uiSettings.isRotateGesturesEnabled = false
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/trackers/ListsTabPagerAdapter.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/ListsTabPagerAdapter.kt
index 3897c637..6e8b5cf0 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/trackers/ListsTabPagerAdapter.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/ListsTabPagerAdapter.kt
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2025 E FOUNDATION
  * Copyright (C) 2023 - 2024 MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
@@ -28,6 +29,7 @@ import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.BindingListAdapter
 import foundation.e.advancedprivacy.common.BindingViewHolder
 import foundation.e.advancedprivacy.common.extensions.dpToPx
+import foundation.e.advancedprivacy.common.setInsetAsBottomPadding
 import foundation.e.advancedprivacy.databinding.TrackersAppsListBinding
 import foundation.e.advancedprivacy.databinding.TrackersItemAppBinding
 import foundation.e.advancedprivacy.databinding.TrackersListBinding
@@ -86,6 +88,7 @@ class ListsTabPagerAdapter(
 
     sealed class ListsTabViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         protected fun setupRecyclerView(recyclerView: RecyclerView) {
+            setInsetAsBottomPadding(recyclerView)
             recyclerView.apply {
                 layoutManager = LinearLayoutManager(context)
                 setHasFixedSize(true)
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt
index 99280ddd..988987c0 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2021 - 2025 E FOUNDATION
  * Copyright (C) 2023-2024 MURENA SAS
- * Copyright (C) 2021 E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ import com.google.android.material.snackbar.Snackbar
 import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.BigNumberFormatter
 import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.common.setInsetAsBottomPadding
 import foundation.e.advancedprivacy.databinding.ApptrackersFragmentBinding
 import foundation.e.advancedprivacy.features.trackers.setupDisclaimerBlock
 import kotlinx.coroutines.launch
@@ -63,6 +64,8 @@ class AppTrackersFragment : NavToolbarFragment(R.layout.apptrackers_fragment) {
         super.onViewCreated(view, savedInstanceState)
         binding = ApptrackersFragmentBinding.bind(view)
 
+        setInsetAsBottomPadding(binding.container)
+
         binding.blockAllToggle.setOnClickListener {
             viewModel.onToggleBlockAll(binding.blockAllToggle.isChecked)
         }
diff --git a/app/src/main/java/foundation/e/advancedprivacy/features/trackers/trackerdetails/TrackerDetailsFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/trackerdetails/TrackerDetailsFragment.kt
index 863f93fb..1ec49194 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/features/trackers/trackerdetails/TrackerDetailsFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/trackerdetails/TrackerDetailsFragment.kt
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2025 E FOUNDATION
  * Copyright (C) 2023-2024 MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
@@ -33,6 +34,7 @@ import com.google.android.material.snackbar.Snackbar
 import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.BigNumberFormatter
 import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.common.setInsetAsBottomPadding
 import foundation.e.advancedprivacy.databinding.TrackerdetailsFragmentBinding
 import foundation.e.advancedprivacy.features.trackers.setupDisclaimerBlock
 import kotlinx.coroutines.launch
@@ -60,6 +62,8 @@ class TrackerDetailsFragment : NavToolbarFragment(R.layout.trackerdetails_fragme
         super.onViewCreated(view, savedInstanceState)
         binding = TrackerdetailsFragmentBinding.bind(view)
 
+        setInsetAsBottomPadding(binding.container)
+
         binding.blockAllToggle.setOnClickListener {
             viewModel.onToggleBlockAll(binding.blockAllToggle.isChecked)
         }
diff --git a/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt b/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
index ac28afe6..b8641f85 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2021 - 2025 E FOUNDATION
  * Copyright (C) 2023 MURENA SAS
- * Copyright (C) 2021 E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
-import androidx.activity.enableEdgeToEdge
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -32,7 +31,6 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavDeepLinkBuilder
 import androidx.navigation.findNavController
 import foundation.e.advancedprivacy.R
-import timber.log.Timber
 
 class MainActivity : FragmentActivity(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -42,32 +40,16 @@ class MainActivity : FragmentActivity(R.layout.activity_main) {
         ViewCompat.setOnApplyWindowInsetsListener(findViewById<View>(R.id.nav_host_fragment)) { v, windowInsets ->
             val insets = windowInsets.getInsets(
                 WindowInsetsCompat.Type.systemBars()
-                        or WindowInsetsCompat.Type.displayCutout())
-            // Apply the insets as a margin to the view. This solution sets
-            // only the bottom, left, and right dimensions, but you can apply whichever
-            // insets are appropriate to your layout. You can also update the view padding
-            // if that's more appropriate.
+                    or WindowInsetsCompat.Type.displayCutout()
+            )
             v.updateLayoutParams<MarginLayoutParams> {
-                topMargin = insets.top
                 leftMargin = insets.left
-                Timber.d("DebugInset - insets: $insets")
-                bottomMargin = insets.bottom
                 rightMargin = insets.right
             }
-
-            // Return CONSUMED if you don't want the window insets to keep passing
-            // down to descendant views.
-
-//            windowInsets
-            WindowInsetsCompat.CONSUMED
+            windowInsets
         }
     }
 
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        enableEdgeToEdge()
-//        super.onCreate(savedInstanceState)
-//    }
-
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         findNavController(R.id.nav_host_fragment).handleDeepLink(intent)
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index 06b8d3fb..f5ca7bc3 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2021 - 2025 E FOUNDATION
   ~ Copyright (C) 2023 MURENA SAS
-  ~ Copyright (C) 2021 E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
         >
 
         <LinearLayout
+            android:id="@+id/container"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:orientation="vertical"
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 9dfc66e4..3fd04d5c 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2025 E FOUNDATION
   ~ Copyright (C) 2024 MURENA SAS
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -29,6 +30,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
         <LinearLayout
+            android:id="@+id/container"
             android:background="@color/background"
             android:gravity="center_horizontal"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index 4309f13d..3ac7a91f 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+  ~ Copyright (C) 2021 - 2025 E FOUNDATION
   ~ Copyright (C) 2023 MURENA SAS
-  ~ Copyright (C) 2021 E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
         <LinearLayout
+            android:id="@+id/container"
             android:layout_height="match_parent"
             android:padding="16dp"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml
index 12b51fbb..4e512fd8 100644
--- a/app/src/main/res/layout/fragment_internet_activity_policy.xml
+++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2025 E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <layout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -17,6 +33,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
         <LinearLayout
+            android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml
index 41f034e2..8990d362 100644
--- a/app/src/main/res/layout/topbar.xml
+++ b/app/src/main/res/layout/topbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright (C) 2021 E FOUNDATION
+  ~ Copyright (C) 2021 - 2025 E FOUNDATION
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
+    android:fitsSystemWindows="true"
+    android:background="@color/background"
     app:elevation="0dp"
     >
 
diff --git a/app/src/main/res/layout/trackerdetails_fragment.xml b/app/src/main/res/layout/trackerdetails_fragment.xml
index 45ba0e49..19304687 100644
--- a/app/src/main/res/layout/trackerdetails_fragment.xml
+++ b/app/src/main/res/layout/trackerdetails_fragment.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2025 E FOUNDATION
   ~ Copyright (C) 2023 MURENA SAS
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -34,6 +35,7 @@
         >
 
         <LinearLayout
+            android:id="@+id/container"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:orientation="vertical"
-- 
GitLab