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

Update UI and strings for the duplicate name review screen.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-15 16:57:01 -05:00
committed by Cody Henthorne
parent e7c018283a
commit bdb34e16c6
9 changed files with 33 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt
View File

@@ -6,7 +6,6 @@
package org.thoughtcrime.securesms.conversation.v2
import android.content.Context
import android.text.SpannableStringBuilder
import android.transition.ChangeBounds
import android.transition.Slide
import android.transition.TransitionManager
@@ -15,8 +14,6 @@ import android.util.AttributeSet
import android.view.Gravity
import android.view.View
import androidx.appcompat.widget.LinearLayoutCompat
import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat
import androidx.core.transition.addListener
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.identity.UnverifiedBannerView
@@ -28,9 +25,7 @@ import org.thoughtcrime.securesms.database.model.IdentityRecord
import org.thoughtcrime.securesms.groups.GroupId
import org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.ContextUtil
import org.thoughtcrime.securesms.util.IdentityUtil
import org.thoughtcrime.securesms.util.SpanUtil
import org.thoughtcrime.securesms.util.ViewUtil
import org.thoughtcrime.securesms.util.views.Stub
import org.thoughtcrime.securesms.util.visible
@@ -114,20 +109,12 @@ class ConversationBannerView @JvmOverloads constructor(
stub = reviewBannerStub
) {
if (requestReviewState.individualReviewState != null) {
val message: CharSequence = SpannableStringBuilder()
.append(SpanUtil.bold(context.getString(R.string.ConversationFragment__review_requests_carefully)))
.append(" ")
.append(context.getString(R.string.ConversationFragment__signal_found_another_contact_with_the_same_name))
setBannerMessage(message)
val drawable = ContextUtil.requireDrawable(context, R.drawable.symbol_info_24).mutate()
DrawableCompat.setTint(drawable, ContextCompat.getColor(context, R.color.signal_icon_tint_primary))
setBannerIcon(drawable)
setOnClickListener { listener?.onRequestReviewIndividual(requestReviewState.individualReviewState.recipient.id) }
setBannerMessage(context.getString(R.string.ConversationFragment__review_banner_body))
setBannerRecipients(requestReviewState.individualReviewState.target, requestReviewState.individualReviewState.firstDuplicate)
setOnClickListener { listener?.onRequestReviewIndividual(requestReviewState.individualReviewState.target.id) }
} else if (requestReviewState.groupReviewState != null) {
setBannerMessage(context.getString(R.string.ConversationFragment__d_group_members_have_the_same_name, requestReviewState.groupReviewState.count))
setBannerRecipient(requestReviewState.groupReviewState.recipient)
setBannerRecipients(requestReviewState.groupReviewState.target, requestReviewState.groupReviewState.firstDuplicate)
setOnClickListener { listener?.onReviewGroupMembers(requestReviewState.groupReviewState.groupId) }
}

13
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
View File

@@ -370,8 +370,16 @@ class ConversationRepository(
return@fromCallable RequestReviewState()
}
if (group == null && ReviewUtil.isRecipientReviewSuggested(recipient.id)) {
return@fromCallable RequestReviewState(individualReviewState = IndividualReviewState(recipient))
if (group == null) {
val recipientsToReview = ReviewUtil.getRecipientsToPromptForReview(recipient.id)
if (recipientsToReview.size > 0) {
return@fromCallable RequestReviewState(
individualReviewState = IndividualReviewState(
target = recipient,
firstDuplicate = Recipient.resolvedList(recipientsToReview)[0]
)
)
}
}
if (group != null && group.isV2Group) {
@@ -383,6 +391,7 @@ class ConversationRepository(
groupReviewState = GroupReviewState(
groupId,
duplicateRecipients[0],
duplicateRecipients[1],
duplicateRecipients.size
)
)

4
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/RequestReviewState.kt
View File

@@ -22,8 +22,8 @@ data class RequestReviewState(
}
/** Recipient is in message request state and has similar name as someone else */
data class IndividualReviewState(val recipient: Recipient)
data class IndividualReviewState(val target: Recipient, val firstDuplicate: Recipient)
/** Group has multiple members with similar names */
data class GroupReviewState(val groupId: GroupId.V2, val recipient: Recipient, val count: Int)
data class GroupReviewState(val groupId: GroupId.V2, val target: Recipient, val firstDuplicate: Recipient, val count: Int)
}