From 524565f0bb77aa3c28793be159b9d266a517a3e3 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 19 Sep 2023 15:36:22 -0400 Subject: [PATCH] Add animations for add name fragment in call links. --- .../securesms/calls/log/CallLogFragment.kt | 15 +++++++++++++++ app/src/main/res/navigation/call_link_details.xml | 6 +++++- .../main/res/navigation/main_activity_list.xml | 6 +++++- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt index 8fc022d1e7..e707878db5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt @@ -57,6 +57,7 @@ import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.stories.tabs.ConversationListTab import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel import org.thoughtcrime.securesms.util.CommunicationActions +import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.doAfterNextLayout import org.thoughtcrime.securesms.util.fragments.requireListener @@ -230,6 +231,13 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal val count = callLogActionMode.getCount() MaterialAlertDialogBuilder(requireContext()) .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, count, count)) + .setMessage( + if (FeatureFlags.adHocCalling()) { + getString(R.string.CallLogFragment__call_links_youve_created) + } else { + null + } + ) .setPositiveButton(R.string.CallLogFragment__delete) { _, _ -> performDeletion(count, viewModel.stageSelectionDeletion()) callLogActionMode.end() @@ -363,6 +371,13 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal override fun deleteCall(call: CallLogRow) { MaterialAlertDialogBuilder(requireContext()) .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, 1, 1)) + .setMessage( + if (FeatureFlags.adHocCalling()) { + getString(R.string.CallLogFragment__call_links_youve_created) + } else { + null + } + ) .setPositiveButton(R.string.CallLogFragment__delete) { _, _ -> performDeletion(1, viewModel.stageCallDeletion(call)) } diff --git a/app/src/main/res/navigation/call_link_details.xml b/app/src/main/res/navigation/call_link_details.xml index b066b0ed3e..adae17d69a 100644 --- a/app/src/main/res/navigation/call_link_details.xml +++ b/app/src/main/res/navigation/call_link_details.xml @@ -10,7 +10,11 @@ android:label="call_link_details"> + app:destination="@id/editCallLinkNameDialogFragment" + app:enterAnim="@anim/fragment_open_enter" + app:exitAnim="@anim/fragment_close_exit" + app:popEnterAnim="@anim/fragment_close_enter" + app:popExitAnim="@anim/fragment_close_exit" /> + app:destination="@id/editCallLinkNameDialogFragment" + app:enterAnim="@anim/fragment_open_enter" + app:exitAnim="@anim/fragment_close_exit" + app:popEnterAnim="@anim/fragment_close_enter" + app:popExitAnim="@anim/fragment_close_exit" /> No calls. Get started by calling a friend. + + Call links you\'ve created will no longer work for people who have them.