Skip to content

fix copy contact link text and icon color #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crossle merged 1 commit into from
Jan 9, 2023
Merged

fix copy contact link text and icon color #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/generated/intl/messages_en.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ class MessageLookup extends MessageLookupByLibrary {
"conversationDeleteTitle": m11,
"copy": MessageLookupByLibrary.simpleMessage("Copy"),
"copyInvite": MessageLookupByLibrary.simpleMessage("Copy Invite Link"),
"copyLink": MessageLookupByLibrary.simpleMessage("Copy Link"),
"create": MessageLookupByLibrary.simpleMessage("Create"),
"createCircle": MessageLookupByLibrary.simpleMessage("New Circle"),
"createConversation":
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_ja.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class MessageLookup extends MessageLookupByLibrary {
"conversationDeleteTitle": m11,
"copy": MessageLookupByLibrary.simpleMessage("コピー"),
"copyInvite": MessageLookupByLibrary.simpleMessage("招待リンクをコピーする"),
"copyLink": MessageLookupByLibrary.simpleMessage("リンクをコピー"),
"create": MessageLookupByLibrary.simpleMessage("作成"),
"createCircle": MessageLookupByLibrary.simpleMessage("新しいグループリスト"),
"createConversation":
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_ms.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ class MessageLookup extends MessageLookupByLibrary {
"conversation": MessageLookupByLibrary.simpleMessage("Perbualan"),
"copy": MessageLookupByLibrary.simpleMessage("Salinan"),
"copyInvite": MessageLookupByLibrary.simpleMessage("Salin pautan"),
"copyLink": MessageLookupByLibrary.simpleMessage("Salin pautan"),
"create": MessageLookupByLibrary.simpleMessage("Buat"),
"dataAndStorageUsage":
MessageLookupByLibrary.simpleMessage("Penggunaan Data dan Storan"),
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_ru.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ class MessageLookup extends MessageLookupByLibrary {
"copy": MessageLookupByLibrary.simpleMessage("Копировать"),
"copyInvite": MessageLookupByLibrary.simpleMessage(
"Скопировать пригласительную ссылку"),
"copyLink": MessageLookupByLibrary.simpleMessage("Копировать ссылку"),
"create": MessageLookupByLibrary.simpleMessage("Создавать"),
"createCircle": MessageLookupByLibrary.simpleMessage("Новый круг"),
"createConversation":
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_zh-HK.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ class MessageLookup extends MessageLookupByLibrary {
"conversationDeleteTitle": m11,
"copy": MessageLookupByLibrary.simpleMessage("複製"),
"copyInvite": MessageLookupByLibrary.simpleMessage("複製邀請鏈接"),
"copyLink": MessageLookupByLibrary.simpleMessage("複製鏈接"),
"create": MessageLookupByLibrary.simpleMessage("創建"),
"createCircle": MessageLookupByLibrary.simpleMessage("新建圈子"),
"createConversation": MessageLookupByLibrary.simpleMessage("新建會話"),
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_zh-TW.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ class MessageLookup extends MessageLookupByLibrary {
"conversationDeleteTitle": m11,
"copy": MessageLookupByLibrary.simpleMessage("複製"),
"copyInvite": MessageLookupByLibrary.simpleMessage("複製邀請連結"),
"copyLink": MessageLookupByLibrary.simpleMessage("複製連結"),
"create": MessageLookupByLibrary.simpleMessage("建立"),
"createCircle": MessageLookupByLibrary.simpleMessage("新建圈子"),
"createConversation": MessageLookupByLibrary.simpleMessage("新建會話"),
Expand Down
1 change: 1 addition & 0 deletions lib/generated/intl/messages_zh.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ class MessageLookup extends MessageLookupByLibrary {
"conversationDeleteTitle": m11,
"copy": MessageLookupByLibrary.simpleMessage("复制"),
"copyInvite": MessageLookupByLibrary.simpleMessage("复制邀请链接"),
"copyLink": MessageLookupByLibrary.simpleMessage("复制链接"),
"create": MessageLookupByLibrary.simpleMessage("创建"),
"createCircle": MessageLookupByLibrary.simpleMessage("新建圈子"),
"createConversation": MessageLookupByLibrary.simpleMessage("新建会话"),
Expand Down
10 changes: 10 additions & 0 deletions lib/generated/l10n.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/l10n/intl_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"conversationDeleteTitle" : "Delete chat: {arg0}",
"copy" : "Copy",
"copyInvite" : "Copy Invite Link",
"copyLink" : "Copy Link",
"create" : "Create",
"createCircle" : "New Circle",
"createConversation" : "New Conversation",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_ja.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"conversationDeleteTitle" : "チャットを削除する：{arg0}",
"copy" : "コピー",
"copyInvite" : "招待リンクをコピーする",
"copyLink" : "リンクをコピー",
"create" : "作成",
"createCircle" : "新しいグループリスト",
"createConversation" : "新しいチャットルーム",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_ms.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"conversation" : "Perbualan",
"copy" : "Salinan",
"copyInvite" : "Salin pautan",
"copyLink" : "Salin pautan",
"create" : "Buat",
"dataAndStorageUsage" : "Penggunaan Data dan Storan",
"dataError" : "Kesalahan data",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_ru.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"conversationDeleteTitle" : "Удалить чат: {arg0}",
"copy" : "Копировать",
"copyInvite" : "Скопировать пригласительную ссылку",
"copyLink" : "Копировать ссылку",
"create" : "Создавать",
"createCircle" : "Новый круг",
"createConversation" : "Новый разговор",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_zh-HK.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"conversationDeleteTitle" : "刪除會話：{arg0}",
"copy" : "複製",
"copyInvite" : "複製邀請鏈接",
"copyLink" : "複製鏈接",
"create" : "創建",
"createCircle" : "新建圈子",
"createConversation" : "新建會話",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_zh-TW.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"conversationDeleteTitle" : "刪除會話：{arg0}",
"copy" : "複製",
"copyInvite" : "複製邀請連結",
"copyLink" : "複製連結",
"create" : "建立",
"createCircle" : "新建圈子",
"createConversation" : "新建會話",
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_zh.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"conversationDeleteTitle" : "删除会话：{arg0}",
"copy" : "复制",
"copyInvite" : "复制邀请链接",
"copyLink" : "复制链接",
"create" : "创建",
"createCircle" : "新建圈子",
"createConversation" : "新建会话",
Expand Down
5 changes: 3 additions & 2 deletions lib/ui/home/chat_slide_page/chat_info_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class ChatInfoPage extends HookWidget {
buildMenus: () => [
ContextMenu(
icon: Resources.assetsImagesContextMenuCopySvg,
title: context.l10n.copyInvite,
title: context.l10n.copyLink,
onTap: () async {
final userId = conversation.userId;
if (userId == null) {
Expand All @@ -169,9 +169,10 @@ class ChatInfoPage extends HookWidget {
),
],
interactiveForTap: true,
child: const ActionButton(
child: ActionButton(
name: Resources.assetsImagesInviteShareSvg,
interactive: false,
color: context.theme.icon,
),
),
);
Expand Down
5 changes: 3 additions & 2 deletions lib/widgets/user/user_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,18 @@ class _UserProfileButtonBar extends StatelessWidget {
buildMenus: () => [
ContextMenu(
icon: Resources.assetsImagesContextMenuCopySvg,
title: context.l10n.copyInvite,
title: context.l10n.copyLink,
onTap: () async {
i('share contact ${user.userId} ${user.codeUrl}');
await Clipboard.setData(ClipboardData(text: user.codeUrl));
},
),
],
interactiveForTap: true,
child: const ActionButton(
child: ActionButton(
name: Resources.assetsImagesInviteShareSvg,
interactive: false,
color: context.theme.icon,
),
),
);
Expand Down