mohemm_HMG_flutter_upgrade
haroon amjad 2 years ago
parent 39d9136299
commit 6811015a0d

@ -90,7 +90,7 @@ class AppState {
String get getHuaweiPushToken => _huaweiPushToken; String get getHuaweiPushToken => _huaweiPushToken;
final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 5.2, mobileType: Platform.isAndroid ? "android" : "ios"); final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 5.3, mobileType: Platform.isAndroid ? "android" : "ios");
void setPostParamsInitConfig() { void setPostParamsInitConfig() {
isAuthenticated = false; isAuthenticated = false;

@ -143,7 +143,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
dateTime: m.dateFormte(m.userChatHistory[i].createdDate!), dateTime: m.dateFormte(m.userChatHistory[i].createdDate!),
cItem: m.userChatHistory[i], cItem: m.userChatHistory[i],
), ),
onRightSwipe: () { onRightSwipe: (val) {
m.chatReply( m.chatReply(
m.userChatHistory[i], m.userChatHistory[i],
); );

@ -83,8 +83,7 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
data = Provider.of<ChatProviderModel>(context, listen: false); data = Provider.of<ChatProviderModel>(context, listen: false);
// callPro = Provider.of<ChatCallProvider>(context, listen: false); // callPro = Provider.of<ChatCallProvider>(context, listen: false);
if (params != null) { if (params != null) {
data.getGroupChatHistory( data.getGroupChatHistory(params!.groupChatDetails!
params!.groupChatDetails!
// senderUID: AppState().chatDetails!.response!.id!.toInt(), // senderUID: AppState().chatDetails!.response!.id!.toInt(),
// receiverUID: params!.groupChatHistory!.groupId!, // receiverUID: params!.groupChatHistory!.groupId!,
// loadMore: false, // loadMore: false,
@ -147,7 +146,7 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
dateTime: m.groupChatHistory[i].createdDate!, dateTime: m.groupChatHistory[i].createdDate!,
cItem: m.groupChatHistory[i], cItem: m.groupChatHistory[i],
), ),
onRightSwipe: () { onRightSwipe: (val) {
m.groupChatReply( m.groupChatReply(
m.groupChatHistory[i], m.groupChatHistory[i],
); );
@ -254,8 +253,7 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
userStatus: 0, userStatus: 0,
userEmail: "", userEmail: "",
targetUserName: params!.groupChatDetails!.groupName!, targetUserName: params!.groupChatDetails!.groupName!,
userList: params!.groupChatDetails!.groupUserList! userList: params!.groupChatDetails!.groupUserList!),
),
) )
.paddingOnly(right: 21), .paddingOnly(right: 21),
], ],
@ -309,9 +307,7 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
RotationTransition( RotationTransition(
turns: const AlwaysStoppedAnimation(45 / 360), turns: const AlwaysStoppedAnimation(45 / 360),
child: const Icon(Icons.attach_file_rounded, size: 26, color: MyColors.grey3AColor).onPress( child: const Icon(Icons.attach_file_rounded, size: 26, color: MyColors.grey3AColor).onPress(
() => { () => {m.selectImageToUpload(context)},
m.selectImageToUpload(context)
},
), ),
).paddingOnly(right: 15), ).paddingOnly(right: 15),
const Icon( const Icon(
@ -322,13 +318,12 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
}), }),
SvgPicture.asset("assets/icons/chat/chat_send_icon.svg", height: 26, width: 26) SvgPicture.asset("assets/icons/chat/chat_send_icon.svg", height: 26, width: 26)
.onPress( .onPress(
() =>m.sendGroupChatMessage(context, () => m.sendGroupChatMessage(context,
targetUserId: params!.groupChatDetails!.groupId!, targetUserId: params!.groupChatDetails!.groupId!,
userStatus: 0, userStatus: 0,
userEmail: "", userEmail: "",
targetUserName: params!.groupChatDetails!.groupName!, targetUserName: params!.groupChatDetails!.groupName!,
userList: params!.groupChatDetails!.groupUserList! userList: params!.groupChatDetails!.groupUserList!),
),
) )
.paddingOnly(right: 21), .paddingOnly(right: 21),
], ],
@ -387,8 +382,8 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
// callPro.stopListeners(); // callPro.stopListeners();
// }); // });
} }
GroupUserList getCurrentUser(int id, GroupResponse groupChatDetails) { GroupUserList getCurrentUser(int id, GroupResponse groupChatDetails) {
return groupChatDetails.groupUserList!.firstWhere((GroupUserList item) => item.id ==id); return groupChatDetails.groupUserList!.firstWhere((GroupUserList item) => item.id == id);
} }
} }

@ -21,7 +21,6 @@ class BusinessCardDialog extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -33,9 +32,9 @@ class BusinessCardDialog extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Image.asset( Image.asset(
"assets/images/logos/bn_cloud_soloution.jpg", "assets/images/logos/bn_hmg_logo.png",
width: 94, width: 280,
height: 91.15, height: 120,
).paddingOnly(top: 4), ).paddingOnly(top: 4),
], ],
), ),

Loading…
Cancel
Save