Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add customize button to in-call reaction picker.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-05-14 16:22:26 -04:00
parent d0340d39db
commit f83275e246
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java
+8 -1
View File
@@ -57,6 +57,7 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends FixedRound
private static final String ARG_SHADOWS = "arg_shadows"; private static final String ARG_SHADOWS = "arg_shadows";
private static final String ARG_RECENT_KEY = "arg_recent_key"; private static final String ARG_RECENT_KEY = "arg_recent_key";
private static final String ARG_EDIT = "arg_edit"; private static final String ARG_EDIT = "arg_edit";
private static final String ARG_DARK = "arg_dark";
private ReactWithAnyEmojiViewModel viewModel; private ReactWithAnyEmojiViewModel viewModel;
private Callback callback = null; private Callback callback = null;
@@ -132,6 +133,8 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends FixedRound
args.putInt(ARG_START_PAGE, -1); args.putInt(ARG_START_PAGE, -1);
args.putBoolean(ARG_SHADOWS, false); args.putBoolean(ARG_SHADOWS, false);
args.putString(ARG_RECENT_KEY, REACTION_STORAGE_KEY); args.putString(ARG_RECENT_KEY, REACTION_STORAGE_KEY);
args.putBoolean(ARG_EDIT, true);
args.putBoolean(ARG_DARK, true);
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
@@ -201,7 +204,11 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends FixedRound
if (requireArguments().getBoolean(ARG_EDIT, false)) { if (requireArguments().getBoolean(ARG_EDIT, false)) {
View customizeReactions = tabBar.findViewById(R.id.customize_reactions_frame); View customizeReactions = tabBar.findViewById(R.id.customize_reactions_frame);
customizeReactions.setVisibility(View.VISIBLE); 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); container.addView(tabBar);
app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsActivity.kt
+8
View File
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.reactions.edit
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.appcompat.app.AppCompatDelegate
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import org.thoughtcrime.securesms.PassphraseRequiredActivity import org.thoughtcrime.securesms.PassphraseRequiredActivity
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
@@ -15,6 +16,9 @@ class EditReactionsActivity : PassphraseRequiredActivity() {
override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) { override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
super.onCreate(savedInstanceState, ready) super.onCreate(savedInstanceState, ready)
if (intent.extras?.getBoolean(ARG_FORCE_DARK_MODE) == true) {
delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
}
theme.onCreate(this) theme.onCreate(this)
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@@ -32,4 +36,8 @@ class EditReactionsActivity : PassphraseRequiredActivity() {
super.onResume() super.onResume()
theme.onResume(this) theme.onResume(this)
} }
companion object {
const val ARG_FORCE_DARK_MODE = "arg_dark"
}
} }