From 2a2cb7c26e06fd294baadd8b025de0e562d5d21c Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Wed, 26 Nov 2025 21:24:58 +0100
Subject: [PATCH] QrActivity: properly implement edge-to-edge

---
 .../java/org/thoughtcrime/securesms/qr/QrScanFragment.java   | 4 ++++
 src/main/res/layout/activity_qr.xml                          | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
index e8d70d0e4..b86056aec 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
@@ -18,6 +18,7 @@ import com.journeyapps.barcodescanner.CompoundBarcodeView;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class QrScanFragment extends Fragment {
 
@@ -38,6 +39,9 @@ public class QrScanFragment extends Fragment {
         barcodeScannerView = view.findViewById(R.id.zxing_barcode_scanner);
         barcodeScannerView.setStatusText(getString(R.string.qrscan_hint) + "\n ");
 
+        // add padding to avoid content hidden behind system bars
+        ViewUtil.applyWindowInsets(barcodeScannerView.getStatusView());
+
         return view;
     }
 
diff --git a/src/main/res/layout/activity_qr.xml b/src/main/res/layout/activity_qr.xml
index 5420180f9..68530d76c 100644
--- a/src/main/res/layout/activity_qr.xml
+++ b/src/main/res/layout/activity_qr.xml
@@ -3,14 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:fitsSystemWindows="true"
-    android:background="?attr/colorPrimary"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:elevation="0dp">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"