diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ed1a787..2f8758c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip \ No newline at end of file diff --git a/assets/icons/close.svg b/assets/icons/close.svg new file mode 100644 index 0000000..631fcfa --- /dev/null +++ b/assets/icons/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/chat-group.svg b/assets/images/chat-group.svg new file mode 100644 index 0000000..127a793 --- /dev/null +++ b/assets/images/chat-group.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 48f443e..2ed5acc 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -527,6 +527,8 @@ "noWinner": "حزين! لم يفز أحد اليوم.", "myTeam": "فريقي", "youCanPlayDemo": "لكن يمكنك لعب العرض", + "group" : "مجموعة", + "searchGroup": "مجموعة البحث", "connectHmgWifi": "قم بتوصيل HMG WIFI", "connectedHmgWifi": "اتصال HMG WIFI", "itgForms": "نماذج (ITG)", diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index b005710..38aeaa7 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -527,6 +527,8 @@ "noWinner": "Sad! No one won today.", "myTeam": "My Team", "youCanPlayDemo": "But you can play demo", + "group": "Groups", + "searchGroup": "Search Group", "connectHmgWifi": "Connect HMG WIFI", "connectedHmgWifi": "Connected HMG WIFI", "itgForms": "ITG Forms", @@ -538,4 +540,24 @@ "expiredDocuments": "Expired\nDocuments", "missingDocuments": "Missing\nDocuments", "uploadedDocuments": "Uploaded\nDocuments" + "resetAdPassword": "Reset AD Password" + "manage": "Manage", + "members": "Members", + "areYouSureWantTodelete": "Are you sure want to delete?", + "groupMembers": "Group Members", + "manageGroup": "Manage Group", + "admin": "Admin", + "addUsers": "Add users to the group", + "editGroups":"Edit Group", + "groupNameshouldbe": "Group name should be minimum 10 character long", + "enterGroupName": "Please enter valid group Name", + "groupName": "Group Name", + "enterGroupNamePlease": "Please enter group name", + "audioCall": "Audio Call", + "videoCall": "Video Call", + "shareScreen": "Share Screen", + "searchByUserName": "Search By Username", + "userSearch": "User Search", + "userName": "User Name", + "userId": "UserID" } \ No newline at end of file diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 24ba08c..cb62b88 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -65,7 +65,6 @@ fetch remote-notification - voip UILaunchStoryboardName LaunchScreen diff --git a/lib/api/chat/chat_api_client.dart b/lib/api/chat/chat_api_client.dart index f727c7d..05af905 100644 --- a/lib/api/chat/chat_api_client.dart +++ b/lib/api/chat/chat_api_client.dart @@ -12,9 +12,17 @@ import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/exceptions/api_exception.dart'; import 'package:mohem_flutter_app/main.dart'; import 'package:mohem_flutter_app/models/chat/chat_user_image_model.dart'; +import 'package:mohem_flutter_app/models/chat/create_group_request.dart' + as createGroup; +import 'package:mohem_flutter_app/models/chat/get_group_chat_history.dart'; import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart'; -import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart' as user; -import 'package:mohem_flutter_app/models/chat/make_user_favotire_unfavorite_chat_model.dart' as fav; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart' + as groups; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart' + as user; +import 'package:mohem_flutter_app/models/chat/make_user_favotire_unfavorite_chat_model.dart' + as fav; class ChatApiClient { static final ChatApiClient _instance = ChatApiClient._internal(); @@ -28,10 +36,13 @@ class ChatApiClient { Response response = await ApiClient().postJsonForResponse( "${ApiConsts.chatLoginTokenUrl}externaluserlogin", { - "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(), + "employeeNumber": + AppState().memberInformationList!.eMPLOYEENUMBER.toString(), "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG", "isMobile": true, - "deviceToken":AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken, + "deviceToken": AppState().getIsHuawei + ? AppState().getHuaweiPushToken + : AppState().getDeviceToken, "isHuaweiDevice": AppState().getIsHuawei, }, ); @@ -41,7 +52,10 @@ class ChatApiClient { } if (response.statusCode == 200) { userLoginResponse = user.userAutoLoginModelFromJson(response.body); - } else if (response.statusCode == 501 || response.statusCode == 502 || response.statusCode == 503 || response.statusCode == 504) { + } else if (response.statusCode == 501 || + response.statusCode == 502 || + response.statusCode == 503 || + response.statusCode == 504) { getUserLoginToken(); } else { userLoginResponse = user.userAutoLoginModelFromJson(response.body); @@ -50,9 +64,16 @@ class ChatApiClient { return userLoginResponse; } - Future getChatMemberFromSearch(String searchParam, int cUserId, int pageNo) async { + Future getChatMemberFromSearch( + String searchParam, int cUserId, int pageNo) async { ChatUserModel chatUserModel; - Response response = await ApiClient().postJsonForResponse("${ApiConsts.chatLoginTokenUrl}getUserWithStatusAndFavAsync", {"employeeNumber": cUserId, "userName": searchParam, "pageNumber": pageNo}, + Response response = await ApiClient().postJsonForResponse( + "${ApiConsts.chatLoginTokenUrl}getUserWithStatusAndFavAsync", + { + "employeeNumber": cUserId, + "userName": searchParam, + "pageNumber": pageNo + }, token: AppState().chatDetails!.response!.token); if (!kReleaseMode) { logger.i("res: " + response.body); @@ -92,7 +113,12 @@ class ChatApiClient { } //Get User Chat History - Future getSingleUserChatHistory({required int senderUID, required int receiverUID, required bool loadMore, bool isNewChat = false, required int paginationVal}) async { + Future getSingleUserChatHistory( + {required int senderUID, + required int receiverUID, + required bool loadMore, + bool isNewChat = false, + required int paginationVal}) async { try { Response response = await ApiClient().getJsonForResponse( "${ApiConsts.chatSingleUserHistoryUrl}GetUserChatHistory/$senderUID/$receiverUID/$paginationVal", @@ -103,23 +129,33 @@ class ChatApiClient { } return response; } catch (e) { - getSingleUserChatHistory(senderUID: senderUID, receiverUID: receiverUID, loadMore: loadMore, paginationVal: paginationVal); + getSingleUserChatHistory( + senderUID: senderUID, + receiverUID: receiverUID, + loadMore: loadMore, + paginationVal: paginationVal); throw e; } } //Favorite Users - Future favUser({required int userID, required int targetUserID}) async { - Response response = await ApiClient().postJsonForResponse("${ApiConsts.chatFavUser}addFavUser", {"targetUserId": targetUserID, "userId": userID}, token: AppState().chatDetails!.response!.token); + Future favUser( + {required int userID, required int targetUserID}) async { + Response response = await ApiClient().postJsonForResponse( + "${ApiConsts.chatFavUser}addFavUser", + {"targetUserId": targetUserID, "userId": userID}, + token: AppState().chatDetails!.response!.token); if (!kReleaseMode) { logger.i("res: " + response.body); } - fav.FavoriteChatUser favoriteChatUser = fav.FavoriteChatUser.fromRawJson(response.body); + fav.FavoriteChatUser favoriteChatUser = + fav.FavoriteChatUser.fromRawJson(response.body); return favoriteChatUser; } //UnFavorite Users - Future unFavUser({required int userID, required int targetUserID}) async { + Future unFavUser( + {required int userID, required int targetUserID}) async { try { Response response = await ApiClient().postJsonForResponse( "${ApiConsts.chatFavUser}deleteFavUser", @@ -129,7 +165,8 @@ class ChatApiClient { if (!kReleaseMode) { logger.i("res: " + response.body); } - fav.FavoriteChatUser favoriteChatUser = fav.FavoriteChatUser.fromRawJson(response.body); + fav.FavoriteChatUser favoriteChatUser = + fav.FavoriteChatUser.fromRawJson(response.body); return favoriteChatUser; } catch (e) { e as APIException; @@ -144,10 +181,12 @@ class ChatApiClient { print(AppState().chatDetails!.response!.token); } - dynamic request = MultipartRequest('POST', Uri.parse('${ApiConsts.chatMediaImageUploadUrl}upload')); + dynamic request = MultipartRequest( + 'POST', Uri.parse('${ApiConsts.chatMediaImageUploadUrl}upload')); request.fields.addAll({'userId': userId, 'fileSource': '1'}); request.files.add(await MultipartFile.fromPath('files', file.path)); - request.headers.addAll({'Authorization': 'Bearer ${AppState().chatDetails!.response!.token}'}); + request.headers.addAll( + {'Authorization': 'Bearer ${AppState().chatDetails!.response!.token}'}); StreamedResponse response = await request.send(); String data = await response.stream.bytesToString(); if (!kReleaseMode) { @@ -157,7 +196,8 @@ class ChatApiClient { } // Download File For Chat - Future downloadURL({required String fileName, required String fileTypeDescription}) async { + Future downloadURL( + {required String fileName, required String fileTypeDescription}) async { Response response = await ApiClient().postJsonForResponse( "${ApiConsts.chatMediaImageUploadUrl}download", {"fileType": fileTypeDescription, "fileName": fileName, "fileSource": 1}, @@ -168,7 +208,8 @@ class ChatApiClient { } //Get Chat Users & Favorite Images - Future> getUsersImages({required List encryptedEmails}) async { + Future> getUsersImages( + {required List encryptedEmails}) async { List imagesData = []; Response response = await ApiClient().postJsonForResponse( "${ApiConsts.chatUserImages}images", @@ -188,4 +229,128 @@ class ChatApiClient { } return imagesData; } + + //group chat apis start here. + Future getGroupsByUserId() async { + try { + Response response = await ApiClient().getJsonForResponse( + "${ApiConsts.getGroupByUserId}${AppState().chatDetails!.response!.id}", + token: AppState().chatDetails!.response!.token, + ); + if (!kReleaseMode) { + logger.i("res: " + response.body); + } + return groups.GetUserGroups.fromRawJson(response.body); + } catch (e) { + //if fail api returning 500 hence just printing here + print(e); + throw e; + } + } + + Future deleteGroup(int? groupId) async { + try { + Response response = await ApiClient().postJsonForResponse( + ApiConsts.deleteGroup, + {"groupId":groupId}, + token: AppState().chatDetails!.response!.token, + ); + if (!kReleaseMode) { + logger.i("res: " + response.body); + } + return response; + } catch (e) { + //if fail api returning 500 hence just printing here + print(e); + throw e; + } + } + + Future updateGroupAdmin( + int? groupId, List groupList) async { + try { + Response response = await ApiClient().postJsonForResponse( + ApiConsts.updateGroupAdmin, + {"groupId": groupId, "groupUserList": groupList}, + token: AppState().chatDetails!.response!.token, + ); + if (!kReleaseMode) { + logger.i("res: " + response.body); + } + return response; + } catch (e) { + //if fail api returning 500 hence just printing here + print(e); + throw e; + } + } + + Future> getGroupChatHistory( + int? groupId, List groupList) async { + try { + Response response = await ApiClient().postJsonForResponse( + ApiConsts.getGroupChatHistoryAsync, + { + "groupId": groupId, + "targetUserList": groupList, + "CurrentId": AppState().chatDetails!.response!.id + }, + token: AppState().chatDetails!.response!.token, + ); + if (!kReleaseMode) { + logger.i("res: " + response.body); + } + List groupChat = []; + List groupChatData = json.decode(response.body); + for (var i in groupChatData) { + groupChat.add(GetGroupChatHistoryAsync.fromJson(i)); + } + + groupChat.sort((a, b) => b.createdDate!.compareTo(a.createdDate!)); + return groupChat; + // for(GetGroupChatHistoryAsync i in groupChat) { + // return GetGroupChatHistoryAsync.fromJson(jsonEncode(i)); + // } + } catch (e) { + //if fail api returning 500 hence just printing here + print(e); + throw e; + } + } + + Future addGroupAndUsers(createGroup.CreateGroupRequest request) async { + try { + Response response = await ApiClient().postJsonForResponse( + ApiConsts.addGroupsAndUsers, + request, + token: AppState().chatDetails!.response!.token, + ); + if (!kReleaseMode) { + logger.i("res: " + response.body); + } + return response.body; + } catch (e) { + //if fail api returning 500 hence just printing here + print(e); + throw e; + } + } + + Future updateGroupAndUsers(createGroup.CreateGroupRequest request) async { + try { + Response response = await ApiClient().postJsonForResponse( + ApiConsts.updateGroupsAndUsers, + request, + token: AppState().chatDetails!.response!.token, + ); + if (!kReleaseMode) { + logger.i("res: " + response.body); + } + return response.body; + } catch (e) { + //if fail api returning 500 hence just printing here + print(e); + throw e; + } + } } diff --git a/lib/api/dashboard_api_client.dart b/lib/api/dashboard_api_client.dart index 544ba71..77cc37d 100644 --- a/lib/api/dashboard_api_client.dart +++ b/lib/api/dashboard_api_client.dart @@ -201,7 +201,7 @@ class DashboardApiClient { }, url, postParams); } - Future setAdvertisementViewed(String masterID, int advertisementId, String ackValue) async { + Future setAdvertisementViewed(String masterID, int advertisementId, String? ackValue) async { String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed"; Map postParams = { diff --git a/lib/api/profile_api_client.dart b/lib/api/profile_api_client.dart index 030a949..342ac31 100644 --- a/lib/api/profile_api_client.dart +++ b/lib/api/profile_api_client.dart @@ -180,7 +180,7 @@ class ProfileApiClient { ], "P_CONTACT_RELATIONSHIP_ID": contactRelationId, "P_ACTION": actionType, - "PayrollCodeStr": "CS", + "PayrollCodeStr": "HMG", "LegislationCodeStr": "SA", }; postParams.addAll(AppState().postParamsJson); diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart index f59994c..b0c93ee 100644 --- a/lib/app_state/app_state.dart +++ b/lib/app_state/app_state.dart @@ -90,7 +90,7 @@ class AppState { String get getHuaweiPushToken => _huaweiPushToken; - final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 4.9, mobileType: Platform.isAndroid ? "android" : "ios"); + final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 5.0, mobileType: Platform.isAndroid ? "android" : "ios"); void setPostParamsInitConfig() { isAuthenticated = false; diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart index 45ef661..64047e5 100644 --- a/lib/classes/consts.dart +++ b/lib/classes/consts.dart @@ -20,6 +20,14 @@ class ApiConsts { static String chatLoginTokenUrl = chatServerBaseApiUrl + "user/"; static String chatHubConnectionUrl = chatServerBaseUrl + "ConnectionChatHub"; + //Groups + static String getGroupByUserId = chatServerBaseApiUrl + "group/getgroupsbyuserid/"; + static String deleteGroup = chatServerBaseApiUrl + "group/updateGroupIsDeleted/"; + static String updateGroupAdmin = chatServerBaseApiUrl + "group/updateGroupAdmin/"; + static String getGroupChatHistoryAsync = chatServerBaseApiUrl + "GroupChat/GetGroupChatHistoryAsync/"; + static String addGroupsAndUsers = chatServerBaseApiUrl + "group/addgroupandusers/"; + static String updateGroupsAndUsers = chatServerBaseApiUrl + "group/updategroupandusers/"; + // static String chatSearchMember = chatLoginTokenUrl + "user/"; static String chatRecentUrl = chatServerBaseApiUrl + "UserChatHistory/"; //For a Mem static String chatSingleUserHistoryUrl = chatServerBaseApiUrl + "UserChatHistory/"; diff --git a/lib/classes/notifications.dart b/lib/classes/notifications.dart index 47d4acd..8f432d7 100644 --- a/lib/classes/notifications.dart +++ b/lib/classes/notifications.dart @@ -109,7 +109,10 @@ class AppNotifications { debugPrint("HUAWEI PUSH TOKEN: $_huaweiToken"); } - void _onTokenError(Object error) {} + void _onTokenError(Object error) { + debugPrint("HUAWEI PUSH TOKEN ERROR: $error"); + Utils.hideLoading(context); + } Future initTokenStream(Function loginCallback) async { huawei_push.Push.getTokenStream.listen(_onTokenEvent, onError: _onTokenError).onData((data) { diff --git a/lib/classes/utils.dart b/lib/classes/utils.dart index 7885fad..9c55375 100644 --- a/lib/classes/utils.dart +++ b/lib/classes/utils.dart @@ -349,7 +349,7 @@ class Utils { } static Future selectDate(BuildContext context, DateTime selectedDate) async { - if (Platform.isIOS) { + if (!Platform.isIOS) { await showCupertinoModalPopup( context: context, builder: (BuildContext cxt) => Container( @@ -401,7 +401,6 @@ class Utils { } return false; } - static bool isDate(String input, String format) { try { DateTime d = DateFormat(format).parseStrict(input); diff --git a/lib/config/routes.dart b/lib/config/routes.dart index 705e40d..07a927d 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -8,6 +8,9 @@ import 'package:mohem_flutter_app/ui/bottom_sheets/attendence_details_bottom_she import 'package:mohem_flutter_app/ui/chat/chat_detailed_screen.dart'; import 'package:mohem_flutter_app/ui/chat/chat_home.dart'; import 'package:mohem_flutter_app/ui/chat/favorite_users_screen.dart'; +import 'package:mohem_flutter_app/ui/chat/group_chat_detaied_screen.dart'; +import 'package:mohem_flutter_app/ui/chat/group_members.dart'; +import 'package:mohem_flutter_app/ui/chat/manage_group.dart'; import 'package:mohem_flutter_app/ui/landing/dashboard_screen.dart'; import 'package:mohem_flutter_app/ui/landing/itg/change_itg_ad_password_screen.dart'; import 'package:mohem_flutter_app/ui/landing/itg/its_add_screen_video_image.dart'; @@ -190,6 +193,10 @@ class AppRoutes { static const String chatDetailed = "/chatDetailed"; static const String chatFavoriteUsers = "/chatFavoriteUsers"; + //Group Chat + static const String manageGroup = "/manageGroup"; + static const String groupMembers = "/groupmembers"; + static const String groupChatDetailed = "/groupChatDetailed"; //Marathon static const String marathonIntroScreen = "/marathonIntroScreen"; static const String marathonScreen = "/marathonScreen"; @@ -302,6 +309,11 @@ class AppRoutes { chatDetailed: (BuildContext context) => ChatDetailScreen(), chatFavoriteUsers: (BuildContext context) => ChatFavoriteUsersScreen(), + //Group Chat + manageGroup: (BuildContext context) => ManageGroupScreen(), + groupMembers: (BuildContext context) => GroupMembersScreen(), + groupChatDetailed: (BuildContext context) => GroupChatDetailScreen(), + // Marathon marathonIntroScreen: (BuildContext context) => MarathonIntroScreen(), marathonScreen: (BuildContext context) => MarathonScreen(), diff --git a/lib/extensions/int_extensions.dart b/lib/extensions/int_extensions.dart index 16bdd29..f46d5bb 100644 --- a/lib/extensions/int_extensions.dart +++ b/lib/extensions/int_extensions.dart @@ -10,6 +10,4 @@ extension IntExtensions on int { Widget get divider => Divider(height: toDouble(), thickness: toDouble(), color: MyColors.lightGreyEFColor); Widget get makeItSquare => SizedBox(width: toDouble(), height: toDouble()); - - } diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index c8bfdfa..1e2d5af 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -543,6 +543,8 @@ class CodegenLoader extends AssetLoader{ "noWinner": "حزين! لم يفز أحد اليوم.", "myTeam": "فريقي", "youCanPlayDemo": "لكن يمكنك لعب العرض", + "group": "مجموعة", + "searchGroup": "مجموعة البحث", "connectHmgWifi": "قم بتوصيل HMG WIFI", "connectedHmgWifi": "اتصال HMG WIFI", "itgForms": "نماذج (ITG)", @@ -1084,6 +1086,8 @@ static const Map en_US = { "noWinner": "Sad! No one won today.", "myTeam": "My Team", "youCanPlayDemo": "But you can play demo", + "group": "Groups", + "searchGroup": "Search Group", "connectHmgWifi": "Connect HMG WIFI", "connectedHmgWifi": "Connected HMG WIFI", "itgForms": "ITG Forms", @@ -1094,7 +1098,26 @@ static const Map en_US = { "allDocuments": "All\nDocuments", "expiredDocuments": "Expired\nDocuments", "missingDocuments": "Missing\nDocuments", - "uploadedDocuments": "Uploaded\nDocuments" + "uploadedDocuments": "Uploaded\nDocuments", + "manage": "Manage", + "members": "Members", + "areYouSureWantTodelete": "Are you sure want to delete?", + "groupMembers": "Group Members", + "manageGroup": "Manage Group", + "admin": "Admin", + "addUsers": "Add users to the group", + "editGroups": "Edit Group", + "groupNameshouldbe": "Group name should be minimum 10 character long", + "enterGroupName": "Please enter valid group Name", + "groupName": "Group Name", + "enterGroupNamePlease": "Please enter group name", + "audioCall": "Audio Call", + "videoCall": "Video Call", + "shareScreen": "Share Screen", + "searchByUserName": "Search By Username", + "userSearch": "User Search", + "userName": "User Name", + "userId": "UserID" }; static const Map> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 3a4921f..c5ec04f 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -513,6 +513,8 @@ abstract class LocaleKeys { static const noWinner = 'noWinner'; static const myTeam = 'myTeam'; static const youCanPlayDemo = 'youCanPlayDemo'; + static const group = 'group'; + static const searchGroup = 'searchGroup'; static const connectHmgWifi = 'connectHmgWifi'; static const connectedHmgWifi = 'connectedHmgWifi'; static const itgForms = 'itgForms'; @@ -525,4 +527,23 @@ abstract class LocaleKeys { static const missingDocuments = 'missingDocuments'; static const uploadedDocuments = 'uploadedDocuments'; + static const manage = 'manage'; + static const members = 'members'; + static const areYouSureWantTodelete = 'areYouSureWantTodelete'; + static const groupMembers = "groupMembers"; + static const manageGroup = "manageGroup"; + static const admin = "admin"; + static const addUsers ="addUsers"; + static const editGroups ="editGroups"; + static const groupNameshouldbe ="groupNameshouldbe"; + static const enterGroupName ="enterGroupName"; + static const groupName ="groupName"; + static const enterGroupNamePlease ="enterGroupNamePlease"; + static const audioCall = 'audioCall'; + static const videoCall ='videoCall'; + static const shareScreen ='shareScreen'; + static const searchByUserName ='searchByUserName'; + static const userSearch ='userSearch'; + static const userName ='userName'; + static const userId ='userId'; } diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 642c8ec..b59eec2 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -16,7 +16,7 @@ import 'package:geolocator_web/geolocator_web.dart'; import 'package:google_maps_flutter_web/google_maps_flutter_web.dart'; import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:just_audio_web/just_audio_web.dart'; -import 'package:record_web/record_web.dart'; +// import 'package:record_web/record_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; import 'package:video_player_web/video_player_web.dart'; @@ -35,7 +35,7 @@ void registerPlugins(Registrar registrar) { GoogleMapsPlugin.registerWith(registrar); ImagePickerPlugin.registerWith(registrar); JustAudioPlugin.registerWith(registrar); - RecordPluginWeb.registerWith(registrar); + //RecordPluginWeb.registerWith(registrar); SharedPreferencesPlugin.registerWith(registrar); UrlLauncherPlugin.registerWith(registrar); VideoPlayerPlugin.registerWith(registrar); diff --git a/lib/models/chat/create_group_request.dart b/lib/models/chat/create_group_request.dart new file mode 100644 index 0000000..b33297f --- /dev/null +++ b/lib/models/chat/create_group_request.dart @@ -0,0 +1,159 @@ +import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart'; + +class CreateGroupRequest { + String? groupName; + int? adminUserId; + List? groupUserList; + bool? canAttach; + bool? canAudioC; + bool? canShareS; + bool? canVideoC; + bool? isMeeting; + bool? canArchive; + int? groupId; + CreateGroupRequest( + {this.groupName, + this.adminUserId, + this.groupUserList, + this.canAttach, + this.canAudioC, + this.canShareS, + this.canVideoC, + this.isMeeting, + this.canArchive, + this.groupId + }); + + CreateGroupRequest.fromJson(Map json) { + groupName = json['groupName']; + adminUserId = json['adminUserId']; + if (json['groupUserList'] != null) { + groupUserList = []; + json['groupUserList'].forEach((v) { + groupUserList!.add(new ChatUser.fromJson(v)); + }); + } + canAttach = json['canAttach']; + canAudioC = json['canAudioC']; + canShareS = json['canShareS']; + canVideoC = json['canVideoC']; + isMeeting = json['isMeeting']; + canArchive = json['canArchive']; + groupId = json['groupId']; + } + + Map toJson() { + Map data = new Map(); + data['groupName'] = this.groupName; + data['adminUserId'] = this.adminUserId; + if (this.groupUserList != null) { + data['groupUserList'] = + this.groupUserList!.map((v) => v.toJson()).toList(); + } + data['canAttach'] = this.canAttach; + data['canAudioC'] = this.canAudioC; + data['canShareS'] = this.canShareS; + data['canVideoC'] = this.canVideoC; + data['isMeeting'] = this.isMeeting; + data['canArchive'] = this.canArchive; + data['groupId'] = this.groupId; + return data; + } +} + +class GroupUserList { + int? id; + String? userName; + String? email; + dynamic? phone; + String? title; + int? userStatus; + String? image; + int? unreadMessageCount; + int? userAction; + bool? isPin; + bool? isFav; + bool? isAdmin; + Null? rKey; + int? totalCount; + bool? isHuaweiDevice; + Null? deviceToken; + String? token; + bool? isDomainUser; + bool? isActiveCode; + String? encryptedUserId; + String? encryptedUserName; + + GroupUserList( + {this.id, + this.userName, + this.email, + this.phone, + this.title, + this.userStatus, + this.image, + this.unreadMessageCount, + this.userAction, + this.isPin, + this.isFav, + this.isAdmin, + this.rKey, + this.totalCount, + this.isHuaweiDevice, + this.deviceToken, + this.token, + this.isDomainUser, + this.isActiveCode, + this.encryptedUserId, + this.encryptedUserName}); + + GroupUserList.fromJson(Map json) { + id = json['id']; + userName = json['userName']; + email = json['email']; + phone = json['phone']; + title = json['title']; + userStatus = json['userStatus']; + image = json['image']; + unreadMessageCount = json['unreadMessageCount']; + userAction = json['userAction']; + isPin = json['isPin']; + isFav = json['isFav']; + isAdmin = json['isAdmin']; + rKey = json['rKey']; + totalCount = json['totalCount']; + isHuaweiDevice = json['isHuaweiDevice']; + deviceToken = json['deviceToken']; + token = json['token']; + isDomainUser = json['isDomainUser']; + isActiveCode = json['isActiveCode']; + encryptedUserId = json['encryptedUserId']; + encryptedUserName = json['encryptedUserName']; + } + + Map toJson() { + Map data = new Map(); + data['id'] = this.id; + data['userName'] = this.userName; + data['email'] = this.email; + data['phone'] = this.phone; + data['title'] = this.title; + data['userStatus'] = this.userStatus; + data['image'] = this.image; + data['unreadMessageCount'] = this.unreadMessageCount; + data['userAction'] = this.userAction; + data['isPin'] = this.isPin; + data['isFav'] = this.isFav; + data['isAdmin'] = this.isAdmin; + data['rKey'] = this.rKey; + data['totalCount'] = this.totalCount; + data['isHuaweiDevice'] = this.isHuaweiDevice; + data['deviceToken'] = this.deviceToken; + data['token'] = this.token; + data['isDomainUser'] = this.isDomainUser; + data['isActiveCode'] = this.isActiveCode; + data['encryptedUserId'] = this.encryptedUserId; + data['encryptedUserName'] = this.encryptedUserName; + return data; + } +} diff --git a/lib/models/chat/get_group_chat_history.dart b/lib/models/chat/get_group_chat_history.dart new file mode 100644 index 0000000..c8476b1 --- /dev/null +++ b/lib/models/chat/get_group_chat_history.dart @@ -0,0 +1,264 @@ +import 'dart:convert'; +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:just_audio/just_audio.dart'; + +class GetGroupChatHistoryAsync { + int? groupChatHistoryId; + String? contant; + String? contantNo; + int? chatEventId; + dynamic? fileTypeId; + bool? isSeen; + bool? isDelivered; + String? createdDate; + int? chatSource; + int? currentUserId; + String? currentUserName; + int? groupId; + String? groupName; + dynamic? encryptedGroupId; + dynamic? encryptedGroupName; + dynamic? callStatus; + String? conversationId; + List? groupChatHistoryTargetUserList; + FileTypeResponse? fileTypeResponse; + GroupChatReplyResponse? groupChatReplyResponse; + bool? isReplied; + bool? isImageLoaded; + Uint8List? image; + File? voice; + AudioPlayer? voiceController; + GetGroupChatHistoryAsync( + {this.groupChatHistoryId, + this.contant, + this.contantNo, + this.chatEventId, + this.fileTypeId, + this.isSeen, + this.isDelivered, + this.createdDate, + this.chatSource, + this.currentUserId, + this.currentUserName, + this.groupId, + this.groupName, + this.encryptedGroupId, + this.encryptedGroupName, + this.callStatus, + this.conversationId, + this.groupChatHistoryTargetUserList, + this.fileTypeResponse, + this.groupChatReplyResponse, + this.image, + this.isImageLoaded, + this.isReplied, + this.voice, + this.voiceController + }); + + GetGroupChatHistoryAsync.fromJson(Map json) { + groupChatHistoryId = json['groupChatHistoryId']; + contant = json['contant']; + contantNo = json['contantNo']; + chatEventId = json['chatEventId']; + fileTypeId = json['fileTypeId']; + isSeen = json['isSeen']; + isDelivered = json['isDelivered']; + createdDate = json['createdDate']; + chatSource = json['chatSource']; + currentUserId = json['currentUserId']; + currentUserName = json['currentUserName']; + groupId = json['groupId']; + groupName = json['groupName']; + encryptedGroupId = json['encryptedGroupId']; + encryptedGroupName = json['encryptedGroupName']; + callStatus = json['callStatus']; + conversationId = json['conversationId']; + if (json['groupChatHistoryTargetUserList'] != null) { + groupChatHistoryTargetUserList = []; + json['groupChatHistoryTargetUserList'].forEach((v) { + groupChatHistoryTargetUserList! + .add(new GroupChatHistoryTargetUserList.fromJson(v)); + }); + } + fileTypeResponse = json['fileTypeResponse'] != null + ? new FileTypeResponse.fromJson(json['fileTypeResponse']) + : null; + groupChatReplyResponse = json["groupChatReplyResponse"] == null ? null : GroupChatReplyResponse.fromJson(json["groupChatReplyResponse"]); + + isReplied= json['isReplied']; + isImageLoaded= json['isImageLoaded'] ??false; + image= json['image']; + voice= json['voice']; + voiceController = json["fileTypeId"] == 13 ? AudioPlayer() : null; + } + + Map toJson() { + Map data = new Map(); + data['groupChatHistoryId'] = this.groupChatHistoryId; + data['contant'] = this.contant; + data['contantNo'] = this.contantNo; + data['chatEventId'] = this.chatEventId; + data['fileTypeId'] = this.fileTypeId; + data['isSeen'] = this.isSeen; + data['isDelivered'] = this.isDelivered; + data['createdDate'] = this.createdDate; + data['chatSource'] = this.chatSource; + data['currentUserId'] = this.currentUserId; + data['currentUserName'] = this.currentUserName; + data['groupId'] = this.groupId; + data['groupName'] = this.groupName; + data['encryptedGroupId'] = this.encryptedGroupId; + data['encryptedGroupName'] = this.encryptedGroupName; + data['callStatus'] = this.callStatus; + data['conversationId'] = this.conversationId; + if (this.groupChatHistoryTargetUserList != null) { + data['groupChatHistoryTargetUserList'] = + this.groupChatHistoryTargetUserList!.map((v) => v.toJson()).toList(); + } + if (this.fileTypeResponse != null) { + data['fileTypeResponse'] = this.fileTypeResponse!.toJson(); + } + if(this.groupChatReplyResponse !=null) { + data['groupChatReplyResponse'] = this.groupChatReplyResponse; + } + + data['isReplied'] =isReplied; + data['isImageLoaded'] = isImageLoaded ?? false; + data['image'] = image; + data['voice'] = voice; + data["fileTypeId"] == 13 ? AudioPlayer() : null; + return data; + } +} + +class GroupChatHistoryTargetUserList { + int? groupChatHistoryLineId; + bool? isSeen; + bool? isDelivered; + int? targetUserId; + String? targetUserName; + dynamic? userAction; + + GroupChatHistoryTargetUserList( + {this.groupChatHistoryLineId, + this.isSeen, + this.isDelivered, + this.targetUserId, + this.targetUserName, + this.userAction}); + + GroupChatHistoryTargetUserList.fromJson(Map json) { + groupChatHistoryLineId = json['groupChatHistoryLineId']; + isSeen = json['isSeen']; + isDelivered = json['isDelivered']; + targetUserId = json['targetUserId']; + targetUserName = json['targetUserName']; + userAction = json['userAction']; + } + + Map toJson() { + Map data = new Map(); + data['groupChatHistoryLineId'] = this.groupChatHistoryLineId; + data['isSeen'] = this.isSeen; + data['isDelivered'] = this.isDelivered; + data['targetUserId'] = this.targetUserId; + data['targetUserName'] = this.targetUserName; + data['userAction'] = this.userAction; + return data; + } +} + +class FileTypeResponse { + int? fileTypeId; + dynamic? fileTypeName; + dynamic? fileTypeDescription; + dynamic? fileKind; + dynamic? fileName; + + FileTypeResponse( + {this.fileTypeId, + this.fileTypeName, + this.fileTypeDescription, + this.fileKind, + this.fileName}); + + FileTypeResponse.fromJson(Map json) { + fileTypeId = json['fileTypeId']; + fileTypeName = json['fileTypeName']; + fileTypeDescription = json['fileTypeDescription']; + fileKind = json['fileKind']; + fileName = json['fileName']; + } + + Map toJson() { + Map data = new Map(); + data['fileTypeId'] = this.fileTypeId; + data['fileTypeName'] = this.fileTypeName; + data['fileTypeDescription'] = this.fileTypeDescription; + data['fileKind'] = this.fileKind; + data['fileName'] = this.fileName; + return data; + } + +} + + +class GroupChatReplyResponse { + GroupChatReplyResponse( + {this.userChatHistoryId, + this.chatEventId, + this.contant, + this.contantNo, + this.fileTypeId, + this.createdDate, + this.targetUserId, + this.targetUserName, + this.fileTypeResponse, + this.isImageLoaded, + this.image, + this.voice}); + + int? userChatHistoryId; + int? chatEventId; + String? contant; + String? contantNo; + dynamic? fileTypeId; + DateTime? createdDate; + int? targetUserId; + String? targetUserName; + FileTypeResponse? fileTypeResponse; + bool? isImageLoaded; + Uint8List? image; + Uint8List? voice; + + factory GroupChatReplyResponse.fromJson(Map json) => GroupChatReplyResponse( + userChatHistoryId: json["userChatHistoryId"] == null ? null : json["userChatHistoryId"], + chatEventId: json["chatEventId"] == null ? null : json["chatEventId"], + contant: json["contant"] == null ? null : json["contant"], + contantNo: json["contantNo"] == null ? null : json["contantNo"], + fileTypeId: json["fileTypeId"], + createdDate: json["createdDate"] == null ? null : DateTime.parse(json["createdDate"]), + targetUserId: json["targetUserId"] == null ? null : json["targetUserId"], + targetUserName: json["targetUserName"] == null ? null : json["targetUserName"], + fileTypeResponse: json["fileTypeResponse"] == null ? null : FileTypeResponse.fromJson(json["fileTypeResponse"]), + isImageLoaded: false, + image: null, + voice: null, + ); + + Map toJson() => { + "userChatHistoryId": userChatHistoryId == null ? null : userChatHistoryId, + "chatEventId": chatEventId == null ? null : chatEventId, + "contant": contant == null ? null : contant, + "contantNo": contantNo == null ? null : contantNo, + "fileTypeId": fileTypeId, + "createdDate": createdDate == null ? null : createdDate!.toIso8601String(), + "targetUserId": targetUserId == null ? null : targetUserId, + "targetUserName": targetUserName == null ? null : targetUserName, + "fileTypeResponse": fileTypeResponse == null ? null : fileTypeResponse!.toJson(), + }; +} + diff --git a/lib/models/chat/get_search_user_chat_model.dart b/lib/models/chat/get_search_user_chat_model.dart index e69fd3b..7c638e9 100644 --- a/lib/models/chat/get_search_user_chat_model.dart +++ b/lib/models/chat/get_search_user_chat_model.dart @@ -69,6 +69,7 @@ class ChatUser { this.isImageLoaded, this.isImageLoading, this.userLocalDownlaodedImage, + this.isChecked }); int? id; @@ -89,7 +90,7 @@ class ChatUser { bool? isImageLoaded; bool? isImageLoading; File? userLocalDownlaodedImage; - + bool? isChecked; factory ChatUser.fromRawJson(String str) => ChatUser.fromJson(json.decode(str)); String toRawJson() => json.encode(toJson()); @@ -112,7 +113,9 @@ class ChatUser { isTyping: false, isImageLoaded: false, isImageLoading: true, - userLocalDownlaodedImage: null); + userLocalDownlaodedImage: null, + isChecked: false + ); Map toJson() => { "id": id == null ? null : id, @@ -129,5 +132,6 @@ class ChatUser { "isAdmin": isAdmin == null ? null : isAdmin, "rKey": rKey, "totalCount": totalCount == null ? null : totalCount, + "isChecked":isChecked }; } diff --git a/lib/models/chat/get_user_groups_by_id.dart b/lib/models/chat/get_user_groups_by_id.dart new file mode 100644 index 0000000..2520c43 --- /dev/null +++ b/lib/models/chat/get_user_groups_by_id.dart @@ -0,0 +1,261 @@ +import 'dart:convert'; + +class GetUserGroups { + List? groupresponse; + Null? errorResponses; + + GetUserGroups({this.groupresponse, this.errorResponses}); + factory GetUserGroups.fromRawJson(String str) => GetUserGroups.fromJson(json.decode(str)); + + String toRawJson() => json.encode(toJson()); + GetUserGroups.fromJson(Map json) { + if (json['response'] != null) { + groupresponse = []; + json['response'].forEach((v) { + if(v['isDeleted'] == false) + groupresponse!.add(new GroupResponse.fromJson(v)); + }); + } + errorResponses = json['errorResponses']; + } + + Map toJson() { + Map data = new Map(); + if (this.groupresponse != null) { + data['response'] = this.groupresponse!.map((v) => v.toJson()).toList(); + } + data['errorResponses'] = this.errorResponses; + return data; + } +} + +class GroupResponse { + int? groupId; + String? groupName; + Null? groupIcon; + bool? isDeleted; + bool? isAdmin; + bool? canVideoC; + bool? canAudioC; + bool? canShareS; + bool? canAttach; + bool? canArchive; + bool? isMeeting; + Null? meetingTime; + Null? extUserLink; + int? callStatus; + int? groupUnreadMessageCount; + AdminUser? adminUser; + List? groupUserList; + + GroupResponse( + {this.groupId, + this.groupName, + this.groupIcon, + this.isDeleted, + this.isAdmin, + this.canVideoC, + this.canAudioC, + this.canShareS, + this.canAttach, + this.canArchive, + this.isMeeting, + this.meetingTime, + this.extUserLink, + this.callStatus, + this.groupUnreadMessageCount, + this.adminUser, + this.groupUserList}); + + GroupResponse.fromJson(Map json) { + groupId = json['groupId']; + groupName = json['groupName']; + groupIcon = json['groupIcon']; + isDeleted = json['isDeleted']; + isAdmin = json['isAdmin']; + canVideoC = json['canVideoC']; + canAudioC = json['canAudioC']; + canShareS = json['canShareS']; + canAttach = json['canAttach']; + canArchive = json['canArchive']; + isMeeting = json['isMeeting']; + meetingTime = json['meetingTime']; + extUserLink = json['extUserLink']; + callStatus = json['callStatus']; + groupUnreadMessageCount = json['groupUnreadMessageCount']; + adminUser = json['adminUser'] != null + ? new AdminUser.fromJson(json['adminUser']) + : null; + if (json['groupUserList'] != null) { + groupUserList = []; + json['groupUserList'].forEach((v) { + groupUserList!.add(new GroupUserList.fromJson(v)); + }); + } + } + + Map toJson() { + Map data = new Map(); + data['groupId'] = this.groupId; + data['groupName'] = this.groupName; + data['groupIcon'] = this.groupIcon; + data['isDeleted'] = this.isDeleted; + data['isAdmin'] = this.isAdmin; + data['canVideoC'] = this.canVideoC; + data['canAudioC'] = this.canAudioC; + data['canShareS'] = this.canShareS; + data['canAttach'] = this.canAttach; + data['canArchive'] = this.canArchive; + data['isMeeting'] = this.isMeeting; + data['meetingTime'] = this.meetingTime; + data['extUserLink'] = this.extUserLink; + data['callStatus'] = this.callStatus; + data['groupUnreadMessageCount'] = this.groupUnreadMessageCount; + if (this.adminUser != null) { + data['adminUser'] = this.adminUser!.toJson(); + } + if (this.groupUserList != null) { + data['groupUserList'] = + this.groupUserList!.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class AdminUser { + int? id; + String? userName; + String? email; + Null? phone; + String? title; + int? userStatus; + Null? image; + int? unreadMessageCount; + Null? userAction; + bool? isPin; + bool? isFav; + bool? isAdmin; + Null? rKey; + int? totalCount; + + AdminUser( + {this.id, + this.userName, + this.email, + this.phone, + this.title, + this.userStatus, + this.image, + this.unreadMessageCount, + this.userAction, + this.isPin, + this.isFav, + this.isAdmin, + this.rKey, + this.totalCount}); + + AdminUser.fromJson(Map json) { + id = json['id']; + userName = json['userName']; + email = json['email']; + phone = json['phone']; + title = json['title']; + userStatus = json['userStatus']; + image = json['image']; + unreadMessageCount = json['unreadMessageCount']; + userAction = json['userAction']; + isPin = json['isPin']; + isFav = json['isFav']; + isAdmin = json['isAdmin']; + rKey = json['rKey']; + totalCount = json['totalCount']; + } + + Map toJson() { + Map data = new Map(); + data['id'] = this.id; + data['userName'] = this.userName; + data['email'] = this.email; + data['phone'] = this.phone; + data['title'] = this.title; + data['userStatus'] = this.userStatus; + data['image'] = this.image; + data['unreadMessageCount'] = this.unreadMessageCount; + data['userAction'] = this.userAction; + data['isPin'] = this.isPin; + data['isFav'] = this.isFav; + data['isAdmin'] = this.isAdmin; + data['rKey'] = this.rKey; + data['totalCount'] = this.totalCount; + return data; + } +} + +class GroupUserList { + int? id; + String? userName; + String? email; + Null? phone; + String? title; + int? userStatus; + Null? image; + int? unreadMessageCount; + int? userAction; + bool? isPin; + bool? isFav; + bool? isAdmin; + Null? rKey; + int? totalCount; + + GroupUserList( + {this.id, + this.userName, + this.email, + this.phone, + this.title, + this.userStatus, + this.image, + this.unreadMessageCount, + this.userAction, + this.isPin, + this.isFav, + this.isAdmin, + this.rKey, + this.totalCount}); + + GroupUserList.fromJson(Map json) { + id = json['id']; + userName = json['userName']; + email = json['email']; + phone = json['phone']; + title = json['title']; + userStatus = json['userStatus']; + image = json['image']; + unreadMessageCount = json['unreadMessageCount']; + userAction = json['userAction']; + isPin = json['isPin']; + isFav = json['isFav']; + isAdmin = json['isAdmin']; + rKey = json['rKey']; + totalCount = json['totalCount']; + } + + Map toJson() { + Map data = new Map(); + data['id'] = this.id; + data['userName'] = this.userName; + data['email'] = this.email; + data['phone'] = this.phone; + data['title'] = this.title; + data['userStatus'] = this.userStatus; + data['image'] = this.image; + data['unreadMessageCount'] = this.unreadMessageCount; + data['userAction'] = this.userAction; + data['isPin'] = this.isPin; + data['isFav'] = this.isFav; + data['isAdmin'] = this.isAdmin; + data['rKey'] = this.rKey; + data['totalCount'] = this.totalCount; + return data; + } +} diff --git a/lib/models/chat/target_users.dart b/lib/models/chat/target_users.dart new file mode 100644 index 0000000..d399a38 --- /dev/null +++ b/lib/models/chat/target_users.dart @@ -0,0 +1,32 @@ +class TargetUsers { + bool? isSeen; + bool? isDelivered; + int? targetUserId; + int? userAction; + int? userStatus; + + TargetUsers( + {this.isSeen, + this.isDelivered, + this.targetUserId, + this.userAction, + this.userStatus}); + + TargetUsers.fromJson(Map json) { + isSeen = json['isSeen']; + isDelivered = json['isDelivered']; + targetUserId = json['targetUserId']; + userAction = json['userAction']; + userStatus = json['userStatus']; + } + + Map toJson() { + Map data = new Map(); + data['isSeen'] = this.isSeen; + data['isDelivered'] = this.isDelivered; + data['targetUserId'] = this.targetUserId; + data['userAction'] = this.userAction; + data['userStatus'] = this.userStatus; + return data; + } +} diff --git a/lib/models/itg/advertisement.dart b/lib/models/itg/advertisement.dart index 96f4037..ebcf704 100644 --- a/lib/models/itg/advertisement.dart +++ b/lib/models/itg/advertisement.dart @@ -1,108 +1,156 @@ class Advertisement { + int? advertisementId; + String? advertisementTitle; + int? durationInSeconds; + bool? showDelete; + dynamic acknowledgment; + late bool isOptional; + List? viewAttachFileColl; + int? skipButtonId; + List? actionButtonsColl; + bool? isActive; + num? pageSize; + num? pageNo; + num? languageId; + Advertisement({ this.advertisementId, this.advertisementTitle, this.durationInSeconds, this.showDelete, this.acknowledgment, + required this.isOptional, + // this.skipBtnTextEn, + // this.skipBtnTextAr, this.viewAttachFileColl, + this.skipButtonId, + this.actionButtonsColl, this.isActive, this.pageSize, this.pageNo, this.languageId, - this.isOptional, - this.skipButtonTextEn, - this.skipButtonTextAr, }); - final int? advertisementId; - final String? advertisementTitle; - final int? durationInSeconds; - final bool? showDelete; - final dynamic acknowledgment; - final List? viewAttachFileColl; - final bool? isActive; - final dynamic pageSize; - final dynamic pageNo; - final dynamic languageId; - final bool? isOptional; - final String? skipButtonTextEn; - final String? skipButtonTextAr; - - factory Advertisement.fromJson(Map json) => Advertisement( - advertisementId: json["advertisementId"] == null ? null : json["advertisementId"], - advertisementTitle: json["advertisementTitle"] == null ? null : json["advertisementTitle"], - durationInSeconds: json["durationInSeconds"] == null ? null : json["durationInSeconds"], - showDelete: json["showDelete"] == null ? null : json["showDelete"], - acknowledgment: json["acknowledgment"], - viewAttachFileColl: json["viewAttachFileColl"] == null ? null : List.from(json["viewAttachFileColl"].map((x) => ViewAttachFileColl.fromJson(x))), - isActive: json["isActive"] == null ? null : json["isActive"], - pageSize: json["pageSize"], - pageNo: json["pageNo"], - languageId: json["languageId"], - isOptional: json["isOptional"] == null ? null : json["isOptional"], - skipButtonTextEn: json["skipBtnTextEn"] == null ? null : json["skipBtnTextEn"], - skipButtonTextAr: json["skipBtnTextAr"] == null ? null : json["skipBtnTextAr"], - ); + Advertisement.fromJson(Map json) { + advertisementId = json['advertisementId']; + advertisementTitle = json['advertisementTitle']; + durationInSeconds = json['durationInSeconds']; + showDelete = json['showDelete']; + acknowledgment = json['acknowledgment']; + isOptional = json['isOptional']; + // skipBtnTextEn = json['skipBtnTextEn']; + // skipBtnTextAr = json['skipBtnTextAr']; + if (json['viewAttachFileColl'] != null) { + viewAttachFileColl = []; + json['viewAttachFileColl'].forEach((v) { + viewAttachFileColl!.add(ViewAttachFileColl.fromJson(v)); + }); + } + skipButtonId = json['skipButtonId']; + if (json['actionButtonsColl'] != null) { + actionButtonsColl = []; + json['actionButtonsColl'].forEach((v) { + actionButtonsColl!.add(ActionButtonsColl.fromJson(v)); + }); + } + isActive = json['isActive']; + pageSize = json['pageSize']; + pageNo = json['pageNo']; + languageId = json['languageId']; + } - Map toJson() => { - "advertisementId": advertisementId == null ? null : advertisementId, - "advertisementTitle": advertisementTitle == null ? null : advertisementTitle, - "durationInSeconds": durationInSeconds == null ? null : durationInSeconds, - "showDelete": showDelete == null ? null : showDelete, - "acknowledgment": acknowledgment, - "viewAttachFileColl": viewAttachFileColl == null ? null : List.from(viewAttachFileColl!.map((x) => x.toJson())), - "isActive": isActive == null ? null : isActive, - "pageSize": pageSize, - "pageNo": pageNo, - "languageId": languageId, - }; + Map toJson() { + Map data = Map(); + data['advertisementId'] = this.advertisementId; + data['advertisementTitle'] = this.advertisementTitle; + data['durationInSeconds'] = this.durationInSeconds; + data['showDelete'] = this.showDelete; + data['acknowledgment'] = this.acknowledgment; + data['isOptional'] = this.isOptional; + // data['skipBtnTextEn'] = this.skipBtnTextEn; + // data['skipBtnTextAr'] = this.skipBtnTextAr; + if (this.viewAttachFileColl != null) { + data['viewAttachFileColl'] = this.viewAttachFileColl!.map((v) => v.toJson()).toList(); + } + data['skipButtonId'] = this.skipButtonId; + if (this.actionButtonsColl != null) { + data['actionButtonsColl'] = this.actionButtonsColl!.map((v) => v.toJson()).toList(); + } + data['isActive'] = this.isActive; + data['pageSize'] = this.pageSize; + data['pageNo'] = this.pageNo; + data['languageId'] = this.languageId; + return data; + } } class ViewAttachFileColl { - ViewAttachFileColl({ - this.attachmentId, - this.fileName, - this.contentType, - this.attachFileStream, - this.base64String, - this.isActive, - this.referenceItemId, - this.content, - this.filePath, - }); + dynamic attachmentId; + String? fileName; + String? contentType; + dynamic attachFileStream; + String? base64String; + dynamic isActive; + dynamic referenceItemId; + dynamic content; + dynamic filePath; + + ViewAttachFileColl({this.attachmentId, this.fileName, this.contentType, this.attachFileStream, this.base64String, this.isActive, this.referenceItemId, this.content, this.filePath}); + + ViewAttachFileColl.fromJson(Map json) { + attachmentId = json['attachmentId']; + fileName = json['fileName']; + contentType = json['contentType']; + attachFileStream = json['attachFileStream']; + base64String = json['base64String']; + isActive = json['isActive']; + referenceItemId = json['referenceItemId']; + content = json['content']; + filePath = json['filePath']; + } + + Map toJson() { + Map data = new Map(); + data['attachmentId'] = this.attachmentId; + data['fileName'] = this.fileName; + data['contentType'] = this.contentType; + data['attachFileStream'] = this.attachFileStream; + data['base64String'] = this.base64String; + data['isActive'] = this.isActive; + data['referenceItemId'] = this.referenceItemId; + data['content'] = this.content; + data['filePath'] = this.filePath; + return data; + } +} + +class ActionButtonsColl { + late int actionButtonId; + late String btnTextEn; + late String btnTextAr; + late String actionValue; + late dynamic iconOrImage; + late int orderNo; - final dynamic attachmentId; - final String? fileName; - final String? contentType; - final dynamic attachFileStream; - final String? base64String; - final dynamic isActive; - final dynamic referenceItemId; - final dynamic content; - final dynamic filePath; + ActionButtonsColl({required this.actionButtonId, required this.btnTextEn, required this.btnTextAr, required this.actionValue, required this.iconOrImage, required this.orderNo}); - factory ViewAttachFileColl.fromJson(Map json) => ViewAttachFileColl( - attachmentId: json["attachmentId"], - fileName: json["fileName"] == null ? null : json["fileName"], - contentType: json["contentType"] == null ? null : json["contentType"], - attachFileStream: json["attachFileStream"], - base64String: json["base64String"] == null ? null : json["base64String"], - isActive: json["isActive"], - referenceItemId: json["referenceItemId"], - content: json["content"], - filePath: json["filePath"], - ); + ActionButtonsColl.fromJson(Map json) { + actionButtonId = json['actionButtonId']; + btnTextEn = json['btnTextEn']; + btnTextAr = json['btnTextAr']; + actionValue = json['actionValue']; + iconOrImage = json['iconOrImage']; + orderNo = json['orderNo']; + } - Map toJson() => { - "attachmentId": attachmentId, - "fileName": fileName == null ? null : fileName, - "contentType": contentType == null ? null : contentType, - "attachFileStream": attachFileStream, - "base64String": base64String == null ? null : base64String, - "isActive": isActive, - "referenceItemId": referenceItemId, - "content": content, - "filePath": filePath, - }; + Map toJson() { + Map data = new Map(); + data['actionButtonId'] = this.actionButtonId; + data['btnTextEn'] = this.btnTextEn; + data['btnTextAr'] = this.btnTextAr; + data['actionValue'] = this.actionValue; + data['iconOrImage'] = this.iconOrImage; + data['orderNo'] = this.orderNo; + return data; + } } diff --git a/lib/models/itg/survey_model.dart b/lib/models/itg/survey_model.dart index 7cdbbdd..f9ac415 100644 --- a/lib/models/itg/survey_model.dart +++ b/lib/models/itg/survey_model.dart @@ -5,9 +5,9 @@ class SurveyModel { String? description; List? questions; bool? isActive; - Null? pageSize; - Null? pageNo; - Null? languageId; + dynamic pageSize; + dynamic pageNo; + dynamic languageId; SurveyModel({this.surveyId, this.referenceNo, this.title, this.description, this.questions, this.isActive, this.pageSize, this.pageNo, this.languageId}); @@ -51,13 +51,13 @@ class Questions { bool? isRequired; String? type; int? sequenceNo; - Null? surveyId; + dynamic surveyId; List? options; - Null? rspPercentage; - Null? isActive; - Null? pageSize; - Null? pageNo; - Null? languageId; + dynamic rspPercentage; + dynamic isActive; + dynamic pageSize; + dynamic pageNo; + dynamic languageId; Questions({this.questionId, this.title, this.isRequired, this.type, this.sequenceNo, this.surveyId, this.options, this.rspPercentage, this.isActive, this.pageSize, this.pageNo, this.languageId}); @@ -107,12 +107,12 @@ class Options { bool? isCommentsRequired; int? sequenceNo; int? questionId; - Null? rspPercentage; - Null? count; - Null? isActive; - Null? pageSize; - Null? pageNo; - Null? languageId; + dynamic rspPercentage; + dynamic count; + dynamic isActive; + dynamic pageSize; + dynamic pageNo; + dynamic languageId; Options({this.optionId, this.title, this.isCommentsRequired, this.sequenceNo, this.questionId, this.rspPercentage, this.count, this.isActive, this.pageSize, this.pageNo, this.languageId}); diff --git a/lib/models/itg_forms_models/itg_request_model.dart b/lib/models/itg_forms_models/itg_request_model.dart index ba10305..87d8280 100644 --- a/lib/models/itg_forms_models/itg_request_model.dart +++ b/lib/models/itg_forms_models/itg_request_model.dart @@ -6,7 +6,7 @@ class ITGRequest { List? allowedActions; List? attachments; List? fieldGoups; - Null? grantFields; + dynamic grantFields; List? wFHistory; ITGRequest({this.allowedActions, this.attachments, this.fieldGoups, this.grantFields, this.wFHistory}); diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart index d374114..00545b2 100644 --- a/lib/provider/chat_provider_model.dart +++ b/lib/provider/chat_provider_model.dart @@ -19,10 +19,20 @@ import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/main.dart'; import 'package:mohem_flutter_app/models/chat/chat_user_image_model.dart'; +import 'package:mohem_flutter_app/models/chat/create_group_request.dart' + as createGroup; +import 'package:mohem_flutter_app/models/chat/get_group_chat_history.dart' + as groupchathistory; import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart'; import 'package:mohem_flutter_app/models/chat/get_single_user_chat_list_model.dart'; -import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart' as userLoginToken; -import 'package:mohem_flutter_app/models/chat/make_user_favotire_unfavorite_chat_model.dart' as fav; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart' + as groups; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart' + as userLoginToken; +import 'package:mohem_flutter_app/models/chat/make_user_favotire_unfavorite_chat_model.dart' + as fav; +import 'package:mohem_flutter_app/models/chat/target_users.dart'; import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart'; import 'package:mohem_flutter_app/ui/chat/chat_detailed_screen.dart'; import 'package:mohem_flutter_app/ui/landing/dashboard_screen.dart'; @@ -40,6 +50,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { TextEditingController message = TextEditingController(); TextEditingController search = TextEditingController(); + TextEditingController searchGroup = TextEditingController(); + List userChatHistory = [], repliedMsg = []; List? pChatHistory, searchedChats; String chatCID = ''; @@ -52,7 +64,10 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { List favUsersList = []; int paginationVal = 0; int? cTypingUserId = 0; - bool isTextMsg = false, isReplyMsg = false, isAttachmentMsg = false, isVoiceMsg = false; + bool isTextMsg = false, + isReplyMsg = false, + isAttachmentMsg = false, + isVoiceMsg = false; // Audio Recoding Work Timer? _timer; @@ -67,7 +82,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { late PlayerController playerController; List getEmployeeSubordinatesList = []; List teamMembersList = []; - + groups.GetUserGroups userGroups = groups.GetUserGroups(); Material.TextDirection textDirection = Material.TextDirection.ltr; bool isRTL = false; String msgText = ""; @@ -75,14 +90,18 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { //Chat Home Page Counter int chatUConvCounter = 0; + late List groupChatHistory, groupChatReplyData; + /// Search Provider List? chatUsersList = []; int pageNo = 1; bool disbaleChatForThisUser = false; + List? uGroups = [], searchGroups = []; Future getUserAutoLoginToken() async { - userLoginToken.UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken(); + userLoginToken.UserAutoLoginModel userLoginResponse = + await ChatApiClient().getUserLoginToken(); if (userLoginResponse.response != null) { AppState().setchatUserDetails = userLoginResponse; } else { @@ -103,26 +122,43 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } chatHubConnection.on("OnDeliveredChatUserAsync", onMsgReceived); chatHubConnection.on("OnGetChatConversationCount", onNewChatConversion); + + //group On message + + chatHubConnection.on("OnDeliveredGroupChatHistoryAsync", onGroupMsgReceived); } Future getHubConnection() async { HubConnection hub; - HttpConnectionOptions httpOp = HttpConnectionOptions(skipNegotiation: false, logMessageContent: true); + HttpConnectionOptions httpOp = + HttpConnectionOptions(skipNegotiation: false, logMessageContent: true); hub = HubConnectionBuilder() - .withUrl(ApiConsts.chatHubConnectionUrl + "?UserId=${AppState().chatDetails!.response!.id}&source=Desktop&access_token=${AppState().chatDetails!.response!.token}", options: httpOp) - .withAutomaticReconnect(retryDelays: [2000, 5000, 10000, 20000]).build(); + .withUrl( + ApiConsts.chatHubConnectionUrl + + "?UserId=${AppState().chatDetails!.response!.id}&source=Desktop&access_token=${AppState().chatDetails!.response!.token}", + options: httpOp) + .withAutomaticReconnect( + retryDelays: [2000, 5000, 10000, 20000]).build(); return hub; } void registerEvents() { chatHubConnection.on("OnUpdateUserStatusAsync", changeStatus); // chatHubConnection.on("OnDeliveredChatUserAsync", onMsgReceived); + chatHubConnection.on("OnSubmitChatAsync", OnSubmitChatAsync); chatHubConnection.on("OnUserTypingAsync", onUserTyping); chatHubConnection.on("OnUserCountAsync", userCountAsync); // chatHubConnection.on("OnUpdateUserChatHistoryWindowsAsync", updateChatHistoryWindow); - chatHubConnection.on("OnGetUserChatHistoryNotDeliveredAsync", chatNotDelivered); - chatHubConnection.on("OnUpdateUserChatHistoryStatusAsync", updateUserChatStatus); + chatHubConnection.on( + "OnGetUserChatHistoryNotDeliveredAsync", chatNotDelivered); + chatHubConnection.on( + "OnUpdateUserChatHistoryStatusAsync", updateUserChatStatus); + chatHubConnection.on( + "OnGetGroupUserStatusAsync", getGroupUserStatus); + + // + // {"type":1,"target":"","arguments":[[{"id":217869,"userName":"Sultan.Khan","email":"Sultan.Khan@cloudsolutions.com.sa","phone":null,"title":"Sultan.Khan","userStatus":1,"image":null,"unreadMessageCount":0,"userAction":3,"isPin":false,"isFav":false,"isAdmin":false,"rKey":null,"totalCount":0,"isHuaweiDevice":false,"deviceToken":null},{"id":15153,"userName":"Tamer.Fanasheh","email":"Tamer.F@cloudsolutions.com.sa","phone":null,"title":"Tamer Fanasheh","userStatus":2,"image":null,"unreadMessageCount":0,"userAction":3,"isPin":false,"isFav":false,"isAdmin":true,"rKey":null,"totalCount":0,"isHuaweiDevice":false,"deviceToken":null}]]} if (kDebugMode) { logger.i("All listeners registered"); @@ -132,9 +168,11 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { Future getUserRecentChats() async { ChatUserModel recentChat = await ChatApiClient().getRecentChats(); ChatUserModel favUList = await ChatApiClient().getFavUsers(); + // userGroups = await ChatApiClient().getGroupsByUserId(); if (favUList.response != null && recentChat.response != null) { favUsersList = favUList.response!; - favUsersList.sort((ChatUser a, ChatUser b) => a.userName!.toLowerCase().compareTo(b.userName!.toLowerCase())); + favUsersList.sort((ChatUser a, ChatUser b) => + a.userName!.toLowerCase().compareTo(b.userName!.toLowerCase())); for (dynamic user in recentChat.response!) { for (dynamic favUser in favUList.response!) { if (user.id == favUser.id) { @@ -144,10 +182,13 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } } pChatHistory = recentChat.response ?? []; - pChatHistory!.sort((ChatUser a, ChatUser b) => a.userName!.toLowerCase().compareTo(b.userName!.toLowerCase())); + uGroups = userGroups.groupresponse ?? []; + pChatHistory!.sort((ChatUser a, ChatUser b) => + a.userName!.toLowerCase().compareTo(b.userName!.toLowerCase())); searchedChats = pChatHistory; isLoading = false; - await invokeUserChatHistoryNotDeliveredAsync(userId: int.parse(AppState().chatDetails!.response!.id.toString())); + await invokeUserChatHistoryNotDeliveredAsync( + userId: int.parse(AppState().chatDetails!.response!.id.toString())); sort(); notifyListeners(); if (searchedChats!.isNotEmpty || favUsersList.isNotEmpty) { @@ -156,27 +197,38 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } Future invokeUserChatHistoryNotDeliveredAsync({required int userId}) async { - await chatHubConnection.invoke("GetUserChatHistoryNotDeliveredAsync", args: [userId]); + await chatHubConnection + .invoke("GetUserChatHistoryNotDeliveredAsync", args: [userId]); return ""; } - void getSingleUserChatHistory({required int senderUID, required int receiverUID, required bool loadMore, bool isNewChat = false}) async { + void getSingleUserChatHistory( + {required int senderUID, + required int receiverUID, + required bool loadMore, + bool isNewChat = false}) async { isLoading = true; if (isNewChat) userChatHistory = []; if (!loadMore) paginationVal = 0; isChatScreenActive = true; receiverID = receiverUID; - Response response = await ChatApiClient().getSingleUserChatHistory(senderUID: senderUID, receiverUID: receiverUID, loadMore: loadMore, paginationVal: paginationVal); + Response response = await ChatApiClient().getSingleUserChatHistory( + senderUID: senderUID, + receiverUID: receiverUID, + loadMore: loadMore, + paginationVal: paginationVal); if (response.statusCode == 204) { if (isNewChat) { userChatHistory = []; } else if (loadMore) {} } else { if (loadMore) { - List temp = getSingleUserChatModel(response.body).reversed.toList(); + List temp = + getSingleUserChatModel(response.body).reversed.toList(); userChatHistory.addAll(temp); } else { - userChatHistory = getSingleUserChatModel(response.body).reversed.toList(); + userChatHistory = + getSingleUserChatModel(response.body).reversed.toList(); } } isLoading = false; @@ -203,7 +255,9 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { dynamic data = [ { "userChatHistoryId": element.userChatHistoryId, - "TargetUserId": element.currentUserId == receiverID ? element.currentUserId : element.targetUserId, + "TargetUserId": element.currentUserId == receiverID + ? element.currentUserId + : element.targetUserId, "isDelivered": true, "isSeen": true, } @@ -225,7 +279,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { void updateUserChatHistoryStatusAsync(List data) { try { - chatHubConnection.invoke("UpdateUserChatHistoryStatusAsync", args: [data]); + chatHubConnection + .invoke("UpdateUserChatHistoryStatusAsync", args: [data]); } catch (e) { throw e; } @@ -233,13 +288,21 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { void updateUserChatHistoryOnMsg(List data) { try { - chatHubConnection.invoke("UpdateUserChatHistoryStatusAsync", args: [data]); + chatHubConnection + .invoke("UpdateUserChatHistoryStatusAsync", args: [data]); } catch (e) { throw e; } } - List getSingleUserChatModel(String str) => List.from(json.decode(str).map((x) => SingleUserChatModel.fromJson(x))); + List getSingleUserChatModel(String str) => + List.from( + json.decode(str).map((x) => SingleUserChatModel.fromJson(x))); + + List getGroupChatHistoryAsync(String str) => + List.from( + json.decode(str).map((x) => groupchathistory.GetGroupChatHistoryAsync.fromJson(x))); + Future uploadAttachments(String userId, File file) async { dynamic result; @@ -269,6 +332,11 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { notifyListeners(); } + void getGroupUserStatus(List? args){ + //note: need to implement this function... + print(args); + } + void onChatSeen(List? args) { dynamic items = args!.toList(); // for (var user in searchedChats!) { @@ -295,7 +363,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { void updateChatHistoryWindow(List? args) { dynamic items = args!.toList(); if (kDebugMode) { - logger.i("---------------------------------Update Chat History Windows Async -------------------------------------"); + logger.i( + "---------------------------------Update Chat History Windows Async -------------------------------------"); } logger.d(items); // for (var user in searchedChats!) { @@ -364,14 +433,26 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { data.first.currentUserName = temp.first.targetUserName; data.first.currentUserEmail = temp.first.targetUserEmail; - if (data.first.fileTypeId == 12 || data.first.fileTypeId == 4 || data.first.fileTypeId == 3) { - data.first.image = await ChatApiClient().downloadURL(fileName: data.first.contant!, fileTypeDescription: data.first.fileTypeResponse!.fileTypeDescription ?? "image/jpg"); + if (data.first.fileTypeId == 12 || + data.first.fileTypeId == 4 || + data.first.fileTypeId == 3) { + data.first.image = await ChatApiClient().downloadURL( + fileName: data.first.contant!, + fileTypeDescription: + data.first.fileTypeResponse!.fileTypeDescription ?? + "image/jpg"); } if (data.first.userChatReplyResponse != null) { if (data.first.fileTypeResponse != null) { - if (data.first.userChatReplyResponse!.fileTypeId == 12 || data.first.userChatReplyResponse!.fileTypeId == 4 || data.first.userChatReplyResponse!.fileTypeId == 3) { - data.first.userChatReplyResponse!.image = - await ChatApiClient().downloadURL(fileName: data.first.userChatReplyResponse!.contant!, fileTypeDescription: data.first.fileTypeResponse!.fileTypeDescription ?? "image/jpg"); + if (data.first.userChatReplyResponse!.fileTypeId == 12 || + data.first.userChatReplyResponse!.fileTypeId == 4 || + data.first.userChatReplyResponse!.fileTypeId == 3) { + data.first.userChatReplyResponse!.image = await ChatApiClient() + .downloadURL( + fileName: data.first.userChatReplyResponse!.contant!, + fileTypeDescription: + data.first.fileTypeResponse!.fileTypeDescription ?? + "image/jpg"); data.first.userChatReplyResponse!.isImageLoaded = true; } } @@ -379,11 +460,14 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } if (searchedChats != null) { - dynamic contain = searchedChats!.where((ChatUser element) => element.id == data.first.currentUserId); + dynamic contain = searchedChats! + .where((ChatUser element) => element.id == data.first.currentUserId); if (contain.isEmpty) { List emails = []; - emails.add(await EmailImageEncryption().encrypt(val: data.first.currentUserEmail!)); - List chatImages = await ChatApiClient().getUsersImages(encryptedEmails: emails); + emails.add(await EmailImageEncryption() + .encrypt(val: data.first.currentUserEmail!)); + List chatImages = + await ChatApiClient().getUsersImages(encryptedEmails: emails); searchedChats!.add( ChatUser( id: data.first.currentUserId, @@ -395,7 +479,9 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { isImageLoaded: true, userStatus: 1, isTyping: false, - userLocalDownlaodedImage: await downloadImageLocal(chatImages.first.profilePicture, data.first.currentUserId.toString()), + userLocalDownlaodedImage: await downloadImageLocal( + chatImages.first.profilePicture, + data.first.currentUserId.toString()), ), ); } @@ -420,7 +506,9 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { "userChatHistoryId": data.first.userChatHistoryId, "TargetUserId": temp.first.targetUserId, "isDelivered": true, - "isSeen": isChatScreenActive && data.first.currentUserId == receiverID ? true : false + "isSeen": isChatScreenActive && data.first.currentUserId == receiverID + ? true + : false } ]; updateUserChatHistoryOnMsg(list); @@ -428,6 +516,107 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { notifyListeners(); } + Future onGroupMsgReceived(List? parameters) async { + List data = [], temp = []; + + + for (dynamic msg in parameters!) { + // groupChatHistory.add(groupchathistory.GetGroupChatHistoryAsync.fromJson(msg)); + data.add(groupchathistory.GetGroupChatHistoryAsync.fromJson(msg)); + temp =data; + // data.first.currentUserId = temp.first.currentUserId; + // data.first.currentUserName = temp.first.currentUserName; + // + // data.first.currentUserId = temp.first.currentUserId; + // data.first.currentUserName = temp.first.currentUserName; + + + if (data.first.fileTypeId == 12 || + data.first.fileTypeId == 4 || + data.first.fileTypeId == 3) { + data.first.image = await ChatApiClient().downloadURL( + fileName: data.first.contant!, + fileTypeDescription: + data.first.fileTypeResponse!.fileTypeDescription ?? + "image/jpg"); + } + if (data.first.groupChatReplyResponse != null) { + if (data.first.fileTypeResponse != null) { + if (data.first.groupChatReplyResponse!.fileTypeId == 12 || + data.first.groupChatReplyResponse!.fileTypeId == 4 || + data.first.groupChatReplyResponse!.fileTypeId == 3) { + data.first.groupChatReplyResponse!.image = await ChatApiClient() + .downloadURL( + fileName: data.first.groupChatReplyResponse!.contant!, + fileTypeDescription: + data.first.fileTypeResponse!.fileTypeDescription ?? + "image/jpg"); + data.first.groupChatReplyResponse!.isImageLoaded = true; + } + } + } + } + + // if (searchedChats != null) { + // dynamic contain = searchedChats! + // .where((ChatUser element) => element.id == data.first.currentUserId); + // if (contain.isEmpty) { + // List emails = []; + // emails.add(await EmailImageEncryption() + // .encrypt(val: data.first.currentUserEmail!)); + // List chatImages = + // await ChatApiClient().getUsersImages(encryptedEmails: emails); + // searchedChats!.add( + // ChatUser( + // id: data.first.currentUserId, + // userName: data.first.currentUserName, + // email: data.first.currentUserEmail, + // unreadMessageCount: 0, + // isImageLoading: false, + // image: chatImages!.first.profilePicture ?? "", + // isImageLoaded: true, + // userStatus: 1, + // isTyping: false, + // userLocalDownlaodedImage: await downloadImageLocal( + // chatImages.first.profilePicture, + // data.first.currentUserId.toString()), + // ), + // ); + // } + // } + groupChatHistory.insert(0, data.first); + setMsgTune(); + // if (isChatScreenActive && data.first.currentUserId == receiverID) { + + // } else { + // if (searchedChats != null) { + // for (ChatUser user in searchedChats!) { + // if (user.id == data.first.currentUserId) { + // int tempCount = user.unreadMessageCount ?? 0; + // user.unreadMessageCount = tempCount + 1; + // } + // } + sort(); + //} + //} + // + // List list = [ + // { + // "userChatHistoryId": data.first.groupId, + // "TargetUserId": temp.first.currentUserId, + // "isDelivered": true, + // "isSeen": isChatScreenActive && data.first.currentUserId == receiverID + // ? true + // : false + // } + // ]; + // updateUserChatHistoryOnMsg(list); + // invokeChatCounter(userId: AppState().chatDetails!.response!.id!); + notifyListeners(); + } + + + void OnSubmitChatAsync(List? parameters) { print(isChatScreenActive); print(receiverID); @@ -445,7 +634,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { data.first.currentUserEmail = temp.first.targetUserEmail; } if (isChatScreenActive && data.first.currentUserId == receiverID) { - int index = userChatHistory.indexWhere((SingleUserChatModel element) => element.userChatHistoryId == 0); + int index = userChatHistory.indexWhere( + (SingleUserChatModel element) => element.userChatHistoryId == 0); logger.d(index); userChatHistory[index] = data.first; } @@ -455,7 +645,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { void sort() { searchedChats!.sort( - (ChatUser a, ChatUser b) => b.unreadMessageCount!.compareTo(a.unreadMessageCount!), + (ChatUser a, ChatUser b) => + b.unreadMessageCount!.compareTo(a.unreadMessageCount!), ); } @@ -586,14 +777,22 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { targetUserName: targetUserName, isReplied: false, fileTypeId: fileTypeId, - userChatReplyResponse: isReply ? UserChatReplyResponse.fromJson(repliedMsg.first.toJson()) : null, + userChatReplyResponse: isReply + ? UserChatReplyResponse.fromJson(repliedMsg.first.toJson()) + : null, fileTypeResponse: isAttachment ? FileTypeResponse( fileTypeId: fileTypeId, - fileTypeName: isVoiceMsg ? getFileExtension(voiceFile!.path).toString() : getFileExtension(selectedFile.path).toString(), + fileTypeName: isVoiceMsg + ? getFileExtension(voiceFile!.path).toString() + : getFileExtension(selectedFile.path).toString(), fileKind: "file", fileName: isVoiceMsg ? msg : selectedFile.path.split("/").last, - fileTypeDescription: isVoiceMsg ? getFileTypeDescription(getFileExtension(voiceFile!.path).toString()) : getFileTypeDescription(getFileExtension(selectedFile.path).toString()), + fileTypeDescription: isVoiceMsg + ? getFileTypeDescription( + getFileExtension(voiceFile!.path).toString()) + : getFileTypeDescription( + getFileExtension(selectedFile.path).toString()), ) : null, image: image, @@ -614,10 +813,298 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { String chatData = '{"contant":"$msg","contantNo":"$contentNo","chatEventId":$chatEventId,"fileTypeId": $fileTypeId,"currentUserId":${AppState().chatDetails!.response!.id},"chatSource":1,"userChatHistoryLineRequestList":[{"isSeen":false,"isDelivered":false,"targetUserId":$targetUserId,"targetUserStatus":1}],"chatReplyId":$chatReplyId,"conversationId":"$chatCID"}'; - await chatHubConnection.invoke("AddChatUserAsync", args: [json.decode(chatData)]); + + await chatHubConnection + .invoke("AddChatUserAsync", args: [json.decode(chatData)]); } - void sendChatMessage(BuildContext context, {required int targetUserId, required int userStatus, required String userEmail, required String targetUserName}) async { + //groupChatMessage + + Future sendGroupChatToServer( + {required int chatEventId, + required fileTypeId, + required int targetGroupId, + required String targetUserName, + required chatReplyId, + required bool isAttachment, + required bool isReply, + Uint8List? image, + required bool isImageLoaded, + String? userEmail, + int? userStatus, + File? voiceFile, + required bool isVoiceAttached, + required List userList + }) async { + Uuid uuid = const Uuid(); + String contentNo = uuid.v4(); + String msg; + if (isVoiceAttached) { + msg = voiceFile!.path.split("/").last; + } else { + msg = message.text; + logger.w(msg); + } + groupchathistory.GetGroupChatHistoryAsync data = + groupchathistory.GetGroupChatHistoryAsync( + //userChatHistoryId: 0, + chatEventId: chatEventId, + chatSource: 1, + contant: msg, + contantNo: contentNo, + conversationId: chatCID, + createdDate: DateTime.now().toString(), + currentUserId: AppState().chatDetails!.response!.id, + currentUserName: AppState().chatDetails!.response!.userName, + groupId: targetGroupId, + groupName: targetUserName, + isReplied: false, + fileTypeId: fileTypeId, + fileTypeResponse: isAttachment + ? groupchathistory.FileTypeResponse( + fileTypeId: fileTypeId, + fileTypeName: isVoiceMsg ? getFileExtension(voiceFile!.path).toString() : getFileExtension(selectedFile.path).toString(), + fileKind: "file", + fileName: isVoiceMsg ? msg : selectedFile.path.split("/").last, + fileTypeDescription: isVoiceMsg ? getFileTypeDescription(getFileExtension(voiceFile!.path).toString()) : getFileTypeDescription(getFileExtension(selectedFile.path).toString())) : null, + image: image, + isImageLoaded: isImageLoaded, + voice: isVoiceMsg ? voiceFile! : null, + voiceController: isVoiceMsg ? AudioPlayer() : null); + if (kDebugMode) { + logger.i("model data: " + jsonEncode(data)); + } + groupChatHistory.insert(0, data); + isTextMsg = false; + isReplyMsg = false; + isAttachmentMsg = false; + isVoiceMsg = false; + sFileType = ""; + message.clear(); + notifyListeners(); + + List targetUsers =[]; + + for (GroupUserList element in userList) { + targetUsers.add(TargetUsers(isDelivered: false,isSeen: false, targetUserId: element.id, userAction: element.userAction, userStatus: element.userStatus)); + + } + + String chatData = + '{"contant":"$msg","contantNo":"$contentNo","chatEventId":$chatEventId,"fileTypeId":$fileTypeId,"currentUserId":${AppState().chatDetails!.response!.id},"chatSource":1,"groupId":$targetGroupId,"groupChatHistoryLineRequestList":${json.encode(targetUsers)},"chatReplyId": $chatReplyId,"conversationId":"${uuid.v4()}"}'; + + await chatHubConnection.invoke("AddGroupChatHistoryAsync", + args: [json.decode(chatData)]); + } + + void sendGroupChatMessage(BuildContext context, + {required int targetUserId, + required int userStatus, + required String userEmail, + required String targetUserName, + required List userList, + }) async { + if (isTextMsg && !isAttachmentMsg && !isVoiceMsg && !isReplyMsg) { + logger.d("// Normal Text Message"); + if (message.text.isEmpty) { + return; + } + sendGroupChatToServer( + chatEventId: 1, + fileTypeId: null, + targetGroupId: targetUserId, + targetUserName: targetUserName, + isAttachment: false, + chatReplyId: null, + isReply: false, + isImageLoaded: false, + image: null, + isVoiceAttached: false, + userEmail: userEmail, + userStatus: userStatus, + userList:userList + ); + } else if (isTextMsg && !isAttachmentMsg && !isVoiceMsg && isReplyMsg) { + logger.d("// Text Message as Reply"); + if (message.text.isEmpty) { + return; + } + sendGroupChatToServer( + chatEventId: 1, + fileTypeId: null, + targetGroupId: targetUserId, + targetUserName: targetUserName, + chatReplyId: groupChatReplyData.first.groupChatHistoryId, + isAttachment: false, + isReply: true, + isImageLoaded: groupChatReplyData.first.isImageLoaded!, + image: groupChatReplyData.first.image, + isVoiceAttached: false, + voiceFile: null, + userEmail: userEmail, + userStatus: userStatus, + userList:userList + ); + } + // Attachment + else if (!isTextMsg && isAttachmentMsg && !isVoiceMsg && !isReplyMsg) { + logger.d("// Normal Image Message"); + Utils.showLoading(context); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), selectedFile); + String? ext = getFileExtension(selectedFile.path); + Utils.hideLoading(context); + sendGroupChatToServer( + chatEventId: 2, + fileTypeId: getFileType(ext.toString()), + targetGroupId: targetUserId, + targetUserName: targetUserName, + isAttachment: true, + chatReplyId: null, + isReply: false, + isImageLoaded: true, + image: selectedFile.readAsBytesSync(), + isVoiceAttached: false, + userEmail: userEmail, + userStatus: userStatus, + userList:userList + ); + } else if (!isTextMsg && isAttachmentMsg && !isVoiceMsg && isReplyMsg) { + logger.d("// Image as Reply Msg"); + Utils.showLoading(context); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), selectedFile); + String? ext = getFileExtension(selectedFile.path); + Utils.hideLoading(context); + sendGroupChatToServer( + chatEventId: 2, + fileTypeId: getFileType(ext.toString()), + + targetGroupId: targetUserId, + targetUserName: targetUserName, + isAttachment: true, + chatReplyId: repliedMsg.first.userChatHistoryId, + isReply: true, + isImageLoaded: true, + image: selectedFile.readAsBytesSync(), + isVoiceAttached: false, + userEmail: userEmail, + userStatus: userStatus, + userList:userList + ); + } + //Voice + + else if (!isTextMsg && !isAttachmentMsg && isVoiceMsg && !isReplyMsg) { + logger.d("// Normal Voice Message"); + + if (!isPause) { + path = await recorderController.stop(false); + } + if (kDebugMode) { + logger.i("path:" + path!); + } + File voiceFile = File(path!); + voiceFile.readAsBytesSync(); + _timer?.cancel(); + isPause = false; + isPlaying = false; + isRecoding = false; + Utils.showLoading(context); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), voiceFile); + String? ext = getFileExtension(voiceFile.path); + Utils.hideLoading(context); + sendGroupChatToServer( + chatEventId: 2, + fileTypeId: getFileType(ext.toString()), + //, + targetGroupId: targetUserId, + targetUserName: targetUserName, + chatReplyId: null, + isAttachment: true, + isReply: isReplyMsg, + isImageLoaded: false, + voiceFile: voiceFile, + isVoiceAttached: true, + userEmail: userEmail, + userStatus: userStatus, + userList:userList + ); + notifyListeners(); + } else if (!isTextMsg && !isAttachmentMsg && isVoiceMsg && isReplyMsg) { + logger.d("// Voice as Reply Msg"); + + if (!isPause) { + path = await recorderController.stop(false); + } + if (kDebugMode) { + logger.i("path:" + path!); + } + File voiceFile = File(path!); + voiceFile.readAsBytesSync(); + _timer?.cancel(); + isPause = false; + isPlaying = false; + isRecoding = false; + + Utils.showLoading(context); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), voiceFile); + String? ext = getFileExtension(voiceFile.path); + Utils.hideLoading(context); + sendGroupChatToServer( + chatEventId: 2, + fileTypeId: getFileType(ext.toString()), + targetGroupId: targetUserId, + targetUserName: targetUserName, + chatReplyId: null, + isAttachment: true, + isReply: isReplyMsg, + isImageLoaded: false, + voiceFile: voiceFile, + isVoiceAttached: true, + userEmail: userEmail, + userStatus: userStatus, + userList:userList + ); + notifyListeners(); + } + if (searchedChats != null) { + dynamic contain = searchedChats! + .where((ChatUser element) => element.id == targetUserId); + if (contain.isEmpty) { + List emails = []; + emails.add(await EmailImageEncryption().encrypt(val: userEmail)); + List chatImages = + await ChatApiClient().getUsersImages(encryptedEmails: emails); + searchedChats!.add( + ChatUser( + id: targetUserId, + userName: targetUserName, + unreadMessageCount: 0, + email: userEmail, + isImageLoading: false, + image: chatImages.first.profilePicture ?? "", + isImageLoaded: true, + isTyping: false, + isFav: false, + userStatus: userStatus, + // userLocalDownlaodedImage: await downloadImageLocal(chatImages.first.profilePicture, targetUserId.toString()), + ), + ); + notifyListeners(); + } + } + } + + void sendChatMessage(BuildContext context, + {required int targetUserId, + required int userStatus, + required String userEmail, + required String targetUserName, + + }) async { if (kDebugMode) { print("====================== Values ============================"); print("Is Text " + isTextMsg.toString()); @@ -668,7 +1155,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { else if (!isTextMsg && isAttachmentMsg && !isVoiceMsg && !isReplyMsg) { logger.d("// Normal Image Message"); Utils.showLoading(context); - dynamic value = await uploadAttachments(AppState().chatDetails!.response!.id.toString(), selectedFile); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), selectedFile); String? ext = getFileExtension(selectedFile.path); Utils.hideLoading(context); sendChatToServer( @@ -687,7 +1175,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } else if (!isTextMsg && isAttachmentMsg && !isVoiceMsg && isReplyMsg) { logger.d("// Image as Reply Msg"); Utils.showLoading(context); - dynamic value = await uploadAttachments(AppState().chatDetails!.response!.id.toString(), selectedFile); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), selectedFile); String? ext = getFileExtension(selectedFile.path); Utils.hideLoading(context); sendChatToServer( @@ -722,7 +1211,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { isPlaying = false; isRecoding = false; Utils.showLoading(context); - dynamic value = await uploadAttachments(AppState().chatDetails!.response!.id.toString(), voiceFile); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), voiceFile); String? ext = getFileExtension(voiceFile.path); Utils.hideLoading(context); sendChatToServer( @@ -756,7 +1246,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { isRecoding = false; Utils.showLoading(context); - dynamic value = await uploadAttachments(AppState().chatDetails!.response!.id.toString(), voiceFile); + dynamic value = await uploadAttachments( + AppState().chatDetails!.response!.id.toString(), voiceFile); String? ext = getFileExtension(voiceFile.path); Utils.hideLoading(context); sendChatToServer( @@ -775,11 +1266,13 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { notifyListeners(); } if (searchedChats != null) { - dynamic contain = searchedChats!.where((ChatUser element) => element.id == targetUserId); + dynamic contain = searchedChats! + .where((ChatUser element) => element.id == targetUserId); if (contain.isEmpty) { List emails = []; emails.add(await EmailImageEncryption().encrypt(val: userEmail)); - List chatImages = await ChatApiClient().getUsersImages(encryptedEmails: emails); + List chatImages = + await ChatApiClient().getUsersImages(encryptedEmails: emails); searchedChats!.add( ChatUser( id: targetUserId, @@ -792,7 +1285,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { isTyping: false, isFav: false, userStatus: userStatus, - userLocalDownlaodedImage: await downloadImageLocal(chatImages.first.profilePicture, targetUserId.toString()), + userLocalDownlaodedImage: await downloadImageLocal( + chatImages.first.profilePicture, targetUserId.toString()), ), ); notifyListeners(); @@ -822,7 +1316,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } void selectImageToUpload(BuildContext context) { - ImageOptions.showImageOptionsNew(context, true, (String image, File file) async { + ImageOptions.showImageOptionsNew(context, true, + (String image, File file) async { if (checkFileSize(file.path)) { selectedFile = file; isAttachmentMsg = true; @@ -911,7 +1406,13 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { repliedMsg.add(data); notifyListeners(); } - + void groupChatReply(groupchathistory.GetGroupChatHistoryAsync data) { + groupChatReplyData = []; + data.isReplied = true; + isReplyMsg = true; + groupChatReplyData.add(data); + notifyListeners(); + } void closeMe() { repliedMsg = []; isReplyMsg = false; @@ -924,13 +1425,18 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { return f.format(data); } - Future favoriteUser({required int userID, required int targetUserID, required bool fromSearch}) async { - fav.FavoriteChatUser favoriteChatUser = await ChatApiClient().favUser(userID: userID, targetUserID: targetUserID); + Future favoriteUser( + {required int userID, + required int targetUserID, + required bool fromSearch}) async { + fav.FavoriteChatUser favoriteChatUser = await ChatApiClient() + .favUser(userID: userID, targetUserID: targetUserID); if (favoriteChatUser.response != null) { for (ChatUser user in searchedChats!) { if (user.id == favoriteChatUser.response!.targetUserId!) { user.isFav = favoriteChatUser.response!.isFav; - dynamic contain = favUsersList!.where((ChatUser element) => element.id == favoriteChatUser.response!.targetUserId!); + dynamic contain = favUsersList!.where((ChatUser element) => + element.id == favoriteChatUser.response!.targetUserId!); if (contain.isEmpty) { favUsersList.add(user); } @@ -940,7 +1446,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { for (ChatUser user in chatUsersList!) { if (user.id == favoriteChatUser.response!.targetUserId!) { user.isFav = favoriteChatUser.response!.isFav; - dynamic contain = favUsersList!.where((ChatUser element) => element.id == favoriteChatUser.response!.targetUserId!); + dynamic contain = favUsersList!.where((ChatUser element) => + element.id == favoriteChatUser.response!.targetUserId!); if (contain.isEmpty) { favUsersList.add(user); } @@ -959,8 +1466,10 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { notifyListeners(); } - Future unFavoriteUser({required int userID, required int targetUserID}) async { - fav.FavoriteChatUser favoriteChatUser = await ChatApiClient().unFavUser(userID: userID, targetUserID: targetUserID); + Future unFavoriteUser( + {required int userID, required int targetUserID}) async { + fav.FavoriteChatUser favoriteChatUser = await ChatApiClient() + .unFavUser(userID: userID, targetUserID: targetUserID); if (favoriteChatUser.response != null) { for (ChatUser user in searchedChats!) { @@ -1030,6 +1539,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { favUsersList.clear(); searchedChats?.clear(); pChatHistory?.clear(); + uGroups?.clear(); + searchGroup?.clear(); chatHubConnection.stop(); AppState().chatDetails = null; } @@ -1063,12 +1574,14 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { emails.add(await EmailImageEncryption().encrypt(val: element.email!)); } - List chatImages = await ChatApiClient().getUsersImages(encryptedEmails: emails); + List chatImages = + await ChatApiClient().getUsersImages(encryptedEmails: emails); for (ChatUser user in searchedChats!) { for (ChatUserImageModel uImage in chatImages) { if (user.email == uImage.email) { user.image = uImage.profilePicture ?? ""; - user.userLocalDownlaodedImage = await downloadImageLocal(uImage.profilePicture, user.id.toString()); + user.userLocalDownlaodedImage = await downloadImageLocal( + uImage.profilePicture, user.id.toString()); user.isImageLoading = false; user.isImageLoaded = true; } @@ -1078,7 +1591,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { for (ChatUserImageModel uImage in chatImages) { if (favUser.email == uImage.email) { favUser.image = uImage.profilePicture ?? ""; - favUser.userLocalDownlaodedImage = await downloadImageLocal(uImage.profilePicture, favUser.id.toString()); + favUser.userLocalDownlaodedImage = await downloadImageLocal( + uImage.profilePicture, favUser.id.toString()); favUser.isImageLoading = false; favUser.isImageLoaded = true; } @@ -1095,7 +1609,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } else { await deleteFile(userID); Uint8List decodedBytes = base64Decode(encodedBytes); - Directory appDocumentsDirectory = await getApplicationDocumentsDirectory(); + Directory appDocumentsDirectory = + await getApplicationDocumentsDirectory(); String dirPath = '${appDocumentsDirectory.path}/chat_images'; if (!await Directory(dirPath).exists()) { await Directory(dirPath).create(); @@ -1118,7 +1633,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { Future downChatMedia(Uint8List bytes, String ext) async { String dir = (await getApplicationDocumentsDirectory()).path; - File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext); + File file = File( + "$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext); await file.writeAsBytes(bytes); return file.path; } @@ -1141,10 +1657,20 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } } - Future getChatMedia(BuildContext context, {required String fileName, required String fileTypeName, required int fileTypeID}) async { + Future getChatMedia(BuildContext context, + {required String fileName, + required String fileTypeName, + required int fileTypeID}) async { Utils.showLoading(context); - if (fileTypeID == 1 || fileTypeID == 5 || fileTypeID == 7 || fileTypeID == 6 || fileTypeID == 8 || fileTypeID == 2) { - Uint8List encodedString = await ChatApiClient().downloadURL(fileName: fileName, fileTypeDescription: getFileTypeDescription(fileTypeName)); + if (fileTypeID == 1 || + fileTypeID == 5 || + fileTypeID == 7 || + fileTypeID == 6 || + fileTypeID == 8 || + fileTypeID == 2) { + Uint8List encodedString = await ChatApiClient().downloadURL( + fileName: fileName, + fileTypeDescription: getFileTypeDescription(fileTypeName)); try { String path = await downChatMedia(encodedString, fileTypeName ?? ""); Utils.hideLoading(context); @@ -1166,9 +1692,18 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { return ""; } - void userTypingInvoke({required int currentUser, required int reciptUser}) async { - await chatHubConnection.invoke("UserTypingAsync", args: [reciptUser, currentUser]); + void userTypingInvoke( + {required int currentUser, required int reciptUser}) async { + await chatHubConnection + .invoke("UserTypingAsync", args: [reciptUser, currentUser]); } + void groupTypingInvoke( + {required GroupResponse groupDetails, required int groupId}) async { + var data = json.decode(json.encode(groupDetails.groupUserList)); + await chatHubConnection + .invoke("GroupTypingAsync", args: ["${groupDetails.adminUser!.userName}",data, groupId ]); + } + //////// Audio Recoding Work //////////////////// @@ -1183,7 +1718,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { await Directory(dirPath).create(); await File('$dirPath/.nomedia').create(); } - path = "$dirPath/${AppState().chatDetails!.response!.id}-$receiverID-${DateTime.now().microsecondsSinceEpoch}.aac"; + path = + "$dirPath/${AppState().chatDetails!.response!.id}-$receiverID-${DateTime.now().microsecondsSinceEpoch}.aac"; recorderController = RecorderController() ..androidEncoder = AndroidEncoder.aac ..androidOutputFormat = AndroidOutputFormat.mpeg4 @@ -1313,15 +1849,19 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { return numberStr; } - Future downChatVoice(Uint8List bytes, String ext, SingleUserChatModel data) async { + Future downChatVoice( + Uint8List bytes, String ext, SingleUserChatModel data) async { File file; try { - String dirPath = '${(await getApplicationDocumentsDirectory()).path}/chat_audios'; + String dirPath = + '${(await getApplicationDocumentsDirectory()).path}/chat_audios'; if (!await Directory(dirPath).exists()) { await Directory(dirPath).create(); await File('$dirPath/.nomedia').create(); } - file = File("$dirPath/${data.currentUserId}-${data.targetUserId}-${DateTime.now().microsecondsSinceEpoch}" + ext); + file = File( + "$dirPath/${data.currentUserId}-${data.targetUserId}-${DateTime.now().microsecondsSinceEpoch}" + + ext); await file.writeAsBytes(bytes); } catch (e) { if (kDebugMode) { @@ -1333,10 +1873,14 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { } void scrollToMsg(SingleUserChatModel data) { - if (data.userChatReplyResponse != null && data.userChatReplyResponse!.userChatHistoryId != null) { - int index = userChatHistory.indexWhere((SingleUserChatModel element) => element.userChatHistoryId == data.userChatReplyResponse!.userChatHistoryId); + if (data.userChatReplyResponse != null && + data.userChatReplyResponse!.userChatHistoryId != null) { + int index = userChatHistory.indexWhere((SingleUserChatModel element) => + element.userChatHistoryId == + data.userChatReplyResponse!.userChatHistoryId); if (index >= 1) { - double contentSize = scrollController.position.viewportDimension + scrollController.position.maxScrollExtent; + double contentSize = scrollController.position.viewportDimension + + scrollController.position.maxScrollExtent; double target = contentSize * index / userChatHistory.length; scrollController.position.animateTo( target, @@ -1368,14 +1912,18 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { isImageLoading: false, image: element.eMPLOYEEIMAGE ?? "", isImageLoaded: element.eMPLOYEEIMAGE == null ? false : true, - userLocalDownlaodedImage: element.eMPLOYEEIMAGE == null ? null : await downloadImageLocal(element.eMPLOYEEIMAGE ?? "", element.eMPLOYEENUMBER!), + userLocalDownlaodedImage: element.eMPLOYEEIMAGE == null + ? null + : await downloadImageLocal( + element.eMPLOYEEIMAGE ?? "", element.eMPLOYEENUMBER!), ), ); } } } } else { - getEmployeeSubordinatesList = await MyTeamApiClient().getEmployeeSubordinates("", "", ""); + getEmployeeSubordinatesList = + await MyTeamApiClient().getEmployeeSubordinates("", "", ""); AppState().setemployeeSubordinatesList = getEmployeeSubordinatesList; for (GetEmployeeSubordinatesList element in getEmployeeSubordinatesList) { if (element.eMPLOYEEEMAILADDRESS != null) { @@ -1393,7 +1941,10 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { isImageLoading: false, image: element.eMPLOYEEIMAGE ?? "", isImageLoaded: element.eMPLOYEEIMAGE == null ? false : true, - userLocalDownlaodedImage: element.eMPLOYEEIMAGE == null ? null : await downloadImageLocal(element.eMPLOYEEIMAGE ?? "", element.eMPLOYEENUMBER!), + userLocalDownlaodedImage: element.eMPLOYEEIMAGE == null + ? null + : await downloadImageLocal( + element.eMPLOYEEIMAGE ?? "", element.eMPLOYEENUMBER!), ), ); } @@ -1462,16 +2013,81 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { SingleUserChatModel nUser = SingleUserChatModel(); Utils.saveStringFromPrefs("isAppOpendByChat", "false"); if (await Utils.getStringFromPrefs("notificationData") != "null") { - nUser = SingleUserChatModel.fromJson(jsonDecode(await Utils.getStringFromPrefs("notificationData"))); + nUser = SingleUserChatModel.fromJson( + jsonDecode(await Utils.getStringFromPrefs("notificationData"))); Utils.saveStringFromPrefs("notificationData", "null"); Future.delayed(const Duration(seconds: 2)); for (ChatUser user in searchedChats!) { if (user.id == nUser.targetUserId) { - Navigator.pushNamed(context, AppRoutes.chatDetailed, arguments: ChatDetailedScreenParams(user, false)); + Navigator.pushNamed(context, AppRoutes.chatDetailed, + arguments: ChatDetailedScreenParams(user, false)); return; } } } Utils.saveStringFromPrefs("notificationData", "null"); } + + //group chat functions added here + + void filterGroups(String value) async { + // filter function added here. + List tmp = []; + if (value.isEmpty || value == "") { + tmp = userGroups.groupresponse!; + } else { + for (groups.GroupResponse element in uGroups!) { + if (element.groupName!.toLowerCase().contains(value.toLowerCase())) { + tmp.add(element); + } + } + } + uGroups = tmp; + notifyListeners(); + } + + Future deleteGroup(GroupResponse groupDetails) async { + isLoading = true; + await ChatApiClient().deleteGroup(groupDetails.groupId); + userGroups = await ChatApiClient().getGroupsByUserId(); + uGroups = userGroups.groupresponse; + isLoading = false; + notifyListeners(); + } + + Future getGroupChatHistory(groups.GroupResponse groupDetails) async { + isLoading = true; + groupChatHistory = await ChatApiClient().getGroupChatHistory( + groupDetails.groupId, + groupDetails.groupUserList as List); + + isLoading = false; + + notifyListeners(); + } + + void updateGroupAdmin(int? groupId, List groupUserList) async { + isLoading = true; + await ChatApiClient().updateGroupAdmin(groupId, groupUserList); + isLoading = false; + notifyListeners(); + } + + Future addGroupAndUsers(createGroup.CreateGroupRequest request) async { + isLoading = true; + var groups = await ChatApiClient().addGroupAndUsers(request); + userGroups.groupresponse! + .add(GroupResponse.fromJson(json.decode(groups)['response'])); + + isLoading = false; + notifyListeners(); + } + Future updateGroupAndUsers(createGroup.CreateGroupRequest request) async { + isLoading = true; + await ChatApiClient().updateGroupAndUsers(request); + userGroups = await ChatApiClient().getGroupsByUserId(); + uGroups = userGroups.groupresponse; + isLoading = false; + notifyListeners(); + } } diff --git a/lib/ui/chat/chat_home.dart b/lib/ui/chat/chat_home.dart index 9c5f216..426c9a2 100644 --- a/lib/ui/chat/chat_home.dart +++ b/lib/ui/chat/chat_home.dart @@ -10,6 +10,7 @@ import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; import 'package:mohem_flutter_app/ui/chat/chat_home_screen.dart'; import 'package:mohem_flutter_app/ui/chat/favorite_users_screen.dart'; +import 'package:mohem_flutter_app/ui/chat/group_chat.dart'; import 'package:mohem_flutter_app/ui/chat/my_team_screen.dart'; import 'package:mohem_flutter_app/ui/landing/dashboard_screen.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; @@ -46,6 +47,7 @@ class _ChatHomeState extends State { data.getUserAutoLoginToken().whenComplete(() async { await data.buildHubConnection(); data.getUserRecentChats(); + }); return; } @@ -89,8 +91,9 @@ class _ChatHomeState extends State { child: Row( children: [ myTab(LocaleKeys.mychats.tr(), 0), - myTab(LocaleKeys.favorite.tr(), 1), - AppState().getempStatusIsManager ? myTab(LocaleKeys.myTeam.tr(), 2) : const SizedBox(), + // myTab(LocaleKeys.group.tr(), 1), + myTab(LocaleKeys.favorite.tr(), 2), + AppState().getempStatusIsManager ? myTab(LocaleKeys.myTeam.tr(), 3) : const SizedBox(), ], ), ), @@ -104,6 +107,7 @@ class _ChatHomeState extends State { }, children: [ ChatHomeScreen(), + // GropChatHomeScreen(), ChatFavoriteUsersScreen(), AppState().getempStatusIsManager ? const MyTeamScreen() : const SizedBox(), ], diff --git a/lib/ui/chat/create_group.dart b/lib/ui/chat/create_group.dart new file mode 100644 index 0000000..43b2635 --- /dev/null +++ b/lib/ui/chat/create_group.dart @@ -0,0 +1,699 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:mohem_flutter_app/api/chat/chat_api_client.dart'; +import 'package:mohem_flutter_app/api/worklist/worklist_api_client.dart'; +import 'package:mohem_flutter_app/app_state/app_state.dart'; +import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/config/routes.dart'; +import 'package:mohem_flutter_app/extensions/int_extensions.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; +import 'package:mohem_flutter_app/main.dart'; +import 'package:mohem_flutter_app/models/chat/create_group_request.dart'; +import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart' + as groups; +import 'package:mohem_flutter_app/models/get_action_history_list_model.dart'; +import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart'; +import 'package:mohem_flutter_app/models/worklist/replacement_list_model.dart'; +import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; +import 'package:mohem_flutter_app/ui/chat/chat_detailed_screen.dart'; +import 'package:mohem_flutter_app/widgets/button/default_button.dart'; +import 'package:mohem_flutter_app/widgets/circular_avatar.dart'; +import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart'; +import 'package:provider/provider.dart'; + +class CreateGroupBottomSheet extends StatefulWidget { + int? notificationID; + String title, apiMode; + List? actionHistoryList; + Function(ReplacementList) onSelectEmployee; + bool fromChat; + groups.GroupResponse groupDetails; + + CreateGroupBottomSheet({ + Key? key, + required this.title, + required this.apiMode, + this.notificationID, + this.actionHistoryList, + required this.onSelectEmployee, + required this.fromChat, + required this.groupDetails, + }) : super(key: key); + + @override + State createState() => _CreateGroupBottomSheetState(); +} + +class _CreateGroupBottomSheetState extends State { + TextEditingController username = TextEditingController(); + ScrollController sc = ScrollController(); + bool isAudioCall = true; + bool isVideoCall = true; + bool isAttachments = true; + bool isShareScreen = true; + String searchText = ""; + String groupName = ""; + List? optionsList = [ + LocaleKeys.fullName.tr(), + LocaleKeys.username.tr(), + LocaleKeys.endDate.tr(), + ]; + List? favUsersList; + + List? replacementList; + List? favouriteUserList; + List? nonFavouriteUserList; + + // Chat Items + late ChatProviderModel provider; + + int _selectedSearchIndex = 0; + List selectedUsers = []; + + void fetchUserByInput({bool isNeedLoading = true}) async { + try { + Utils.showLoading(context); + replacementList = await WorkListApiClient().searchUserByInput( + userName: _selectedSearchIndex == 0 ? searchText : "", + userId: _selectedSearchIndex == 1 ? searchText : "", + email: _selectedSearchIndex == 2 ? searchText : "", + ); + favouriteUserList = replacementList + ?.where((ReplacementList element) => element.isFavorite ?? false) + .toList(); + nonFavouriteUserList = replacementList + ?.where((ReplacementList element) => !(element.isFavorite ?? false)) + .toList(); + Utils.hideLoading(context); + setState(() {}); + } catch (e) { + Utils.hideLoading(context); + Utils.handleException(e, context, null); + } + + if (isNeedLoading) Utils.hideLoading(context); + setState(() {}); + return null; + } + + void fetchChatUser({bool isNeedLoading = true}) async { + if (provider.pageNo == 1) provider.chatUsersList!.clear(); + try { + Utils.showLoading(context); + await ChatApiClient() + .getChatMemberFromSearch(searchText, + AppState().chatDetails!.response!.id!, provider.pageNo) + .then((ChatUserModel value) { + if (value.response != null) { + if (provider.pageNo == 1) { + provider.chatUsersList = value.response; + } else { + print("--------------------------Added More----------------------"); + provider.chatUsersList!.addAll(value.response!); + } + } + }); + provider.chatUsersList!.removeWhere((ChatUser element) => + element.id == AppState().chatDetails!.response!.id); + Utils.hideLoading(context); + setState(() {}); + } catch (e) { + Utils.hideLoading(context); + Utils.handleException(e, context, null); + } + if (isNeedLoading) Utils.hideLoading(context); + setState(() {}); + return null; + } + + void scrollListener() async { + if (sc.position.pixels == sc.position.maxScrollExtent) { + provider.pageNo++; + logger.w(provider.chatUsersList!.length); + logger.w(provider.pageNo); + fetchChatUser(); + } + } + + @override + void initState() { + super.initState(); + sc.addListener(scrollListener); + provider = Provider.of(context, listen: false); + if (widget.groupDetails.groupName !=null) { + setState(() { + groupName = widget.groupDetails.groupName!; + isAudioCall = widget.groupDetails.canAudioC!; + isVideoCall = widget.groupDetails.canVideoC!; + isAttachments = widget.groupDetails.canAttach!; + isShareScreen = widget.groupDetails.canShareS!; + for (groups.GroupUserList items in widget.groupDetails.groupUserList!) { + { + selectedUsers.add(ChatUser.fromJson(items.toJson())); + } + } + }); + } + } + + @override + void dispose() { + super.dispose(); + provider.chatUsersList = []; + provider.pageNo = 1; + } + + @override + Widget build(BuildContext context) { + return SizedBox( + width: double.infinity, + height: MediaQuery.of(context).size.height - 100, + child: Column( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + widget.title.toText24(isBold: true), + 21.height, + Row( + children: [ + DynamicTextFieldWidget( + LocaleKeys.groupName.tr(), + groupName.isEmpty ? LocaleKeys.enterGroupNamePlease.tr() : groupName, + inputAction: TextInputAction.done, + onChange: (String text) { + groupName = text; + setState(() {}); + }, + ).expanded, + ], + ), + + //11.height, + Row( + children: [ + SizedBox( + height: 35, + child: CheckboxListTile( + contentPadding: EdgeInsets.zero, + title: LocaleKeys.audioCall.tr().toText10(), + + checkboxShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10)), + side: BorderSide( + width: 1.5, + color: Theme.of(context).unselectedWidgetColor), + + value: isAudioCall, + onChanged: (bool? newValue) { + setState(() { + isAudioCall = newValue!; + }); + }, + controlAffinity: ListTileControlAffinity + .leading, // <-- leading Checkbox + )).expanded, + SizedBox( + height: 35, + child: CheckboxListTile( + contentPadding: EdgeInsets.zero, + title: LocaleKeys.videoCall.tr().toText10(), + checkboxShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10)), + value: isVideoCall, + onChanged: (bool? newValue) { + setState(() { + isVideoCall = newValue!; + }); + }, + controlAffinity: ListTileControlAffinity + .leading, // <-- leading Checkbox + )).expanded + ], + ), + Row( + children: [ + SizedBox( + height: 35, + child: CheckboxListTile( + contentPadding: EdgeInsets.zero, + title:LocaleKeys.attachments.tr().toText10(), + checkboxShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10)), + value: isAttachments, + onChanged: (bool? newValue) { + setState(() { + isAttachments = newValue!; + }); + }, + controlAffinity: ListTileControlAffinity + .leading, // <-- leading Checkbox + )).expanded, + SizedBox( + height: 35, + child: CheckboxListTile( + contentPadding: EdgeInsets.zero, + checkboxShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10)), + title:LocaleKeys.shareScreen.tr().toText10(), + value: isShareScreen, + onChanged: (bool? newValue) { + setState(() { + isShareScreen = newValue!; + }); + }, + controlAffinity: ListTileControlAffinity + .leading, // <-- leading Checkbox + )).expanded + ], + ), + 11.height, + LocaleKeys.userSearch.tr().toText16(), + 11.height, + Row( + children: [ + radioOption(widget.fromChat ? LocaleKeys.userId.tr() : LocaleKeys.name.tr(), 0, + _selectedSearchIndex), + radioOption(LocaleKeys.userName.tr(), 1, _selectedSearchIndex), + radioOption(LocaleKeys.email.tr(), 2, _selectedSearchIndex), + ], + ), + 14.height, + Row( + children: [ + DynamicTextFieldWidget( + LocaleKeys.search.tr(), + LocaleKeys.searchByUserName.tr(), + inputAction: TextInputAction.done, + suffixIconData: Icons.search, + onChange: (String text) { + searchText = text; + setState(() {}); + }, + ).expanded, + IconButton( + constraints: const BoxConstraints(), + onPressed: () async { + provider.chatUsersList!.clear(); + provider.pageNo =1; + await SystemChannels.textInput + .invokeMethod('TextInput.hide'); + widget.fromChat ? fetchChatUser() : fetchUserByInput(); + }, + icon: const Icon(Icons.search), + ) + ], + ), + if (replacementList != null) + replacementList!.isEmpty + ? Utils.getNoDataWidget(context).expanded + : ListView( + physics: const BouncingScrollPhysics(), + padding: EdgeInsets.only(top: 21, bottom: 8), + children: [ + if (favouriteUserList?.isNotEmpty ?? false) ...[ + LocaleKeys.favorite.tr().toText16(), + 12.height, + ListView.separated( + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (BuildContext cxt, int index) => + employeeItemView(favouriteUserList![index]), + separatorBuilder: + (BuildContext cxt, int index) => Container( + height: 1, + color: MyColors.borderE3Color, + ), + itemCount: favouriteUserList?.length ?? 0), + 12.height, + ], + if (nonFavouriteUserList?.isNotEmpty ?? false) ...[ + "Related".toText16(), + 12.height, + ListView.separated( + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (BuildContext cxt, int index) => + employeeItemView( + nonFavouriteUserList![index]), + separatorBuilder: + (BuildContext cxt, int index) => Container( + height: 1, + color: MyColors.borderE3Color, + ), + itemCount: nonFavouriteUserList?.length ?? 0), + ], + ], + ).expanded, + selectedUsers!.isNotEmpty + ? SizedBox( + height: 95, + child: ListView.builder( + physics: const ClampingScrollPhysics(), + scrollDirection: Axis.horizontal, + itemCount: selectedUsers!.length, + itemBuilder: (BuildContext context, int index2) { + return Stack(children: [ + Column( + children: [ + 12.height, + Stack(children: [ + Container( + padding:const EdgeInsets.all(5), + child: SvgPicture.asset( + "assets/images/user.svg", + height: 48, + width: 48, + )), + Positioned( + right: 0, + top: 0, + child: InkWell( + child: SvgPicture.asset( + 'assets/icons/close.svg', + height:15, + width:15 + ), + onTap: () { + setState(() { + // provider.chatUsersList![index] + // .isChecked = false; + + List user = provider + .chatUsersList! + .where((ChatUser value) => + value.userName == + selectedUsers[index2] + .userName) + .toList(); + if (user.isNotEmpty) { + user.first.isChecked = false; + } + selectedUsers.remove( + selectedUsers[index2]); + }); + }, + )) + ],), + (selectedUsers![index2] + .userName! + .replaceFirst(".", " ") + .capitalizeFirstofEach ?? + "") + .toText12(color: MyColors.darkTextColor) + .paddingOnly(left: 5, top: 5), + selectedUsers![index2].isTyping! + ? 'Typing...' + .toText10( + color: MyColors.textMixColor, + ) + .paddingOnly(left: 5.0) + : const SizedBox() + ], + ), + + + + // IconButton(onPressed: (){}, icon: const Icon(Icons.close_outlined, color: Colors.red, size: 20)), + + ]); + })) + : 0.height, + + if (widget.fromChat) + if (provider.chatUsersList != null && widget.fromChat) + provider.chatUsersList!.isEmpty + ? Column( + children: [ + 20.height, + Utils.getNoDataWidget(context), + ], + ) + : ListView.separated( + itemCount: provider.chatUsersList!.length, + shrinkWrap: true, + physics: const ClampingScrollPhysics(), + controller: sc, + padding: const EdgeInsets.only(bottom: 80.0, top: 20), + itemBuilder: (BuildContext context, int index) { + return SizedBox( + height: 55, + child: Row( + children: [ + Stack( + children: [ + SvgPicture.asset( + "assets/images/user.svg", + height: 48, + width: 48, + ), + Positioned( + right: 5, + bottom: 1, + child: Container( + width: 10, + height: 10, + decoration: BoxDecoration( + color: provider + .chatUsersList![index] + .userStatus == + 1 + ? MyColors.green2DColor + : Colors.red, + ), + ).circle(10), + ) + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + (provider.chatUsersList![index].userName! + .replaceFirst(".", " ") + .capitalizeFirstofEach ?? + "") + .toText14( + color: MyColors.darkTextColor) + .paddingOnly(left: 11, top: 13), + provider.chatUsersList![index].isTyping! + ? 'Typing...' + .toText10( + color: MyColors.textMixColor, + ) + .paddingOnly(left: 11.0) + : const SizedBox() + ], + ).expanded, + SizedBox( + width: 60, + child: Row( + crossAxisAlignment: + CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.end, + mainAxisSize: MainAxisSize.max, + children: [ + if (provider.chatUsersList![index] + .unreadMessageCount! > + 0) + Container( + alignment: Alignment.center, + width: 18, + height: 18, + decoration: const BoxDecoration( + color: MyColors.redColor, + borderRadius: BorderRadius.all( + Radius.circular(20), + ), + ), + child: (provider + .chatUsersList![index] + .unreadMessageCount! + .toString()) + .toText10( + color: MyColors.white, + ) + .center, + ).paddingOnly(right: 10).center, + Checkbox( + value: provider + .chatUsersList![index].isChecked, + shape: CircleBorder(), + onChanged: (bool? value) { + setState(() { + provider.chatUsersList![index] + .isChecked = value; + if (provider.chatUsersList![index] + .isChecked == + true) { + selectedUsers.add(provider + .chatUsersList![index]); + } else { + selectedUsers.remove(provider + .chatUsersList![index]); + } + }); + }, + ) + ], + ), + ), + ], + ), + ); + }, + separatorBuilder: (BuildContext context, int index) => + const Divider(color: MyColors.lightGreyE5Color) + .paddingOnly(left: 59), + ).expanded, + ], + ).paddingOnly(left: 21, right: 21, bottom: 0, top: 21).expanded, + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + DefaultButton( + LocaleKeys.cancel.tr(), + () { + Navigator.pop(context); + provider.chatUsersList = []; + provider.pageNo = 1; + }, + textColor: MyColors.grey3AColor, + colors: const [ + Color(0xffE6E6E6), + Color(0xffE6E6E6), + ], + ).paddingOnly(left: 14, right: 14, bottom: 15, top: 10).expanded, + DefaultButton( + LocaleKeys.submit.tr(), + () { + // Navigator.pop(context); + // provider.chatUsersList = []; + // provider.pageNo = 1; + createGroup(); + }, + textColor: MyColors.whiteColor, + colors: const [ + Color(0xff32D892), + Color(0xff1AB170), + ], + ).paddingOnly(left: 15, right: 15, bottom: 15, top: 10).expanded, + ], + ) + ], + ), + ); + } + + Widget employeeItemView(ReplacementList replacement) { + return InkWell( + onTap: () { + Navigator.pop(context); + widget.onSelectEmployee(replacement); + }, + child: SizedBox( + height: 50, + child: Row( + children: [ + CircularAvatar( + url: replacement.employeeImage ?? "", + height: 30, + width: 30, + isImageBase64: true, + ), + 16.width, + Expanded( + child: (replacement.employeeDisplayName ?? "").toText12(), + ), + Icon(Icons.star, + size: 16, + color: replacement.isFavorite! + ? MyColors.yellowFavColor + : MyColors.borderCEColor), + ], + ), + ), + ); + } + + Widget radioOption(String title, int value, int groupValue) { + return Row( + children: [ + Container( + width: 24, + height: 24, + decoration: BoxDecoration( + color: Colors.transparent, + border: Border.all(color: MyColors.borderColor, width: 1), + borderRadius: const BorderRadius.all( + Radius.circular(100), + ), + ), + padding: const EdgeInsets.all(4), + child: Container( + width: double.infinity, + height: double.infinity, + decoration: BoxDecoration( + color: value == groupValue + ? MyColors.grey3AColor + : Colors.transparent, + borderRadius: const BorderRadius.all( + Radius.circular(100), + ), + ), + ), + ), + 9.width, + title.toText12(color: MyColors.grey57Color) + ], + ).onPress(() { + _selectedSearchIndex = value; + setState(() {}); + }).expanded; + } + + void createGroup() async { + RegExp validCharacters = RegExp(r'^[a-zA-Z0-9_\-=@,\.;]+$'); + if (!validCharacters.hasMatch(groupName)) { + Utils.showToast(LocaleKeys.enterGroupName.tr()); + } else if (groupName.length < 10) { + Utils.showToast(LocaleKeys.groupNameshouldbe.tr()); + } else { + List? mainUsers = []; + ChatUser admin = + ChatUser.fromJson(AppState().chatDetails!.response!.toJson()); + admin.isAdmin = true; + admin.userStatus = 2; + admin.unreadMessageCount = 0; + admin.totalCount = 0; + mainUsers.add(admin); + CreateGroupRequest request = CreateGroupRequest( + groupUserList: [...selectedUsers, ...mainUsers].toList(), + canArchive: false, + isMeeting: false, + canShareS: isShareScreen, + canAudioC: isAudioCall, + canAttach: isAttachments, + canVideoC: isVideoCall, + groupName: groupName, + adminUserId: AppState().chatDetails!.response!.id); + + if(widget.groupDetails!.groupId !=null){ + request.groupId =widget.groupDetails!.groupId; + await provider.updateGroupAndUsers(request); + }else { + await provider.addGroupAndUsers(request); + } + Navigator.pop(context); + } + } +} diff --git a/lib/ui/chat/group_chat.dart b/lib/ui/chat/group_chat.dart new file mode 100644 index 0000000..35b4c5c --- /dev/null +++ b/lib/ui/chat/group_chat.dart @@ -0,0 +1,307 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:mohem_flutter_app/app_state/app_state.dart'; +import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/config/routes.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; +import 'package:mohem_flutter_app/models/chat/get_group_chat_history.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart'; +import 'package:mohem_flutter_app/models/worklist/replacement_list_model.dart'; +import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; +import 'package:mohem_flutter_app/ui/chat/chat_detailed_screen.dart'; +import 'package:mohem_flutter_app/ui/chat/create_group.dart'; +import 'package:mohem_flutter_app/ui/chat/group_chat_detaied_screen.dart'; +import 'package:mohem_flutter_app/ui/chat/manage_group.dart'; +import 'package:mohem_flutter_app/widgets/bottom_sheet.dart'; +import 'package:mohem_flutter_app/widgets/bottom_sheets/search_employee_bottom_sheet.dart'; +import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart'; +import 'package:provider/provider.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; + +class GropChatHomeScreen extends StatefulWidget { + const GropChatHomeScreen({Key? key}) : super(key: key); + + @override + State createState() => _GropChatHomeScreenState(); +} + +class _GropChatHomeScreenState extends State { + TextEditingController search = TextEditingController(); + + @override + void initState() { + super.initState(); + } + + @override + void dispose() { + super.dispose(); + search.clear(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: MyColors.white, + body: Consumer( + builder: (BuildContext context, ChatProviderModel m, Widget? child) { + return m.isLoading + ? ChatHomeShimmer( + isDetailedScreen: false, + ) + : Column( + children: [ + TextField( + controller: m.searchGroup, + style: const TextStyle( + color: MyColors.darkTextColor, + fontWeight: FontWeight.w500, + fontSize: 12), + onChanged: (String val) { + m.filterGroups(val); + }, + decoration: InputDecoration( + border: fieldBorder(radius: 5, color: 0xFFE5E5E5), + focusedBorder: + fieldBorder(radius: 5, color: 0xFFE5E5E5), + enabledBorder: + fieldBorder(radius: 5, color: 0xFFE5E5E5), + contentPadding: const EdgeInsets.all(11), + hintText: LocaleKeys.searchGroup.tr(), + hintStyle: const TextStyle( + color: MyColors.lightTextColor, + fontStyle: FontStyle.italic, + fontWeight: FontWeight.w500, + fontSize: 12), + filled: true, + fillColor: MyColors.greyF7Color, + suffixIconConstraints: const BoxConstraints(), + suffixIcon: m.search.text.isNotEmpty + ? IconButton( + constraints: const BoxConstraints(), + onPressed: () { + m.clearSelections(); + }, + icon: const Icon(Icons.clear, size: 22), + color: MyColors.redA3Color, + ) + : null, + ), + ).paddingOnly(top: 20, bottom: 14), + if (m.uGroups != null) + ListView.separated( + itemCount: m.uGroups!.length, + shrinkWrap: true, + physics: const ClampingScrollPhysics(), + padding: const EdgeInsets.only(bottom: 80.0), + itemBuilder: (BuildContext context, int index) { + return SizedBox( + height: 55, + child: Row( + children: [ + Container( + alignment: Alignment.center, + width: 48, + height: 48, + padding: const EdgeInsets.all(10.0), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(24.0), + border: Border.all( + width: 1, color: Colors.black), + ), + child: SvgPicture.asset( + "assets/images/chat-group.svg", + )), + Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + (m.uGroups![index] + .groupName! + .toText14( + color: MyColors.darkTextColor) + .paddingOnly(left: 11, top: 16))!, + ]), + Align( + alignment: Alignment.centerRight, + + child: PopupMenuButton( + onSelected: (String value){ + goToSelected(m.uGroups![index], m, value); + + }, + itemBuilder: (context) => [ + PopupMenuItem( + value: '1', + enabled: m.uGroups![index].isAdmin ?? false, + child: (LocaleKeys.edit + .tr() + .toText14(color: m.userGroups?.groupresponse![index].isAdmin == true ? MyColors.darkTextColor: MyColors.lightGreyColor) + .paddingOnly(left: 11, top: 16))), + PopupMenuItem( + value: '2', + enabled: m.uGroups![index].isAdmin ?? false, + child: (LocaleKeys.delete + .tr() + .toText14(color: m.uGroups![index].isAdmin == true ? MyColors.darkTextColor: MyColors.lightGreyColor) + .paddingOnly(left: 11, top: 16))), + PopupMenuItem( + value: '3', + enabled: m.uGroups![index].isAdmin ?? false, + onTap: () { + + }, + child: (LocaleKeys.manage + .tr() + .toText14(color: m.uGroups![index].isAdmin == true ? MyColors.darkTextColor: MyColors.lightGreyColor) + .paddingOnly(left: 11, top: 16))), + PopupMenuItem( + value: '4', + child: (LocaleKeys.members + .tr() + .toText14(color: MyColors.darkTextColor) + .paddingOnly(left: 11, top: 16))), + ], + ) + + + ) + .expanded + ], + ), + ).onPress(() { + chatDetails(m.uGroups![index], m,); + // Navigator.pushNamed( + // context, + // AppRoutes.chatDetailed, + // arguments: ChatDetailedScreenParams( + // m.searchedChats![index], false), + // ).then((Object? value) { + // m.clearSelections(); + // m.notifyListeners(); + // }); + }); + }, + separatorBuilder: (BuildContext context, int index) => + const Divider(color: MyColors.black) + .paddingOnly(left: 59), + ).expanded, + ], + ).paddingOnly(left: 21, right: 21); + }, + ), + floatingActionButton: FloatingActionButton( + child: Container( + width: 60, + height: 60, + decoration: const BoxDecoration( + shape: BoxShape.circle, + gradient: LinearGradient( + transform: GradientRotation(.46), + begin: Alignment.topRight, + end: Alignment.bottomLeft, + colors: [ + MyColors.gradiantEndColor, + MyColors.gradiantStartColor, + ], + ), + ), + child: const Icon( + Icons.add, + size: 30, + color: MyColors.white, + ), + ), + onPressed: () async { + + showMyBottomSheet( + context, + callBackFunc: () {}, + child: CreateGroupBottomSheet( + title:LocaleKeys.addUsers.tr(), + apiMode: LocaleKeys.delegate.tr(), + fromChat: true, + onSelectEmployee: (ReplacementList _selectedEmployee) {}, + groupDetails:GroupResponse(), + ), + ); + }, + ), + ); + } + + OutlineInputBorder fieldBorder({required double radius, required int color}) { + return OutlineInputBorder( + borderRadius: BorderRadius.circular(radius), + borderSide: BorderSide( + color: Color(color), + ), + ); + } + +void goToSelected(GroupResponse? groupDetails, ChatProviderModel m, String value) { + switch(value) { + case '1': + editGroup(groupDetails, m); + break; + case '2': + deleteGroup(groupDetails, m, context); + break; + case '3': + Navigator.pushNamed(context, + AppRoutes.manageGroup, + arguments: groupDetails , + ); + break; + case '4': + Navigator.pushNamed(context, + AppRoutes.groupMembers, + arguments: groupDetails!.groupUserList, + ); + break; + } + } + void deleteGroup( + GroupResponse? groupDetails, ChatProviderModel m, BuildContext context) { + groupDetails!.groupUserList; + Utils.confirmDialog( + context, + LocaleKeys.areYouSureWantTodelete.tr(), + onTap: () { + Navigator.pop(context); + m.deleteGroup(groupDetails); + }, + ); + } + + Future chatDetails(GroupResponse? groupDetails, ChatProviderModel m) async { + + // await m.getGroupChatHistory(groupDetails!); + + Navigator.pushNamed(context, + AppRoutes.groupChatDetailed, + arguments: + GroupChatDetailedScreenParams( + groupDetails, + false)); + } + Future editGroup(GroupResponse? groupDetails, ChatProviderModel m) async { + showMyBottomSheet( + context, + callBackFunc: () {}, + child: CreateGroupBottomSheet( + title:LocaleKeys.editGroups.tr(), + apiMode: LocaleKeys.delegate.tr(), + fromChat: true, + onSelectEmployee: (ReplacementList _selectedEmployee) {}, + groupDetails: groupDetails!, + ), + ); + + } +} diff --git a/lib/ui/chat/group_chat_bubble.dart b/lib/ui/chat/group_chat_bubble.dart new file mode 100644 index 0000000..69a50df --- /dev/null +++ b/lib/ui/chat/group_chat_bubble.dart @@ -0,0 +1,643 @@ +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:just_audio/just_audio.dart'; +import 'package:mohem_flutter_app/api/chat/chat_api_client.dart'; +import 'package:mohem_flutter_app/app_state/app_state.dart'; +import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/classes/my_custom_stream.dart'; +import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/extensions/int_extensions.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/main.dart'; +import 'package:mohem_flutter_app/models/chat/get_group_chat_history.dart'; +import 'package:mohem_flutter_app/models/chat/get_single_user_chat_list_model.dart'; +import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; +import 'package:mohem_flutter_app/ui/chat/chat_full_image_preview.dart'; +import 'package:mohem_flutter_app/ui/chat/common.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:provider/provider.dart'; +import 'package:rxdart/rxdart.dart'; + +class GroupChatBubble extends StatelessWidget { + GroupChatBubble({Key? key, required this.dateTime, required this.cItem}) + : super(key: key); + final String dateTime; + final GetGroupChatHistoryAsync cItem; + + bool isCurrentUser = false; + + bool isSeen = false; + + bool isReplied = false; + + bool isVoice = false; + + int? fileTypeID; + + String? fileTypeName; + + late ChatProviderModel provider; + + String? fileTypeDescription; + + bool isDelivered = false; + + String userName = ''; + + late Offset screenOffset; + + void makeAssign() { + isCurrentUser = cItem.currentUserId == AppState().chatDetails!.response!.id + ? true + : false; + isSeen = cItem.isSeen == true ? true : false; + isReplied = cItem.groupChatReplyResponse != null ? true : false; + // isVoice = cItem.fileTypeId == 13 && cItem.voiceController != null ? true : false; + fileTypeID = cItem.fileTypeId; + fileTypeName = cItem.fileTypeResponse != null + ? cItem.fileTypeResponse!.fileTypeName + : ""; + fileTypeDescription = cItem.fileTypeResponse != null + ? cItem.fileTypeResponse!.fileTypeDescription + : ""; + isDelivered = cItem.currentUserId == AppState().chatDetails!.response!.id && + cItem.isDelivered == true + ? true + : false; + userName = AppState().chatDetails!.response!.userName == + cItem.currentUserName.toString() + ? "You" + : cItem.currentUserName.toString(); + } + + void playVoice( + BuildContext context, { + required SingleUserChatModel data, + }) async { + if (data.voice != null && data.voice!.existsSync()) { + if (Platform.isIOS) { + Duration? duration = await data.voiceController! + .setAudioSource(MyCustomStream(data.voice!.readAsBytesSync())); + await data.voiceController!.seek(duration); + await data.voiceController!.setLoopMode(LoopMode.off); + await data.voiceController!.setVolume(1.0); + await data.voiceController!.load(); + data.voiceController!.play(); + } else { + await data.voiceController!.setFilePath(data!.voice!.path); + Duration? duration = await data.voiceController!.load(); + await data.voiceController!.seek(duration); + await data.voiceController!.setLoopMode(LoopMode.off); + await data.voiceController!.play(); + } + } else { + Utils.showLoading(context); + Uint8List encodedString = await ChatApiClient().downloadURL( + fileName: data.contant!, + fileTypeDescription: provider.getFileTypeDescription( + data.fileTypeResponse!.fileTypeName ?? "")); + // try { + File sFile = await provider.downChatVoice( + encodedString, data.fileTypeResponse!.fileTypeName ?? "", data); + if (sFile.path.isEmpty) { + logger.d("Path Is Emptyyyyyyy"); + } else { + logger.d("Path Exsists"); + } + data.voice = sFile; + if (Platform.isIOS) { + logger.d("isIOS"); + Duration? duration = await data.voiceController! + .setAudioSource(MyCustomStream(data.voice!.readAsBytesSync())); + await data.voiceController!.seek(duration); + await data.voiceController!.setLoopMode(LoopMode.off); + await data.voiceController!.setVolume(1.0); + await data.voiceController!.load(); + Utils.hideLoading(context); + data.voiceController!.play(); + } else { + Duration? duration = + await data.voiceController!.setFilePath(sFile.path); + await data.voiceController!.setLoopMode(LoopMode.off); + await data.voiceController!.seek(duration); + Utils.hideLoading(context); + await data.voiceController!.play(); + } + } + } + + void pausePlaying(BuildContext context, + {required SingleUserChatModel data}) async { + await data.voiceController!.pause(); + } + + void rePlay(BuildContext context, {required SingleUserChatModel data}) async { + if (data.voice != null && data.voice!.existsSync()) { + await data.voiceController!.seek(Duration.zero); + await data.voiceController!.play(); + } + } + + Stream get _positionDataStream => + Rx.combineLatest3( + cItem.voiceController!.positionStream, + cItem.voiceController!.bufferedPositionStream, + cItem.voiceController!.durationStream, + (Duration position, Duration bufferedPosition, Duration? duration) => + PositionData( + position, bufferedPosition, duration ?? Duration.zero)); + + @override + Widget build(BuildContext context) { + Size windowSize = MediaQuery.of(context).size; + screenOffset = Offset(windowSize.width / 2, windowSize.height / 2); + makeAssign(); + provider = Provider.of(context, listen: false); + return isCurrentUser ? currentUser(context) : receiptUser(context); + } + + Widget currentUser(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (isReplied) + ClipRRect( + borderRadius: BorderRadius.circular(5.0), + child: Container( + width: double.infinity, + decoration: BoxDecoration( + border: Border( + left: BorderSide( + width: 6, + color: isCurrentUser + ? MyColors.gradiantStartColor + : MyColors.white), + ), + color: isCurrentUser + ? MyColors.black.withOpacity(0.10) + : MyColors.black.withOpacity(0.30), + ), + child: Row( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (userName) + .toText12( + color: MyColors.gradiantStartColor, isBold: false) + .paddingOnly(right: 5, top: 5, bottom: 0, left: 5), + Directionality( + textDirection: provider.getTextDirection( + cItem.groupChatReplyResponse != null + ? cItem.groupChatReplyResponse!.contant + .toString() + : ""), + child: (cItem.groupChatReplyResponse != null + ? cItem.groupChatReplyResponse!.contant + .toString() + : "") + .toText10( + color: isCurrentUser + ? MyColors.grey71Color + : MyColors.white.withOpacity(0.5), + isBold: false, + maxlines: 4) + .paddingOnly(right: 5, top: 5, bottom: 8, left: 5), + ), + ], + ).expanded, + if (cItem.groupChatReplyResponse != null) + if (cItem.groupChatReplyResponse!.fileTypeId == 12 || + cItem.groupChatReplyResponse!.fileTypeId == 3 || + cItem.groupChatReplyResponse!.fileTypeId == 4) + ClipRRect( + borderRadius: BorderRadius.circular(8.0), + child: SizedBox( + height: 32, + width: 32, + child: showImage( + isReplyPreview: false, + fileName: + cItem.groupChatReplyResponse!.contant!, + fileTypeDescription: cItem + .groupChatReplyResponse! + .fileTypeResponse! + .fileTypeDescription ?? + "image/jpg")), + ).paddingOnly(left: 10, right: 10, bottom: 16, top: 16), + ], + ), + ), + ).paddingOnly(bottom: 7).onPress(() { + // provider.scrollToMsg(cItem); + }), + if (fileTypeID == 12 || fileTypeID == 4 || fileTypeID == 3) + ClipRRect( + borderRadius: BorderRadius.circular(5.0), + child: SizedBox( + height: 140, + width: 227, + child: showImage( + isReplyPreview: false, + fileName: cItem.contant!, + fileTypeDescription: + cItem.fileTypeResponse!.fileTypeDescription) + .onPress(() { + showDialog( + context: context, + anchorPoint: screenOffset, + builder: (BuildContext context) => ChatImagePreviewScreen( + imgTitle: cItem.contant!, img: cItem.image!), + ); + }), + ), + ).paddingOnly(bottom: 4), + if (fileTypeID == 13 && cItem.voiceController != null) + currentWaveBubble(context, cItem) + else + Row( + children: [ + if (fileTypeID == 1 || + fileTypeID == 5 || + fileTypeID == 7 || + fileTypeID == 6 || + fileTypeID == 8 + // || fileTypeID == 2 + ) + SvgPicture.asset(provider.getType(fileTypeName ?? ""), + height: 30, + width: 22, + alignment: Alignment.center, + fit: BoxFit.cover) + .paddingOnly(left: 0, right: 10), + Directionality( + textDirection: provider.getTextDirection(cItem.contant ?? ""), + child: (cItem.contant ?? "").toText12().expanded), + if (fileTypeID == 1 || + fileTypeID == 5 || + fileTypeID == 7 || + fileTypeID == 6 || + fileTypeID == 8 + //|| fileTypeID == 2 + ) + const Icon(Icons.remove_red_eye, size: 16) + ], + ), + Align( + alignment: Alignment.centerRight, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + dateTime.toText10( + color: MyColors.grey41Color.withOpacity(.5), + ), + 7.width, + Icon(isDelivered ? Icons.done_all : Icons.done_all, + color: isSeen ? MyColors.textMixColor : MyColors.grey9DColor, + size: 14), + ], + ), + ), + ], + ) + .paddingOnly(top: 11, left: 13, right: 13, bottom: 5) + .objectContainerView(disablePadding: true) + .paddingOnly(left: MediaQuery.of(context).size.width * 0.3); + } + + Widget receiptUser(BuildContext context) { + return Container( + padding: const EdgeInsets.only(top: 5, left: 8, right: 13, bottom: 5), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + gradient: const LinearGradient( + transform: GradientRotation(.83), + begin: Alignment.topRight, + end: Alignment.bottomLeft, + colors: [ + MyColors.gradiantEndColor, + MyColors.gradiantStartColor + ], + ), + ), + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + if (isReplied) + ClipRRect( + borderRadius: BorderRadius.circular(5.0), + child: Container( + width: double.infinity, + decoration: BoxDecoration( + border: Border( + left: BorderSide( + width: 6, + color: isCurrentUser + ? MyColors.gradiantStartColor + : MyColors.white)), + color: isCurrentUser + ? MyColors.black.withOpacity(0.10) + : MyColors.black.withOpacity(0.30), + ), + child: Row( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (userName) + .toText12( + color: MyColors.gradiantStartColor, + isBold: false) + .paddingOnly(right: 5, top: 5, bottom: 0, left: 5), + Directionality( + textDirection: provider.getTextDirection( + cItem.groupChatReplyResponse != null + ? cItem.groupChatReplyResponse!.contant + .toString() + : ""), + child: (cItem.groupChatReplyResponse != null + ? cItem.groupChatReplyResponse!.contant + .toString() + : "") + .toText10( + color: isCurrentUser + ? MyColors.grey71Color + : MyColors.white.withOpacity(0.5), + isBold: false, + maxlines: 4) + .paddingOnly( + right: 5, top: 5, bottom: 8, left: 5), + ), + ], + ).expanded, + if (cItem.groupChatReplyResponse != null) + if (cItem.groupChatReplyResponse!.fileTypeId == 12 || + cItem.groupChatReplyResponse!.fileTypeId == 3 || + cItem.groupChatReplyResponse!.fileTypeId == 4) + ClipRRect( + borderRadius: BorderRadius.circular(8.0), + child: SizedBox( + height: 32, + width: 32, + child: showImage( + isReplyPreview: true, + fileName: + cItem.groupChatReplyResponse!.contant!, + fileTypeDescription: cItem + .groupChatReplyResponse! + .fileTypeResponse! + .fileTypeDescription ?? + "image/jpg"), + ), + ).paddingOnly(left: 10, right: 10, bottom: 16, top: 16) + ], + ), + ), + ).paddingOnly(bottom: 7).onPress(() { + // provider.scrollToMsg(cItem); + }), + if (fileTypeID == 12 || fileTypeID == 4 || fileTypeID == 3) + ClipRRect( + borderRadius: BorderRadius.circular(5.0), + child: SizedBox( + height: 140, + width: 227, + child: showImage( + isReplyPreview: false, + fileName: cItem.contant ?? "", + fileTypeDescription: + cItem.fileTypeResponse!.fileTypeDescription ?? + "image/jpg") + .onPress(() { + showDialog( + context: context, + anchorPoint: screenOffset, + builder: (BuildContext context) => ChatImagePreviewScreen( + imgTitle: cItem.contant ?? "", img: cItem.image!), + ); + }), + ), + ).paddingOnly(bottom: 4), + if (fileTypeID == 13 && cItem.voiceController != null) + recipetWaveBubble(context, cItem) + else + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + cItem.currentUserName!.toText10( + color: Colors.black, + ).paddingOnly(bottom: 5), + Row( + children: [ + if (fileTypeID == 1 || + fileTypeID == 5 || + fileTypeID == 7 || + fileTypeID == 6 || + fileTypeID == 8 + // || fileTypeID == 2 + ) + SvgPicture.asset(provider.getType(fileTypeName ?? ""), + height: 30, + width: 22, + alignment: Alignment.center, + fit: BoxFit.cover) + .paddingOnly(left: 0, right: 10), + Directionality( + textDirection: + provider.getTextDirection(cItem.contant ?? ""), + child: (cItem.contant ?? "") + .toText12(color: Colors.white) + .expanded), + if (fileTypeID == 1 || + fileTypeID == 5 || + fileTypeID == 7 || + fileTypeID == 6 || + fileTypeID == 8 + //|| fileTypeID == 2 + ) + const Icon(Icons.remove_red_eye, + color: Colors.white, size: 16) + ], + ), + Align( + alignment: Alignment.topRight, + child: dateTime.toText10( + color: Colors.white.withOpacity(.71), + ).paddingOnly(top:5), + ), + ], + ), + ])).paddingOnly(right: MediaQuery.of(context).size.width * 0.3); + } + + Widget voiceMsg(BuildContext context) { + return Container(); + } + + Widget showImage( + {required bool isReplyPreview, + required String fileName, + required String fileTypeDescription}) { + if (cItem.isImageLoaded != null && cItem.image != null) { + return Image.memory( + cItem.image!, + height: isReplyPreview ? 32 : 140, + width: isReplyPreview ? 32 : 227, + fit: BoxFit.cover, + alignment: Alignment.center, + ); + } else { + return FutureBuilder( + future: ChatApiClient().downloadURL( + fileName: fileName, fileTypeDescription: fileTypeDescription), + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.connectionState != ConnectionState.waiting) { + if (snapshot.data == null) { + return const SizedBox(); + } else { + cItem.image = snapshot.data; + cItem.isImageLoaded = true; + return Image.memory( + snapshot.data, + height: isReplyPreview ? 32 : 140, + width: isReplyPreview ? 32 : 227, + fit: BoxFit.cover, + alignment: Alignment.center, + ); + } + } else { + return SizedBox( + height: isReplyPreview ? 32 : 140, + width: isReplyPreview ? 32 : 227, + ).toShimmer(); + } + }, + ); + } + } + + Widget currentWaveBubble( + BuildContext context, GetGroupChatHistoryAsync data) { + return Container( + margin: const EdgeInsets.all(0), + decoration: BoxDecoration( + border: Border( + left: BorderSide( + width: 6, + color: + isCurrentUser ? MyColors.gradiantStartColor : MyColors.white), + ), + color: isCurrentUser + ? MyColors.black.withOpacity(0.10) + : MyColors.black.withOpacity(0.30), + ), + child: Row( + children: [ + //need to check and verify for group hence for now commented + // getPlayer(player: data.voiceController!, modelData: data), + StreamBuilder( + stream: _positionDataStream, + builder: + (BuildContext context, AsyncSnapshot snapshot) { + PositionData? positionData = snapshot.data; + return SeekBar( + duration: positionData?.duration ?? Duration.zero, + position: positionData?.position ?? Duration.zero, + bufferedPosition: + positionData?.bufferedPosition ?? Duration.zero, + onChangeEnd: data.voiceController!.seek, + ).expanded; + }, + ), + ], + ), + ).circle(5); + } + + Widget recipetWaveBubble( + BuildContext context, GetGroupChatHistoryAsync data) { + return Container( + margin: const EdgeInsets.all(0), + decoration: BoxDecoration( + border: Border( + left: BorderSide( + width: 6, + color: + isCurrentUser ? MyColors.gradiantStartColor : MyColors.white), + ), + color: isCurrentUser + ? MyColors.black.withOpacity(0.10) + : MyColors.black.withOpacity(0.30), + ), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + //commented to verify after + //getPlayer(player: data.voiceController!, modelData: data), + StreamBuilder( + stream: _positionDataStream, + builder: + (BuildContext context, AsyncSnapshot snapshot) { + PositionData? positionData = snapshot.data; + return SeekBar( + duration: positionData?.duration ?? Duration.zero, + position: positionData?.position ?? Duration.zero, + bufferedPosition: + positionData?.bufferedPosition ?? Duration.zero, + onChangeEnd: data.voiceController!.seek, + ).expanded; + }, + ), + ], + ), + ).circle(5); + } + + Widget getPlayer( + {required AudioPlayer player, required SingleUserChatModel modelData}) { + return StreamBuilder( + stream: player.playerStateStream, + builder: (BuildContext context, AsyncSnapshot snapshot) { + PlayerState? playerState = snapshot.data; + ProcessingState? processingState = playerState?.processingState; + bool? playing = playerState?.playing; + if (processingState == ProcessingState.loading || + processingState == ProcessingState.buffering) { + return Container( + margin: const EdgeInsets.all(8.0), + width: 30.0, + height: 30.0, + child: const CircularProgressIndicator(), + ); + } else if (playing != true) { + return const Icon( + Icons.play_arrow, + size: 30, + color: MyColors.lightGreenColor, + ).onPress(() { + playVoice(context, data: modelData); + }); + } else if (processingState != ProcessingState.completed) { + return const Icon( + Icons.pause, + size: 30, + color: MyColors.lightGreenColor, + ).onPress(() { + pausePlaying(context, data: modelData); + }); + } else { + return const Icon( + Icons.replay, + size: 30, + color: MyColors.lightGreenColor, + ).onPress(() { + rePlay(context, data: modelData); + }); + } + }, + ); + } +} diff --git a/lib/ui/chat/group_chat_detaied_screen.dart b/lib/ui/chat/group_chat_detaied_screen.dart new file mode 100644 index 0000000..c43a2df --- /dev/null +++ b/lib/ui/chat/group_chat_detaied_screen.dart @@ -0,0 +1,394 @@ +import 'dart:async'; +import 'dart:convert'; +import 'package:audio_waveforms/audio_waveforms.dart'; +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:mohem_flutter_app/app_state/app_state.dart'; +import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/extensions/int_extensions.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; +import 'package:mohem_flutter_app/main.dart'; +import 'package:mohem_flutter_app/models/chat/call.dart'; +import 'package:mohem_flutter_app/models/chat/get_group_chat_history.dart'; +import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart'; +import 'package:mohem_flutter_app/models/chat/get_single_user_chat_list_model.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart'; +import 'package:mohem_flutter_app/provider/chat_call_provider.dart'; +import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; +import 'package:mohem_flutter_app/ui/chat/custom_auto_direction.dart'; +import 'package:mohem_flutter_app/ui/chat/call/chat_outgoing_call_screen.dart'; +import 'package:mohem_flutter_app/ui/chat/chat_bubble.dart'; +import 'package:mohem_flutter_app/ui/chat/common.dart'; +import 'package:mohem_flutter_app/ui/chat/group_chat_bubble.dart'; +import 'package:mohem_flutter_app/widgets/chat_app_bar_widge.dart'; +import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart'; +import 'package:provider/provider.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; +import 'package:signalr_netcore/signalr_client.dart'; +import 'package:swipe_to/swipe_to.dart'; + +class GroupChatDetailedScreenParams { + GroupResponse? groupChatDetails; + bool? isNewChat; + + GroupChatDetailedScreenParams(this.groupChatDetails, this.isNewChat); +} + +class GroupChatDetailScreen extends StatefulWidget { + const GroupChatDetailScreen({Key? key}) : super(key: key); + + @override + State createState() => _GroupChatDetailScreenState(); +} + +class _GroupChatDetailScreenState extends State { + final RefreshController _rc = RefreshController(initialRefresh: false); + late ChatProviderModel data; + late ChatCallProvider callPro; + GroupChatDetailedScreenParams? params; + + // var textDirection = TextDirection.RTL; + + void getMoreChat() async { + if (params != null) { + data.paginationVal = data.paginationVal + 10; + if (params != null) { + data.getGroupChatHistory(params!.groupChatDetails! + // senderUID: AppState().chatDetails!.response!.id!.toInt(), + // receiverUID: params!.groupChatDetails!.groupId!, + // loadMore: true, + // isNewChat: false, + ); + } + } + await Future.delayed( + const Duration(milliseconds: 1000), + ); + _rc.loadComplete(); + } + + @override + void dispose() { + data.disposeAudio(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + params = ModalRoute.of(context)!.settings.arguments as GroupChatDetailedScreenParams; + data = Provider.of(context, listen: false); + // callPro = Provider.of(context, listen: false); + if (params != null) { + data.getGroupChatHistory( + params!.groupChatDetails! + // senderUID: AppState().chatDetails!.response!.id!.toInt(), + // receiverUID: params!.groupChatHistory!.groupId!, + // loadMore: false, + // isNewChat: params!.isNewChat!, + ); + data.initAudio(receiverId: params!.groupChatDetails!.groupId!); + } + + return Scaffold( + backgroundColor: MyColors.backgroundColor, + appBar: ChatAppBarWidget( + context, + title: params!.groupChatDetails!.groupName.toString().replaceAll(".", " ").capitalizeFirstofEach, + showHomeButton: false, + // showTyping: true, + // chatUser: params!.groupChatHistory!.groupChatHistoryTargetUserList as ChatUser, + actions: [ + // SvgPicture.asset("assets/icons/chat/call.svg", width: 21, height: 23).onPress(() { + // makeCall(callType: "AUDIO"); + // }), + // 24.width, + // SvgPicture.asset("assets/icons/chat/video_call.svg", width: 21, height: 18).onPress(() { + // makeCall(callType: "VIDEO"); + // }), + // 21.width, + ], + ), + body: SafeArea( + child: Consumer( + builder: (BuildContext context, ChatProviderModel m, Widget? child) { + return (m.isLoading + ? ChatHomeShimmer( + isDetailedScreen: true, + ) + : Column( + children: [ + SmartRefresher( + enablePullDown: false, + enablePullUp: true, + onLoading: () { + getMoreChat(); + }, + header: const MaterialClassicHeader( + color: MyColors.gradiantEndColor, + ), + controller: _rc, + reverse: true, + child: ListView.separated( + controller: m.scrollController, + shrinkWrap: true, + physics: const BouncingScrollPhysics(), + reverse: true, + itemCount: m.groupChatHistory.length, + padding: const EdgeInsets.all(21), + separatorBuilder: (BuildContext cxt, int index) => 8.height, + itemBuilder: (BuildContext context, int i) { + return SwipeTo( + iconColor: MyColors.lightGreenColor, + child: GroupChatBubble( + dateTime: m.groupChatHistory[i].createdDate!, + cItem: m.groupChatHistory[i], + ), + onRightSwipe: () { + m.groupChatReply( + m.groupChatHistory[i], + ); + }, + ).onPress(() async { + logger.w(m.userChatHistory[i].toJson()); + if (m.userChatHistory[i].fileTypeResponse != null && m.userChatHistory[i].fileTypeId != null) { + if (m.userChatHistory[i].fileTypeId! == 1 || + m.userChatHistory[i].fileTypeId! == 5 || + m.userChatHistory[i].fileTypeId! == 7 || + m.userChatHistory[i].fileTypeId! == 6 || + m.userChatHistory[i].fileTypeId! == 8 + // || m.userChatHistory[i].fileTypeId! == 2 + ) { + m.getChatMedia(context, + fileTypeName: m.userChatHistory[i].fileTypeResponse!.fileTypeName ?? "", fileTypeID: m.userChatHistory[i].fileTypeId!, fileName: m.userChatHistory[i].contant!); + } + } + }); + }, + ), + ).expanded, + if (m.isReplyMsg) + SizedBox( + height: 82, + child: Row( + children: [ + Container(height: 82, color: MyColors.textMixColor, width: 6), + Container( + color: MyColors.darkTextColor.withOpacity(0.10), + padding: const EdgeInsets.only(top: 11, left: 14, bottom: 14, right: 21), + child: Row( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (AppState().chatDetails!.response!.userName == m.groupChatReplyData.first.currentUserName.toString() + ? "You" + : m.groupChatReplyData.first.currentUserName.toString().replaceAll(".", " ")) + .toText14(color: MyColors.lightGreenColor), + (m.groupChatReplyData.isNotEmpty ? m.groupChatReplyData.first.contant! : "").toText12(color: MyColors.grey71Color, maxLine: 2) + ], + ).expanded, + 12.width, + if (m.isReplyMsg && m.groupChatReplyData.isNotEmpty) showReplyImage(m.groupChatReplyData, m), + 12.width, + const Icon(Icons.cancel, size: 23, color: MyColors.grey7BColor).onPress(m.closeMe), + ], + ), + ).expanded, + ], + ), + ), + if (m.isAttachmentMsg && m.sFileType == ".png" || m.sFileType == ".jpeg" || m.sFileType == ".jpg") + SizedBox(height: 200, width: double.infinity, child: Image.file(m.selectedFile, fit: BoxFit.cover)).paddingOnly(left: 21, right: 21, top: 21), + const Divider(height: 1, color: MyColors.lightGreyEFColor), + if (m.isRecoding) + Column( + children: [ + Row( + children: [ + Text(m.buildTimer()).paddingAll(10), + if (m.isRecoding && m.isPlaying) + WaveBubble( + playerController: m.playerController, + isPlaying: m.playerController.playerState == PlayerState.playing, + onTap: () {}, + ).expanded + else + AudioWaveforms( + waveStyle: const WaveStyle( + waveColor: MyColors.lightGreenColor, + middleLineColor: Colors.transparent, + extendWaveform: true, + showBottom: true, + showTop: true, + waveThickness: 2, + showMiddleLine: false, + middleLineThickness: 0, + ), + padding: const EdgeInsets.all(5), + shouldCalculateScrolledPosition: false, + margin: EdgeInsets.zero, + size: const Size(double.infinity, 30.0), + recorderController: m.recorderController, + backgroundColor: Colors.white, + ).expanded, + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Icon( + Icons.delete_outlined, + size: 26, + color: MyColors.lightGreenColor, + ).paddingAll(10).onPress(() { + m.deleteRecoding(); + }), + SvgPicture.asset("assets/icons/chat/chat_send_icon.svg", height: 26, width: 26) + .onPress( + () => m.sendGroupChatMessage(context, + targetUserId: params!.groupChatDetails!.groupId!, + userStatus: 0, + userEmail: "", + targetUserName: params!.groupChatDetails!.groupName!, + userList: params!.groupChatDetails!.groupUserList! + ), + ) + .paddingOnly(right: 21), + ], + ), + ], + ).objectContainerView(disablePadding: true, radius: 0), + if (!m.isRecoding) + Row( + children: [ + CustomAutoDirection( + onDirectionChange: (bool isRTL) => m.onDirectionChange(isRTL), + text: m.msgText, + child: TextField( + // textDirection: m.textDirection, + controller: m.message, + decoration: InputDecoration( + hintTextDirection: m.textDirection, + hintText: m.isAttachmentMsg ? m.selectedFile.path.split("/").last : LocaleKeys.typeheretoreply.tr(), + hintStyle: TextStyle(color: m.isAttachmentMsg ? MyColors.darkTextColor : MyColors.grey98Color, fontSize: 14), + border: InputBorder.none, + focusedBorder: InputBorder.none, + enabledBorder: InputBorder.none, + errorBorder: InputBorder.none, + disabledBorder: InputBorder.none, + filled: true, + fillColor: MyColors.white, + contentPadding: const EdgeInsets.only( + left: 21, + top: 20, + bottom: 20, + ), + prefixIconConstraints: const BoxConstraints(), + prefixIcon: m.sFileType.isNotEmpty + ? SvgPicture.asset(m.getType(m.sFileType), height: 30, width: 22, alignment: Alignment.center, fit: BoxFit.cover).paddingOnly(left: 21, right: 15) + : null, + ), + onChanged: (String val) { + m.inputBoxDirection(val); + m.groupTypingInvoke(groupDetails: params!.groupChatDetails!, groupId: params!.groupChatDetails!.groupId!); + }, + ).expanded, + ), + if (m.sFileType.isNotEmpty) + Row( + children: [ + const Icon(Icons.cancel, size: 15, color: MyColors.redA3Color).paddingOnly(right: 5), + ("Clear").toText11(color: MyColors.redA3Color, isUnderLine: true).paddingOnly(left: 0), + ], + ).onPress(() => m.removeAttachment()).paddingOnly(right: 15), + if (m.sFileType.isEmpty) + RotationTransition( + turns: const AlwaysStoppedAnimation(45 / 360), + child: const Icon(Icons.attach_file_rounded, size: 26, color: MyColors.grey3AColor).onPress( + () => { + m.selectImageToUpload(context) + }, + ), + ).paddingOnly(right: 15), + const Icon( + Icons.mic, + color: MyColors.lightGreenColor, + ).paddingOnly(right: 15).onPress(() { + m.startRecoding(context); + }), + SvgPicture.asset("assets/icons/chat/chat_send_icon.svg", height: 26, width: 26) + .onPress( + () =>m.sendGroupChatMessage(context, + targetUserId: params!.groupChatDetails!.groupId!, + userStatus: 0, + userEmail: "", + targetUserName: params!.groupChatDetails!.groupName!, + userList: params!.groupChatDetails!.groupUserList! + ), + ) + .paddingOnly(right: 21), + ], + ).objectContainerView(disablePadding: true, radius: 0), + ], + )); + }, + ), + ), + ); + } + + Widget showReplyImage(List data, ChatProviderModel m) { + if (data.first.isImageLoaded! && data.first.image != null) { + return Container( + width: 43, + height: 43, + decoration: BoxDecoration( + border: Border.all(color: MyColors.darkGrey3BColor, width: 1), borderRadius: BorderRadius.circular(10.0), image: DecorationImage(image: MemoryImage(data.first.image!), fit: BoxFit.cover)), + ); + } else { + return data.first.fileTypeResponse != null && data.first.fileTypeResponse!.fileTypeName != null + ? Container( + width: 43, + height: 43, + constraints: const BoxConstraints(), + decoration: BoxDecoration(border: Border.all(color: MyColors.darkGrey3BColor, width: 1), borderRadius: BorderRadius.circular(10.0), color: Colors.white), + child: SvgPicture.asset(m.getType(data.first.fileTypeResponse!.fileTypeName ?? ""), alignment: Alignment.center, fit: BoxFit.cover).paddingOnly(left: 5, right: 5, top: 5, bottom: 5)) + : const SizedBox(); + } + } + + void makeCall({required String callType}) async { + callPro.initCallListeners(); + print("================== Make call Triggered ============================"); + // Map json = { + // "callerID": AppState().chatDetails!.response!.id!.toString(), + // "callerDetails": AppState().chatDetails!.toJson(), + // "receiverID": params!.chatUser!.id.toString(), + // "receiverDetails": params!.chatUser!.toJson(), + // "title": params!.chatUser!.userName!.replaceAll(".", " "), + // "calltype": callType == "VIDEO" ? "Video" : "Audio", + // }; + logger.w(json); + // CallDataModel callData = CallDataModel.fromJson(json); + // await Navigator.push( + // context, + // MaterialPageRoute( + // builder: (BuildContext context) => OutGoingCall( + // isVideoCall: callType == "VIDEO" ? true : false, + // outGoingCallData: callData, + // ), + // ), + // ).then((value) { + // print("then"); + // callPro.stopListeners(); + // }); + } + GroupUserList getCurrentUser(int id, GroupResponse groupChatDetails) { + return groupChatDetails.groupUserList!.firstWhere((GroupUserList item) => item.id ==id); + } + +} diff --git a/lib/ui/chat/group_members.dart b/lib/ui/chat/group_members.dart new file mode 100644 index 0000000..5751101 --- /dev/null +++ b/lib/ui/chat/group_members.dart @@ -0,0 +1,131 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:mohem_flutter_app/app_state/app_state.dart'; +import 'package:mohem_flutter_app/config/routes.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; +import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart'; +import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; +import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/ui/chat/chat_detailed_screen.dart'; +import 'package:mohem_flutter_app/widgets/chat_app_bar_widge.dart'; +import 'package:provider/provider.dart'; +class GroupMembersScreen extends StatefulWidget { + + const GroupMembersScreen({Key? key,}) : super(key: key); + + @override + State createState() => _GroupMembersScreenState(); +} + +class _GroupMembersScreenState extends State { + late ChatProviderModel provider; + late List groupUserList; + @override + void initState() { + super.initState(); + provider = Provider.of(context, listen: false); + + } + + @override + Widget build(BuildContext context) { + groupUserList = ModalRoute.of(context)!.settings.arguments as List; + return Scaffold( + backgroundColor: MyColors.white, + appBar: ChatAppBarWidget( + context, + title: LocaleKeys.groupMembers.tr(), + showHomeButton: false, + ), + body: + groupUserList!.isNotEmpty ? ListView.separated( + itemCount: groupUserList!.length, + shrinkWrap: true, + physics: const ClampingScrollPhysics(), + padding: const EdgeInsets.only(bottom: 5.0), + itemBuilder: (BuildContext context, int index) { + if(groupUserList![index].id != AppState().chatDetails!.response!.id) { + return SizedBox( + height: 55, + child: Row( + children: [ + + Stack( + children: [ + if (groupUserList![index].image == null) + SvgPicture.asset( + "assets/images/user.svg", + height: 48, + width: 48, + ), + Positioned( + right: 5, + bottom: 1, + child: Container( + width: 10, + height: 10, + decoration: BoxDecoration( + color:groupUserList![index].userStatus == 1 + ? MyColors.green2DColor + : Colors.red, + ), + ).circle(10), + ) + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (groupUserList![index].userName! ?? "").toText14( + color: MyColors.darkTextColor).paddingOnly( + left: 11, top: 13), + ], + ).expanded, + + + Row( + children: [ + IconButton(onPressed: (){ + goToChat(groupUserList![index]); + }, icon: Icon(Icons.chat)) + ], + ) + ], + ), + ); + } else { + return const SizedBox(); + } + }, + separatorBuilder: (BuildContext context, int index) => + const Divider(color: MyColors.lightGreyE5Color).paddingOnly( + left: 70), + ).paddingAll(10) + : Column( + children: [ + Utils + .getNoDataWidget(context) + .expanded, + ], + ) + ); + } + + void goToChat(GroupUserList groupUser){ + + ChatUser chatUser = ChatUser.fromJson(groupUser.toJson()); + Navigator.pushNamed(context, + AppRoutes.chatDetailed, + arguments: + ChatDetailedScreenParams( + chatUser, + false)); + } +} \ No newline at end of file diff --git a/lib/ui/chat/manage_group.dart b/lib/ui/chat/manage_group.dart new file mode 100644 index 0000000..7db0444 --- /dev/null +++ b/lib/ui/chat/manage_group.dart @@ -0,0 +1,142 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:mohem_flutter_app/app_state/app_state.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; +import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart'; +import 'package:mohem_flutter_app/provider/chat_provider_model.dart'; +import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/widgets/chat_app_bar_widge.dart'; +import 'package:provider/provider.dart'; + +class ManageGroupScreen extends StatefulWidget { + const ManageGroupScreen({ + Key? key, + }) : super(key: key); + + @override + State createState() => _ManageGroupScreenState(); +} + +class _ManageGroupScreenState extends State { + late ChatProviderModel provider; + GroupResponse? groupDetails; + + @override + void initState() { + super.initState(); + provider = Provider.of(context, listen: false); + } + + @override + Widget build(BuildContext context) { + groupDetails = ModalRoute.of(context)!.settings.arguments as GroupResponse; + return Scaffold( + backgroundColor: MyColors.white, + appBar: ChatAppBarWidget( + context, + title: LocaleKeys.manageGroup.tr(), + showHomeButton: false, + ), + body: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + LocaleKeys.admin + .tr() + .toText14(color: MyColors.darkTextColor) + .paddingOnly(right: 25)!, + groupDetails!.groupUserList!.isNotEmpty + ? ListView.separated( + itemCount: groupDetails!.groupUserList!.length, + shrinkWrap: true, + physics: const ClampingScrollPhysics(), + padding: const EdgeInsets.only(bottom: 5.0), + itemBuilder: (BuildContext context, int index) { + return SizedBox( + height: 55, + child: Row( + children: [ + Stack( + children: [ + if (groupDetails!.groupUserList![index].image == + null) + SvgPicture.asset( + "assets/images/user.svg", + height: 48, + width: 48, + ), + Positioned( + right: 5, + bottom: 1, + child: Container( + width: 10, + height: 10, + decoration: BoxDecoration( + color: groupDetails!.groupUserList![index] + .userStatus == + 1 + ? MyColors.green2DColor + : Colors.red, + ), + ).circle(10), + ) + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + (groupDetails! + .groupUserList![index].userName! ?? + "") + .toText14(color: MyColors.darkTextColor) + .paddingOnly(left: 11, top: 13), + ], + ).expanded, + Row( + children: [ + Switch( + value: groupDetails! + .groupUserList![index].isAdmin!, + onChanged: groupDetails! + .groupUserList![index].id == + AppState().chatDetails!.response!.id + ? null + : (value) { + setState(() { + groupDetails!.groupUserList![index] + .isAdmin = value; + updateGroupAdmin( + groupDetails!.groupUserList!, + groupDetails!.groupId); + }); + }, + ) + ], + ) + ], + ), + ); + }, + separatorBuilder: (BuildContext context, int index) => + const Divider(color: MyColors.lightGreyE5Color) + .paddingOnly(left: 70), + ).paddingAll(10) + : Column( + children: [ + Utils.getNoDataWidget(context).expanded, + ], + ) + ], + )); + } + + void updateGroupAdmin(List groupUserList, int? groupId) async { + //Group id need to be updated.. + provider.updateGroupAdmin(groupId, groupUserList); + } +} diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index 2db09d0..4116594 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -163,7 +163,7 @@ class _DashboardScreenState extends State with WidgetsBindingOb print("-------------------- Survey ----------------------------"); if (val.result!.data!.notificationType == "Survey") { DashboardApiClient().getAdvertisementDetail(val.result!.data!.notificationMasterId ?? "").then( - (value) { + (value) { if (value!.mohemmItgResponseItem!.statusCode == 200) { if (value.mohemmItgResponseItem!.result!.data != null) { // Navigator.pushNamed(context, AppRoutes.survey, arguments: val.result!.data); diff --git a/lib/ui/landing/itg/its_add_screen_video_image.dart b/lib/ui/landing/itg/its_add_screen_video_image.dart index 1e280d8..8ce89d0 100644 --- a/lib/ui/landing/itg/its_add_screen_video_image.dart +++ b/lib/ui/landing/itg/its_add_screen_video_image.dart @@ -61,6 +61,11 @@ class _ITGAdsScreenState extends State { isVideo = true; _futureController = createVideoPlayer(rFile!); } + + advertisementData?.actionButtonsColl!.forEach((element) { + advertisementData?.actionButtonsColl!.removeWhere((element1) => element1.actionButtonId == advertisementData?.skipButtonId); + }); + setState(() {}); } @@ -152,55 +157,101 @@ class _ITGAdsScreenState extends State { textStyle: const TextStyle(color: Colors.white, fontSize: 16, letterSpacing: -0.48, fontWeight: FontWeight.bold), ), 50.height, + if (advertisementData?.isOptional ?? false) + DefaultButton(AppState().isArabic(context) ? "يتخطى" : "Skip", () async { + Navigator.pop(context); + DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Skip").then((value) { + logger.d(value); + }); + }).paddingOnly(left: 60.0, right: 60.0, top: 8, bottom: 8), ValueListenableBuilder( valueListenable: hasTimerEnded, builder: (context, val, child) { if (hasTimerEndedBool) { - return Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_up, color: MyColors.gradiantEndColor)) - .onPress(() { - try { - Navigator.pop(context); - DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Like").then((value) { - logger.d(value); - }); - } catch (ex) { - logger.wtf(ex); - Utils.handleException(ex, context, null); - } - }), - 20.width, - Container( - padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_down, color: MyColors.gradiantEndColor)) - .onPress(() { - try { - Navigator.pop(context); - DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Dislike").then((value) { - logger.d(value); - }); - } catch (ex) { - logger.wtf(ex); - Utils.handleException(ex, context, null); - } - }), - ], + return GridView.builder( + padding: EdgeInsets.zero, + itemCount: advertisementData?.actionButtonsColl!.length, + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemBuilder: (context, index) { + String? btnText = AppState().isArabic(context) ? advertisementData?.actionButtonsColl![index].btnTextAr : advertisementData?.actionButtonsColl![index].btnTextEn; + return DefaultButton(btnText!, () async { + Navigator.pop(context); + DashboardApiClient() + .setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, advertisementData?.actionButtonsColl![index].actionValue) + .then((value) { + logger.d(value); + }); + }).paddingOnly(left: 60.0, right: 60.0, top: 8, bottom: 8); + }, + gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 1, + childAspectRatio: (7.0), + ), ); + // Row( + // mainAxisAlignment: MainAxisAlignment.center, + // children: [ + // Container(padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_up, color: MyColors.gradiantEndColor)) + // .onPress(() { + // try { + // Navigator.pop(context); + // DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Like").then((value) { + // logger.d(value); + // }); + // } catch (ex) { + // logger.wtf(ex); + // Utils.handleException(ex, context, null); + // } + // }), + // 20.width, + // Container( + // padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_down, color: MyColors.gradiantEndColor)) + // .onPress(() { + // try { + // Navigator.pop(context); + // DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Dislike").then((value) { + // logger.d(value); + // }); + // } catch (ex) { + // logger.wtf(ex); + // Utils.handleException(ex, context, null); + // } + // }), + // ], + // ); } else { return Container(); } }, ), 20.height, - if (advertisementData?.isOptional ?? false) - DefaultButton(AppState().isArabic(context) ? advertisementData?.skipButtonTextAr ?? "Skip" : advertisementData?.skipButtonTextEn ?? "Skip", () async { - Navigator.pop(context); - DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Skip").then((value) { - logger.d(value); - }); - }).paddingOnly(left: 100, right: 100) + // if (advertisementData?.isOptional ?? false) + // GridView.builder( + // padding: EdgeInsets.zero, + // itemCount: advertisementData?.actionButtonsColl!.length, + // shrinkWrap: true, + // physics: const NeverScrollableScrollPhysics(), + // itemBuilder: (context, index) { + // String? btnText = AppState().isArabic(context) ? advertisementData?.actionButtonsColl![index].btnTextAr : advertisementData?.actionButtonsColl![index].btnTextEn; + // return DefaultButton(btnText!, () async { + // Navigator.pop(context); + // DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, advertisementData?.actionButtonsColl![index].actionValue).then((value) { + // logger.d(value); + // }); + // }).paddingAll(8); + // }, + // gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + // crossAxisCount: 2, + // childAspectRatio: (4.0), + // ), + // ) + // DefaultButton(AppState().isArabic(context) ? advertisementData?.skipButtonTextAr ?? "Skip" : advertisementData?.skipButtonTextEn ?? "Skip", () async { + // Navigator.pop(context); + // DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Skip").then((value) { + // logger.d(value); + // }); + // }).paddingOnly(left: 100, right: 100) ], ); } else { diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart index 3293e43..5d83fe9 100644 --- a/lib/ui/login/login_screen.dart +++ b/lib/ui/login/login_screen.dart @@ -103,6 +103,7 @@ class _LoginScreenState extends State { try { if (!(await Utils.isGoogleServicesAvailable())) { print("HUAWEI APPPP GALLERYYYY!!!!"); + AppNotifications().init(firebaseToken, context); AppState().setIsHuawei = true; AppNotifications().initHuaweiPush(checkLoginInfo); } else { diff --git a/lib/ui/marathon/marathon_screen.dart b/lib/ui/marathon/marathon_screen.dart index 6dbbd18..d5fc8c4 100644 --- a/lib/ui/marathon/marathon_screen.dart +++ b/lib/ui/marathon/marathon_screen.dart @@ -81,8 +81,8 @@ class MarathonScreen extends StatelessWidget { displayLocalizedContent( isPhoneLangArabic: AppState().isArabic(context), selectedLanguage: provider.demoMarathonDetailModel.selectedLanguage!, - arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr!, - englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn!, + arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "", + englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "", ).toText22( color: MyColors.grey3AColor, isCentered: true, diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart index 8d595bf..c1f5cfe 100644 --- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart +++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart @@ -94,17 +94,8 @@ class _DynamicInputScreenState extends State { genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp); SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values, empID: dynamicParams!.selectedEmp); Utils.hideLoading(context); - await Navigator.pushNamed( - context, - AppRoutes.requestSubmitScreen, - arguments: RequestSubmitScreenParams( - LocaleKeys.submit.tr(), - submitEITTransactionList.pTRANSACTIONID!, - submitEITTransactionList.pITEMKEY!, - 'eit', - popNavigateToSpecificRoute: dynamicParams!.popUntilRoute, - ), - ); + await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen, + arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit')); if (!AppState().cancelRequestTrancsection) { return; } @@ -350,13 +341,17 @@ class _DynamicInputScreenState extends State { if (getEitDffStructureList![j].fORMATTYPE == "X") { idColName = Utils.reverseFormatDate(idColName!); - if (Utils.isDate(Utils.reverseFormatDate(Utils.formatDateNew(idColName)), "yyyy-MM-dd")) { - idColName = Utils.formatStandardDate(Utils.formatStandardDate(Utils.formatDateNew(idColName))); + if(Utils.isDate(Utils.reverseFormatDate(Utils.formatDateNew(idColName!)), "yyyy-MM-dd")){ + + idColName = Utils.formatStandardDate(Utils.formatStandardDate(Utils.formatDateNew(idColName!))); // idColName = DateFormat('yyyy/MM/dd HH:mm:ss').format(date); - } else if (Utils.isDate(Utils.reverseFormatDate(idColName), "dd-MM-yyyy")) { + }else if(Utils.isDate(Utils.reverseFormatDate(idColName!), "dd-MM-yyyy")){ + + // // change date format on 31/05/2023 - DateTime date = DateFormat('dd-MM-yyyy').parse(idColName); + DateTime date = DateFormat('dd-MM-yyyy').parse(idColName!); idColName = DateFormat('yyyy-MM-dd HH:mm:ss').format(date); + } } } @@ -531,9 +526,12 @@ class _DynamicInputScreenState extends State { onTap: () async { if ((getEitDffStructureList![index].eSERVICESDV?.pVALUECOLUMNNAME != null)) { if (getEitDffStructureList![index].isDefaultTypeIsCDPS) { - selectedDate = DateFormat("yyyy/MM/dd", "en_US").parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!.replaceAll('/"', '').replaceAll(" 00:00:00", "")); - } else { - selectedDate = DateTime.parse(getEitDffStructureList![index].eSERVICESDV!.pVALUECOLUMNNAME!); + if (displayText.contains(" 00:00:00")) { + displayText = displayText.replaceAll(" 00:00:00", ""); + } + if (displayText.contains("/")) { + displayText = DateFormat('yyyy-MM-dd', "en_US").format(DateFormat("yyyy/MM/dd", "en_US").parse(displayText)); + } } } DateTime date = await _selectDate(context); diff --git a/lib/ui/screens/my_documents/my_documents_fragment.dart b/lib/ui/screens/my_documents/my_documents_fragment.dart index 89ad69d..e1be0a4 100644 --- a/lib/ui/screens/my_documents/my_documents_fragment.dart +++ b/lib/ui/screens/my_documents/my_documents_fragment.dart @@ -75,8 +75,11 @@ class _MyDocumentsFragmentState extends State { padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 11), itemBuilder: (cxt, index) { return MyDocumentItem(documentfilteredList[index], getColorByDocumentStatus(documentfilteredList[index].dOCUMENTSTATUS!)).onPress(() { - Navigator.pushNamed(context, AppRoutes.addDynamicInput, - arguments: DynamicListViewParams(documentfilteredList[index].dOCUMENTTYPE!, documentfilteredList[index].fUNCTIONNAME!, selectedEmp: AppState().getUserName, popUntilRoute: AppRoutes.myDocuments)); + Navigator.pushNamed( + context, + AppRoutes.addDynamicInput, + arguments: DynamicListViewParams(documentfilteredList[index].dOCUMENTTYPE!, documentfilteredList[index].fUNCTIONNAME!, selectedEmp: AppState().getUserName), + ); }); }, separatorBuilder: (cxt, index) => 12.height, @@ -107,7 +110,7 @@ class _MyDocumentsFragmentState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ title.toText10(), - value.toText20(isBold: true, color: color), + value.toText18(isBold: true, color: color), ], ), ).onPress(() { diff --git a/lib/ui/work_list/worklist_fragments/info_fragments.dart b/lib/ui/work_list/worklist_fragments/info_fragments.dart index d2c64f3..5edb6f1 100644 --- a/lib/ui/work_list/worklist_fragments/info_fragments.dart +++ b/lib/ui/work_list/worklist_fragments/info_fragments.dart @@ -164,7 +164,7 @@ class InfoFragment extends StatelessWidget { ), ItemDetailGrid( ItemDetailViewCol(LocaleKeys.otherCharges.tr(), poHeaderList[index].oTHERCHARGES?.toString() ?? ""), - ItemDetailViewCol(LocaleKeys.totalPOAmountWithVAT.tr(), poHeaderList[index].tOTPOAMT.toString() ?? ""), + ItemDetailViewCol(LocaleKeys.totalPOAmountWithVAT.tr(), poHeaderList[index].lOCCURTOTPOAMT.toString() ?? ""), ), ItemDetailGrid( ItemDetailViewCol(LocaleKeys.totalPOAmountInWords.tr(), poHeaderList[index].tOTPOAMTWORD ?? ""), diff --git a/lib/widgets/location/Location.dart b/lib/widgets/location/Location.dart index e324618..67d3cdd 100644 --- a/lib/widgets/location/Location.dart +++ b/lib/widgets/location/Location.dart @@ -47,15 +47,6 @@ class Location { Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.medium, timeLimit: const Duration(seconds: 5)).then((value) { done(value); }); - // Geolocator.getLastKnownPosition(forceAndroidLocationManager: true).then((value) { - // if (value == null) { - // Geolocator.getCurrentPosition().then((value) { - // done(value); - // }); - // } else { - // done(value); - // } - // }); } else { // AppPermissions } diff --git a/lib/widgets/mark_attendance_widget.dart b/lib/widgets/mark_attendance_widget.dart index dfb4357..982e316 100644 --- a/lib/widgets/mark_attendance_widget.dart +++ b/lib/widgets/mark_attendance_widget.dart @@ -1,13 +1,11 @@ +import 'dart:async'; import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:huawei_location/location/fused_location_provider_client.dart'; -import 'package:huawei_location/location/location_request.dart'; -import 'package:huawei_location/location/location_settings_request.dart'; -import 'package:huawei_location/permission/permission_handler.dart'; +import 'package:huawei_location/huawei_location.dart'; import 'package:mohem_flutter_app/api/dashboard_api_client.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/classes/colors.dart'; @@ -21,7 +19,7 @@ import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart'; import 'package:mohem_flutter_app/ui/dialogs/success_dialog.dart'; import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart'; import 'package:mohem_flutter_app/widgets/dialogs/dialogs.dart'; -import 'package:mohem_flutter_app/widgets/location/Location.dart'; +import 'package:mohem_flutter_app/widgets/location/Location.dart' as location; import 'package:mohem_flutter_app/widgets/nfc/nfc_reader_sheet.dart'; import 'package:mohem_flutter_app/widgets/qr_scanner_dialog.dart'; import 'package:nfc_manager/nfc_manager.dart'; @@ -75,26 +73,61 @@ class _MarkAttendanceWidgetState extends State { } void checkHuaweiLocationPermission(String attendanceType) async { - PermissionHandler permissionHandler = PermissionHandler(); - - if (await permissionHandler.hasLocationPermission()) { - getHuaweiCurrentLocation(attendanceType); - } else { - bool has = await requestPermissions(); - if (has) { - getHuaweiCurrentLocation(attendanceType); + // Permission_Handler permissionHandler = PermissionHandler(); + location.Location.isEnabled((bool isEnabled) async { + if (isEnabled) { + location.Location.havePermission((bool permission) async { + if (permission) { + getHuaweiCurrentLocation(attendanceType); + } else { + bool has = await requestPermissions(); + if (has) { + getHuaweiCurrentLocation(attendanceType); + } else { + showDialog( + context: context, + builder: (BuildContext cxt) => ConfirmDialog( + message: "You need to give location permission to mark attendance", + onTap: () { + Navigator.pop(context); + }, + ), + ); + } + } + }); } else { showDialog( context: context, builder: (BuildContext cxt) => ConfirmDialog( - message: "You need to give location permission to mark attendance", - onTap: () { + message: "You need to enable location services to mark attendance", + onTap: () async { Navigator.pop(context); + await Geolocator.openLocationSettings(); }, ), ); } - } + }); + + // if (await permissionHandler.hasLocationPermission()) { + // getHuaweiCurrentLocation(attendanceType); + // } else { + // bool has = await requestPermissions(); + // if (has) { + // getHuaweiCurrentLocation(attendanceType); + // } else { + // showDialog( + // context: context, + // builder: (BuildContext cxt) => ConfirmDialog( + // message: "You need to give location permission to mark attendance", + // onTap: () { + // Navigator.pop(context); + // }, + // ), + // ); + // } + // } } Future requestPermissions() async { @@ -134,11 +167,11 @@ class _MarkAttendanceWidgetState extends State { if (AppState().getIsHuawei) { checkHuaweiLocationPermission("NFC"); } else { - Location.isEnabled((bool isEnabled) { + location.Location.isEnabled((bool isEnabled) { if (isEnabled) { - Location.havePermission((bool permission) { + location.Location.havePermission((bool permission) { if (permission) { - Location.getCurrentLocation( + location.Location.getCurrentLocation( (Position position, bool isMocked) { if (isMocked) { markFakeAttendance("NFC", position.latitude.toString() ?? "", position.longitude.toString() ?? ""); @@ -181,11 +214,11 @@ class _MarkAttendanceWidgetState extends State { if (AppState().getIsHuawei) { checkHuaweiLocationPermission("WIFI"); } else { - Location.isEnabled((bool isEnabled) { + location.Location.isEnabled((bool isEnabled) { if (isEnabled) { - Location.havePermission((bool permission) { + location.Location.havePermission((bool permission) { if (permission) { - Location.getCurrentLocation( + location.Location.getCurrentLocation( (Position position, bool isMocked) { if (isMocked) { markFakeAttendance("WIFI", position.latitude.toString() ?? "", position.longitude.toString() ?? ""); @@ -228,11 +261,11 @@ class _MarkAttendanceWidgetState extends State { if (AppState().getIsHuawei) { checkHuaweiLocationPermission("QR"); } else { - Location.isEnabled((bool isEnabled) { + location.Location.isEnabled((bool isEnabled) { if (isEnabled) { - Location.havePermission((bool permission) { + location.Location.havePermission((bool permission) { if (permission) { - Location.getCurrentLocation( + location.Location.getCurrentLocation( (Position position, bool isMocked) { if (isMocked) { markFakeAttendance("QR", position.latitude.toString() ?? "", position.longitude.toString() ?? ""); @@ -277,49 +310,70 @@ class _MarkAttendanceWidgetState extends State { ); } - void getHuaweiCurrentLocation(String attendanceType) { + void getHuaweiCurrentLocation(String attendanceType) async { try { + Utils.showLoading(context); FusedLocationProviderClient locationService = FusedLocationProviderClient(); LocationRequest locationRequest = LocationRequest(); locationRequest.priority = LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY; - locationRequest.interval = 1000; + locationRequest.interval = 500; List locationRequestList = [locationRequest]; LocationSettingsRequest locationSettingsRequest = LocationSettingsRequest(requests: locationRequestList); - locationService.checkLocationSettings(locationSettingsRequest).then((settings) async { - await locationService.getLastLocation().then((value) { - if (value.latitude == null || value.longitude == null) { - showDialog( - context: context, - builder: (BuildContext cxt) => ConfirmDialog( - message: "Unable to get your location, Please check your location settings & try again.", - onTap: () { - Navigator.pop(context); - }, - ), - ); - } else { - if (attendanceType == "QR") { - performQrCodeAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? ""); - } - if (attendanceType == "WIFI") { - performWifiAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? ""); - } - if (attendanceType == "NFC") { - performNfcAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? ""); - } + late StreamSubscription _streamSubscription; + int requestCode = (await (locationService.requestLocationUpdates(locationRequest)))!; + + _streamSubscription = locationService.onLocationData!.listen( + (Location location) async { + Utils.hideLoading(context); + await locationService.removeLocationUpdates(requestCode); + if (attendanceType == "QR") { + performQrCodeAttendance(widget.model, lat: location.latitude.toString() ?? "", lng: location.longitude.toString() ?? ""); } - }).catchError((error) { - print("HUAWEI LOCATION getLastLocation ERROR!!!!!"); - print(error); - }); - }).catchError((error) { - print("HUAWEI LOCATION checkLocationSettings ERROR!!!!!"); - print(error); - if (error.code == "LOCATION_SETTINGS_NOT_AVAILABLE") { - // Location service not enabled. - } - }); + if (attendanceType == "WIFI") { + performWifiAttendance(widget.model, lat: location.latitude.toString() ?? "", lng: location.longitude.toString() ?? ""); + } + if (attendanceType == "NFC") { + performNfcAttendance(widget.model, lat: location.latitude.toString() ?? "", lng: location.longitude.toString() ?? ""); + } + requestCode = 0; + }, + ); + + // locationService.checkLocationSettings(locationSettingsRequest).then((settings) async { + // await locationService.getLastLocation().then((value) { + // if (value.latitude == null || value.longitude == null) { + // showDialog( + // context: context, + // builder: (BuildContext cxt) => ConfirmDialog( + // message: "Unable to get your location, Please check your location settings & try again.", + // onTap: () { + // Navigator.pop(context); + // }, + // ), + // ); + // } else { + // if (attendanceType == "QR") { + // performQrCodeAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? ""); + // } + // if (attendanceType == "WIFI") { + // performWifiAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? ""); + // } + // if (attendanceType == "NFC") { + // performNfcAttendance(widget.model, lat: value.latitude.toString() ?? "", lng: value.longitude.toString() ?? ""); + // } + // } + // }).catchError((error) { + // print("HUAWEI LOCATION getLastLocation ERROR!!!!!"); + // print(error); + // }); + // }).catchError((error) { + // print("HUAWEI LOCATION checkLocationSettings ERROR!!!!!"); + // print(error); + // if (error.code == "LOCATION_SETTINGS_NOT_AVAILABLE") { + // // Location service not enabled. + // } + // }); } catch (error) { print("HUAWEI LOCATION ERROR!!!!!"); print(error); diff --git a/pubspec.yaml b/pubspec.yaml index aae7196..4c46a26 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.2.93+300032 +version: 3.2.991+300039 environment: sdk: ">=2.16.0 <3.0.0" @@ -46,7 +46,7 @@ dependencies: local_auth: ^1.1.9 fluttertoast: ^8.0.8 syncfusion_flutter_calendar: ^19.4.48 -# flutter_calendar_carousel: ^2.1.0 + # flutter_calendar_carousel: ^2.1.0 pie_chart: ^5.1.0 shared_preferences: ^2.0.12 firebase_messaging: ^13.0.4 @@ -54,9 +54,9 @@ dependencies: logger: ^1.1.0 flutter_countdown_timer: ^4.1.0 nfc_manager: ^3.2.0 -# uuid: ^3.0.6 -# device_info_plus: ^4.0.0 -# android_id: ^0.1.3+1 + # uuid: ^3.0.6 + # device_info_plus: ^4.0.0 + # android_id: ^0.1.3+1 platform_device_id: ^1.0.1 image_picker: ^0.8.5+3 file_picker: ^4.6.1 @@ -66,21 +66,21 @@ dependencies: open_file: ^3.2.1 wifi_iot: ^0.3.18 flutter_html: ^3.0.0-alpha.6 -# flutter_barcode_scanner: ^2.0.0 + # flutter_barcode_scanner: ^2.0.0 qr_code_scanner: ^1.0.1 -# qr_flutter: ^4.0.0 + # qr_flutter: ^4.0.0 url_launcher: ^6.0.15 share: 2.0.4 flutter_rating_bar: ^4.0.1 auto_size_text: ^3.0.0 pull_to_refresh: ^2.0.0 -# lottie json animations + # lottie json animations lottie: any -# Marathon Card Swipe + # Marathon Card Swipe appinio_swiper: ^1.1.1 expandable: ^5.0.1 -# networkImage + # networkImage cached_network_image: ^3.2.2 #Chat @@ -101,12 +101,13 @@ dependencies: video_player: ^2.5.1 just_audio: ^0.9.30 -# safe_device: ^1.1.2 + # safe_device: ^1.1.2 flutter_layout_grid: ^2.0.1 #Huawei Dependencies -# huawei_hmsavailability: ^6.6.0+300 - huawei_location: 6.0.0+302 + # huawei_hmsavailability: ^6.6.0+300 +# huawei_location: 6.0.0+302 + huawei_location: ^6.11.0+301 huawei_push: ^6.7.0+300 firebase_crashlytics: ^2.9.0 @@ -114,7 +115,7 @@ dependencies: carousel_slider: ^4.2.1 #Huawei Specified -# store_checker: ^1.1.0 + # store_checker: ^1.1.0 google_api_availability: ^3.0.1 #todo its for temporary purpose, later will remove this.