From 78da9bdc67f75ef521916e3a2b0d1b3fc5df728b Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 25 Jun 2024 20:05:32 +0930 Subject: [PATCH] Rename StartConversation --- .../start/NewConversationDelegate.kt | 4 +-- .../start/NewConversationFragment.kt | 8 +++--- ...Fragment.kt => NewConversationFragment.kt} | 10 +++---- ...nversationHome.kt => StartConversation.kt} | 28 +++++++++---------- .../invitefriend/InviteFriendFragment.kt | 4 +-- .../start/newmessage/NewMessageFragment.kt | 4 +-- .../securesms/groups/CreateGroupFragment.kt | 4 +-- .../securesms/groups/JoinCommunityFragment.kt | 4 +-- .../securesms/home/HomeActivity.kt | 8 +++--- .../thoughtcrime/securesms/util/GlowView.kt | 2 +- app/src/main/res/values-fa-rIR/strings.xml | 6 ++-- app/src/main/res/values-fr-rFR/strings.xml | 6 ++-- app/src/main/res/values-fr/strings.xml | 6 ++-- app/src/main/res/values-hy-rAM/strings.xml | 6 ++-- app/src/main/res/values-hy/strings.xml | 6 ++-- app/src/main/res/values-it-rIT/strings.xml | 4 +-- app/src/main/res/values-it/strings.xml | 4 +-- app/src/main/res/values-zh-rTW/strings.xml | 6 ++-- app/src/main/res/values/strings.xml | 6 ++-- 19 files changed, 63 insertions(+), 63 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/{NewConversationHomeFragment.kt => NewConversationFragment.kt} (73%) rename app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/{NewConversationHome.kt => StartConversation.kt} (76%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationDelegate.kt index 16266948b6..04b16b64ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationDelegate.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationDelegate.kt @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.conversation.start -interface NewConversationDelegate { +interface StartConversationDelegate { fun onNewMessageSelected() fun onCreateGroupSelected() fun onJoinCommunitySelected() @@ -10,7 +10,7 @@ interface NewConversationDelegate { fun onInviteFriend() } -object NullNewConversationDelegate: NewConversationDelegate { +object NullStartConversationDelegate: StartConversationDelegate { override fun onNewMessageSelected() {} override fun onCreateGroupSelected() {} override fun onJoinCommunitySelected() {} diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt index c5873834bf..1ffc65f592 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt @@ -17,7 +17,7 @@ import dagger.hilt.android.AndroidEntryPoint import network.loki.messenger.R import org.session.libsession.utilities.Address import org.session.libsession.utilities.modifyLayoutParams -import org.thoughtcrime.securesms.conversation.start.home.NewConversationHomeFragment +import org.thoughtcrime.securesms.conversation.start.home.StartConversationHomeFragment import org.thoughtcrime.securesms.conversation.start.invitefriend.InviteFriendFragment import org.thoughtcrime.securesms.conversation.start.newmessage.NewMessageFragment import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.groups.CreateGroupFragment import org.thoughtcrime.securesms.groups.JoinCommunityFragment @AndroidEntryPoint -class NewConversationFragment : BottomSheetDialogFragment(), NewConversationDelegate { +class StartConversationFragment : BottomSheetDialogFragment(), StartConversationDelegate { private val defaultPeekHeight: Int by lazy { (Resources.getSystem().displayMetrics.heightPixels * 0.94).toInt() } @@ -39,8 +39,8 @@ class NewConversationFragment : BottomSheetDialogFragment(), NewConversationDele override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) replaceFragment( - fragment = NewConversationHomeFragment().also { it.delegate.value = this }, - fragmentKey = NewConversationHomeFragment::class.java.simpleName + fragment = StartConversationHomeFragment().also { it.delegate.value = this }, + fragmentKey = StartConversationHomeFragment::class.java.simpleName ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHomeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationFragment.kt similarity index 73% rename from app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHomeFragment.kt rename to app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationFragment.kt index 1798814732..1934c5e5bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHomeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationFragment.kt @@ -9,25 +9,25 @@ import androidx.fragment.app.Fragment import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.MutableStateFlow import org.session.libsession.utilities.TextSecurePreferences -import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate -import org.thoughtcrime.securesms.conversation.start.NullNewConversationDelegate +import org.thoughtcrime.securesms.conversation.start.StartConversationDelegate +import org.thoughtcrime.securesms.conversation.start.NullStartConversationDelegate import org.thoughtcrime.securesms.ui.createThemedComposeView import javax.inject.Inject @AndroidEntryPoint -class NewConversationHomeFragment : Fragment() { +class StartConversationHomeFragment : Fragment() { @Inject lateinit var textSecurePreferences: TextSecurePreferences - var delegate = MutableStateFlow(NullNewConversationDelegate) + var delegate = MutableStateFlow(NullStartConversationDelegate) override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View = createThemedComposeView { - NewConversationScreen( + StartConversationScreen( accountId = TextSecurePreferences.getLocalNumber(requireContext())!!, delegate = delegate.collectAsState().value ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHome.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt similarity index 76% rename from app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHome.kt rename to app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt index 5be77f4621..cac26163f2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHome.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt @@ -18,10 +18,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import network.loki.messenger.R -import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate -import org.thoughtcrime.securesms.conversation.start.NullNewConversationDelegate +import org.thoughtcrime.securesms.conversation.start.NullStartConversationDelegate +import org.thoughtcrime.securesms.conversation.start.StartConversationDelegate import org.thoughtcrime.securesms.ui.Divider -import org.thoughtcrime.securesms.ui.ItemButton +import org.thoughtcrime.securesms.ui.SmallItemButton import org.thoughtcrime.securesms.ui.LocalDimensions import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.SessionColorsParameterProvider @@ -34,9 +34,9 @@ import org.thoughtcrime.securesms.ui.small import org.thoughtcrime.securesms.ui.xl @Composable -internal fun NewConversationScreen( +internal fun StartConversationScreen( accountId: String, - delegate: NewConversationDelegate + delegate: StartConversationDelegate ) { Column(modifier = Modifier.background(LocalColors.current.backgroundSecondary)) { AppBar(stringResource(R.string.dialog_start_conversation_title), onClose = delegate::onDialogClosePressed) @@ -54,21 +54,21 @@ internal fun NewConversationScreen( } /** - * Items of the NewConversationHome screen. Use in a [Column] + * Items of the StartConversationHome screen. Use in a [Column] */ @Suppress("UnusedReceiverParameter") @Composable private fun ColumnScope.Items( accountId: String, - delegate: NewConversationDelegate + delegate: StartConversationDelegate ) { - ItemButton(textId = R.string.messageNew, icon = R.drawable.ic_message, onClick = delegate::onNewMessageSelected) + SmallItemButton(textId = R.string.messageNew, icon = R.drawable.ic_message, onClick = delegate::onNewMessageSelected) Divider(startIndent = LocalDimensions.current.dividerIndent) - ItemButton(textId = R.string.activity_create_group_title, icon = R.drawable.ic_group, onClick = delegate::onCreateGroupSelected) + SmallItemButton(textId = R.string.activity_create_group_title, icon = R.drawable.ic_group, onClick = delegate::onCreateGroupSelected) Divider(startIndent = LocalDimensions.current.dividerIndent) - ItemButton(textId = R.string.dialog_join_community_title, icon = R.drawable.ic_globe, onClick = delegate::onJoinCommunitySelected) + SmallItemButton(textId = R.string.dialog_join_community_title, icon = R.drawable.ic_globe, onClick = delegate::onJoinCommunitySelected) Divider(startIndent = LocalDimensions.current.dividerIndent) - ItemButton(textId = R.string.activity_settings_invite_button_title, icon = R.drawable.ic_invite_friend, Modifier.contentDescription( + SmallItemButton(textId = R.string.activity_settings_invite_button_title, icon = R.drawable.ic_invite_friend, Modifier.contentDescription( R.string.AccessibilityId_invite_friend_button), onClick = delegate::onInviteFriend) Column( modifier = Modifier @@ -90,13 +90,13 @@ private fun ColumnScope.Items( @Preview @Composable -private fun PreviewNewConversationScreen( +private fun PreviewStartConversationScreen( @PreviewParameter(SessionColorsParameterProvider::class) colors: Colors ) { PreviewTheme(colors) { - NewConversationScreen( + StartConversationScreen( accountId = "059287129387123", - NullNewConversationDelegate + NullStartConversationDelegate ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriendFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriendFragment.kt index c177b1667d..4239a7a067 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriendFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriendFragment.kt @@ -8,14 +8,14 @@ import androidx.compose.ui.platform.LocalContext import androidx.fragment.app.Fragment import dagger.hilt.android.AndroidEntryPoint import org.session.libsession.utilities.TextSecurePreferences -import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate +import org.thoughtcrime.securesms.conversation.start.StartConversationDelegate import org.thoughtcrime.securesms.preferences.copyPublicKey import org.thoughtcrime.securesms.preferences.sendInvitationToUseSession import org.thoughtcrime.securesms.ui.createThemedComposeView @AndroidEntryPoint class InviteFriendFragment : Fragment() { - lateinit var delegate: NewConversationDelegate + lateinit var delegate: StartConversationDelegate override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageFragment.kt index a128d2ff83..5f0801fe8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageFragment.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.launch import org.session.libsession.utilities.Address import org.session.libsession.utilities.recipients.Recipient -import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate +import org.thoughtcrime.securesms.conversation.start.StartConversationDelegate import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.dependencies.DatabaseComponent import org.thoughtcrime.securesms.showOpenUrlDialog @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.ui.createThemedComposeView class NewMessageFragment : Fragment() { private val viewModel: NewMessageViewModel by viewModels() - lateinit var delegate: NewConversationDelegate + lateinit var delegate: StartConversationDelegate override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt index 75c7681b1d..7bfea9aab0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt @@ -25,7 +25,7 @@ import org.session.libsession.utilities.Device import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.contacts.SelectContactsAdapter -import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate +import org.thoughtcrime.securesms.conversation.start.StartConversationDelegate import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.dependencies.DatabaseComponent import org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView @@ -43,7 +43,7 @@ class CreateGroupFragment : Fragment() { private lateinit var binding: FragmentCreateGroupBinding private val viewModel: CreateGroupViewModel by viewModels() - lateinit var delegate: NewConversationDelegate + lateinit var delegate: StartConversationDelegate override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt index ae59c3833e..964e1e1770 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt @@ -24,7 +24,7 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.OpenGroupUrlParser import org.session.libsession.utilities.recipients.Recipient import org.session.libsignal.utilities.Log -import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate +import org.thoughtcrime.securesms.conversation.start.StartConversationDelegate import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities @@ -33,7 +33,7 @@ class JoinCommunityFragment : Fragment() { private lateinit var binding: FragmentJoinCommunityBinding - lateinit var delegate: NewConversationDelegate + lateinit var delegate: StartConversationDelegate override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt index dc38f0a6ee..772515d080 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -67,7 +67,7 @@ import org.session.libsignal.utilities.ThreadUtils import org.session.libsignal.utilities.toHexString import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity -import org.thoughtcrime.securesms.conversation.start.NewConversationFragment +import org.thoughtcrime.securesms.conversation.start.StartConversationFragment import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.conversation.v2.utilities.NotificationUtils import org.thoughtcrime.securesms.crypto.IdentityKeyUtil @@ -229,7 +229,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), IP2Country.configureIfNeeded(this@HomeActivity) // Set up new conversation button - binding.newConversationButton.setOnClickListener { showNewConversation() } + binding.newConversationButton.setOnClickListener { showStartConversation() } // Observe blocked contacts changed events // subscribe to outdated config updates, this should be removed after long enough time for device migration @@ -667,8 +667,8 @@ class HomeActivity : PassphraseRequiredActionBarActivity(), } } - private fun showNewConversation() { - NewConversationFragment().show(supportFragmentManager, "NewConversationFragment") + private fun showStartConversation() { + StartConversationFragment().show(supportFragmentManager, "StartConversationFragment") } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt b/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt index c7d53c1fef..a0c0da24fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt @@ -118,7 +118,7 @@ class PNModeView : LinearLayout, GlowView { // endregion } -class NewConversationButtonImageView : androidx.appcompat.widget.AppCompatImageView, GlowView { +class StartConversationButtonImageView : androidx.appcompat.widget.AppCompatImageView, GlowView { @ColorInt override var mainColor: Int = 0 set(newValue) { field = newValue; paint.color = newValue } @ColorInt override var sessionShadowColor: Int = 0 diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index 960d0ea9e7..6c630074ea 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -756,9 +756,9 @@ درخواست پیام شما قبول شد. درخواست پیام شما در انتظار پاسخ می باشد. هیچ درخواست پیامی وجود ندارد - پیام مستقیم - گروه‌های خصوصی - گروه‌های باز + پیام مستقیم + گروه‌های خصوصی + گروه‌های باز شما درخواست پیام جدیدی دارید در حال اتصال… تماس دریافتی diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 1aea354ab9..8a032d81c6 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -759,9 +759,9 @@ Votre demande de message a été acceptée. Votre demande de message est en attente. Aucune demande de message en attente - Message privé - Groupes privés - Groupe public + Message privé + Groupes privés + Groupe public Vous avez une nouvelle demande de message Connexion… Appel entrant diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1aea354ab9..8a032d81c6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -759,9 +759,9 @@ Votre demande de message a été acceptée. Votre demande de message est en attente. Aucune demande de message en attente - Message privé - Groupes privés - Groupe public + Message privé + Groupes privés + Groupe public Vous avez une nouvelle demande de message Connexion… Appel entrant diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml index 0020afe344..c368215fae 100644 --- a/app/src/main/res/values-hy-rAM/strings.xml +++ b/app/src/main/res/values-hy-rAM/strings.xml @@ -712,7 +712,7 @@ Նշել բոլորը, որպես տեսնված Կոնտակտներ և խմբեր Հաղորդագրություններ - Անմիջական հաղորդագրություն - Փակ խումբ - Բաց խումբ + Անմիջական հաղորդագրություն + Փակ խումբ + Բաց խումբ diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index 0020afe344..c368215fae 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -712,7 +712,7 @@ Նշել բոլորը, որպես տեսնված Կոնտակտներ և խմբեր Հաղորդագրություններ - Անմիջական հաղորդագրություն - Փակ խումբ - Բաց խումբ + Անմիջական հաղորդագրություն + Փակ խումբ + Բաց խումբ diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 9bb9d354e1..63e09d830a 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -705,6 +705,6 @@ scambia un altro messaggio! Segna tutto come già letto Contatti e Gruppi Messaggi - Messaggio Privato - Gruppo Chiuso + Messaggio Privato + Gruppo Chiuso diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9bb9d354e1..63e09d830a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -705,6 +705,6 @@ scambia un altro messaggio! Segna tutto come già letto Contatti e Gruppi Messaggi - Messaggio Privato - Gruppo Chiuso + Messaggio Privato + Gruppo Chiuso diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ac8796ba37..264e80f51a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -698,7 +698,7 @@ 全部標示為已讀 聯絡人群組 訊息 - 直接傳訊 - 已關閉的群組 - 開啟群組 + 直接傳訊 + 已關閉的群組 + 開啟群組 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62c0c886a9..3d6485acab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -933,9 +933,9 @@ Your message request has been accepted. Your message request is currently pending. No pending message requests - Direct Message - Closed Group - Open Group + Direct Message + Closed Group + Open Group You have a new message request Connecting… Incoming call