Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 11:51:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update message request states for 1:1 and groups chats.

Browse Source
This commit is contained in:
Michelle Tang
2025-02-20 10:18:40 -05:00
committed by Greyson Parrelli
parent 20cecbd5cd
commit 886bebb088
38 changed files with 799 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
View File

@@ -33,6 +33,7 @@ import org.signal.core.util.Result
import org.signal.core.util.concurrent.LifecycleDisposable
import org.signal.core.util.concurrent.addTo
import org.signal.core.util.getParcelableArrayListExtraCompat
import org.signal.donations.InAppPaymentType
import org.thoughtcrime.securesms.AvatarPreviewActivity
import org.thoughtcrime.securesms.BlockUnblockDialog
import org.thoughtcrime.securesms.InviteActivity
@@ -52,6 +53,8 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon
import org.thoughtcrime.securesms.components.settings.DSLSettingsText
import org.thoughtcrime.securesms.components.settings.NO_TINT
import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
import org.thoughtcrime.securesms.components.settings.app.subscription.donate.CheckoutFlowActivity
import org.thoughtcrime.securesms.components.settings.configure
import org.thoughtcrime.securesms.components.settings.conversation.preferences.AvatarPreference
import org.thoughtcrime.securesms.components.settings.conversation.preferences.BioTextPreference
@@ -492,6 +495,18 @@ class ConversationSettingsFragment : DSLSettingsFragment(
dividerPref()
}
if (state.recipient.isReleaseNotes) {
textPref(
icon = DSLSettingsIcon.from(R.drawable.symbol_official_20),
title = DSLSettingsText.from(R.string.ReleaseNotes__this_is_official_chat)
)
textPref(
icon = DSLSettingsIcon.from(R.drawable.symbol_bell_20),
title = DSLSettingsText.from(R.string.ReleaseNotes__keep_up_to_date)
)
dividerPref()
}
val summary = DSLSettingsText.from(formatDisappearingMessagesLifespan(state.disappearingMessagesLifespan))
val icon = if (state.disappearingMessagesLifespan <= 0 || state.recipient.isBlocked) {
R.drawable.symbol_timer_slash_24
@@ -633,6 +648,27 @@ class ConversationSettingsFragment : DSLSettingsFragment(
)
}
if (state.recipient.isReleaseNotes) {
dividerPref()
sectionHeaderPref(R.string.preferences__help)
externalLinkPref(
icon = DSLSettingsIcon.from(R.drawable.symbol_help_24),
title = DSLSettingsText.from(R.string.HelpSettingsFragment__support_center),
linkId = R.string.support_center_url
)
clickPref(
icon = DSLSettingsIcon.from(R.drawable.symbol_invite_24),
title = DSLSettingsText.from(R.string.HelpSettingsFragment__contact_us),
onClick = { startActivity(AppSettingsActivity.help(requireContext())) }
)
clickPref(
icon = DSLSettingsIcon.from(R.drawable.symbol_heart_24),
title = DSLSettingsText.from(R.string.preferences__donate_to_signal),
onClick = { startActivity(CheckoutFlowActivity.createIntent(requireContext(), InAppPaymentType.ONE_TIME_DONATION)) }
)
}
state.withRecipientSettingsState { recipientSettingsState ->
if (state.recipient.badges.isNotEmpty() && !state.recipient.isSelf) {
dividerPref()

10
app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
View File

@@ -213,9 +213,10 @@ class DSLConfiguration {
fun textPref(
title: DSLSettingsText? = null,
summary: DSLSettingsText? = null
summary: DSLSettingsText? = null,
icon: DSLSettingsIcon? = null
) {
val preference = TextPreference(title, summary)
val preference = TextPreference(title, summary, icon)
children.add(preference)
}
@@ -257,8 +258,9 @@ abstract class PreferenceModel<T : PreferenceModel<T>>(
class TextPreference(
title: DSLSettingsText?,
summary: DSLSettingsText?
) : PreferenceModel<TextPreference>(title = title, summary = summary)
summary: DSLSettingsText?,
icon: DSLSettingsIcon? = null
) : PreferenceModel<TextPreference>(title = title, summary = summary, icon = icon)
class LearnMoreTextPreference(
override val title: DSLSettingsText?,