mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2025-06-29 04:39:53 +00:00
align more
This commit is contained in:
parent
9198d2997c
commit
9d7407ca47
3 changed files with 12 additions and 3 deletions
|
@ -40,7 +40,7 @@ fun ContactPreviewView(
|
||||||
contactType == ContactType.CARD -> MaterialTheme.colors.primary
|
contactType == ContactType.CARD -> MaterialTheme.colors.primary
|
||||||
contactType == ContactType.CONTACT_WITH_REQUEST -> MaterialTheme.colors.primary
|
contactType == ContactType.CONTACT_WITH_REQUEST -> MaterialTheme.colors.primary
|
||||||
contactType == ContactType.REQUEST -> MaterialTheme.colors.primary
|
contactType == ContactType.REQUEST -> MaterialTheme.colors.primary
|
||||||
contactType == ContactType.RECENT && chat.chatInfo.incognito -> Indigo
|
contactType == ContactType.RECENT -> if (chat.chatInfo.nextConnect) MaterialTheme.colors.primary else Color.Unspecified
|
||||||
else -> Color.Unspecified
|
else -> Color.Unspecified
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -473,7 +473,14 @@ fun showPrepareContactAlert(
|
||||||
) {
|
) {
|
||||||
AlertManager.privacySensitive.showOpenChatAlert(
|
AlertManager.privacySensitive.showOpenChatAlert(
|
||||||
profileName = contactShortLinkData.profile.displayName,
|
profileName = contactShortLinkData.profile.displayName,
|
||||||
profileImage = { ProfileImage(size = 72.dp, image = contactShortLinkData.profile.image) },
|
profileImage = {
|
||||||
|
ProfileImage(
|
||||||
|
size = 72.dp,
|
||||||
|
image = contactShortLinkData.profile.image,
|
||||||
|
icon = if (contactShortLinkData.business) MR.images.ic_work_filled_padded else MR.images.ic_account_circle_filled
|
||||||
|
)
|
||||||
|
},
|
||||||
|
confirmText = generalGetString(MR.strings.connect_plan_open_chat),
|
||||||
onConfirm = {
|
onConfirm = {
|
||||||
AlertManager.privacySensitive.hideAlert()
|
AlertManager.privacySensitive.hideAlert()
|
||||||
withBGApi {
|
withBGApi {
|
||||||
|
@ -503,6 +510,7 @@ fun showPrepareGroupAlert(
|
||||||
AlertManager.privacySensitive.showOpenChatAlert(
|
AlertManager.privacySensitive.showOpenChatAlert(
|
||||||
profileName = groupShortLinkData.groupProfile.displayName,
|
profileName = groupShortLinkData.groupProfile.displayName,
|
||||||
profileImage = { ProfileImage(size = 72.dp, image = groupShortLinkData.groupProfile.image, icon = MR.images.ic_supervised_user_circle_filled) },
|
profileImage = { ProfileImage(size = 72.dp, image = groupShortLinkData.groupProfile.image, icon = MR.images.ic_supervised_user_circle_filled) },
|
||||||
|
confirmText = generalGetString(MR.strings.connect_plan_open_group),
|
||||||
onConfirm = {
|
onConfirm = {
|
||||||
AlertManager.privacySensitive.hideAlert()
|
AlertManager.privacySensitive.hideAlert()
|
||||||
withBGApi {
|
withBGApi {
|
||||||
|
|
|
@ -13,7 +13,8 @@
|
||||||
<string name="you_will_join_group">You will connect to all group members.</string>
|
<string name="you_will_join_group">You will connect to all group members.</string>
|
||||||
<string name="connect_via_link_verb">Connect</string>
|
<string name="connect_via_link_verb">Connect</string>
|
||||||
<string name="connect_via_link_incognito">Connect incognito</string>
|
<string name="connect_via_link_incognito">Connect incognito</string>
|
||||||
<string name="connect_plan_open_chat">Open</string>
|
<string name="connect_plan_open_chat">Open chat</string>
|
||||||
|
<string name="connect_plan_open_group">Open group</string>
|
||||||
<string name="error_parsing_uri_title">Invalid link</string>
|
<string name="error_parsing_uri_title">Invalid link</string>
|
||||||
<string name="error_parsing_uri_desc">Please check that SimpleX link is correct.</string>
|
<string name="error_parsing_uri_desc">Please check that SimpleX link is correct.</string>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue