Apply changes from 4.10.0

Author: Zryte

assets/Icons/amity_ic_report_message_error.svg

@@ -526,10 +526,40 @@
             "right_bubble_subtle_text_color": "#A9C4F9",
             "bubble_divider_color": "#C1C1C1"
         },
-        "group_chat_page/*/*": {
+        "chat_home_page/*/search_chat_button": {
+            "image": "search_chat_button"
         },
+        "chat_home_page/*/create_new_chat_button": {
+            "image": "create_new_chat_button"
+        },
+        "chat_home_page/*/create_new_conversation_button": {
+            "image": "create_new_conversation_button",
+            "text": "Direct chat"
+        },
+        "chat_home_page/*/create_new_group_button": {
+            "image": "create_new_group_button",
+            "text": "Group chat"
+        },
+        "chat_home_page/*/chat_home_page_more_menu_button": {
+            "image": "chat_home_page_more_menu_button"
+        },
+        "chat_home_page/*/chat_home_page_all_chat_button": {
+            "text": "All"
+        },
+        "chat_home_page/*/chat_home_page_direct_chat_button": {
+            "text": "Direct"
+        },
+        "chat_home_page/*/chat_home_page_group_chat_button": {
+            "text": "Groups"
+        },
+        "select_group_member_page/*/select_group_user_title": {
+            "text": "New group"
+        },
+        "create_group_chat_page/*/create_group_chat_title": {
+            "text": "New group"
+        },
+        "group_chat_page/*/*": {},
         "group_chat_page/message_bubble/*": {
-            
             "left_bubble_color": "#EBECEF",
             "left_bubble_pressed_color": "#A5A9b5",
             "left_bubble_text_color": "#292B32",
@@ -539,6 +569,141 @@
             "right_bubble_text_color": "#FFFFFF",
             "right_bubble_subtle_text_color": "#A9C4F9",
             "bubble_divider_color": "#C1C1C1"
+        },
+        "group_chat_page/*/group_chat_page_title": {},
+        "group_chat_page/*/group_chat_page_image": {
+            "image": "group_chat_page_image_placeholder"
+        },
+        "group_chat_page/group_chat_message_list_component/*": {},
+        "group_setting_page/*/group_setting_title": {},
+        "group_setting_page/*/group_setting_image": {
+            "image": "group_setting_image_placeholder"
+        },
+        "group_setting_page/*/edit_group_profile_button": {
+            "image": "edit_group_profile_button",
+            "text": "Group profile"
+        },
+        "group_setting_page/*/edit_group_notification_button": {
+            "image": "edit_group_notification_button",
+            "text": "Group notification"
+        },
+        "group_setting_page/*/edit_group_member_permission_button": {
+            "image": "edit_group_member_permission_button",
+            "text": "Member permissions"
+        },
+        "group_setting_page/*/group_member_list_button": {
+            "image": "group_member_list_button",
+            "text": "All members"
+        },
+        "group_setting_page/*/group_banned_list_button": {
+            "image": "group_banned_list_button",
+            "text": "Banned users"
+        },
+        "group_setting_page/*/notification_preference_button": {
+            "image": "notification_preference_button",
+            "text": "Notifications"
+        },
+        "edit_group_profile_page/*/edit_group_profile_title": {
+            "text": "Group profile"
+        },
+        "edit_group_profile_page/*/edit_group_image": {
+            "image": "edit_group_image_placeholder"
+        },
+        "edit_group_profile_page/*/edit_profile_save_button": {
+            "image": "Save"
+        },
+        "edit_group_notification_page/*/edit_group_notification_title": {
+            "text": "Group notifications"
+        },
+        "edit_group_notification_page/*/group_notification_default_mode_button": {},
+        "edit_group_notification_page/*/group_notification_silent_mode_button": {},
+        "edit_group_notification_page/*/group_notification_subscribe_mode_button": {},
+        "edit_member_permission_page/*/edit_member_permission_title": {
+            "text": "Member permissions"
+        },
+        "edit_member_permission_page/*/messaging_permission_all_member_button": {},
+        "edit_member_permission_page/*/messaging_permission_only_moderator_button": {},
+        "group_member_list_page/*/group_member_list_title": {
+            "text": "All members"
+        },
+        "group_member_list_page/*/add_group_member_button": {
+            "image": "group_member_list_add_member_button"
+        },
+        "banned_member_list_page/*/banned_member_list_title": {
+            "text": "Banned users"
+        },
+        "add_group_member_page/*/add_group_member_title": {
+            "text": "Add member"
+        },
+        "add_group_member_page/*/add_group_member_add_button": {
+            "text": "Add member"
+        },
+        "*/group_member_action/promote_user_button": {
+            "image": "promote_user_button",
+            "text": "Promote to moderator"
+        },
+        "*/group_member_action/demote_user_button": {
+            "image": "demote_user_button",
+            "text": "Demote from moderator"
+        },
+        "*/group_member_action/remove_user_button": {
+            "image": "remove_user_button",
+            "text": "Remove from group"
+        },
+        "*/group_member_action/report_user_button": {
+            "image": "report_user_button",
+            "text": "Report user"
+        },
+        "*/group_member_action/unreport_user_button": {
+            "image": "unreport_user_button",
+            "text": "Unreport user"
+        },
+        "*/group_member_action/ban_user_button": {
+            "image": "ban_user_button",
+            "text": "Ban user"
+        },
+        "*/group_member_action/unban_user_button": {
+            "image": "unban_user_button",
+            "text": "Unban user"
+        },
+        "group_notification_preference_page/*/group_notification_title": {
+            "text": "Notifications"
+        },
+        "*/conversation_chat_list/*": {},
+        "*/group_chat_list/*": {},
+        "*/all_chat_list/*": {},
+        "*/chat_user_action/turn_on_chat_notification_button": {
+            "image": "turn_on_chat_notification_button",
+            "text": "Turn on notification"
+        },
+        "*/chat_user_action/turn_off_chat_notification_button": {
+            "image": "turn_off_chat_notification_button",
+            "text": "Turn off notification"
+        },
+        "*/group_member_action/block_chat_user_button": {
+            "image": "block_chat_user_button",
+            "text": "Block user"
+        },
+        "*/group_member_action/unblock_chat_user_button": {
+            "image": "unblock_chat_user_button",
+            "text": "Unblock user"
+        },
+        "*/group_member_action/report_chat_user_button": {
+            "image": "report_chat_user_button",
+            "text": "Report user"
+        },
+        "*/group_member_action/unreport_chat_user_button": {
+            "image": "unreport_chat_user_button",
+            "text": "Unreport user"
+        },
+        "*/message_report/message_report_submit_button": {
+            "text": "Submit"
+        },
+        "*/message_report/message_report_close_button": {
+            "image": "message_report_close_button"
+        },
+        "*/message_report/error_close_button": {
+            "text": "Close"
         }
     }
 }

assets/Icons/amity_ic_right_arrow_no_body.svg

@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: amity_sdk
-      sha256: "514efbe097b3def2e4249da00ce3db2bdffc925a85bae543e9768d07001482e3"
+      sha256: "90a17df1401e6faef91a12b696a97712135af2181b464426a195a0376945ea74"
       url: "https://pub.dev"
     source: hosted
-    version: "7.4.6"
+    version: "7.5.0"
   amity_sdk_api:
     dependency: transitive
     description:
@@ -31,7 +31,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.7.0"
+    version: "4.9.0"
   analyzer:
     dependency: transitive
     description:
@@ -661,10 +661,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
+      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "3.0.0"
   frontend_server_client:
     dependency: transitive
     description:

assets/config/config.json

@@ -4,11 +4,11 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:amity_sdk/amity_sdk.dart';
 
-part 'add_group_member_state.dart';
+part 'amity_add_group_member_state.dart';
 
-class AddGroupMemberCubit extends Cubit<AddGroupMemberState> {
+class AmityAddGroupMemberCubit extends Cubit<AmityAddGroupMemberState> {
 
-  AddGroupMemberCubit() : super(const AddGroupMemberState());
+  AmityAddGroupMemberCubit() : super(const AmityAddGroupMemberState());
 
   late UserLiveCollection userLiveCollection;
   StreamSubscription<List<AmityUser>>? _subscription;

example/pubspec.lock

@@ -8,32 +8,32 @@ import 'package:amity_uikit_beta_service/v4/utils/debouncer.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import '../bloc/add_group_member_cubit.dart';
+import 'amity_add_group_member_cubit.dart';
 
-class AddGroupMemberPage extends NewBasePage {
-  AddGroupMemberPage({
+class AmityAddGroupMemberPage extends NewBasePage {
+  AmityAddGroupMemberPage({
     Key? key,
     required this.channel,
   }) : super(key: key, pageId: 'add_group_member_page');
 
   final AmityChannel channel;
-  final ScrollController scrollController = ScrollController();
-  final ScrollController horizontalScrollController = ScrollController();
-  var textcontroller = TextEditingController();
+  final scrollController = ScrollController();
+  final horizontalScrollController = ScrollController();
+  final textcontroller = TextEditingController();
   final _debouncer = Debouncer(milliseconds: 300);
 
   @override
   Widget buildPage(BuildContext context) {
     return BlocProvider(
       create: (context) {
-        final cubit = AddGroupMemberCubit();
+        final cubit = AmityAddGroupMemberCubit();
         return cubit;
       },
       child: Builder(builder: (context) {
         // Initialize user list
-        context.read<AddGroupMemberCubit>().queryUser('');
+        context.read<AmityAddGroupMemberCubit>().queryUser('');
 
-        return BlocBuilder<AddGroupMemberCubit, AddGroupMemberState>(
+        return BlocBuilder<AmityAddGroupMemberCubit, AmityAddGroupMemberState>(
           builder: (context, state) {
             return Scaffold(
               backgroundColor: theme.backgroundColor,
@@ -67,7 +67,7 @@ class AddGroupMemberPage extends NewBasePage {
                       hintText: 'Search',
                       onTextChanged: (value) {
                         _debouncer.run(() {
-                          context.read<AddGroupMemberCubit>().queryUser(value);
+                          context.read<AmityAddGroupMemberCubit>().queryUser(value);
                         });
                       },
                       showCancelButton: false,
@@ -134,12 +134,12 @@ class AddGroupMemberPage extends NewBasePage {
     );
   }
 
-  Widget userContainer(BuildContext context, AddGroupMemberState state) {
-    if (state.isFetching == true) {
+  Widget userContainer(BuildContext context, AmityAddGroupMemberState state) {
+    if (state.isFetching == true && state.users.isEmpty) {
       return userSkeletonList(theme, configProvider, itemCount: 10);
     } else if (state.isFetching == false && state.users.isEmpty) {
       return Container();
-    } else if (state is AddGroupMemberState) {
+    } else {
       if (state.users.isEmpty) {
         return Center(
           child: Column(
@@ -174,17 +174,16 @@ class AddGroupMemberPage extends NewBasePage {
           theme: theme,
           loadMore: () {
             // Implement load more functionality with cubit if needed
-            context.read<AddGroupMemberCubit>().loadmoreUsers();
+            context.read<AmityAddGroupMemberCubit>().loadmoreUsers();
           },
           onSelectUser: (user) {
-            context.read<AddGroupMemberCubit>().updateSelectedUsers(user);
+            context.read<AmityAddGroupMemberCubit>().updateSelectedUsers(user);
           },
           excludeCurrentUser: true,
           selectedUsers: state.selectedUsers,
+          isLoadingMore: state.isFetching == true && state.users.isNotEmpty,
         );
       }
-    } else {
-      return Container();
     }
   }
 }

…teGroup/bloc/add_group_member_cubit.dart …member/amity_add_group_member_cubit.dartlib/v4/chat/createGroup/bloc/add_group_member_cubit.dart renamed to lib/v4/chat/add_group_member/amity_add_group_member_cubit.dart lib/v4/chat/createGroup/bloc/add_group_member_cubit.dart renamed to lib/v4/chat/add_group_member/amity_add_group_member_cubit.dart

@@ -1,25 +1,25 @@
-part of 'add_group_member_cubit.dart';
+part of 'amity_add_group_member_cubit.dart';
 
-class AddGroupMemberState extends Equatable {
+class AmityAddGroupMemberState extends Equatable {
   final List<AmityUser> users;
   final bool? hasMoreItems;
   final bool? isFetching;
   final List<AmityUser> selectedUsers;
 
-  const AddGroupMemberState({
+  const AmityAddGroupMemberState({
     this.users = const [],
     this.hasMoreItems,
     this.isFetching,
     this.selectedUsers = const [],
   });
 
-  AddGroupMemberState copyWith({
+  AmityAddGroupMemberState copyWith({
     List<AmityUser>? users,
     bool? hasMoreItems,
     bool? isFetching,
     List<AmityUser>? selectedUsers,
   }) {
-    return AddGroupMemberState(
+    return AmityAddGroupMemberState(
       users: users ?? this.users,
       hasMoreItems: hasMoreItems ?? this.hasMoreItems,
       isFetching: isFetching ?? this.isFetching,

…reateGroup/ui/add_group_member_page.dart …_member/amity_add_group_member_page.dartlib/v4/chat/createGroup/ui/add_group_member_page.dart renamed to lib/v4/chat/add_group_member/amity_add_group_member_page.dart lib/v4/chat/createGroup/ui/add_group_member_page.dart renamed to lib/v4/chat/add_group_member/amity_add_group_member_page.dart

@@ -1,15 +1,15 @@
-part of 'group_banned_users_page.dart';
+part of 'amity_banned_group_member_list_page.dart';
 
-class GroupBannedUsersCubit extends Cubit<GroupBannedUsersState> {
+class AmityBannedGroupMemberListCubit extends Cubit<AmityBannedGroupMemberListState> {
   final AmityChannel channel;
   final AmityToastBloc? toastBloc;
   late ChannelMemberSearchLiveCollection memberLiveCollection;
   StreamSubscription<List<AmityChannelMember>>? _membersSubscription;
   StreamSubscription<bool>? _loadingSubscription;
   String _searchQuery = '';
 
-  GroupBannedUsersCubit({required this.channel, this.toastBloc})
-      : super(const GroupBannedUsersState()) {
+  AmityBannedGroupMemberListCubit({required this.channel, this.toastBloc})
+      : super(const AmityBannedGroupMemberListState()) {
     loadBannedUsers();
     _getCurrentUserRoles();
   }