From 09e36e0ed8f454d7cbcb7556faf0309d4d545c44 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 10 Apr 2025 11:47:40 -0300
Subject: [PATCH] Fix 3 button nav styling.

---
 .../org/thoughtcrime/securesms/MainActivity.kt   | 16 +++++++++++++---
 .../thoughtcrime/securesms/main/MainToolbar.kt   |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index e3af6c500f..1dcd83e2ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -10,11 +10,13 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewTreeObserver
 import android.widget.Toast
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
@@ -173,10 +175,18 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
 
   @OptIn(ExperimentalMaterial3AdaptiveApi::class)
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
-    enableEdgeToEdge()
-
     AppStartup.getInstance().onCriticalRenderEventStart()
-    super.onCreate(savedInstanceState, ready)
+
+    if (Build.VERSION.SDK_INT > 21) {
+      enableEdgeToEdge(
+        navigationBarStyle = if (DynamicTheme.isDarkTheme(this)) {
+          SystemBarStyle.dark(0)
+        } else {
+          SystemBarStyle.light(0, 0)
+        }
+      )
+    }
+
     conversationListTabsViewModel
 
     AppForegroundObserver.addListener(object : AppForegroundObserver.Listener {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
index 23b993a7e6..584b8fca26 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
@@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape