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

Merge branch 'master' into development_haroon

Browse Source
merge-requests/166/head
haroon amjad 3 years ago
parent 88abc86e39 7d04095408
commit 736f9c70e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
lib/ui/marathon/marathon_provider.dart
Unescape Escape View File

@ -195,7 +195,6 @@ class MarathonProvider extends ChangeNotifier {
if (isUserWaiting) { if (isUserWaiting) {
MarathonApiClient().joinMarathonAsParticipant().whenComplete(() async { MarathonApiClient().joinMarathonAsParticipant().whenComplete(() async {
await callNextQuestionApi(); await callNextQuestionApi();
totalMarathoners = await MarathonApiClient().getMarathonersCount(marathonId: marathonDetailModel.id!);
}); });
} else { } else {
isButtonEnabled = false; isButtonEnabled = false;
@ -359,6 +358,7 @@ class MarathonProvider extends ChangeNotifier {
} }
startTimerForQuestion(); startTimerForQuestion();
updateCardData(); updateCardData();
totalMarathoners = await MarathonApiClient().getMarathonersCount(marathonId: marathonDetailModel.id!);
Navigator.pushReplacementNamed(AppRoutes.navigatorKey.currentContext!, AppRoutes.marathonScreen); Navigator.pushReplacementNamed(AppRoutes.navigatorKey.currentContext!, AppRoutes.marathonScreen);
} else { } else {
currentQuestion = AppState().getIsDemoMarathon currentQuestion = AppState().getIsDemoMarathon

4
lib/ui/marathon/marathon_screen.dart
Unescape Escape View File

@ -175,7 +175,7 @@ class MarathonScreen extends StatelessWidget {
selectedLanguage: provider.marathonDetailModel.selectedLanguage ?? 0, selectedLanguage: provider.marathonDetailModel.selectedLanguage ?? 0,
arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "", arabicContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "",
englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "", englishContent: AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
).toText22( ).toText24(
color: MyColors.grey3AColor, color: MyColors.grey3AColor,
isCentered: true, isCentered: true,
), ),
@ -185,7 +185,7 @@ class MarathonScreen extends StatelessWidget {
) )
: const SizedBox(), : const SizedBox(),
if (provider.selectedWinners != null) ...<Widget>[ if (provider.selectedWinners != null) ...<Widget>[
provider.selectedWinners!.length == 1 provider.selectedWinners!.length == 1 && !provider.iAmWinner
? Column( ? Column(
children: <Widget>[ children: <Widget>[
displayLocalizedContent( displayLocalizedContent(

Write Preview
Loading…
Cancel
Save