Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Polish about sheet UX.

Browse Source
This commit is contained in:
Alex Hart
2024-01-17 11:24:25 -04:00
committed by Greyson Parrelli
parent 99f936ff97
commit 73d98da32b
9 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,9 +323,14 @@ class ConversationSettingsFragment : DSLSettingsFragment(
state.withRecipientSettingsState {
customPref(
BioTextPreference.RecipientModel(recipient = state.recipient, onHeadlineClickListener = {
AboutSheet.create(state.recipient).show(parentFragmentManager, null)
})
BioTextPreference.RecipientModel(
recipient = state.recipient,
onHeadlineClickListener = if (state.recipient.isSelf || !state.recipient.isIndividual) {
null
} else {
{ AboutSheet.create(state.recipient).show(parentFragmentManager, null) }
}
)
)
}

28
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
View File

@@ -2,13 +2,14 @@ package org.thoughtcrime.securesms.components.settings.conversation.preferences
import android.content.ClipData
import android.content.Context
import android.graphics.drawable.InsetDrawable
import android.text.SpannableStringBuilder
import android.view.View
import android.widget.TextView
import android.widget.Toast
import org.signal.core.util.dp
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.PreferenceModel
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.ContextUtil
import org.thoughtcrime.securesms.util.ServiceUtil
@@ -32,12 +33,12 @@ object BioTextPreference {
abstract fun getSubhead1Text(context: Context): String?
abstract fun getSubhead2Text(): String?
open val onHeadlineClickListener: () -> Unit = {}
open val onHeadlineClickListener: (() -> Unit)? = null
}
class RecipientModel(
private val recipient: Recipient,
override val onHeadlineClickListener: () -> Unit
override val onHeadlineClickListener: (() -> Unit)?
) : BioTextPreferenceModel<RecipientModel>() {
override fun getHeadlineText(context: Context): CharSequence {
@@ -56,8 +57,13 @@ object BioTextPreference {
SpanUtil.appendCenteredImageSpan(this, ContextUtil.requireDrawable(context, R.drawable.ic_official_28), 28, 28)
}
if (recipient.isIndividual) {
SpanUtil.appendCenteredImageSpan(this, ContextUtil.requireDrawable(context, R.drawable.symbol_chevron_right_24_color_on_secondary_container), 24, 24)
if (recipient.isIndividual && !recipient.isSelf) {
val drawable = ContextUtil.requireDrawable(context, R.drawable.symbol_chevron_right_24_color_on_secondary_container)
drawable.setBounds(0, 0, 24.dp, 24.dp)
val insetDrawable = InsetDrawable(drawable, 0, 0, 0, 4.dp)
SpanUtil.appendBottomImageSpan(this, insetDrawable, 24, 28)
}
}
}
@@ -70,11 +76,7 @@ object BioTextPreference {
}
}
override fun getSubhead2Text(): String? = if (recipient.shouldShowE164()) {
recipient.e164.map(PhoneNumberFormatter::prettyPrint).orElse(null)
} else {
null
}
override fun getSubhead2Text(): String? = null
override fun areContentsTheSame(newItem: RecipientModel): Boolean {
return super.areContentsTheSame(newItem) && newItem.recipient.hasSameContent(recipient)
@@ -114,7 +116,11 @@ object BioTextPreference {
override fun bind(model: T) {
headline.text = model.getHeadlineText(context)
headline.setOnClickListener { model.onHeadlineClickListener() }
val clickListener = model.onHeadlineClickListener
if (clickListener != null) {
headline.setOnClickListener { clickListener() }
}
model.getSubhead1Text(context).let {
subhead1.text = it