Skip to content

Commit 5a699d4

Browse files
ZayYarHtunZayYarHtun
committed
chore: Apply changes from version 4.20.12
1 parent 34b2fb3 commit 5a699d4

11 files changed

Lines changed: 32 additions & 29 deletions

File tree

‎assets/config/config.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -493,17 +493,17 @@
493493
"highlight_color": "#1054DE"
494494
},
495495
"dark": {
496-
"primary_color": "#FF7500",
496+
"primary_color": "#1054DE",
497497
"secondary_color": "#292B32",
498-
"base_color": "#292B32",
499-
"base_shade1_color": "#636878",
500-
"base_shade2_color": "#898E9E",
501-
"base_shade3_color": "#A5A9b5",
502-
"base_shade4_color": "#EBECEF",
498+
"base_color": "#EBECEF",
499+
"base_shade1_color": "#A5A9B5",
500+
"base_shade2_color": "#6E7487",
501+
"base_shade3_color": "#40434E",
502+
"base_shade4_color": "#292B32",
503503
"alert_color": "#FA4D30",
504-
"background_color": "#FFFFFF",
505-
"base_inverse_color": "#000000",
506-
"highlight_color": "#FF7500"
504+
"background_color": "#191919",
505+
"base_inverse_color": "#FFFFFF",
506+
"highlight_color": "#1054DE"
507507
}
508508
}
509509
},
@@ -523,17 +523,17 @@
523523
"highlight_color": "#1054DE"
524524
},
525525
"dark": {
526-
"primary_color": "#10F4DE",
526+
"primary_color": "#1054DE",
527527
"secondary_color": "#292B32",
528-
"base_color": "#292B32",
529-
"base_shade1_color": "#636878",
530-
"base_shade2_color": "#898E9E",
531-
"base_shade3_color": "#A5A9b5",
532-
"base_shade4_color": "#EBECEF",
528+
"base_color": "#EBECEF",
529+
"base_shade1_color": "#A5A9B5",
530+
"base_shade2_color": "#6E7487",
531+
"base_shade3_color": "#40434E",
532+
"base_shade4_color": "#292B32",
533533
"alert_color": "#FA4D30",
534-
"background_color": "#FFFFFF",
535-
"base_inverse_color": "#000000",
536-
"highlight_color": "#10F4DE"
534+
"background_color": "#191919",
535+
"base_inverse_color": "#FFFFFF",
536+
"highlight_color": "#1054DE"
537537
}
538538
},
539539
"left_bubble_color": "#EBECEF",

‎lib/v4/chat/edit_group_member_permission/amity_edit_group_member_permissions_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AmityEditGroupMemberPermissionsPage extends NewBasePage {
7777
),
7878
],
7979
leading: IconButton(
80-
icon: const Icon(Icons.arrow_back_ios),
80+
icon: Icon(Icons.arrow_back_ios, color: theme.baseColor),
8181
onPressed: () => Navigator.pop(context),
8282
),
8383
),

‎lib/v4/chat/edit_group_notification/amity_edit_group_notification_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class AmityEditGroupNotificationPage extends NewBasePage {
6363
),
6464
],
6565
leading: IconButton(
66-
icon: const Icon(Icons.arrow_back_ios),
66+
icon: Icon(Icons.arrow_back_ios, color: theme.baseColor),
6767
onPressed: () => Navigator.pop(context),
6868
),
6969
),

‎lib/v4/chat/edit_group_profile/amity_edit_group_profile_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AmityEditGroupProfilePage extends NewBasePage {
6060
),
6161
],
6262
leading: IconButton(
63-
icon: const Icon(Icons.arrow_back_ios),
63+
icon: Icon(Icons.arrow_back_ios, color: theme.baseColor),
6464
onPressed: () => Navigator.pop(context),
6565
),
6666
),

‎lib/v4/chat/full_text_message.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class FullTextScreen extends StatelessWidget {
2323
return Scaffold(
2424
appBar: AppBar(
2525
backgroundColor: theme.backgroundColor,
26+
iconTheme: IconThemeData(color: theme.baseColor),
2627
scrolledUnderElevation: 1,
2728
centerTitle: displayName == "Replied message", //TODO Remove this condition when jump to replied message is implemented
2829
title: Text(displayName,

‎lib/v4/chat/group_member_list/amity_group_member_list_page.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class AmityGroupMemberListPage extends NewBasePage {
7272
style: AmityTextStyle.titleBold(theme.baseColor),
7373
),
7474
leading: IconButton(
75-
icon: const Icon(Icons.arrow_back_ios),
75+
icon: Icon(Icons.arrow_back_ios, color: theme.baseColor),
7676
onPressed: () {
7777
Navigator.pop(context);
7878
},
@@ -89,7 +89,7 @@ class AmityGroupMemberListPage extends NewBasePage {
8989
"assets/Icons/amity_ic_post_creation_button.svg",
9090
package: 'amity_uikit_beta_service',
9191
colorFilter: ColorFilter.mode(
92-
theme.secondaryColor,
92+
theme.baseColor,
9393
BlendMode.srcIn,
9494
),
9595
),

‎lib/v4/chat/group_message/amity_group_chat_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class AmityGroupChatPage extends NewBasePage {
102102
icon: SvgPicture.asset(
103103
"assets/Icons/amity_ic_back_button.svg",
104104
package: 'amity_uikit_beta_service',
105-
color: theme.secondaryColor,
105+
color: theme.baseColor,
106106
),
107107
onPressed: () {
108108
Navigator.of(context).pop();

‎lib/v4/chat/message/chat_page.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class AmityChatPage extends NewBasePage {
121121
icon: SvgPicture.asset(
122122
"assets/Icons/amity_ic_back_button.svg",
123123
package: 'amity_uikit_beta_service',
124-
color: theme.secondaryColor,
124+
color: theme.baseColor,
125125
),
126126
onPressed: () {
127127
Navigator.of(context).pop();
@@ -191,7 +191,7 @@ class AmityChatPage extends NewBasePage {
191191
width: 24,
192192
height: 24,
193193
colorFilter: ColorFilter.mode(
194-
theme.secondaryColor, BlendMode.srcIn),
194+
theme.baseColor, BlendMode.srcIn),
195195
),
196196
onPressed: () {
197197
HapticFeedback.heavyImpact();

‎lib/v4/chat/message/components/amity_conversation_chat_user_action_component.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ class AmityConversationChatUserActionComponent extends NewBaseComponent {
141141
: 'assets/Icons/amity_ic_report_user_button.svg',
142142
package: 'amity_uikit_beta_service',
143143
width: 24,
144-
height: 24),
144+
height: 24,
145+
colorFilter:
146+
ColorFilter.mode(theme.baseColor, BlendMode.srcIn)),
145147
),
146148
const SizedBox(width: 12),
147149
Expanded(

‎lib/v4/chat/notification_preference/notification_preference_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class AmityGroupNotificationPreferencePage extends NewBasePage {
4444
style: AmityTextStyle.titleBold(theme.baseColor),
4545
),
4646
leading: IconButton(
47-
icon: const Icon(Icons.arrow_back_ios),
47+
icon: Icon(Icons.arrow_back_ios, color: theme.baseColor),
4848
onPressed: () => Navigator.pop(context),
4949
),
5050
actions: [

0 commit comments

Comments
 (0)