development_haroon
haroon amjad 2 years ago
parent ed9705f18f
commit 281f0bab78

@ -65,7 +65,6 @@
<array> <array>
<string>fetch</string> <string>fetch</string>
<string>remote-notification</string> <string>remote-notification</string>
<string>voip</string>
</array> </array>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>

@ -168,7 +168,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
Future<void> getUserRecentChats() async { Future<void> getUserRecentChats() async {
ChatUserModel recentChat = await ChatApiClient().getRecentChats(); ChatUserModel recentChat = await ChatApiClient().getRecentChats();
ChatUserModel favUList = await ChatApiClient().getFavUsers(); ChatUserModel favUList = await ChatApiClient().getFavUsers();
userGroups = await ChatApiClient().getGroupsByUserId(); // userGroups = await ChatApiClient().getGroupsByUserId();
if (favUList.response != null && recentChat.response != null) { if (favUList.response != null && recentChat.response != null) {
favUsersList = favUList.response!; favUsersList = favUList.response!;
favUsersList.sort((ChatUser a, ChatUser b) => favUsersList.sort((ChatUser a, ChatUser b) =>

@ -91,7 +91,7 @@ class _ChatHomeState extends State<ChatHome> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
myTab(LocaleKeys.mychats.tr(), 0), myTab(LocaleKeys.mychats.tr(), 0),
myTab(LocaleKeys.group.tr(), 1), // myTab(LocaleKeys.group.tr(), 1),
myTab(LocaleKeys.favorite.tr(), 2), myTab(LocaleKeys.favorite.tr(), 2),
AppState().getempStatusIsManager ? myTab(LocaleKeys.myTeam.tr(), 3) : const SizedBox(), AppState().getempStatusIsManager ? myTab(LocaleKeys.myTeam.tr(), 3) : const SizedBox(),
], ],
@ -107,7 +107,7 @@ class _ChatHomeState extends State<ChatHome> {
}, },
children: <Widget>[ children: <Widget>[
ChatHomeScreen(), ChatHomeScreen(),
GropChatHomeScreen(), // GropChatHomeScreen(),
ChatFavoriteUsersScreen(), ChatFavoriteUsersScreen(),
AppState().getempStatusIsManager ? const MyTeamScreen() : const SizedBox(), AppState().getempStatusIsManager ? const MyTeamScreen() : const SizedBox(),
], ],

@ -81,8 +81,8 @@ class MarathonScreen extends StatelessWidget {
displayLocalizedContent( displayLocalizedContent(
isPhoneLangArabic: AppState().isArabic(context), isPhoneLangArabic: AppState().isArabic(context),
selectedLanguage: provider.demoMarathonDetailModel.selectedLanguage!, selectedLanguage: provider.demoMarathonDetailModel.selectedLanguage!,
arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr!, arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "",
englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn!, englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
).toText22( ).toText22(
color: MyColors.grey3AColor, color: MyColors.grey3AColor,
isCentered: true, isCentered: true,

Loading…
Cancel
Save