Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitee9d4a7

Browse files
committed
feat: daily update
1 parentcc58c54 commitee9d4a7

File tree

13 files changed

+52
-27
lines changed

13 files changed

+52
-27
lines changed

‎lib/l10n/app_en.arb‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,14 @@
139139
"canned_responses_description": "Canned Responses are pre-written reply templates that help you quickly respond to a conversation. Agents can type the '/' character followed by the shortcode to insert a canned response during a conversation.",
140140
"canned_response_add": "Add canned response",
141141
"macros": "Macros",
142+
"macro_execute_confirm_message": "Are you sure you want to execute macro {name}?",
143+
"@macro_execute_confirm_message": {
144+
"placeholders": {
145+
"name": {
146+
"type": "String"
147+
}
148+
}
149+
},
142150
"automation": "Automation",
143151
"inboxes": "Inboxes",
144152
"inboxes_title": "Inboxes",
@@ -148,6 +156,8 @@
148156
"agents": "Agents",
149157
"agents_title": "Agents",
150158
"agents_description": "An agent is a member of your customer support team who can view and respond to user messages. The list below shows all the agents in your account.",
159+
"agents_search": "Search agents",
160+
"agents_search_hint": "Type something",
151161
"account": "Account",
152162
"change_password": "Change password",
153163
"change_password_invalid": "Please enter a password of length 6 or more",

‎lib/models/profile.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ class ProfileInfo {
6464
available_name: json['available_name'],
6565
avatar_url: json['avatar_url'],
6666
confirmed: json['confirmed'],
67-
display_name: json['display_name']?? json['name'],
67+
display_name:
68+
json['display_name']?? json['available_name']?? json['name'],
6869
message_signature: json['message_signature'],
6970
email: json['email'],
7071
id: json['id'],

‎lib/models/user.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class UserInfo {
44
finalint id;
55
finalint? account_id;
66
finalString name;
7-
finalStringavailable_name;
7+
finalStringdisplay_name;
88
finalAvailabilityStatus availability_status;
99
finalbool? auto_offline;
1010
finalbool? confirmed;
@@ -16,14 +16,14 @@ class UserInfo {
1616
requiredthis.id,
1717
this.account_id,
1818
requiredthis.name,
19-
String?available_name,
19+
String?display_name,
2020
AvailabilityStatus? availability_status,
2121
requiredthis.thumbnail,
2222
this.auto_offline,
2323
this.confirmed,
2424
this.custom_role_id,
2525
requiredthis.type,
26-
}):available_name=available_name?? name,
26+
}):display_name=display_name?? name,
2727
availability_status=
2828
availability_status??AvailabilityStatus.undefined;
2929

@@ -32,7 +32,8 @@ class UserInfo {
3232
id: json['id'],
3333
account_id: json['account_id'],
3434
name: json['name'],
35-
available_name: json['available_name']?? json['name'],
35+
display_name:
36+
json['display_name']?? json['available_name']?? json['name'],
3637
availability_status:
3738
AvailabilityStatus.fromName(json['availability_status']),
3839
thumbnail: json['avatar_url']?? json['thumbnail'],
@@ -47,7 +48,7 @@ class UserInfo {
4748
return {
4849
'id': id,
4950
'account_id': account_id,
50-
'available_name':available_name,
51+
'display_name':display_name,
5152
'availability_status': availability_status.name,
5253
'thumbnail': thumbnail,
5354
'auto_offline': auto_offline,

‎lib/screens/conversations/controllers/chat.dart‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ class ConversationChatController extends GetxController {
88
final _realtime=Get.find<RealtimeService>();
99

1010
final scrollController=ScrollController();
11-
finalintid;
11+
finalintconversation_id;
1212
final loading=false.obs;
1313
final isNoMore=false.obs;
1414
final info=Rxn<ConversationInfo>();
1515
final error=''.obs;
1616
lateRxList<MessageInfo> messages;
1717

1818
ConversationChatController({
19-
requiredthis.id,
19+
requiredthis.conversation_id,
2020
MessageInfo? initial_message,
2121
}): messages=RxList<MessageInfo>(
2222
initial_message!=null? [initial_message]: []);
@@ -28,7 +28,7 @@ class ConversationChatController extends GetxController {
2828
@override
2929
voidonInit() {
3030
super.onInit();
31-
_logger.i('onInit(conversation_id:$id)');
31+
_logger.i('onInit(conversation_id:$conversation_id)');
3232

3333
scrollController.addListener(_onScroll);
3434

@@ -53,7 +53,7 @@ class ConversationChatController extends GetxController {
5353
super.onReady();
5454

5555
getConversation().then((_) {
56-
_api.markMessageRead(conversation_id:id);
56+
_api.markMessageRead(conversation_id:conversation_id);
5757
});
5858
getMessages();
5959
}
@@ -72,7 +72,7 @@ class ConversationChatController extends GetxController {
7272
try {
7373
final result=await _api.getConversation(
7474
account_id: _auth.profile.value!.account_id,
75-
conversation_id:id,
75+
conversation_id:conversation_id,
7676
onCacheHit: (data)=> info.value= data,
7777
);
7878

@@ -92,7 +92,7 @@ class ConversationChatController extends GetxController {
9292

9393
final result=await _api.listMessages(
9494
account_id: _auth.profile.value!.account_id,
95-
conversation_id:id,
95+
conversation_id:conversation_id,
9696
before: before,
9797
onCacheHit: (data) {
9898
if (before!=null)return;
@@ -189,6 +189,9 @@ class ConversationChatController extends GetxController {
189189
info.value!.status= status;
190190
info.refresh();
191191

192-
_api.changeConversationStatus(conversation_id: id, status: status);
192+
_api.changeConversationStatus(
193+
conversation_id: conversation_id,
194+
status: status,
195+
);
193196
}
194197
}

‎lib/screens/conversations/controllers/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class ConversationsController extends GetxController {
175175

176176
Get.to(
177177
()=>ConversationChatView(
178-
id: info.id,
178+
conversation_id: info.id,
179179
initial_message: info.last_non_activity_message,
180180
),
181181
);

‎lib/screens/conversations/views/chat.dart‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ class ConversationChatView extends StatelessWidget {
88
final realtimeService=Get.find<RealtimeService>();
99

1010
finalConversationChatController c;
11-
finalintid;
11+
finalintconversation_id;
1212

1313
ConversationChatView({
1414
super.key,
15-
requiredthis.id,
15+
requiredthis.conversation_id,
1616
MessageInfo? initial_message,
1717
}): c=Get.put(
1818
ConversationChatController(
19-
id: id,
19+
conversation_id: conversation_id,
2020
initial_message: initial_message,
2121
),
22-
tag:id.toString(),
22+
tag:'$conversation_id',
2323
);
2424

2525
@override
@@ -79,7 +79,11 @@ class ConversationChatView extends StatelessWidget {
7979
icon:Icon(Icons.menu_outlined),
8080
onPressed: info==null
8181
?null
82-
: ()=>Get.to(()=>ConversationDetailView(id: id)),
82+
: ()=>Get.to(
83+
()=>ConversationDetailView(
84+
conversation_id: conversation_id,
85+
),
86+
),
8387
),
8488
Padding(padding:EdgeInsets.only(right:8)),
8589
],
@@ -96,7 +100,7 @@ class ConversationChatView extends StatelessWidget {
96100
returnbuildMessages();
97101
}),
98102
),
99-
ConversationInput(id: c.id),
103+
ConversationInput(id: c.conversation_id),
100104
],
101105
),
102106
Obx(() {

‎lib/screens/conversations/widgets/filter.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class ConversationsFilterView extends GetView<ConversationsController> {
7272
returnCustomRadioListTile(
7373
title:Text(item.label),
7474
value: item,
75-
selected: assigneeType== item,
7675
groupValue: assigneeType,
7776
onChanged: (next)=> controller.assignee_type.value= item,
7877
);

‎lib/screens/conversations/widgets/item.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class ConversationItem extends StatelessWidget {
6565
crossAxisAlignment:CrossAxisAlignment.start,
6666
children: [
6767
Row(
68+
spacing:4,
6869
children: [
6970
if (typeIcon!=null)
7071
Icon(

‎lib/screens/conversations/widgets/message.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class Message extends StatelessWidget {
174174
),
175175
if (isOwner==false)
176176
Text(
177-
sender.available_name,
177+
sender.display_name,
178178
style:TextStyle(
179179
fontSize:Get.textTheme.labelSmall!.fontSize,
180180
),

‎lib/services/notification.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class NotificationService extends GetxService {
136136
switch (info.primary_actor_type) {
137137
caseNotificationActorType.conversation:
138138
Get.to(
139-
()=>ConversationChatView(id: info.primary_actor_id),
139+
()=>ConversationChatView(conversation_id: info.primary_actor_id),
140140
);
141141
break;
142142

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp