keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Rename StartConversation

Browse Source
pull/1554/head
Andrew 11 months ago
parent a55c85c28c
commit 78da9bdc67
19 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationDelegate.kt
Unescape Escape View File

@ -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() {}

8
app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt
Unescape Escape View File

@ -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
)
}

10
app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHomeFragment.kt → app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationFragment.kt
Unescape Escape View File

@ -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<NewConversationDelegate>(NullNewConversationDelegate)
var delegate = MutableStateFlow<StartConversationDelegate>(NullStartConversationDelegate)
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View = createThemedComposeView {
NewConversationScreen(
StartConversationScreen(
accountId = TextSecurePreferences.getLocalNumber(requireContext())!!,
delegate = delegate.collectAsState().value
)

28
app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/NewConversationHome.kt → app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
Unescape Escape View File

@ -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
)
}
}

4
app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriendFragment.kt
Unescape Escape View File

@ -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?,

4
app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessageFragment.kt
Unescape Escape View File

@ -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)

4
app/src/main/java/org/thoughtcrime/securesms/groups/CreateGroupFragment.kt
Unescape Escape View File

@ -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?,

4
app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt
Unescape Escape View File

@ -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?,

8
app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
Unescape Escape View File

@ -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")
}
}

2
app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt
Unescape Escape View File

@ -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

6
app/src/main/res/values-fa-rIR/strings.xml
Unescape Escape View File

@ -756,9 +756,9 @@
<string name="message_requests_accepted">درخواست پیام شما قبول شد.</string>
<string name="message_requests_pending">درخواست پیام شما در انتظار پاسخ می باشد.</string>
<string name="message_request_empty_state_message">هیچ درخواست پیامی وجود ندارد</string>
<string name="NewConversationButton_SessionTooltip">پیام مستقیم</string>
<string name="NewConversationButton_ClosedGroupTooltip">گروه‌های خصوصی</string>
<string name="NewConversationButton_OpenGroupTooltip">گروه‌های باز</string>
<string name="StartConversationButton_SessionTooltip">پیام مستقیم</string>
<string name="StartConversationButton_ClosedGroupTooltip">گروه‌های خصوصی</string>
<string name="StartConversationButton_OpenGroupTooltip">گروه‌های باز</string>
<string name="message_requests_notification">شما درخواست پیام جدیدی دارید</string>
<string name="CallNotificationBuilder_connecting">در حال اتصال…</string>
<string name="NotificationBarManager__incoming_signal_call">تماس دریافتی</string>

6
app/src/main/res/values-fr-rFR/strings.xml
Unescape Escape View File

@ -759,9 +759,9 @@
<string name="message_requests_accepted">Votre demande de message a été acceptée.</string>
<string name="message_requests_pending">Votre demande de message est en attente.</string>
<string name="message_request_empty_state_message">Aucune demande de message en attente</string>
<string name="NewConversationButton_SessionTooltip">Message privé</string>
<string name="NewConversationButton_ClosedGroupTooltip">Groupes privés</string>
<string name="NewConversationButton_OpenGroupTooltip">Groupe public</string>
<string name="StartConversationButton_SessionTooltip">Message privé</string>
<string name="StartConversationButton_ClosedGroupTooltip">Groupes privés</string>
<string name="StartConversationButton_OpenGroupTooltip">Groupe public</string>
<string name="message_requests_notification">Vous avez une nouvelle demande de message</string>
<string name="CallNotificationBuilder_connecting">Connexion…</string>
<string name="NotificationBarManager__incoming_signal_call">Appel entrant</string>

6
app/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -759,9 +759,9 @@
<string name="message_requests_accepted">Votre demande de message a été acceptée.</string>
<string name="message_requests_pending">Votre demande de message est en attente.</string>
<string name="message_request_empty_state_message">Aucune demande de message en attente</string>
<string name="NewConversationButton_SessionTooltip">Message privé</string>
<string name="NewConversationButton_ClosedGroupTooltip">Groupes privés</string>
<string name="NewConversationButton_OpenGroupTooltip">Groupe public</string>
<string name="StartConversationButton_SessionTooltip">Message privé</string>
<string name="StartConversationButton_ClosedGroupTooltip">Groupes privés</string>
<string name="StartConversationButton_OpenGroupTooltip">Groupe public</string>
<string name="message_requests_notification">Vous avez une nouvelle demande de message</string>
<string name="CallNotificationBuilder_connecting">Connexion…</string>
<string name="NotificationBarManager__incoming_signal_call">Appel entrant</string>

6
app/src/main/res/values-hy-rAM/strings.xml
Unescape Escape View File

@ -712,7 +712,7 @@
<string name="mark_all_as_read">Նշել բոլորը, որպես տեսնված</string>
<string name="global_search_contacts_groups">Կոնտակտներ և խմբեր</string>
<string name="global_search_messages">Հաղորդագրություններ</string>
<string name="NewConversationButton_SessionTooltip">Անմիջական հաղորդագրություն</string>
<string name="NewConversationButton_ClosedGroupTooltip">Փակ խումբ</string>
<string name="NewConversationButton_OpenGroupTooltip">Բաց խումբ</string>
<string name="StartConversationButton_SessionTooltip">Անմիջական հաղորդագրություն</string>
<string name="StartConversationButton_ClosedGroupTooltip">Փակ խումբ</string>
<string name="StartConversationButton_OpenGroupTooltip">Բաց խումբ</string>
</resources>

6
app/src/main/res/values-hy/strings.xml
Unescape Escape View File

@ -712,7 +712,7 @@
<string name="mark_all_as_read">Նշել բոլորը, որպես տեսնված</string>
<string name="global_search_contacts_groups">Կոնտակտներ և խմբեր</string>
<string name="global_search_messages">Հաղորդագրություններ</string>
<string name="NewConversationButton_SessionTooltip">Անմիջական հաղորդագրություն</string>
<string name="NewConversationButton_ClosedGroupTooltip">Փակ խումբ</string>
<string name="NewConversationButton_OpenGroupTooltip">Բաց խումբ</string>
<string name="StartConversationButton_SessionTooltip">Անմիջական հաղորդագրություն</string>
<string name="StartConversationButton_ClosedGroupTooltip">Փակ խումբ</string>
<string name="StartConversationButton_OpenGroupTooltip">Բաց խումբ</string>
</resources>

4
app/src/main/res/values-it-rIT/strings.xml
Unescape Escape View File

@ -705,6 +705,6 @@ scambia un altro messaggio!</string>
<string name="mark_all_as_read">Segna tutto come già letto</string>
<string name="global_search_contacts_groups">Contatti e Gruppi</string>
<string name="global_search_messages">Messaggi</string>
<string name="NewConversationButton_SessionTooltip">Messaggio Privato</string>
<string name="NewConversationButton_ClosedGroupTooltip">Gruppo Chiuso</string>
<string name="StartConversationButton_SessionTooltip">Messaggio Privato</string>
<string name="StartConversationButton_ClosedGroupTooltip">Gruppo Chiuso</string>
</resources>

4
app/src/main/res/values-it/strings.xml
Unescape Escape View File

@ -705,6 +705,6 @@ scambia un altro messaggio!</string>
<string name="mark_all_as_read">Segna tutto come già letto</string>
<string name="global_search_contacts_groups">Contatti e Gruppi</string>
<string name="global_search_messages">Messaggi</string>
<string name="NewConversationButton_SessionTooltip">Messaggio Privato</string>
<string name="NewConversationButton_ClosedGroupTooltip">Gruppo Chiuso</string>
<string name="StartConversationButton_SessionTooltip">Messaggio Privato</string>
<string name="StartConversationButton_ClosedGroupTooltip">Gruppo Chiuso</string>
</resources>

6
app/src/main/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -698,7 +698,7 @@
<string name="mark_all_as_read">全部標示為已讀</string>
<string name="global_search_contacts_groups">聯絡人群組</string>
<string name="global_search_messages">訊息</string>
<string name="NewConversationButton_SessionTooltip">直接傳訊</string>
<string name="NewConversationButton_ClosedGroupTooltip">已關閉的群組</string>
<string name="NewConversationButton_OpenGroupTooltip">開啟群組</string>
<string name="StartConversationButton_SessionTooltip">直接傳訊</string>
<string name="StartConversationButton_ClosedGroupTooltip">已關閉的群組</string>
<string name="StartConversationButton_OpenGroupTooltip">開啟群組</string>
</resources>

6
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -933,9 +933,9 @@
<string name="message_requests_accepted">Your message request has been accepted.</string>
<string name="message_requests_pending">Your message request is currently pending.</string>
<string name="message_request_empty_state_message">No pending message requests</string>
<string name="NewConversationButton_SessionTooltip">Direct Message</string>
<string name="NewConversationButton_ClosedGroupTooltip">Closed Group</string>
<string name="NewConversationButton_OpenGroupTooltip">Open Group</string>
<string name="StartConversationButton_SessionTooltip">Direct Message</string>
<string name="StartConversationButton_ClosedGroupTooltip">Closed Group</string>
<string name="StartConversationButton_OpenGroupTooltip">Open Group</string>
<string name="message_requests_notification">You have a new message request</string>
<string name="CallNotificationBuilder_connecting">Connecting…</string>
<string name="NotificationBarManager__incoming_signal_call">Incoming call</string>

Write Preview
Loading…
Cancel
Save