Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-15 12:40:33 +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
app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
+4
View File
@@ -339,7 +339,11 @@ class V2ConversationItemShapeTest {
override fun onMessageRequestAcceptOptionsClicked() = Unit
override fun onItemDoubleClick(item: MultiselectPart) = Unit
override fun onPaymentTombstoneClicked() = Unit
override fun onDisplayMediaNoLongerAvailableSheet() = Unit
override fun onShowUnverifiedProfileSheet(forGroup: Boolean) = Unit
}
}
app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt
+4
View File
@@ -327,5 +327,9 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
override fun onMessageRequestAcceptOptionsClicked() {
Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
}
override fun onShowUnverifiedProfileSheet(forGroup: Boolean) {
Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
}
}
}
app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
+1
View File
@@ -135,5 +135,6 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
void onItemDoubleClick(MultiselectPart multiselectPart);
void onPaymentTombstoneClicked();
void onDisplayMediaNoLongerAvailableSheet();
void onShowUnverifiedProfileSheet(boolean forGroup);
}
}
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+36
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()
app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
+6 -4
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?,
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
+64 -13
View File
@@ -5,12 +5,14 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.util.AttributeSet;
import android.view.View;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.core.view.ViewKt;
@@ -92,25 +94,39 @@ public class ConversationHeaderView extends ConstraintLayout {
return title.toString();
}
public void setAbout(@NonNull Recipient recipient) {
String about;
if (recipient.isReleaseNotes()) {
about = getContext().getString(R.string.ReleaseNotes__signal_release_notes_and_news);
} else {
about = recipient.getCombinedAboutAndEmoji();
}
binding.messageRequestAbout.setText(about);
binding.messageRequestAbout.setVisibility(TextUtils.isEmpty(about) ? GONE : VISIBLE);
public void showReleaseNoteHeader() {
binding.messageRequestInfo.setVisibility(View.GONE);
binding.releaseHeaderContainer.setVisibility(View.VISIBLE);
binding.releaseHeaderDescription1.setText(prependIcon(getContext().getString(R.string.ReleaseNotes__this_is_official_chat_period), R.drawable.symbol_official_20));
binding.releaseHeaderDescription2.setText(prependIcon(getContext().getString(R.string.ReleaseNotes__keep_up_to_date_period), R.drawable.symbol_bell_20));
}
public void setSubtitle(@NonNull CharSequence subtitle, @DrawableRes int iconRes) {
public void setAbout(@NonNull Recipient recipient) {
String about = recipient.getCombinedAboutAndEmoji();
binding.messageRequestAbout.setText(about);
binding.messageRequestAbout.setVisibility(TextUtils.isEmpty(about) || recipient.isReleaseNotes() ? GONE : VISIBLE);
}
public void setSubtitle(@NonNull CharSequence subtitle, @DrawableRes int iconRes, @Nullable Runnable onClick) {
if (TextUtils.isEmpty(subtitle)) {
hideSubtitle();
return;
}
binding.messageRequestSubtitle.setText(prependIcon(subtitle, iconRes));
if (onClick != null) {
binding.messageRequestSubtitle.setMovementMethod(LinkMovementMethod.getInstance());
CharSequence builder = SpanUtil.clickSubstring(
subtitle,
subtitle,
listener -> onClick.run(),
ContextCompat.getColor(getContext(), R.color.signal_colorOnSurface),
true
);
binding.messageRequestSubtitle.setText(prependIcon(builder, iconRes));
} else {
binding.messageRequestSubtitle.setText(prependIcon(subtitle, iconRes));
}
binding.messageRequestSubtitle.setVisibility(View.VISIBLE);
}
@@ -134,6 +150,32 @@ public class ConversationHeaderView extends ConstraintLayout {
binding.messageRequestButton.setVisibility(View.VISIBLE);
}
public void showWarningSubtitle() {
binding.messageRequestReviewCarefully.setVisibility(View.VISIBLE);
}
public void hideWarningSubtitle() {
binding.messageRequestReviewCarefully.setVisibility(View.GONE);
}
public void setUnverifiedNameSubtitle(@DrawableRes int iconRes, @StringRes int clickableRes, boolean forGroup, @Nullable Runnable onClick) {
binding.messageRequestProfileNameUnverified.setVisibility(View.VISIBLE);
binding.messageRequestProfileNameUnverified.setMovementMethod(LinkMovementMethod.getInstance());
CharSequence builder = SpanUtil.clickSubstring(
getContext(),
R.string.ConversationFragment_profile_names_not_verified,
clickableRes,
listener -> onClick.run(),
true,
R.color.signal_colorOnSurface
);
binding.messageRequestProfileNameUnverified.setText(prependIcon(builder, iconRes, forGroup));
}
public void hideUnverifiedNameSubtitle() {
binding.messageRequestProfileNameUnverified.setVisibility(View.GONE);
}
public void showBackgroundBubble(boolean enabled) {
if (enabled) {
setBackgroundResource(R.drawable.wallpaper_bubble_background_18);
@@ -176,6 +218,9 @@ public class ConversationHeaderView extends ConstraintLayout {
binding.messageRequestInfoOutline.setVisibility(View.VISIBLE);
binding.messageRequestDivider.setVisibility(View.INVISIBLE);
}
} else if (ViewKt.isVisible(binding.releaseHeaderContainer)) {
binding.messageRequestInfoOutline.setVisibility(View.GONE);
binding.messageRequestDivider.setVisibility(View.INVISIBLE);
} else {
binding.messageRequestInfoOutline.setVisibility(View.GONE);
binding.messageRequestDivider.setVisibility(View.GONE);
@@ -183,9 +228,15 @@ public class ConversationHeaderView extends ConstraintLayout {
}
private @NonNull CharSequence prependIcon(@NonNull CharSequence input, @DrawableRes int iconRes) {
return prependIcon(input, iconRes, false);
}
private @NonNull CharSequence prependIcon(@NonNull CharSequence input, @DrawableRes int iconRes, boolean useIntrinsicWidth) {
Drawable drawable = ContextCompat.getDrawable(getContext(), iconRes);
Preconditions.checkNotNull(drawable);
drawable.setBounds(0, 0, (int) DimensionUnit.SP.toPixels(20), (int) DimensionUnit.SP.toPixels(20));
int width = useIntrinsicWidth ? drawable.getIntrinsicWidth() : (int) DimensionUnit.SP.toPixels(20);
drawable.setBounds(0, 0, width, (int) DimensionUnit.SP.toPixels(20));
drawable.setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_colorOnSurface), PorterDuff.Mode.SRC_ATOP);
return new SpannableStringBuilder()
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+11 -3
View File
@@ -186,9 +186,10 @@ public class ConversationTitleView extends ConstraintLayout {
}
private void setRecipientTitle(@NonNull Recipient recipient) {
if (recipient.isGroup()) setGroupRecipientTitle(recipient);
else if (recipient.isSelf()) setSelfTitle();
else setIndividualRecipientTitle(recipient);
if (recipient.isGroup()) setGroupRecipientTitle(recipient);
else if (recipient.isSelf()) setSelfTitle();
else if (recipient.isReleaseNotes()) setReleaseNotesTitle(recipient);
else setIndividualRecipientTitle(recipient);
}
private void setGroupRecipientTitle(@NonNull Recipient recipient) {
@@ -200,6 +201,13 @@ public class ConversationTitleView extends ConstraintLayout {
updateSubtitleVisibility();
}
private void setReleaseNotesTitle(@NonNull Recipient recipient) {
final String displayName = recipient.getDisplayName(getContext());
this.title.setText(displayName);
this.subtitle.setText(R.string.ReleaseNotes__official_only_chat);
updateSubtitleVisibility();
}
private void setIndividualRecipientTitle(@NonNull Recipient recipient) {
final String displayName = recipient.getDisplayName(getContext());
this.title.setText(displayName);
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
+66 -25
View File
@@ -5,13 +5,13 @@
package org.thoughtcrime.securesms.conversation.v2
import android.content.Context
import android.text.TextUtils
import android.view.GestureDetector
import android.view.GestureDetector.SimpleOnGestureListener
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import androidx.core.text.HtmlCompat
import androidx.core.view.children
import androidx.fragment.app.DialogFragment
import androidx.lifecycle.LifecycleOwner
@@ -23,6 +23,7 @@ import org.signal.core.util.toOptional
import org.thoughtcrime.securesms.BindableConversationItem
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.Unbindable
import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity
import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickListener
import org.thoughtcrime.securesms.conversation.ConversationAdapterBridge
import org.thoughtcrime.securesms.conversation.ConversationHeaderView
@@ -78,6 +79,7 @@ class ConversationAdapterV2(
companion object {
private val TAG = Log.tag(ConversationAdapterV2::class.java)
private val MIN_GROUPS_THRESHOLD = 2
}
private val _selected = hashSetOf<MultiselectPart>()
@@ -539,41 +541,66 @@ class ConversationAdapterV2(
val title: String = conversationBanner.setTitle(recipient) {
displayDialogFragment(AboutSheet.create(recipient))
}
if (recipient.isReleaseNotes) {
conversationBanner.showReleaseNoteHeader()
}
conversationBanner.setAbout(recipient)
if (recipient.isGroup) {
if (!groupInfo.hasExistingContacts) {
conversationBanner.setUnverifiedNameSubtitle(R.drawable.symbol_group_question_20, R.string.ConversationFragment_group_names, true) {
clickListener.onShowUnverifiedProfileSheet(true)
}
} else {
conversationBanner.hideUnverifiedNameSubtitle()
}
if (groupInfo.pendingMemberCount > 0) {
val invited = context.resources.getQuantityString(R.plurals.MessageRequestProfileView_invited, groupInfo.pendingMemberCount, groupInfo.pendingMemberCount)
conversationBanner.setSubtitle(context.resources.getQuantityString(R.plurals.MessageRequestProfileView_members_and_invited, groupInfo.fullMemberCount, groupInfo.fullMemberCount, invited), R.drawable.symbol_group_light_20)
conversationBanner.setSubtitle(context.resources.getQuantityString(R.plurals.MessageRequestProfileView_members_and_invited, groupInfo.fullMemberCount, groupInfo.fullMemberCount, invited), R.drawable.symbol_group_light_20) { goToGroupSettings(recipient) }
} else if (groupInfo.fullMemberCount > 0) {
conversationBanner.setSubtitle(context.resources.getQuantityString(R.plurals.MessageRequestProfileView_members, groupInfo.fullMemberCount, groupInfo.fullMemberCount), R.drawable.symbol_group_light_20)
conversationBanner.setSubtitle(context.resources.getQuantityString(R.plurals.MessageRequestProfileView_members, groupInfo.fullMemberCount, groupInfo.fullMemberCount), R.drawable.symbol_group_light_20) { goToGroupSettings(recipient) }
} else {
conversationBanner.hideSubtitle()
}
} else if (isSelf) {
conversationBanner.setSubtitle(context.getString(R.string.ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation), R.drawable.symbol_note_light_24)
conversationBanner.setSubtitle(context.getString(R.string.ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation), R.drawable.symbol_note_light_24, null)
} else {
if (recipient.nickname.isEmpty && !recipient.isSystemContact) {
conversationBanner.setUnverifiedNameSubtitle(R.drawable.symbol_person_question_16, R.string.ConversationFragment_profile_names, false) {
clickListener.onShowUnverifiedProfileSheet(false)
}
} else {
conversationBanner.hideUnverifiedNameSubtitle()
}
val subtitle: String? = recipient.takeIf { it.shouldShowE164 }?.e164?.map { e164: String? -> PhoneNumberFormatter.prettyPrint(e164!!) }?.orElse(null)
if (subtitle == null || subtitle == title) {
conversationBanner.hideSubtitle()
} else {
conversationBanner.setSubtitle(subtitle, R.drawable.symbol_phone_light_20)
conversationBanner.setSubtitle(subtitle, R.drawable.symbol_phone_light_20, null)
}
}
conversationBanner.hideButton()
if (messageRequestState?.isAccepted == false && sharedGroups.isEmpty() && !isSelf && !recipient.isGroup) {
conversationBanner.setDescription(context.getString(R.string.ConversationUpdateItem_no_groups_in_common_review_requests_carefully), R.drawable.symbol_error_circle_24)
if (messageRequestState?.isAccepted == false && !isSelf && !recipient.isGroup) {
if (sharedGroups.size < MIN_GROUPS_THRESHOLD) {
conversationBanner.showWarningSubtitle()
}
conversationBanner.setButton(context.getString(R.string.ConversationFragment_safety_tips)) {
clickListener.onShowSafetyTips(false)
}
} else if (messageRequestState?.isAccepted == false && recipient.isGroup && !groupInfo.hasExistingContacts) {
conversationBanner.setDescription(context.getString(R.string.ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully), R.drawable.symbol_error_circle_24)
conversationBanner.setDescription(getDescription(context, sharedGroups), R.drawable.symbol_group_light_20)
} else if (messageRequestState?.isAccepted == false && recipient.isGroup) {
conversationBanner.showWarningSubtitle()
conversationBanner.setButton(context.getString(R.string.ConversationFragment_safety_tips)) {
clickListener.onShowSafetyTips(true)
}
} else if (sharedGroups.isEmpty() || isSelf) {
} else if ((recipient.isGroup && sharedGroups.isEmpty()) || isSelf) {
conversationBanner.hideWarningSubtitle()
if (TextUtils.isEmpty(groupInfo.description)) {
conversationBanner.setLinkifyDescription(false)
conversationBanner.hideDescription()
@@ -592,23 +619,37 @@ class ConversationAdapterV2(
}
}
} else {
val description: String = when (sharedGroups.size) {
1 -> context.getString(R.string.MessageRequestProfileView_member_of_one_group, sharedGroups[0])
2 -> context.getString(R.string.MessageRequestProfileView_member_of_two_groups, sharedGroups[0], sharedGroups[1])
3 -> context.getString(R.string.MessageRequestProfileView_member_of_many_groups, sharedGroups[0], sharedGroups[1], sharedGroups[2])
else -> {
val others: Int = sharedGroups.size - 2
context.getString(
R.string.MessageRequestProfileView_member_of_many_groups,
sharedGroups[0],
sharedGroups[1],
context.resources.getQuantityString(R.plurals.MessageRequestProfileView_member_of_d_additional_groups, others, others)
)
}
}
conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0), R.drawable.symbol_group_light_20)
conversationBanner.hideWarningSubtitle()
conversationBanner.setDescription(getDescription(context, sharedGroups), R.drawable.symbol_group_light_20)
}
}
private fun getDescription(context: Context, sharedGroups: List<String>): String {
return when (sharedGroups.size) {
0 -> context.getString(R.string.ConversationUpdateItem_no_groups_in_common_review_requests_carefully)
1 -> context.getString(R.string.MessageRequestProfileView_member_of_one_group, sharedGroups[0])
2 -> context.getString(R.string.MessageRequestProfileView_member_of_two_groups, sharedGroups[0], sharedGroups[1])
3 -> context.getString(R.string.MessageRequestProfileView_member_of_many_groups, sharedGroups[0], sharedGroups[1], sharedGroups[2])
else -> {
val others: Int = sharedGroups.size - 2
context.getString(
R.string.MessageRequestProfileView_member_of_many_groups,
sharedGroups[0],
sharedGroups[1],
context.resources.getQuantityString(R.plurals.MessageRequestProfileView_member_of_d_additional_groups, others, others)
)
}
}
}
private fun goToGroupSettings(recipient: Recipient) {
val intent = ConversationSettingsActivity.forGroup(getContext(), recipient.requireGroupId())
val bundle = ConversationSettingsActivity.createTransitionBundle(
getContext(),
conversationBanner.getViewById(R.id.message_request_avatar)
)
getContext().startActivity(intent, bundle)
}
}
private inner class OnScrollStateChangedListener : RecyclerView.OnScrollListener() {
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+4
View File
@@ -2952,6 +2952,10 @@ class ConversationFragment :
ConversationDialogs.displaySafetyNumberLearnMoreDialog(this@ConversationFragment, recipient)
}
override fun onShowUnverifiedProfileSheet(forGroup: Boolean) {
UnverifiedProfileNameBottomSheet.show(parentFragmentManager, forGroup)
}
override fun onJoinGroupCallClicked() {
val activity = activity ?: return
val recipient = viewModel.recipientSnapshot ?: return
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DisabledInputView.kt
+20 -1
View File
@@ -15,6 +15,7 @@ import android.widget.FrameLayout
import android.widget.TextView
import androidx.core.content.ContextCompat
import com.google.android.material.button.MaterialButton
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.messagerequests.MessageRequestState
import org.thoughtcrime.securesms.messagerequests.MessageRequestsBottomView
@@ -82,7 +83,25 @@ class DisabledInputView @JvmOverloads constructor(
setMessageRequestData(recipient, messageRequestState)
setWallpaperEnabled(recipient.hasWallpaper)
setAcceptOnClickListener { listener?.onAcceptMessageRequestClicked() }
setAcceptOnClickListener {
if (messageRequestState.isFewConnectionsIndividual) {
MaterialAlertDialogBuilder(context)
.setTitle(R.string.MessageRequestBottomView_accept_request)
.setMessage(R.string.MessageRequestBottomView_review_requests_carefully)
.setPositiveButton(R.string.MessageRequestBottomView_accept) { _, _ -> listener?.onAcceptMessageRequestClicked() }
.setNegativeButton(android.R.string.cancel, null)
.show()
} else if (messageRequestState.isGroupV2Add) {
MaterialAlertDialogBuilder(context)
.setTitle(R.string.MessageRequestBottomView_join_group)
.setMessage(R.string.MessageRequestBottomView_review_requests_carefully_groups)
.setPositiveButton(R.string.MessageRequestBottomView_join) { _, _ -> listener?.onAcceptMessageRequestClicked() }
.setNegativeButton(android.R.string.cancel, null)
.show()
} else {
listener?.onAcceptMessageRequestClicked()
}
}
setDeleteOnClickListener { listener?.onDeleteClicked() }
setBlockOnClickListener { listener?.onBlockClicked() }
setUnblockOnClickListener { listener?.onUnblockClicked() }
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/SafetyTipsBottomSheetDialog.kt
+1
View File
@@ -88,6 +88,7 @@ data class SafetyTipData(
)
private val tips = listOf(
SafetyTipData(heroImage = R.drawable.safety_tip0, titleText = R.string.SafetyTips_tip0_title, messageText = R.string.SafetyTips_tip0_message),
SafetyTipData(heroImage = R.drawable.safety_tip1, titleText = R.string.SafetyTips_tip1_title, messageText = R.string.SafetyTips_tip1_message),
SafetyTipData(heroImage = R.drawable.safety_tip2, titleText = R.string.SafetyTips_tip2_title, messageText = R.string.SafetyTips_tip2_message),
SafetyTipData(heroImage = R.drawable.safety_tip3, titleText = R.string.SafetyTips_tip3_title, messageText = R.string.SafetyTips_tip3_message),
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/UnverifiedProfileNameBottomSheet.kt
+165
View File
@@ -0,0 +1,165 @@
package org.thoughtcrime.securesms.conversation.v2
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.dp
import androidx.core.os.bundleOf
import androidx.fragment.app.FragmentManager
import org.signal.core.ui.BottomSheets
import org.signal.core.ui.Previews
import org.signal.core.ui.SignalPreview
import org.signal.core.ui.horizontalGutters
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
import org.thoughtcrime.securesms.util.BottomSheetUtil
/**
* Bottom sheet shown in message request state that explains that profile names are unverified
*/
class UnverifiedProfileNameBottomSheet : ComposeBottomSheetDialogFragment() {
override val peekHeightPercentage: Float = 0.75f
companion object {
private const val FOR_GROUP_ARG = "for_group"
@JvmStatic
fun show(fragmentManager: FragmentManager, forGroup: Boolean) {
UnverifiedProfileNameBottomSheet()
.apply {
arguments = bundleOf(
FOR_GROUP_ARG to forGroup
)
}
.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
}
}
@Composable
override fun SheetContent() {
ProfileNameSheet(
forGroup = requireArguments().getBoolean(FOR_GROUP_ARG, false)
)
}
}
@Composable
private fun ProfileNameSheet(forGroup: Boolean = true) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.fillMaxWidth()
.horizontalGutters()
) {
BottomSheets.Handle()
val (imageVector, placeholder, text) =
if (forGroup) {
Triple(
R.drawable.symbol_group_question_55,
stringResource(R.string.ConversationFragment_group_names),
stringResource(id = R.string.ProfileNameBottomSheet__group_names_on_signal, stringResource(R.string.ConversationFragment_group_names))
)
} else {
Triple(
R.drawable.symbol_person_question_40,
stringResource(R.string.ConversationFragment_profile_names),
stringResource(id = R.string.ProfileNameBottomSheet__profile_names_on_signal, stringResource(R.string.ConversationFragment_profile_names))
)
}
Icon(
imageVector = ImageVector.vectorResource(imageVector),
contentDescription = null,
modifier = Modifier
.padding(top = 38.dp, bottom = 24.dp)
.size(height = 56.dp, width = 72.dp)
)
val annotatedText = remember {
buildAnnotatedString {
val start = text.indexOf(placeholder)
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
append(text.substring(start, start + placeholder.length))
}
append(text.substring(start + placeholder.length))
}
}
Text(
text = annotatedText,
modifier = Modifier.padding(bottom = 20.dp)
)
if (forGroup) {
InfoRow(stringResource(R.string.ProfileNameBottomSheet__be_cautious_of_groups))
InfoRow(stringResource(R.string.ProfileNameBottomSheet__profile_names_in_groups))
} else {
InfoRow(stringResource(R.string.ProfileNameBottomSheet__profile_names_arent_verified))
InfoRow(stringResource(R.string.ProfileNameBottomSheet__be_cautious_of_accounts))
}
InfoRow(stringResource(R.string.ProfileNameBottomSheet__dont_share_personal))
Spacer(Modifier.size(55.dp))
}
}
@Composable
fun InfoRow(text: String) {
Row(
modifier = Modifier
.height(IntrinsicSize.Min)
.fillMaxWidth()
.padding(start = 16.dp, bottom = 12.dp)
) {
Box(
modifier = Modifier
.width(4.dp)
.padding(vertical = 5.dp)
.fillMaxHeight()
.clip(RoundedCornerShape(10.dp))
.background(color = MaterialTheme.colorScheme.outline.copy(.4f))
)
Text(
text = text,
modifier = Modifier.padding(start = 12.dp),
style = MaterialTheme.typography.bodyLarge
)
}
}
@SignalPreview
@Composable
private fun ProfileNameSheetPreview() {
Previews.BottomSheetPreview {
ProfileNameSheet()
}
}
app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsFragment.kt
+4
View File
@@ -386,6 +386,10 @@ class MessageDetailsFragment : FullScreenDialogFragment(), MessageDetailsAdapter
Log.w(TAG, "Not yet implemented!", Exception())
}
override fun onShowUnverifiedProfileSheet(forGroup: Boolean) {
Log.w(TAG, "Not yet implemented!", Exception())
}
interface Callback {
fun onMessageDetailsFragmentDismissed()
}
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
+7 -3
View File
@@ -47,7 +47,8 @@ import kotlin.Unit;
public final class MessageRequestRepository {
private static final String TAG = Log.tag(MessageRequestRepository.class);
private static final String TAG = Log.tag(MessageRequestRepository.class);
private static final int MIN_GROUPS_THRESHOLD = 2;
private final Context context;
private final Executor executor;
@@ -68,7 +69,7 @@ public final class MessageRequestRepository {
if (groupRecord.get().isV2Group()) {
List<Recipient> recipients = Recipient.resolvedList(groupRecord.get().getMembers());
for (Recipient recipient : recipients) {
if ((recipient.isProfileSharing() || recipient.getHasGroupsInCommon()) && !recipient.isSelf()) {
if ((recipient.isProfileSharing() || recipient.isSystemContact()) && !recipient.isSelf()) {
groupHasExistingContacts = true;
break;
}
@@ -139,8 +140,11 @@ public final class MessageRequestRepository {
} else {
Recipient.HiddenState hiddenState = RecipientUtil.getRecipientHiddenState(threadId);
boolean reportedAsSpam = reportedAsSpam(threadId);
List<String> sharedGroups = SignalDatabase.groups().getPushGroupNamesContainingMember(recipient.getId());
if (hiddenState == Recipient.HiddenState.NOT_HIDDEN) {
if (hiddenState == Recipient.HiddenState.NOT_HIDDEN && sharedGroups.size() < MIN_GROUPS_THRESHOLD) {
return new MessageRequestState(MessageRequestState.State.INDIVIDUAL_FEW_CONNECTIONS, reportedAsSpam);
} else if (hiddenState == Recipient.HiddenState.NOT_HIDDEN) {
return new MessageRequestState(MessageRequestState.State.INDIVIDUAL, reportedAsSpam);
} else if (hiddenState == Recipient.HiddenState.HIDDEN) {
return new MessageRequestState(MessageRequestState.State.NONE_HIDDEN, reportedAsSpam);
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestState.kt
+9
View File
@@ -19,6 +19,12 @@ data class MessageRequestState @JvmOverloads constructor(val state: State = Stat
val isBlocked: Boolean
get() = state == State.INDIVIDUAL_BLOCKED || state == State.BLOCKED_GROUP
val isFewConnectionsIndividual: Boolean
get() = state == State.INDIVIDUAL_FEW_CONNECTIONS
val isGroupV2Add: Boolean
get() = state == State.GROUP_V2_ADD
/**
* An enum representing the possible message request states a user can be in.
*/
@@ -50,6 +56,9 @@ data class MessageRequestState @JvmOverloads constructor(val state: State = Stat
/** A user is blocked */
INDIVIDUAL_BLOCKED,
/** A message request and secondary confirmation is needed for an individual with less than 2 common groups */
INDIVIDUAL_FEW_CONNECTIONS,
/** A message request is needed for an individual since they have been hidden */
INDIVIDUAL_HIDDEN
}
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.kt
+2 -1
View File
@@ -90,7 +90,8 @@ class MessageRequestsBottomView @JvmOverloads constructor(context: Context, attr
accept.setText(R.string.MessageRequestBottomView_accept)
}
MessageRequestState.State.INDIVIDUAL -> {
MessageRequestState.State.INDIVIDUAL,
MessageRequestState.State.INDIVIDUAL_FEW_CONNECTIONS -> {
question.text = HtmlCompat.fromHtml(
context.getString(
R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept,
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
+79 -26
View File
@@ -28,11 +28,11 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@@ -40,6 +40,7 @@ import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.os.bundleOf
import androidx.core.widget.TextViewCompat
import org.signal.core.ui.BottomSheets
import org.signal.core.ui.SignalPreview
import org.signal.core.ui.theme.SignalTheme
import org.signal.core.util.getParcelableCompat
import org.signal.core.util.isNotNullOrBlank
@@ -48,6 +49,7 @@ import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.avatar.AvatarImage
import org.thoughtcrime.securesms.components.emoji.EmojiTextView
import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
import org.thoughtcrime.securesms.conversation.v2.UnverifiedProfileNameBottomSheet
import org.thoughtcrime.securesms.nicknames.ViewNoteSheet
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
import org.thoughtcrime.securesms.recipients.Recipient
@@ -112,7 +114,8 @@ class AboutSheet : ComposeBottomSheetDialogFragment() {
),
onClickSignalConnections = this::openSignalConnectionsSheet,
onAvatarClicked = this::openProfilePhotoViewer,
onNoteClicked = this::openNoteSheet
onNoteClicked = this::openNoteSheet,
onUnverifiedProfileClicked = this::openUnverifiedProfileSheet
)
}
}
@@ -130,6 +133,11 @@ class AboutSheet : ComposeBottomSheetDialogFragment() {
dismiss()
ViewNoteSheet.create(recipientId).show(parentFragmentManager, null)
}
private fun openUnverifiedProfileSheet() {
dismiss()
UnverifiedProfileNameBottomSheet.show(fragmentManager = parentFragmentManager, forGroup = false)
}
}
private data class AboutModel(
@@ -153,7 +161,8 @@ private fun Content(
model: AboutModel,
onClickSignalConnections: () -> Unit,
onAvatarClicked: () -> Unit,
onNoteClicked: () -> Unit
onNoteClicked: () -> Unit,
onUnverifiedProfileClicked: () -> Unit = {}
) {
Box(
contentAlignment = Alignment.Center,
@@ -190,7 +199,7 @@ private fun Content(
)
AboutRow(
startIcon = painterResource(R.drawable.symbol_person_24),
startIcon = ImageVector.vectorResource(R.drawable.symbol_person_24),
text = if (!model.isSelf && model.displayName.isNotBlank() && model.profileName.isNotBlank() && model.displayName != model.profileName) {
stringResource(id = R.string.AboutSheet__user_set_display_name_and_profile_name, model.displayName, model.profileName)
} else {
@@ -203,7 +212,7 @@ private fun Content(
val textColor = LocalContentColor.current
AboutRow(
startIcon = painterResource(R.drawable.symbol_edit_24),
startIcon = ImageVector.vectorResource(R.drawable.symbol_edit_24),
text = {
Row {
AndroidView(factory = ::EmojiTextView) {
@@ -219,9 +228,19 @@ private fun Content(
)
}
if (!model.isSelf && !model.profileSharing && !model.systemContact) {
AboutRow(
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_person_question_24),
text = stringResource(id = R.string.AboutSheet__profile_names_are_not_verified),
endIcon = ImageVector.vectorResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
modifier = Modifier.align(alignment = Alignment.Start),
onClick = onUnverifiedProfileClicked
)
}
if (!model.isSelf && model.verified) {
AboutRow(
startIcon = painterResource(id = R.drawable.symbol_safety_number_24),
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_safety_number_24),
text = stringResource(id = R.string.AboutSheet__verified),
modifier = Modifier.align(alignment = Alignment.Start),
onClick = onClickSignalConnections
@@ -231,25 +250,30 @@ private fun Content(
if (!model.isSelf) {
if (model.profileSharing || model.systemContact) {
AboutRow(
startIcon = painterResource(id = R.drawable.symbol_connections_24),
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_connections_24),
text = stringResource(id = R.string.AboutSheet__signal_connection),
endIcon = painterResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
endIcon = ImageVector.vectorResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
modifier = Modifier.align(alignment = Alignment.Start),
onClick = onClickSignalConnections
)
} else if (model.groupsInCommon == 0) {
AboutRow(
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_chat_badge_24),
text = stringResource(id = R.string.AboutSheet__pending_message_request),
modifier = Modifier.align(alignment = Alignment.Start)
)
} else {
AboutRow(
startIcon = painterResource(id = R.drawable.symbol_chat_x),
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_chat_x),
text = stringResource(id = R.string.AboutSheet__no_direct_message, model.shortName),
modifier = Modifier.align(alignment = Alignment.Start),
onClick = onClickSignalConnections
modifier = Modifier.align(alignment = Alignment.Start)
)
}
}
if (!model.isSelf && model.systemContact) {
AboutRow(
startIcon = painterResource(id = R.drawable.symbol_person_circle_24),
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_person_circle_24),
text = stringResource(id = R.string.AboutSheet__s_is_in_your_system_contacts, model.shortName),
modifier = Modifier.fillMaxWidth()
)
@@ -257,7 +281,7 @@ private fun Content(
if (model.formattedE164.isNotNullOrBlank()) {
AboutRow(
startIcon = painterResource(R.drawable.symbol_phone_24),
startIcon = ImageVector.vectorResource(R.drawable.symbol_phone_24),
text = model.formattedE164,
modifier = Modifier.fillMaxWidth()
)
@@ -271,9 +295,9 @@ private fun Content(
}
val groupsInCommonIcon = if (!model.profileSharing && model.groupsInCommon == 0) {
painterResource(R.drawable.symbol_error_circle_24)
ImageVector.vectorResource(R.drawable.symbol_error_circle_24)
} else {
painterResource(R.drawable.symbol_group_24)
ImageVector.vectorResource(R.drawable.symbol_group_24)
}
AboutRow(
@@ -285,10 +309,10 @@ private fun Content(
if (model.note.isNotBlank()) {
AboutRow(
startIcon = painterResource(id = R.drawable.symbol_note_light_24),
startIcon = ImageVector.vectorResource(id = R.drawable.symbol_note_light_24),
text = model.note,
modifier = Modifier.fillMaxWidth(),
endIcon = painterResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
endIcon = ImageVector.vectorResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
onClick = onNoteClicked
)
}
@@ -299,10 +323,10 @@ private fun Content(
@Composable
private fun AboutRow(
startIcon: Painter,
startIcon: ImageVector,
text: String,
modifier: Modifier = Modifier,
endIcon: Painter? = null,
endIcon: ImageVector? = null,
onClick: (() -> Unit)? = null
) {
AboutRow(
@@ -324,10 +348,10 @@ private fun AboutRow(
@Composable
private fun AboutRow(
startIcon: Painter,
startIcon: ImageVector,
text: @Composable RowScope.() -> Unit,
modifier: Modifier = Modifier,
endIcon: Painter? = null,
endIcon: ImageVector? = null,
onClick: (() -> Unit)? = null
) {
val padHorizontal = if (onClick != null) 19.dp else 32.dp
@@ -350,7 +374,7 @@ private fun AboutRow(
}
) {
Icon(
painter = startIcon,
imageVector = startIcon,
contentDescription = null,
modifier = Modifier
.padding(end = 16.dp)
@@ -361,7 +385,7 @@ private fun AboutRow(
if (endIcon != null) {
Icon(
painter = endIcon,
imageVector = endIcon,
contentDescription = null,
tint = MaterialTheme.colorScheme.outline
)
@@ -549,6 +573,35 @@ private fun ContentPreviewNotAConnection() {
}
}
@SignalPreview
@Composable
private fun ContentPreviewNotAConnectionNoGroups() {
SignalTheme {
Surface {
Content(
model = AboutModel(
isSelf = false,
displayName = "Peter Parker",
shortName = "Peter",
profileName = "Peter Parker",
about = "(spoilers) dead",
verified = false,
hasAvatar = true,
recipientForAvatar = Recipient.UNKNOWN,
formattedE164 = null,
profileSharing = false,
systemContact = false,
groupsInCommon = 0,
note = ""
),
onClickSignalConnections = {},
onAvatarClicked = {},
onNoteClicked = {}
)
}
}
}
@Preview(name = "Light Theme", group = "about row", uiMode = Configuration.UI_MODE_NIGHT_NO)
@Preview(name = "Dark Theme", group = "about row", uiMode = Configuration.UI_MODE_NIGHT_YES)
@Composable
@@ -556,9 +609,9 @@ private fun AboutRowPreview() {
SignalTheme {
Surface {
AboutRow(
startIcon = painterResource(R.drawable.symbol_person_24),
startIcon = ImageVector.vectorResource(R.drawable.symbol_person_24),
text = "Maya Johnson",
endIcon = painterResource(id = R.drawable.symbol_chevron_right_compact_bold_16)
endIcon = ImageVector.vectorResource(id = R.drawable.symbol_chevron_right_compact_bold_16)
)
}
}
app/src/main/java/org/thoughtcrime/securesms/util/SpanUtil.java
+19 -5
View File
@@ -186,6 +186,10 @@ public final class SpanUtil {
return spannable;
}
public static Spannable clickSubstring(@NonNull Context context, @StringRes int mainString, @StringRes int clickableString, @NonNull View.OnClickListener clickListener) {
return clickSubstring(context, mainString, clickableString, clickListener, false, R.color.signal_accent_primary);
}
/**
* Takes two resources:
* - one resource that has a single string placeholder
@@ -198,8 +202,10 @@ public final class SpanUtil {
*
* -> This is a clickable string.
* (where "clickable" is blue and will trigger the provided click listener when clicked)
*
* Can optionally configure the color & if it's underlined. Default is blue with no underline.
*/
public static Spannable clickSubstring(@NonNull Context context, @StringRes int mainString, @StringRes int clickableString, @NonNull View.OnClickListener clickListener) {
public static Spannable clickSubstring(@NonNull Context context, @StringRes int mainString, @StringRes int clickableString, @NonNull View.OnClickListener clickListener, boolean shouldUnderline, int linkColor) {
String main = context.getString(mainString, SPAN_PLACE_HOLDER);
String clickable = context.getString(clickableString);
@@ -217,8 +223,8 @@ public final class SpanUtil {
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
ds.setColor(context.getResources().getColor(R.color.signal_accent_primary));
ds.setUnderlineText(shouldUnderline);
ds.setColor(context.getResources().getColor(linkColor));
}
}, start, start + clickable.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
@@ -238,13 +244,21 @@ public final class SpanUtil {
public static CharSequence clickSubstring(@NonNull CharSequence fullString,
@NonNull CharSequence substring,
@NonNull View.OnClickListener clickListener,
@ColorInt int linkColor)
@ColorInt int linkColor) {
return clickSubstring(fullString, substring, clickListener, linkColor, false);
}
public static CharSequence clickSubstring(@NonNull CharSequence fullString,
@NonNull CharSequence substring,
@NonNull View.OnClickListener clickListener,
@ColorInt int linkColor,
boolean shouldUnderline)
{
ClickableSpan clickable = new ClickableSpan() {
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
ds.setUnderlineText(shouldUnderline);
ds.setColor(linkColor);
}
app/src/main/res/drawable-xxhdpi/safety_tip1.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

app/src/main/res/drawable-xxhdpi/safety_tip2.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

app/src/main/res/drawable-xxhdpi/safety_tip3.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

app/src/main/res/drawable-xxhdpi/safety_tip4.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

app/src/main/res/drawable/release_header_background.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="188dp"
android:height="123dp"
android:viewportWidth="288"
android:viewportHeight="123">
<path
android:pathData="M18,0L270,0A18,18 0,0 1,288 18L288,105A18,18 0,0 1,270 123L18,123A18,18 0,0 1,0 105L0,18A18,18 0,0 1,18 0z"
android:fillColor="#2934FD"
android:fillAlpha="0.08"/>
</vector>
app/src/main/res/drawable/safety_tip0.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

app/src/main/res/drawable/safety_tip1.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

app/src/main/res/drawable/safety_tip2.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

app/src/main/res/drawable/safety_tip3.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

app/src/main/res/drawable/safety_tip4.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

app/src/main/res/drawable/symbol_bell_20.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M10,1.146C6.816,1.146 4.112,3.594 3.993,7.011C3.887,10.042 3.276,11.126 2.816,11.669C2.693,11.814 2.568,11.936 2.435,12.059C2.415,12.078 2.394,12.097 2.373,12.117C2.261,12.22 2.128,12.343 2.013,12.469C1.689,12.825 1.458,13.26 1.458,13.918C1.458,15.021 2.339,15.938 3.454,15.938H6.423C6.749,17.628 8.195,18.854 10,18.854C11.805,18.854 13.251,17.628 13.577,15.938H16.546C17.66,15.938 18.542,15.021 18.542,13.918C18.542,13.26 18.311,12.825 17.987,12.469C17.872,12.343 17.739,12.22 17.627,12.117C17.606,12.097 17.585,12.078 17.565,12.059C17.432,11.936 17.307,11.814 17.184,11.669C16.724,11.126 16.113,10.042 16.007,7.011C15.888,3.594 13.184,1.146 10,1.146ZM5.45,7.062C5.542,4.446 7.586,2.604 10,2.604C12.414,2.604 14.458,4.446 14.55,7.062C14.662,10.268 15.318,11.723 16.071,12.611C16.251,12.824 16.426,12.991 16.572,13.127C16.601,13.154 16.628,13.179 16.653,13.202C16.763,13.305 16.84,13.375 16.908,13.45C17.025,13.579 17.083,13.675 17.083,13.918C17.083,14.241 16.83,14.479 16.546,14.479H3.454C3.17,14.479 2.917,14.241 2.917,13.918C2.917,13.675 2.975,13.579 3.092,13.45C3.16,13.375 3.237,13.305 3.347,13.202C3.372,13.179 3.399,13.154 3.428,13.127C3.574,12.991 3.749,12.824 3.929,12.611C4.681,11.723 5.338,10.268 5.45,7.062ZM12.073,15.938H7.927C8.213,16.806 9.008,17.396 10,17.396C10.992,17.396 11.787,16.806 12.073,15.938Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
</vector>
app/src/main/res/drawable/symbol_error_triangle_filled_16.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:pathData="M6.36,1.759C7.094,0.506 8.906,0.506 9.64,1.759L15.024,10.957C15.765,12.223 14.851,13.817 13.384,13.817H2.616C1.148,13.817 0.235,12.223 0.976,10.957L6.36,1.759ZM8,4.225C8.504,4.225 8.899,4.657 8.855,5.158L8.534,8.786C8.51,9.063 8.278,9.275 8,9.275C7.722,9.275 7.49,9.063 7.466,8.786L7.146,5.158C7.101,4.657 7.496,4.225 8,4.225ZM8,10.1C7.503,10.1 7.1,10.503 7.1,11C7.1,11.497 7.503,11.9 8,11.9C8.497,11.9 8.9,11.497 8.9,11C8.9,10.503 8.497,10.1 8,10.1Z"
android:fillColor="#A88746"
android:fillType="evenOdd"/>
</vector>
app/src/main/res/drawable/symbol_group_question_20.xml
+15
View File
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="20dp" android:viewportHeight="16" android:viewportWidth="22" android:width="27.5dp">
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M6.895,9.069C6.313,8.831 5.669,8.7 5,8.7C2.558,8.7 0.45,10.447 0.45,12.75C0.45,13.224 0.845,13.55 1.26,13.55H5.314C5.272,13.292 5.25,13.024 5.25,12.75C5.25,12.649 5.253,12.549 5.259,12.45H1.568C1.742,11.014 3.151,9.8 5,9.8C5.396,9.8 5.771,9.856 6.119,9.957C6.343,9.633 6.604,9.336 6.895,9.069Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M7.568,12.45H14.432C14.258,11.014 12.849,9.8 11,9.8C9.151,9.8 7.742,11.014 7.568,12.45ZM6.45,12.75C6.45,10.447 8.558,8.7 11,8.7C13.442,8.7 15.55,10.447 15.55,12.75C15.55,13.224 15.155,13.55 14.74,13.55H7.26C6.845,13.55 6.45,13.224 6.45,12.75Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M11,3.55C10.412,3.55 9.8,4.108 9.8,5.059C9.8,5.527 9.957,5.953 10.194,6.254C10.431,6.554 10.721,6.7 11,6.7C11.279,6.7 11.569,6.554 11.806,6.254C12.043,5.953 12.2,5.527 12.2,5.059C12.2,4.108 11.588,3.55 11,3.55ZM8.7,5.059C8.7,3.662 9.655,2.45 11,2.45C12.345,2.45 13.3,3.662 13.3,5.059C13.3,5.764 13.066,6.433 12.669,6.935C12.273,7.437 11.688,7.8 11,7.8C10.312,7.8 9.727,7.437 9.331,6.935C8.935,6.433 8.7,5.764 8.7,5.059Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M5,3.55C4.412,3.55 3.8,4.108 3.8,5.059C3.8,5.527 3.957,5.953 4.194,6.254C4.431,6.554 4.721,6.7 5,6.7C5.279,6.7 5.569,6.554 5.806,6.254C6.043,5.953 6.2,5.527 6.2,5.059C6.2,4.108 5.588,3.55 5,3.55ZM2.7,5.059C2.7,3.662 3.655,2.45 5,2.45C6.345,2.45 7.3,3.662 7.3,5.059C7.3,5.764 7.066,6.433 6.669,6.935C6.273,7.437 5.688,7.8 5,7.8C4.312,7.8 3.727,7.437 3.331,6.935C2.935,6.433 2.7,5.764 2.7,5.059Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M17.05,4.069C17.442,3.813 17.937,3.7 18.5,3.7C19.17,3.7 19.743,3.874 20.154,4.206C20.571,4.543 20.8,5.024 20.8,5.58C20.8,6.031 20.671,6.371 20.472,6.649C20.293,6.898 20.061,7.09 19.86,7.257C19.847,7.267 19.834,7.278 19.822,7.288C19.603,7.47 19.418,7.63 19.283,7.835C19.153,8.03 19.061,8.28 19.061,8.649V8.739C19.061,9.049 18.81,9.3 18.5,9.3C18.19,9.3 17.939,9.049 17.939,8.739V8.649C17.939,8.142 18.061,7.752 18.255,7.434C18.444,7.123 18.694,6.898 18.917,6.712C18.955,6.68 18.993,6.649 19.029,6.619C19.437,6.282 19.678,6.082 19.678,5.667C19.678,5.309 19.553,5.069 19.365,4.912C19.17,4.749 18.876,4.651 18.5,4.651C18.135,4.651 17.879,4.731 17.705,4.855C17.535,4.977 17.414,5.159 17.352,5.422C17.296,5.662 17.084,5.88 16.792,5.88C16.469,5.88 16.171,5.586 16.263,5.22C16.389,4.721 16.652,4.33 17.05,4.069Z"/>
<path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M17.875,11C17.875,10.655 18.155,10.375 18.5,10.375C18.845,10.375 19.125,10.655 19.125,11C19.125,11.345 18.845,11.625 18.5,11.625C18.155,11.625 17.875,11.345 17.875,11Z"/>
</vector>
app/src/main/res/drawable/symbol_group_question_55.xml
+30
View File
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="55dp"
android:height="40dp"
android:viewportWidth="55"
android:viewportHeight="40">
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M18.24 22.69c-1.68-0.92-3.66-1.44-5.74-1.44-5.95 0-11 4.24-11 9.75 0 0.88 0.73 1.5 1.52 1.5h11.6c-0.08-0.53-0.12-1.06-0.12-1.61V30.5H3.53c0.3-3.94 4.09-7.25 8.98-7.25 1.59 0 3.06 0.35 4.33 0.95 0.42-0.54 0.9-1.05 1.41-1.51Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M18.52 30.5h17.96c-0.3-3.94-4.09-7.25-8.98-7.25-4.9 0-8.68 3.3-8.98 7.25ZM16.5 31c0-5.5 5.05-9.75 11-9.75s11 4.24 11 9.75c0 0.88-0.73 1.5-1.52 1.5H18.02c-0.8 0-1.52-0.62-1.52-1.5Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M27.5 7.75c-1.8 0-3.5 1.69-3.5 4.33 0 1.3 0.43 2.5 1.1 3.36 0.68 0.85 1.53 1.31 2.4 1.31 0.87 0 1.72-0.46 2.4-1.31 0.67-0.86 1.1-2.06 1.1-3.36 0-2.64-1.7-4.33-3.5-4.33ZM22 12.08c0-3.44 2.32-6.33 5.5-6.33s5.5 2.9 5.5 6.33c0 1.73-0.57 3.37-1.53 4.59-0.96 1.22-2.35 2.08-3.97 2.08s-3.01-0.86-3.97-2.08c-0.96-1.22-1.53-2.86-1.53-4.6Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M12.5 7.75c-1.8 0-3.5 1.69-3.5 4.33 0 1.3 0.43 2.5 1.1 3.36 0.68 0.85 1.53 1.31 2.4 1.31 0.87 0 1.72-0.46 2.4-1.31 0.67-0.86 1.1-2.06 1.1-3.36 0-2.64-1.7-4.33-3.5-4.33ZM7 12.08c0-3.44 2.32-6.33 5.5-6.33s5.5 2.9 5.5 6.33c0 1.73-0.57 3.37-1.53 4.59-0.96 1.22-2.35 2.08-3.97 2.08s-3.01-0.86-3.97-2.08C7.57 15.45 7 13.81 7 12.07Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M42.94 11.39c0.84-0.51 1.9-0.75 3.14-0.75 1.49 0 2.73 0.37 3.6 1.04 0.9 0.67 1.39 1.65 1.39 2.79 0 1.83-1.1 2.69-2.06 3.44l-0.09 0.07c-0.5 0.4-0.95 0.76-1.29 1.24-0.32 0.47-0.55 1.05-0.55 1.9v0.16c0 0.55-0.45 1-1 1s-1-0.45-1-1V21.1c0-1.05 0.28-1.86 0.7-2.5 0.4-0.64 0.95-1.1 1.45-1.5l0.3-0.24c0.4-0.3 0.74-0.58 1.02-0.89 0.32-0.36 0.52-0.77 0.52-1.33 0-0.83-0.31-1.42-0.81-1.82-0.51-0.4-1.26-0.63-2.18-0.63-0.87 0-1.52 0.18-1.99 0.5-0.45 0.3-0.76 0.74-0.91 1.35-0.11 0.43-0.5 0.81-1 0.81-0.59 0-1.1-0.52-0.93-1.16 0.28-1.02 0.85-1.8 1.7-2.31Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M44.83 26.88c0-0.7 0.56-1.26 1.25-1.26 0.7 0 1.25 0.56 1.25 1.25 0 0.7-0.56 1.26-1.25 1.26s-1.25-0.56-1.25-1.25Z"/>
</vector>
app/src/main/res/drawable/symbol_official_20.xml
+24
View File
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<group>
<clip-path
android:pathData="M0,0h20v20h-20z"/>
<path
android:pathData="M8.22,2.393C8.85,1.614 10.039,1.614 10.669,2.393L11.365,3.255C11.561,3.497 11.881,3.601 12.182,3.52L13.252,3.233C14.22,2.972 15.181,3.671 15.233,4.672L15.29,5.778C15.306,6.089 15.503,6.361 15.794,6.473L16.829,6.869C17.765,7.227 18.132,8.358 17.586,9.198L16.981,10.127C16.812,10.387 16.812,10.724 16.981,10.985L17.586,11.914C18.132,12.754 17.765,13.884 16.829,14.242L15.794,14.639C15.503,14.75 15.306,15.022 15.29,15.333L15.233,16.44C15.181,17.441 14.22,18.139 13.252,17.879L12.182,17.591C11.881,17.51 11.561,17.614 11.365,17.856L10.669,18.718C10.039,19.498 8.85,19.498 8.22,18.718L7.524,17.856C7.328,17.614 7.008,17.51 6.707,17.591L5.637,17.879C4.669,18.139 3.708,17.441 3.656,16.44L3.599,15.333C3.583,15.022 3.385,14.75 3.095,14.639L2.06,14.242C1.124,13.884 0.757,12.754 1.303,11.914L1.908,10.985C2.077,10.724 2.077,10.387 1.908,10.127L1.303,9.198C0.757,8.358 1.124,7.227 2.06,6.869L3.095,6.473C3.385,6.361 3.583,6.089 3.599,5.778L3.656,4.672C3.708,3.671 4.669,2.972 5.637,3.233L6.707,3.52C7.008,3.601 7.328,3.497 7.524,3.255L8.22,2.393Z"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#000000"/>
<group>
<clip-path
android:pathData="M13.177,7.832C13.378,7.509 13.28,7.084 12.958,6.883C12.635,6.681 12.21,6.779 12.009,7.102L8.588,12.574L6.834,10.381C6.597,10.084 6.163,10.036 5.866,10.274C5.569,10.511 5.521,10.945 5.759,11.242L8.12,14.193C8.259,14.367 8.475,14.463 8.697,14.45C8.92,14.437 9.123,14.317 9.241,14.128L13.177,7.832Z"
android:fillType="evenOdd"/>
<path
android:pathData="M13.177,7.832L14.449,8.627V8.627L13.177,7.832ZM12.009,7.102L13.281,7.897L13.281,7.897L12.009,7.102ZM8.588,12.574L7.417,13.511L8.739,15.163L9.86,13.369L8.588,12.574ZM6.834,10.381L5.663,11.318L5.663,11.318L6.834,10.381ZM5.866,10.274L6.803,11.445L6.803,11.445L5.866,10.274ZM5.759,11.242L6.93,10.305L6.93,10.305L5.759,11.242ZM8.12,14.193L9.291,13.256L9.291,13.256L8.12,14.193ZM8.697,14.45L8.61,12.953L8.61,12.953L8.697,14.45ZM9.241,14.128L10.513,14.923L10.513,14.923L9.241,14.128ZM12.163,8.155C11.783,7.917 11.667,7.417 11.905,7.037L14.449,8.627C15.089,7.602 14.778,6.251 13.753,5.611L12.163,8.155ZM13.281,7.897C13.043,8.277 12.543,8.392 12.163,8.155L13.753,5.611C12.728,4.97 11.377,5.282 10.737,6.307L13.281,7.897ZM9.86,13.369L13.281,7.897L10.737,6.307L7.316,11.779L9.86,13.369ZM5.663,11.318L7.417,13.511L9.76,11.637L8.005,9.444L5.663,11.318ZM6.803,11.445C6.453,11.725 5.943,11.668 5.663,11.318L8.005,9.444C7.25,8.5 5.873,8.347 4.929,9.102L6.803,11.445ZM6.93,10.305C7.21,10.655 7.153,11.165 6.803,11.445L4.929,9.102C3.985,9.858 3.832,11.235 4.587,12.179L6.93,10.305ZM9.291,13.256L6.93,10.305L4.587,12.179L6.948,15.13L9.291,13.256ZM8.61,12.953C8.873,12.938 9.127,13.051 9.291,13.256L6.948,15.13C7.392,15.684 8.076,15.989 8.784,15.948L8.61,12.953ZM7.969,13.333C8.109,13.11 8.348,12.968 8.61,12.953L8.784,15.948C9.493,15.907 10.137,15.525 10.513,14.923L7.969,13.333ZM11.905,7.037L7.969,13.333L10.513,14.923L14.449,8.627L11.905,7.037Z"
android:fillColor="#000000"/>
</group>
</group>
</vector>
app/src/main/res/drawable/symbol_person_question_16.xml
+22
View File
@@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M5 3.4c-0.6 0-1.23 0.56-1.23 1.53C3.77 5.96 4.45 6.6 5 6.6c0.55 0 1.22-0.64 1.22-1.67C6.22 3.96 5.6 3.4 5 3.4ZM2.47 4.93C2.47 3.42 3.52 2.1 5 2.1c1.48 0 2.52 1.32 2.52 2.83 0 1.46-1 2.97-2.52 2.97S2.47 6.39 2.47 4.93Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M1.44 12.35h7.12C8.32 11.05 6.92 9.9 5 9.9c-1.92 0-3.32 1.14-3.56 2.45Zm-1.34 0.4c0-2.4 2.32-4.15 4.9-4.15 2.58 0 4.9 1.75 4.9 4.15 0 0.54-0.45 0.9-0.91 0.9H1c-0.46 0-0.91-0.36-0.91-0.9Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M11 3.99c0.4-0.27 0.92-0.39 1.5-0.39 0.69 0 1.28 0.18 1.72 0.53C14.66 4.48 14.9 5 14.9 5.58c0 0.47-0.14 0.83-0.35 1.13-0.18 0.26-0.43 0.46-0.62 0.62l-0.04 0.03c-0.22 0.19-0.4 0.34-0.52 0.53-0.12 0.18-0.2 0.4-0.2 0.76v0.09c0 0.36-0.3 0.66-0.67 0.66-0.37 0-0.66-0.3-0.66-0.66v-0.1c0-0.52 0.13-0.92 0.33-1.26 0.2-0.32 0.46-0.56 0.68-0.74l0.1-0.09c0.43-0.35 0.63-0.52 0.63-0.88 0-0.33-0.12-0.55-0.28-0.68-0.17-0.14-0.44-0.24-0.8-0.24-0.35 0-0.58 0.08-0.74 0.19-0.14 0.1-0.25 0.26-0.31 0.5-0.07 0.28-0.31 0.54-0.66 0.54-0.38 0-0.73-0.35-0.62-0.78 0.13-0.53 0.4-0.94 0.83-1.21Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M11.75 11c0-0.41 0.34-0.75 0.75-0.75s0.75 0.34 0.75 0.75-0.34 0.75-0.75 0.75-0.75-0.34-0.75-0.75Z"/>
</vector>
app/src/main/res/drawable/symbol_person_question_24.xml
+22
View File
@@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M7.75 4.88c-0.88 0-1.88 0.9-1.88 2.51 0 0.79 0.26 1.5 0.63 2 0.38 0.5 0.83 0.73 1.25 0.73 0.42 0 0.87-0.22 1.25-0.73 0.37-0.5 0.63-1.21 0.63-2 0-1.62-1-2.51-1.88-2.51ZM4.12 7.38c0-2.25 1.47-4.26 3.63-4.26s3.63 2.01 3.63 4.26c0 1.15-0.37 2.24-0.99 3.06-0.61 0.82-1.54 1.43-2.64 1.43s-2.03-0.61-2.64-1.43C4.49 9.63 4.12 8.54 4.12 7.39Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M2.03 19.13h11.35c-0.3-2.17-2.58-4.06-5.67-4.06-3.1 0-5.37 1.9-5.68 4.05ZM0.25 19.6c0-3.63 3.5-6.3 7.46-6.3 3.95 0 7.45 2.67 7.45 6.3 0 0.75-0.62 1.27-1.27 1.27H1.53c-0.65 0-1.28-0.52-1.28-1.27Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M16.73 6.6c0.55-0.33 1.24-0.47 2.02-0.47 0.93 0 1.73 0.22 2.32 0.67C21.67 7.25 22 7.9 22 8.68c0 1.23-0.75 1.81-1.32 2.26L20.6 11c-0.3 0.24-0.54 0.44-0.72 0.7-0.16 0.23-0.28 0.53-0.28 0.98v0.1c0 0.47-0.39 0.86-0.86 0.86s-0.86-0.39-0.86-0.86v-0.1c0-0.68 0.18-1.22 0.45-1.65 0.28-0.42 0.63-0.72 0.94-0.96l0.19-0.15c0.23-0.18 0.42-0.33 0.56-0.5 0.16-0.18 0.25-0.36 0.25-0.62 0-0.42-0.15-0.7-0.39-0.89-0.24-0.2-0.63-0.32-1.14-0.32-0.5 0-0.83 0.1-1.05 0.25-0.21 0.14-0.36 0.36-0.44 0.66-0.1 0.36-0.4 0.69-0.86 0.69-0.49 0-0.96-0.46-0.8-1.03 0.18-0.67 0.57-1.2 1.13-1.54Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M17.75 16.13c0-0.56 0.45-1 1-1s1 0.44 1 1c0 0.55-0.45 1-1 1s-1-0.45-1-1Z"/>
</vector>
app/src/main/res/drawable/symbol_person_question_40.xml
+21
View File
@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M12.92 7.67c-1.8 0-3.59 1.78-3.59 4.65 0 1.4 0.45 2.7 1.14 3.61 0.7 0.92 1.57 1.4 2.45 1.4 0.87 0 1.75-0.48 2.44-1.4 0.69-0.92 1.14-2.2 1.14-3.61 0-2.87-1.78-4.65-3.58-4.65Zm-5.59 4.65c0-3.58 2.33-6.65 5.59-6.65s5.58 3.07 5.58 6.65c0 1.81-0.58 3.53-1.54 4.82-0.97 1.28-2.39 2.2-4.04 2.2-1.66 0-3.08-0.92-4.04-2.2-0.97-1.29-1.55-3-1.55-4.82Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M2.88 32.33h19.93c-0.23-4.11-4.43-7.68-9.96-7.68-5.54 0-9.74 3.57-9.97 7.68Zm-2 0.36c0-5.72 5.54-10.04 11.97-10.04 6.42 0 11.97 4.32 11.97 10.04 0 0.97-0.82 1.64-1.68 1.64H2.54c-0.85 0-1.67-0.67-1.67-1.64Z"/>
<path
android:fillColor="#FF000000"
android:fillType="evenOdd"
android:pathData="M28.11 11.39c0.83-0.51 1.9-0.75 3.14-0.75 1.48 0 2.72 0.37 3.6 1.04 0.89 0.67 1.38 1.65 1.38 2.79 0 1.83-1.09 2.69-2.05 3.44l-0.1 0.07c-0.5 0.4-0.95 0.76-1.28 1.24-0.33 0.47-0.55 1.05-0.55 1.9v0.16c0 0.55-0.45 1-1 1s-1-0.45-1-1V21.1c0-1.05 0.27-1.86 0.69-2.5 0.41-0.64 0.95-1.1 1.46-1.5l0.3-0.24c0.4-0.3 0.74-0.58 1.01-0.89 0.33-0.36 0.53-0.77 0.53-1.33 0-0.83-0.31-1.42-0.81-1.82-0.52-0.4-1.27-0.63-2.18-0.63-0.88 0-1.53 0.18-1.99 0.5-0.45 0.3-0.76 0.74-0.92 1.35-0.1 0.43-0.49 0.81-1 0.81-0.58 0-1.1-0.52-0.93-1.16 0.29-1.02 0.86-1.8 1.7-2.31Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M32.5 26.88c0 0.69-0.56 1.25-1.25 1.25S30 27.57 30 26.88c0-0.7 0.56-1.25 1.25-1.25s1.25 0.55 1.25 1.25Z"/>
</vector>
app/src/main/res/layout/conversation_header_view.xml
+79 -6
View File
@@ -92,9 +92,50 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@color/signal_dark_colorTransparentInverse2"
app:layout_constraintBottom_toTopOf="@id/message_request_info"
app:layout_constraintBottom_toTopOf="@id/message_request_barrier"
app:layout_constraintTop_toBottomOf="@id/message_request_about" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/message_request_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="top"
app:constraint_referenced_ids="message_request_info,release_header_container" />
<LinearLayout
android:id="@+id/release_header_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:orientation="vertical"
android:background="@drawable/release_header_background"
android:minWidth="288dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/message_request_divider"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/release_header_description_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ReleaseNotes__this_is_official_chat_period"
style="@style/Signal.Text.BodyMedium"
android:textAlignment="center" />
<TextView
android:id="@+id/release_header_description_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ReleaseNotes__keep_up_to_date_period"
style="@style/Signal.Text.BodyMedium"
android:textAlignment="center"
android:layout_marginTop="8dp" />
</LinearLayout>
<View
android:id="@+id/message_request_info_outline"
android:layout_width="0dp"
@@ -109,7 +150,7 @@
android:id="@+id/message_request_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="20dp"
android:padding="16dp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -118,6 +159,38 @@
app:layout_constraintWidth_max="308dp"
app:layout_constraintWidth_min="256dp">
<TextView
android:id="@+id/message_request_review_carefully"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ConversationFragment_review_carefully"
android:textColor="#A88746"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:textStyle="bold"
android:visibility="gone"
app:drawableStartCompat="@drawable/symbol_error_triangle_filled_16"
android:drawablePadding="6dp"
android:layout_marginBottom="8dp"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/message_request_profile_name_unverified" />
<TextView
android:id="@+id/message_request_profile_name_unverified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:text="@string/ConversationFragment_profile_names_not_verified"
android:visibility="gone"
android:layout_marginBottom="8dp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/message_request_review_carefully"
app:layout_constraintBottom_toTopOf="@id/message_request_subtitle" />
<TextView
android:id="@+id/message_request_subtitle"
android:layout_width="wrap_content"
@@ -125,10 +198,12 @@
android:gravity="center"
android:textAppearance="@style/Signal.Text.BodyMedium"
app:layout_constrainedWidth="true"
android:layout_marginBottom="8dp"
app:layout_goneMarginBottom="0dp"
app:layout_constraintBottom_toTopOf="@id/message_request_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@id/message_request_profile_name_unverified"
tools:drawableStartCompat="@drawable/symbol_person_24"
tools:text="\@caycepollard" />
@@ -136,7 +211,6 @@
android:id="@+id/message_request_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:visibility="gone"
@@ -145,7 +219,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/message_request_subtitle"
app:layout_goneMarginTop="0dp"
tools:text="Member of NYC Rock Climbers, Dinner Party and Friends"
tools:visibility="visible" />
@@ -154,7 +227,7 @@
style="@style/Widget.Signal.Button.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginTop="16dp"
android:textColor="@color/signal_colorOnSurface"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app/src/main/res/values/strings.xml
+54 -2
View File
@@ -670,6 +670,14 @@
<string name="ConversationFragment_reported_as_spam_and_blocked">Reported as spam and blocked</string>
<!-- Dialog message shown after accepting a message request and tapping on options from the conversation event -->
<string name="ConversationFragment_you_accepted_a_message_request_from_s">You accepted a message request from %1$s. If this was a mistake, you can choose an action below.</string>
<!-- Text shown in conversation header when in a message request state and to carefully review the user -->
<string name="ConversationFragment_review_carefully">Review carefully</string>
<!-- Text shown in conversation header when in a message request state that profile and group names are not verified. Placeholder will either be 'Profile names' or 'Group names' -->
<string name="ConversationFragment_profile_names_not_verified">%s are not verified</string>
<!-- Placeholder text shown in conversation header that when clicked will open a dialog about profile names -->
<string name="ConversationFragment_profile_names">Profile names</string>
<!-- Placeholder text shown in conversation header that when clicked will open a dialog about group names -->
<string name="ConversationFragment_group_names">Group names</string>
<!-- Title of Safety Tips bottom sheet dialog -->
<string name="SafetyTips_title">Safety Tips</string>
@@ -681,6 +689,10 @@
<string name="SafetyTips_previous_tip">Previous tip</string>
<!-- Button text to move to the next tip -->
<string name="SafetyTips_next_tip">Next tip</string>
<!-- Title of tip 0 -->
<string name="SafetyTips_tip0_title">Fake names and accounts</string>
<!-- Message of tip 0 -->
<string name="SafetyTips_tip0_message">Signal will never contact you for your registration code or PIN. Be cautious of requests that impersonate others. Profile names are chosen by their account holder and aren\'t verified.</string>
<!-- Title of tip 1 -->
<string name="SafetyTips_tip1_title">Crypto or money scams</string>
<!-- Message of tip 1 -->
@@ -698,6 +710,21 @@
<!-- Message of tip 4 -->
<string name="SafetyTips_tip4_message">Be careful of businesses or government agencies contacting you. Messages involving tax agencies, couriers, and more can be spam.</string>
<!-- Bottom sheet text explaining that profile names are chosen by the account holder. Placeholder will be 'Profile names' -->
<string name="ProfileNameBottomSheet__profile_names_on_signal">%s on Signal are chosen by their account holder.</string>
<!-- Bottom sheet text explaining that profile names are not verified. -->
<string name="ProfileNameBottomSheet__profile_names_arent_verified">Profile names aren’t verified</string>
<!-- Bottom sheet text explaining that accounts can impersonate other people and to be cautious -->
<string name="ProfileNameBottomSheet__be_cautious_of_accounts">Be cautious of accounts that impersonate others</string>
<!-- Bottom sheet text explaining that personal information should not be shared with strangers -->
<string name="ProfileNameBottomSheet__dont_share_personal">Don’t share personal information with people you don’t know</string>
<!-- Bottom sheet text explaining that group names are chosen by the group members. Placeholder will be 'Group names' -->
<string name="ProfileNameBottomSheet__group_names_on_signal">%1$s are chosen by members of the group.</string>
<!-- Bottom sheet text explaining that groups can impersonate organizations and to be cautious -->
<string name="ProfileNameBottomSheet__be_cautious_of_groups">Be cautious of groups that impersonate organizations and businesses</string>
<!-- Bottom sheet text explaining that profile names of group members are not verified -->
<string name="ProfileNameBottomSheet__profile_names_in_groups">Profile names of members in groups are not verified</string>
<!-- Label for a button displayed in conversation list to clear the chat filter -->
<string name="ConversationListFragment__clear_filter">Clear filter</string>
<!-- Notice on chat list when no unread chats are available, centered on display -->
@@ -2104,6 +2131,16 @@
</plurals>
<!-- Button label to report spam for a conversation when in a message request state -->
<string name="MessageRequestBottomView_report">Report…</string>
<!-- Alert dialog title to accept a message request -->
<string name="MessageRequestBottomView_accept_request">Accept request?</string>
<!-- Alert dialog body to review the message request carefully -->
<string name="MessageRequestBottomView_review_requests_carefully">Review requests carefully. Profile names are chosen by their account owner and aren’t verified.</string>
<!-- Alert dialog title to accept a message request to join a group -->
<string name="MessageRequestBottomView_join_group">Join group?</string>
<!-- Alert dialog body to review the message request for a group carefully -->
<string name="MessageRequestBottomView_review_requests_carefully_groups">Review requests carefully. Group names are chosen by members of the group and aren’t verified.</string>
<!-- Button text to join a group -->
<string name="MessageRequestBottomView_join">Join</string>
<!-- PassphraseChangeActivity -->
<string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passphrases don\'t match!</string>
@@ -2487,12 +2524,16 @@
<string name="AboutSheet__signal_connection">Signal connection</string>
<!-- Displayed in a sheet row describing that the user has marked this contact as \'verified\' from within the app -->
<string name="AboutSheet__verified">Verified</string>
<!-- Displayed in a sheet row that tells users that profile names are not verified -->
<string name="AboutSheet__profile_names_are_not_verified">Profile names are not verified</string>
<!-- Displayed in a sheet row describing that the user is in a message request state with the person -->
<string name="AboutSheet__pending_message_request">Pending message request</string>
<!-- Displayed in bottom sheet describing that the user has no direct messages with this person. The placeholder is a person\'s name. -->
<string name="AboutSheet__no_direct_message">No direct messages with %1$s</string>
<!-- Explains that the given user (placeholder is short name) is in the users system contact -->
<string name="AboutSheet__s_is_in_your_system_contacts">%1$s is in your phone contacts</string>
<!-- Notice in a row when user has no groups in common -->
<string name="AboutSheet__you_have_no_groups_in_common">You have no groups in common</string>
<string name="AboutSheet__you_have_no_groups_in_common">No groups in common</string>
<!-- Notice when a user is not a connection to review requests carefully -->
<string name="AboutSheet__review_requests_carefully">Review requests carefully</string>
<!-- Text used when user has groups in common. Placeholder is the count -->
@@ -3273,7 +3314,8 @@
<string name="ConversationUpdateItem_update_contact">Update contact</string>
<!-- Update item button text to show to block a recipient from requesting to join via group link -->
<string name="ConversationUpdateItem_block_request">Block request</string>
<string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">No groups in common. Review requests carefully.</string>
<!-- Text shown in conversation header that the account messaging the user does not have any groups in common with them -->
<string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">No groups in common</string>
<string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">No contacts in this group. Review requests carefully.</string>
<string name="ConversationUpdateItem_view">View</string>
<string name="ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them">The disappearing message time will be set to %1$s when you message them.</string>
@@ -6230,6 +6272,16 @@
<!-- Description shown for the Signal Release Notes channel -->
<string name="ReleaseNotes__signal_release_notes_and_news">Signal Release Notes &amp; News</string>
<!-- Text description shown for the Signal Release Notes channel explaining that it is the only chat from Signal -->
<string name="ReleaseNotes__this_is_official_chat_period">This is the official and only chat from Signal.</string>
<!-- Text description shown for the Signal Release Notes channel explaining what the channel is for -->
<string name="ReleaseNotes__keep_up_to_date_period">Keep up to date with news and release notes.</string>
<!-- Text description in Signal Release channel details explaining that it is the only chat from Signal -->
<string name="ReleaseNotes__this_is_official_chat">This is the official and only chat from Signal</string>
<!-- Text description in Signal Release channel details explaining what the channel is for -->
<string name="ReleaseNotes__keep_up_to_date">Keep up to date with news and release notes</string>
<!-- Subtitle for the Signal Release channel explaining that it is the only chat from Signal -->
<string name="ReleaseNotes__official_only_chat">Official and only Signal chat</string>
<!-- Donation receipts activity title -->
<string name="DonationReceiptListFragment__all_activity">All activity</string>