Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Chat Fixes & Counter Updated on Signal R

Browse Source
merge-requests/99/head
Aamir Muhammad 3 years ago
parent 30c7f5738d
commit ff3592a120
6 changed files with 86 additions and 43 deletions
Show Stats Download Patch File Download Diff File

13
lib/provider/chat_provider_model.dart
Unescape Escape View File

@ -44,6 +44,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
List<ChatUser> favUsersList = [];
int paginationVal = 0;
bool currentUserTyping = false;
int? cTypingUserId = 0;
//Chat
int chatUConvCounter = 0;
@ -412,17 +413,6 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
);
}
}
if (isChatScreenActive) {
currentUserTyping = true;
notifyListeners();
Future.delayed(
const Duration(seconds: 2),
() {
currentUserTyping = false;
notifyListeners();
},
);
}
notifyListeners();
}
@ -869,7 +859,6 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
}
Future invokeChatCounter({required int userId}) async {
print("invokedd");
await chatHubConnection.invoke("GetChatCounversationCount", args: [userId]);
return "";
}

6
lib/ui/chat/chat_bubble.dart
Unescape Escape View File

@ -116,7 +116,7 @@ class ChatBubble extends StatelessWidget {
children: [
if (fileTypeID == 1 || fileTypeID == 5 || fileTypeID == 7 || fileTypeID == 6 || fileTypeID == 8 || fileTypeID == 2)
SvgPicture.asset(data.getType(fileTypeName ?? ""), height: 30, width: 22, alignment: Alignment.center, fit: BoxFit.cover).paddingOnly(left: 0, right: 10),
(cItem.contant ?? "").toText12(),
(cItem.contant ?? "").toText12().expanded,
],
),
Align(
@ -208,12 +208,12 @@ class ChatBubble extends StatelessWidget {
left: 0,
right: 10,
),
(cItem.contant ?? "").toText12(color: Colors.white),
(cItem.contant ?? "").toText12(color: Colors.white).expanded,
],
),
Align(
alignment: Alignment.centerRight,
child: dateTime.toText10(color: Colors.white.withOpacity(.71)),
child: dateTime.toText10(color: Colors.white.withOpacity(.71),),
),
],
),

4
lib/ui/chat/chat_detailed_screen.dart
Unescape Escape View File

@ -18,6 +18,7 @@ import 'package:mohem_flutter_app/provider/chat_provider_model.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/widgets/app_bar_widget.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';
@ -76,12 +77,13 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
return Scaffold(
backgroundColor: MyColors.backgroundColor,
appBar: AppBarWidget(
appBar: ChatAppBarWidget(
context,
title: params!.chatUser!.userName.toString().replaceAll(".", " ").capitalizeFirstofEach,
showHomeButton: false,
image: params!.chatUser!.image == null || params!.chatUser!.image.isEmpty ? null : params!.chatUser!.image,
showTyping: true,
chatUser: params!.chatUser,
actions: [
SvgPicture.asset("assets/icons/chat/call.svg", width: 21, height: 23).onPress(() {
// makeCall(callType: "AUDIO", con: hubConnection);

2
lib/ui/chat/chat_home_screen.dart
Unescape Escape View File

@ -137,7 +137,7 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
(m.searchedChats![index].userName!.replaceFirst(".", " ").capitalizeFirstofEach ?? "").toText14(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 13),
(m.searchedChats![index].isTyping! ? "Typing ..." : "").toText10(color: MyColors.lightGreyColor).paddingOnly(left: 11, top: 0),
(m.searchedChats![index].isTyping! ? "Typing ..." : "").toText10(color: MyColors.darkTextColor).paddingOnly(left: 11, top: 0),
],
).expanded,
SizedBox(

26
lib/widgets/app_bar_widget.dart
Unescape Escape View File

@ -14,19 +14,11 @@ AppBar AppBarWidget(BuildContext context,
bool showHomeButton = true,
bool showNotificationButton = false,
bool showMemberButton = false,
String? image,
bool showTyping = false,
List<Widget>? actions,
void Function()? onHomeTapped,
void Function()? onBackTapped}) {
return AppBar(
leadingWidth: 0,
// leading: GestureDetector(
// behavior: HitTestBehavior.opaque,
// onTap: Feedback.wrapForTap(() => Navigator.maybePop(context), context),
// child: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor),
// ),
//titleSpacing: -1.44,
title: Row(
children: [
GestureDetector(
@ -37,25 +29,7 @@ AppBar AppBarWidget(BuildContext context,
child: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor),
),
4.width,
if (image != null)
CircularAvatar(
url: image,
height: 40,
width: 40,
isImageBase64: true,
),
if (image != null) 14.width,
title.toText24(color: MyColors.darkTextColor, isBold: true).expanded,
if(showTyping)
Consumer<ChatProviderModel>(
builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
if (data.currentUserTyping) {
return ("Typing ...").toText10(color: MyColors.lightGreyColor).paddingOnly(left: 5, top: 0);
} else {
return const SizedBox();
}
},
),
],
),
centerTitle: false,

78
lib/widgets/chat_app_bar_widge.dart
Unescape Escape View File

@ -0,0 +1,78 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/classes/colors.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/models/chat/get_search_user_chat_model.dart';
import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
import 'package:provider/provider.dart';
AppBar ChatAppBarWidget(BuildContext context,
{required String title,
bool showHomeButton = true,
String? image,
ChatUser? chatUser,
bool showTyping = false,
List<Widget>? actions,
void Function()? onHomeTapped,
void Function()? onBackTapped}) {
return AppBar(
leadingWidth: 0,
title: Row(
children: [
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: Feedback.wrapForTap(() {
(onBackTapped == null ? Navigator.maybePop(context) : onBackTapped());
}, context),
child: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor),
),
4.width,
if (image != null)
CircularAvatar(
url: image,
height: 40,
width: 40,
isImageBase64: true,
),
if (image != null) 14.width,
SizedBox(
height: 40,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
title.toText20(color: MyColors.darkTextColor, isBold: true).expanded,
if (showTyping)
Consumer<ChatProviderModel>(
builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
if (chatUser!.isTyping!) {
return ("Typing ...").toText10(color: MyColors.darkTextColor);
} else {
return const SizedBox();
}
},
),
],
).expanded,
)
],
),
centerTitle: false,
elevation: 0,
backgroundColor: Colors.white,
actions: [
if (showHomeButton)
IconButton(
onPressed: () {
onHomeTapped == null ? Navigator.popUntil(context, ModalRoute.withName(AppRoutes.dashboard)) : onHomeTapped();
},
icon: const Icon(Icons.home, color: MyColors.darkIconColor),
),
...actions ?? []
],
);
}
Write Preview
Loading…
Cancel
Save