From f83275e246c4e8fbfa2025634359cd0b3a8f146d Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Tue, 14 May 2024 16:22:26 -0400
Subject: [PATCH] Add customize button to in-call reaction picker.

---
 .../any/ReactWithAnyEmojiBottomSheetDialogFragment.java  | 9 ++++++++-
 .../securesms/reactions/edit/EditReactionsActivity.kt    | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
index 16ae57fcc1..80fc91342b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
@@ -57,6 +57,7 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends FixedRound
   private static final String ARG_SHADOWS    = "arg_shadows";
   private static final String ARG_RECENT_KEY = "arg_recent_key";
   private static final String ARG_EDIT       = "arg_edit";
+  private static final String ARG_DARK       = "arg_dark";
 
   private ReactWithAnyEmojiViewModel viewModel;
   private Callback                   callback = null;
@@ -132,6 +133,8 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends FixedRound
     args.putInt(ARG_START_PAGE, -1);
     args.putBoolean(ARG_SHADOWS, false);
     args.putString(ARG_RECENT_KEY, REACTION_STORAGE_KEY);
+    args.putBoolean(ARG_EDIT, true);
+    args.putBoolean(ARG_DARK, true);
     fragment.setArguments(args);
 
     return fragment;
@@ -201,7 +204,11 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends FixedRound
     if (requireArguments().getBoolean(ARG_EDIT, false)) {
       View customizeReactions = tabBar.findViewById(R.id.customize_reactions_frame);
       customizeReactions.setVisibility(View.VISIBLE);
-      customizeReactions.setOnClickListener(v -> startActivity(new Intent(requireContext(), EditReactionsActivity.class)));
+      customizeReactions.setOnClickListener(v -> {
+        final Intent intent = new Intent(requireContext(), EditReactionsActivity.class);
+        intent.putExtra(EditReactionsActivity.ARG_FORCE_DARK_MODE, requireArguments().getBoolean(ARG_DARK, false));
+        startActivity(intent);
+      });
     }
 
     container.addView(tabBar);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsActivity.kt
index 3cccf25f6b..b35f35cb44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsActivity.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.reactions.edit
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
@@ -15,6 +16,9 @@ class EditReactionsActivity : PassphraseRequiredActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
     super.onCreate(savedInstanceState, ready)
+    if (intent.extras?.getBoolean(ARG_FORCE_DARK_MODE) == true) {
+      delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
+    }
     theme.onCreate(this)
 
     @Suppress("DEPRECATION")
@@ -32,4 +36,8 @@ class EditReactionsActivity : PassphraseRequiredActivity() {
     super.onResume()
     theme.onResume(this)
   }
+
+  companion object {
+    const val ARG_FORCE_DARK_MODE = "arg_dark"
+  }
 }