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

Chat Favorite Screen & Fixes

Browse Source
merge-requests/55/head
Aamir Muhammad 3 years ago
parent 5412dcaf35
commit 83aabd0555
4 changed files with 209 additions and 202 deletions
Show Stats Download Patch File Download Diff File

8
lib/generated/codegen_loader.g.dart
Unescape Escape View File

@ -514,7 +514,9 @@ class CodegenLoader extends AssetLoader{
"verification": "تَحَقّق", "verification": "تَحَقّق",
"resend": "إعادة إرسال", "resend": "إعادة إرسال",
"codeExpire": "انتهت صلاحية رمز التحقق", "codeExpire": "انتهت صلاحية رمز التحقق",
"typeheretoreply": "اكتب هنا للرد" "typeheretoreply": "اكتب هنا للرد",
"favorite": "مفضل",
"searchfromchat": "البحث من الدردشة"
}; };
static const Map<String,dynamic> en_US = { static const Map<String,dynamic> en_US = {
"mohemm": "Mohemm", "mohemm": "Mohemm",
@ -1016,7 +1018,9 @@ static const Map<String,dynamic> en_US = {
"resend": "Resend", "resend": "Resend",
"codeExpire": "The verification code has been expired", "codeExpire": "The verification code has been expired",
"allQuestionsCorrect": "You have answered all questions correct", "allQuestionsCorrect": "You have answered all questions correct",
"typeheretoreply": "Type here to reply" "typeheretoreply": "Type here to reply",
"favorite": "Favorite",
"searchfromchat": "Search from chat"
}; };
static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
} }

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

@ -16,10 +16,12 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:swipe_to/swipe_to.dart'; import 'package:swipe_to/swipe_to.dart';
class ChatDetailScreen extends StatelessWidget { class ChatDetailScreen extends StatelessWidget {
ChatDetailScreen({Key? key}) : super(key: key);
dynamic userDetails; dynamic userDetails;
late ChatProviderModel data; late ChatProviderModel data;
ScrollController scrollController = ScrollController(); ScrollController scrollController = ScrollController();
final RefreshController _refreshController = RefreshController(initialRefresh: false); final RefreshController _refreshController = RefreshController(initialRefresh: false);
void getMoreChat() async { void getMoreChat() async {

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

@ -43,147 +43,149 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: MyColors.white, backgroundColor: MyColors.white,
body: Consumer<ChatProviderModel>(builder: (BuildContext context, ChatProviderModel m, Widget? child) { body: Consumer<ChatProviderModel>(
return m.isLoading builder: (BuildContext context, ChatProviderModel m, Widget? child) {
? ChatHomeShimmer() return m.isLoading
: ListView( ? ChatHomeShimmer()
shrinkWrap: true, : ListView(
physics: const AlwaysScrollableScrollPhysics(), shrinkWrap: true,
children: [ physics: const AlwaysScrollableScrollPhysics(),
Padding( children: <Widget>[
padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20), Padding(
child: TextField( padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
onChanged: (String val) { child: TextField(
m.filter(val); onChanged: (String val) {
}, m.filter(val);
decoration: InputDecoration( },
border: OutlineInputBorder( decoration: InputDecoration(
borderRadius: BorderRadius.circular(5), border: OutlineInputBorder(
borderSide: const BorderSide( borderRadius: BorderRadius.circular(5),
color: Color(0xFFE5E5E5), borderSide: const BorderSide(
color: Color(0xFFE5E5E5),
),
), ),
), focusedBorder: OutlineInputBorder(
focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(5),
borderRadius: BorderRadius.circular(5), borderSide: const BorderSide(
borderSide: const BorderSide( color: Color(0xFFE5E5E5),
color: Color(0xFFE5E5E5), ),
), ),
), enabledBorder: OutlineInputBorder(
enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(5),
borderRadius: BorderRadius.circular(5), borderSide: const BorderSide(
borderSide: const BorderSide( color: Color(0xFFE5E5E5),
color: Color(0xFFE5E5E5), ),
), ),
contentPadding: const EdgeInsets.symmetric(horizontal: 15, vertical: 10),
hintText: LocaleKeys.searchfromchat.tr(),
hintStyle: const TextStyle(color: MyColors.lightTextColor, fontStyle: FontStyle.italic),
filled: true,
fillColor: const Color(0xFFF7F7F7),
), ),
contentPadding: const EdgeInsets.symmetric(horizontal: 15, vertical: 10),
hintText: LocaleKeys.searchfromchat.tr(),
hintStyle: const TextStyle(color: MyColors.lightTextColor, fontStyle: FontStyle.italic),
filled: true,
fillColor: const Color(0xFFF7F7F7),
), ),
), ),
), if (m.searchedChats != null)
if (m.searchedChats != null) ListView.separated(
ListView.separated( itemCount: m.searchedChats!.length,
itemCount: m.searchedChats!.length, padding: const EdgeInsets.only(bottom: 80),
padding: const EdgeInsets.only(bottom: 80), shrinkWrap: true,
shrinkWrap: true, physics: const NeverScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(), itemBuilder: (BuildContext context, int index) {
itemBuilder: (BuildContext context, int index) { return SizedBox(
return SizedBox( height: 55,
height: 55, child: ListTile(
child: ListTile( leading: Stack(
leading: Stack( children: [
children: [ SvgPicture.asset(
SvgPicture.asset( "assets/images/user.svg",
"assets/images/user.svg", height: 48,
height: 48, width: 48,
width: 48,
),
Positioned(
right: 5,
bottom: 1,
child: Container(
width: 10,
height: 10,
decoration: BoxDecoration(
color: m.searchedChats![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
borderRadius: const BorderRadius.all(
Radius.circular(10),
),
),
), ),
) Positioned(
], right: 5,
), bottom: 1,
title: (m.searchedChats![index].userName ?? "").toText14(color: MyColors.darkTextColor), child: Container(
// subtitle: (m.searchedChats![index].isTyping == true ? "Typing ..." : "").toText11(color: MyColors.normalTextColor), width: 10,
trailing: SizedBox( height: 10,
width: 60, decoration: BoxDecoration(
child: Row( color: m.searchedChats![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
crossAxisAlignment: CrossAxisAlignment.center, borderRadius: const BorderRadius.all(
mainAxisAlignment: MainAxisAlignment.end, Radius.circular(10),
mainAxisSize: MainAxisSize.max,
children: <Widget>[
if (m.searchedChats![index].unreadMessageCount! > 0)
Flexible(
child: Container(
padding: EdgeInsets.zero,
alignment: Alignment.centerRight,
width: 18,
height: 18,
decoration: const BoxDecoration(
color: MyColors.redColor,
borderRadius: BorderRadius.all(
Radius.circular(20),
),
), ),
child: (m.searchedChats![index].unreadMessageCount!.toString())
.toText10(
color: MyColors.white,
)
.center,
), ),
), ),
Flexible(
child: IconButton(
alignment: Alignment.centerRight,
padding: EdgeInsets.zero,
icon: Icon(m.searchedChats![index].isFav! ? Icons.star : Icons.star_border),
color: m.searchedChats![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color,
onPressed: () {
if (m.searchedChats![index].isFav!) m.unFavoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
if (!m.searchedChats![index].isFav!) m.favoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
},
),
) )
], ],
), ),
title: (m.searchedChats![index].userName ?? "").toText14(color: MyColors.darkTextColor),
// subtitle: (m.searchedChats![index].isTyping == true ? "Typing ..." : "").toText11(color: MyColors.normalTextColor),
trailing: SizedBox(
width: 60,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.end,
mainAxisSize: MainAxisSize.max,
children: <Widget>[
if (m.searchedChats![index].unreadMessageCount! > 0)
Flexible(
child: Container(
padding: EdgeInsets.zero,
alignment: Alignment.centerRight,
width: 18,
height: 18,
decoration: const BoxDecoration(
color: MyColors.redColor,
borderRadius: BorderRadius.all(
Radius.circular(20),
),
),
child: (m.searchedChats![index].unreadMessageCount!.toString())
.toText10(
color: MyColors.white,
)
.center,
),
),
Flexible(
child: IconButton(
alignment: Alignment.centerRight,
padding: EdgeInsets.zero,
icon: Icon(m.searchedChats![index].isFav! ? Icons.star : Icons.star_border),
color: m.searchedChats![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color,
onPressed: () {
if (m.searchedChats![index].isFav!) m.unFavoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
if (!m.searchedChats![index].isFav!) m.favoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.searchedChats![index].id!);
},
),
)
],
),
),
minVerticalPadding: 0,
onTap: () {
Navigator.pushNamed(
context,
AppRoutes.chatDetailed,
arguments: {"targetUser": m.searchedChats![index]},
).then((value) {
m.clearSelections();
});
},
onLongPress: () {},
), ),
minVerticalPadding: 0, );
onTap: () { },
Navigator.pushNamed( separatorBuilder: (BuildContext context, int index) => const Padding(
context, padding: EdgeInsets.only(right: 10, left: 70),
AppRoutes.chatDetailed, child: Divider(
arguments: {"targetUser": m.searchedChats![index]}, color: Color(0xFFE5E5E5),
).then((value) {
m.clearSelections();
});
},
onLongPress: () {},
), ),
);
},
separatorBuilder: (BuildContext context, int index) => const Padding(
padding: EdgeInsets.only(right: 10, left: 70),
child: Divider(
color: Color(0xFFE5E5E5),
), ),
), ),
), ],
], );
); },
}), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
child: Container( child: Container(
width: 60, width: 60,

149
lib/ui/chat/favorite_users_screen.dart
Unescape Escape View File

@ -12,91 +12,90 @@ import 'package:mohem_flutter_app/widgets/shimmer/dashboard_shimmer_widget.dart'
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class ChatFavoriteUsersScreen extends StatelessWidget { class ChatFavoriteUsersScreen extends StatelessWidget {
const ChatFavoriteUsersScreen({Key? key}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// TODO: implement build
return Scaffold( return Scaffold(
backgroundColor: MyColors.white, backgroundColor: MyColors.white,
body: Consumer<ChatProviderModel>(builder: (BuildContext context, ChatProviderModel m, Widget? child) { body: Consumer<ChatProviderModel>(
return m.isLoading builder: (BuildContext context, ChatProviderModel m, Widget? child) {
? ChatHomeShimmer() if (m.isLoading) {
: ListView( return ChatHomeShimmer();
shrinkWrap: true, } else {
physics: const AlwaysScrollableScrollPhysics(), return m.favUsersList != null && m.favUsersList.isNotEmpty
padding: const EdgeInsets.only(top: 20), ? ListView.separated(
children: [ itemCount: m.favUsersList!.length,
if (m.favUsersList != null && m.favUsersList.isNotEmpty) padding: const EdgeInsets.only(top: 20),
ListView.separated( shrinkWrap: true,
itemCount: m.favUsersList!.length, physics: const NeverScrollableScrollPhysics(),
padding: EdgeInsets.zero, itemBuilder: (BuildContext context, int index) {
shrinkWrap: true, return SizedBox(
physics: const NeverScrollableScrollPhysics(), height: 55,
itemBuilder: (BuildContext context, int index) { child: ListTile(
return SizedBox( leading: Stack(
height: 55, children: [
child: ListTile( SvgPicture.asset(
leading: Stack( "assets/images/user.svg",
children: [ height: 48,
SvgPicture.asset( width: 48,
"assets/images/user.svg", ),
height: 48, Positioned(
width: 48, right: 5,
), bottom: 1,
Positioned( child: Container(
right: 5, width: 10,
bottom: 1, height: 10,
child: Container( decoration: BoxDecoration(
width: 10, color: m.favUsersList![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
height: 10, borderRadius: const BorderRadius.all(
decoration: BoxDecoration( Radius.circular(10),
color: m.favUsersList![index].userStatus == 1 ? MyColors.green2DColor : Colors.red,
borderRadius: const BorderRadius.all(
Radius.circular(10),
),
), ),
), ),
) ),
], )
), ],
title: (m.favUsersList![index].userName ?? "").toText14(color: MyColors.darkTextColor), ),
// subtitle: (m.searchedChats![index].isTyping == true ? "Typing ..." : "").toText11(color: MyColors.normalTextColor), title: (m.favUsersList![index].userName ?? "").toText14(color: MyColors.darkTextColor),
trailing: IconButton( trailing: IconButton(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
icon: Icon(m.favUsersList![index].isFav! ? Icons.star : Icons.star_border), icon: Icon(m.favUsersList![index].isFav! ? Icons.star : Icons.star_border),
color: m.favUsersList![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color, color: m.favUsersList![index].isFav! ? MyColors.yellowColor : MyColors.grey35Color,
onPressed: () { onPressed: () {
if (m.favUsersList![index].isFav!) m.unFavoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.favUsersList![index].id!); if (m.favUsersList![index].isFav!) m.unFavoriteUser(userID: AppState().chatDetails!.response!.id!, targetUserID: m.favUsersList![index].id!);
},
),
minVerticalPadding: 0,
onTap: () {
Navigator.pushNamed(
context,
AppRoutes.chatDetailed,
arguments: {"targetUser": m.favUsersList![index]},
).then((value) {
m.clearSelections();
});
}, },
onLongPress: () {},
), ),
); minVerticalPadding: 0,
}, onTap: () {
separatorBuilder: (BuildContext context, int index) => const Padding( Navigator.pushNamed(
padding: EdgeInsets.only(right: 10, left: 70), context,
child: Divider( AppRoutes.chatDetailed,
color: Color(0xFFE5E5E5), arguments: {"targetUser": m.favUsersList![index]},
).then(
(Object? value) {
m.clearSelections();
},
);
},
),
);
},
separatorBuilder: (BuildContext context, int index) => const Padding(
padding: EdgeInsets.only(right: 10, left: 70),
child: Divider(
color: Color(
0xFFE5E5E5,
), ),
), ),
) ),
else )
Utils.getNoDataWidget(context).expanded : Column(
], children: [
); Utils.getNoDataWidget(context).expanded,
}), ],
);
}
},
),
); );
} }
} }

Write Preview
Loading…
Cancel
Save