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

Added Answer Selected Status

Browse Source
merge-requests/38/head
FaizHashmiCS22 3 years ago
parent db174035ca
commit 11e4da6478
7 changed files with 135 additions and 126 deletions
Show Stats Download Patch File Download Diff File

7
lib/classes/decorations_helper.dart
Unescape Escape View File

@ -14,9 +14,12 @@ class MyDecorations {
], ],
); );
static Decoration answerContainerDecoration = BoxDecoration( static Decoration getContainersDecoration(Color color) {
Decoration answerContainerDecoration = BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: MyColors.greyF7Color, color: color,
border: Border.all(width: 1, color: MyColors.lightGreyEFColor), border: Border.all(width: 1, color: MyColors.lightGreyEFColor),
); );
return answerContainerDecoration;
}
} }

49
lib/ui/marathon/marathon_intro_screen.dart
Unescape Escape View File

@ -11,7 +11,7 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart'; import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/countdown_timer.dart'; import 'package:mohem_flutter_app/ui/marathon/widgets/countdown_timer.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_header.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -24,18 +24,20 @@ class MarathonIntroScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
MarathonProvider provider = context.watch<MarathonProvider>(); MarathonProvider provider = context.watch<MarathonProvider>();
return Scaffold( return Scaffold(
appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr()),
body: Stack( body: Stack(
children: <Widget>[ children: <Widget>[
SingleChildScrollView( SingleChildScrollView(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
const MarathonHeader(),
MarathonDetailsCard(provider: provider).paddingAll(15), MarathonDetailsCard(provider: provider).paddingAll(15),
MarathonTimerCard( MarathonTimerCard(
provider: provider, provider: provider,
timeToMarathon: dummyEndTime, timeToMarathon: dummyEndTime,
).paddingOnly(left: 15, right: 15, bottom: 15), ).paddingOnly(left: 15, right: 15, bottom: 15),
const SizedBox(height: 100,), const SizedBox(
height: 100,
),
], ],
), ),
), ),
@ -52,8 +54,7 @@ class MarathonIntroScreen extends StatelessWidget {
class MarathonDetailsCard extends StatelessWidget { class MarathonDetailsCard extends StatelessWidget {
final MarathonProvider provider; final MarathonProvider provider;
const MarathonDetailsCard({Key? key, required this.provider}) const MarathonDetailsCard({Key? key, required this.provider}) : super(key: key);
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -68,17 +69,12 @@ class MarathonDetailsCard extends StatelessWidget {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
LocaleKeys.contestTopicAbout LocaleKeys.contestTopicAbout.tr().toText16(color: MyColors.grey77Color),
.tr() "Saudi Arabia".toText20(color: MyColors.textMixColor, isBold: true),
.toText16(color: MyColors.grey77Color),
"Saudi Arabia"
.toText20(color: MyColors.textMixColor, isBold: true),
Row( Row(
children: <Widget>[ children: <Widget>[
Flexible( Flexible(
child: child: "Nam suscipit turpis in pharetra euismsdef. Duis rutrum at nulla id aliquam".toText14(color: MyColors.grey77Color),
"Nam suscipit turpis in pharetra euismsdef. Duis rutrum at nulla id aliquam"
.toText14(color: MyColors.grey77Color),
) )
], ],
), ),
@ -86,31 +82,25 @@ class MarathonDetailsCard extends StatelessWidget {
5.height, 5.height,
Row( Row(
children: <Widget>[ children: <Widget>[
LocaleKeys.prize LocaleKeys.prize.tr().toText16(color: MyColors.grey77Color, isBold: true),
.tr() " LED 55\" Android TV".toText16(color: MyColors.greenColor, isBold: true),
.toText16(color: MyColors.grey77Color, isBold: true),
" LED 55\" Android TV"
.toText16(color: MyColors.greenColor, isBold: true),
], ],
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
LocaleKeys.sponsoredBy LocaleKeys.sponsoredBy.tr().toText16(color: MyColors.grey77Color),
.tr() " Extra".toText16(color: MyColors.darkTextColor, isBold: true),
.toText16(color: MyColors.grey77Color),
" Extra"
.toText16(color: MyColors.darkTextColor, isBold: true),
], ],
), ),
10.height, 10.height,
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Image.network( Image.asset(
"https://cdn.pixabay.com/photo/2014/08/27/07/53/blog-428950_1280.jpg", "assets/images/logos/main_mohemm_logo.png",
height: 50, height: 40,
fit: BoxFit.fill, fit: BoxFit.fill,
width: 120, width: 150,
) )
], ],
), ),
@ -144,8 +134,7 @@ class MarathonTimerCard extends StatelessWidget {
Row( Row(
children: <Widget>[ children: <Widget>[
LocaleKeys.gameDate.tr().toText16(color: MyColors.grey77Color), LocaleKeys.gameDate.tr().toText16(color: MyColors.grey77Color),
" 10 Oct, 2022" " 10 Oct, 2022".toText16(color: MyColors.darkTextColor, isBold: true),
.toText16(color: MyColors.darkTextColor, isBold: true),
], ],
), ),
Row( Row(
@ -156,7 +145,7 @@ class MarathonTimerCard extends StatelessWidget {
), ),
Lottie.asset( Lottie.asset(
MyLottieConsts.hourGlassLottie, MyLottieConsts.hourGlassLottie,
height: 140, height: 200,
), ),
BuildCountdownTimer( BuildCountdownTimer(
timeToMarathon: timeToMarathon, timeToMarathon: timeToMarathon,

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

@ -2,7 +2,9 @@ import 'dart:async';
import 'package:appinio_swiper/appinio_swiper.dart'; import 'package:appinio_swiper/appinio_swiper.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
class MarathonProvider extends ChangeNotifier { class MarathonProvider extends ChangeNotifier {
final AppinioSwiperController swiperController = AppinioSwiperController(); final AppinioSwiperController swiperController = AppinioSwiperController();
@ -41,11 +43,18 @@ class MarathonProvider extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
void resetAll() {
isSelectedOptions[0] = false;
isSelectedOptions[1] = false;
isSelectedOptions[2] = false;
isSelectedOptions[3] = false;
}
Timer timerU = Timer.periodic(const Duration(seconds: 1), (Timer timer) {}); Timer timerU = Timer.periodic(const Duration(seconds: 1), (Timer timer) {});
int start = 5; int start = 8;
void startTimer(BuildContext context) { void startTimer(BuildContext context) {
start = 5; start = 8;
const Duration oneSec = Duration(seconds: 1); const Duration oneSec = Duration(seconds: 1);
timerU = Timer.periodic( timerU = Timer.periodic(
oneSec, oneSec,
@ -66,9 +75,10 @@ class MarathonProvider extends ChangeNotifier {
return; return;
} }
swipeCardLeft(); resetAll();
timer.cancel(); timer.cancel();
cancelTimer(); cancelTimer();
swipeCardLeft();
} else { } else {
start--; start--;
} }

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

@ -13,8 +13,8 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart'; import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/custom_status_widget.dart'; import 'package:mohem_flutter_app/ui/marathon/widgets/custom_status_widget.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_header.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart'; import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:steps_indicator/steps_indicator.dart'; import 'package:steps_indicator/steps_indicator.dart';
@ -25,13 +25,12 @@ class MarathonScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
MarathonProvider provider = context.watch<MarathonProvider>(); MarathonProvider provider = context.watch<MarathonProvider>();
return Scaffold( return Scaffold(
appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr()),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
const MarathonHeader(),
20.height, 20.height,
MarathonProgressContainer(provider: provider) MarathonProgressContainer(provider: provider).paddingOnly(left: 21, right: 21),
.paddingOnly(left: 21, right: 21),
if (provider.isMarathonCompleted) if (provider.isMarathonCompleted)
InkWell( InkWell(
onTap: () { onTap: () {
@ -58,17 +57,12 @@ class MarathonScreen extends StatelessWidget {
subTitle: Text( subTitle: Text(
LocaleKeys.allQuestionsCorrect.tr(), LocaleKeys.allQuestionsCorrect.tr(),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: const TextStyle( style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: MyColors.darkTextColor, letterSpacing: -1.08),
fontSize: 18,
fontWeight: FontWeight.w600,
color: MyColors.darkTextColor,
letterSpacing: -1.08),
), ),
).paddingOnly(top: 12, left: 21, right: 21), ).paddingOnly(top: 12, left: 21, right: 21),
) )
else else
QuestionCard(provider: provider) QuestionCard(provider: provider).paddingOnly(top: 12, left: 21, right: 21),
.paddingOnly(top: 12, left: 21, right: 21),
], ],
), ),
), ),
@ -79,12 +73,10 @@ class MarathonScreen extends StatelessWidget {
class MarathonProgressContainer extends StatefulWidget { class MarathonProgressContainer extends StatefulWidget {
final MarathonProvider provider; final MarathonProvider provider;
const MarathonProgressContainer({Key? key, required this.provider}) const MarathonProgressContainer({Key? key, required this.provider}) : super(key: key);
: super(key: key);
@override @override
State<MarathonProgressContainer> createState() => State<MarathonProgressContainer> createState() => _MarathonProgressContainerState();
_MarathonProgressContainerState();
} }
class _MarathonProgressContainerState extends State<MarathonProgressContainer> { class _MarathonProgressContainerState extends State<MarathonProgressContainer> {
@ -120,13 +112,10 @@ class _MarathonProgressContainerState extends State<MarathonProgressContainer> {
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 8), padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 8),
child: child: "${widget.provider.currentQuestionNumber.toString()} / ${widget.provider.totalQuestions.toString()} ${LocaleKeys.question.tr()}".toText12(color: MyColors.white),
"${widget.provider.currentQuestionNumber.toString()} / ${widget.provider.totalQuestions.toString()} ${LocaleKeys.question.tr()}"
.toText12(color: MyColors.white),
), ),
"23 ${LocaleKeys.marathoners.tr()}".toText14(), "23 ${LocaleKeys.marathoners.tr()}".toText14(),
"00:${widget.provider.start < 10 ? "0${widget.provider.start}" : widget.provider.start}" "00:${widget.provider.start < 10 ? "0${widget.provider.start}" : widget.provider.start}".toText18(),
.toText18(),
], ],
), ),
15.height, 15.height,
@ -152,8 +141,7 @@ class _MarathonProgressContainerState extends State<MarathonProgressContainer> {
12.height, 12.height,
Row( Row(
children: <Widget>[ children: <Widget>[
"${widget.provider.currentQuestionNumber * 10}% ${LocaleKeys.completed.tr()}" "${widget.provider.currentQuestionNumber * 10}% ${LocaleKeys.completed.tr()}".toText14(isBold: true),
.toText14(isBold: true),
], ],
), ),
], ],

20
lib/ui/marathon/marathon_winner_selection.dart
Unescape Escape View File

@ -13,7 +13,7 @@ import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart'; import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/custom_status_widget.dart'; import 'package:mohem_flutter_app/ui/marathon/widgets/custom_status_widget.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_header.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class MarathonWinnerSelection extends StatelessWidget { class MarathonWinnerSelection extends StatelessWidget {
@ -23,13 +23,12 @@ class MarathonWinnerSelection extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
MarathonProvider provider = context.read<MarathonProvider>(); MarathonProvider provider = context.read<MarathonProvider>();
return Scaffold( return Scaffold(
appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr()),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
const MarathonHeader(),
20.height, 20.height,
QualifiersContainer(provider: provider) QualifiersContainer(provider: provider).paddingOnly(left: 21, right: 21),
.paddingOnly(left: 21, right: 21),
20.height, 20.height,
InkWell( InkWell(
onTap: () { onTap: () {
@ -53,8 +52,7 @@ class MarathonWinnerSelection extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
"Muhammad Shrouff" "Muhammad Shrouff".toText18(isBold: true, color: MyColors.white),
.toText18(isBold: true, color: MyColors.white),
"837436".toText18(isBold: true, color: MyColors.white), "837436".toText18(isBold: true, color: MyColors.white),
], ],
), ),
@ -96,8 +94,7 @@ class MarathonWinnerSelection extends StatelessWidget {
class QualifiersContainer extends StatefulWidget { class QualifiersContainer extends StatefulWidget {
final MarathonProvider provider; final MarathonProvider provider;
const QualifiersContainer({Key? key, required this.provider}) const QualifiersContainer({Key? key, required this.provider}) : super(key: key);
: super(key: key);
@override @override
State<QualifiersContainer> createState() => _QualifiersContainerState(); State<QualifiersContainer> createState() => _QualifiersContainerState();
@ -134,11 +131,8 @@ class _QualifiersContainerState extends State<QualifiersContainer> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
LocaleKeys.winnerSelection LocaleKeys.winnerSelection.tr().toText18(isBold: true, color: MyColors.grey3AColor),
.tr() "00:${widget.provider.start < 10 ? "0${widget.provider.start}" : widget.provider.start}".toText18(isBold: true, color: MyColors.redColor),
.toText18(isBold: true, color: MyColors.grey3AColor),
"00:${widget.provider.start < 10 ? "0${widget.provider.start}" : widget.provider.start}"
.toText18(isBold: true, color: MyColors.redColor),
], ],
), ),
10.height, 10.height,

115
lib/ui/marathon/widgets/question_card.dart
Unescape Escape View File

@ -8,6 +8,13 @@ import 'package:mohem_flutter_app/models/marathon_question_model.dart';
import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart'; import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
List<bool> isSelectedOptions = [
false,
false,
false,
false,
];
class QuestionCard extends StatefulWidget { class QuestionCard extends StatefulWidget {
final MarathonProvider provider; final MarathonProvider provider;
@ -18,7 +25,7 @@ class QuestionCard extends StatefulWidget {
} }
class _QuestionCardState extends State<QuestionCard> { class _QuestionCardState extends State<QuestionCard> {
final List<QuestionContent> questionCards = <QuestionContent>[]; final List<CardContent> questionCards = <CardContent>[];
@override @override
void initState() { void initState() {
@ -29,7 +36,7 @@ class _QuestionCardState extends State<QuestionCard> {
void _loadCards() { void _loadCards() {
for (DummyQuestionModel question in questions) { for (DummyQuestionModel question in questions) {
questionCards.add( questionCards.add(
QuestionContent( CardContent(
question: question, question: question,
provider: widget.provider, provider: widget.provider,
), ),
@ -64,11 +71,11 @@ class _QuestionCardState extends State<QuestionCard> {
} }
} }
class QuestionContent extends StatelessWidget { class CardContent extends StatelessWidget {
final DummyQuestionModel question; final DummyQuestionModel question;
final MarathonProvider provider; final MarathonProvider provider;
const QuestionContent({ const CardContent({
Key? key, Key? key,
required this.question, required this.question,
required this.provider, required this.provider,
@ -131,12 +138,38 @@ class QuestionContent extends StatelessWidget {
} }
} }
class AnswerContent extends StatelessWidget { class AnswerContent extends StatefulWidget {
final DummyQuestionModel question; final DummyQuestionModel question;
final MarathonProvider provider; final MarathonProvider provider;
const AnswerContent({Key? key, required this.question, required this.provider}) : super(key: key); const AnswerContent({Key? key, required this.question, required this.provider}) : super(key: key);
@override
State<AnswerContent> createState() => _AnswerContentState();
}
class _AnswerContentState extends State<AnswerContent> {
void updateOption(int index, bool value) {
isSelectedOptions[0] = false;
isSelectedOptions[1] = false;
isSelectedOptions[2] = false;
isSelectedOptions[3] = false;
isSelectedOptions[index] = value;
setState(() {});
}
Decoration getContainerColor(int index) {
if (!isSelectedOptions[index]) {
return MyDecorations.getContainersDecoration(MyColors.greyF7Color);
}
if (isSelectedOptions[index] && context.watch<MarathonProvider>().start > 0) {
return MyDecorations.getContainersDecoration(MyColors.yellowColorII);
}
return MyDecorations.getContainersDecoration(
isSelectedOptions[index] ? MyColors.greenColor : MyColors.greyF7Color,
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
@ -155,29 +188,27 @@ class AnswerContent extends StatelessWidget {
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
if (provider.currentQuestionNumber == 9) { if (widget.provider.currentQuestionNumber == 9) {
provider.cancelTimer(); widget.provider.cancelTimer();
provider.resetValues(); widget.provider.resetValues();
Navigator.pushReplacementNamed( Navigator.pushReplacementNamed(
context, context,
AppRoutes.marathonWinnerSelection, AppRoutes.marathonWinnerSelection,
); );
return; return;
} }
provider.cancelTimer(); updateOption(0, true);
provider.startTimer(context);
provider.swipeCardLeft();
}, },
child: Container( child: Container(
height: 60, height: 60,
width: MediaQuery.of(context).size.width - 75, width: MediaQuery.of(context).size.width - 75,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
decoration: MyDecorations.answerContainerDecoration, decoration: getContainerColor(0),
child: Center( child: Center(
child: Text( child: Text(
question.opt1!, widget.question.opt1!,
style: const TextStyle( style: TextStyle(
color: MyColors.darkTextColor, color: isSelectedOptions[0] ? MyColors.white : MyColors.darkTextColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16, fontSize: 16,
), ),
@ -188,29 +219,27 @@ class AnswerContent extends StatelessWidget {
const SizedBox(height: 15), const SizedBox(height: 15),
InkWell( InkWell(
onTap: () { onTap: () {
if (provider.currentQuestionNumber == 9) { if (widget.provider.currentQuestionNumber == 9) {
provider.cancelTimer(); widget.provider.cancelTimer();
provider.resetValues(); widget.provider.resetValues();
Navigator.pushReplacementNamed( Navigator.pushReplacementNamed(
context, context,
AppRoutes.marathonWinnerSelection, AppRoutes.marathonWinnerSelection,
); );
return; return;
} }
provider.cancelTimer(); updateOption(1, true);
provider.startTimer(context);
provider.swipeCardLeft();
}, },
child: Container( child: Container(
height: 60, height: 60,
width: MediaQuery.of(context).size.width - 75, width: MediaQuery.of(context).size.width - 75,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
decoration: MyDecorations.answerContainerDecoration, decoration: getContainerColor(1),
child: Center( child: Center(
child: Text( child: Text(
question.opt2!, widget.question.opt2!,
style: const TextStyle( style: TextStyle(
color: MyColors.darkTextColor, color: isSelectedOptions[1] ? MyColors.white : MyColors.darkTextColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16, fontSize: 16,
), ),
@ -221,29 +250,27 @@ class AnswerContent extends StatelessWidget {
const SizedBox(height: 15), const SizedBox(height: 15),
InkWell( InkWell(
onTap: () { onTap: () {
if (provider.currentQuestionNumber == 9) { if (widget.provider.currentQuestionNumber == 9) {
provider.cancelTimer(); widget.provider.cancelTimer();
provider.resetValues(); widget.provider.resetValues();
Navigator.pushReplacementNamed( Navigator.pushReplacementNamed(
context, context,
AppRoutes.marathonWinnerSelection, AppRoutes.marathonWinnerSelection,
); );
return; return;
} }
provider.cancelTimer(); updateOption(2, true);
provider.startTimer(context);
provider.swipeCardLeft();
}, },
child: Container( child: Container(
height: 60, height: 60,
width: MediaQuery.of(context).size.width - 75, width: MediaQuery.of(context).size.width - 75,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
decoration: MyDecorations.answerContainerDecoration, decoration: getContainerColor(2),
child: Center( child: Center(
child: Text( child: Text(
question.opt3!, widget.question.opt3!,
style: const TextStyle( style: TextStyle(
color: MyColors.darkTextColor, color: isSelectedOptions[2] ? MyColors.white : MyColors.darkTextColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16, fontSize: 16,
), ),
@ -254,29 +281,27 @@ class AnswerContent extends StatelessWidget {
const SizedBox(height: 15), const SizedBox(height: 15),
InkWell( InkWell(
onTap: () { onTap: () {
if (provider.currentQuestionNumber == 9) { if (widget.provider.currentQuestionNumber == 9) {
provider.cancelTimer(); widget.provider.cancelTimer();
provider.resetValues(); widget.provider.resetValues();
Navigator.pushReplacementNamed( Navigator.pushReplacementNamed(
context, context,
AppRoutes.marathonWinnerSelection, AppRoutes.marathonWinnerSelection,
); );
return; return;
} }
provider.cancelTimer(); updateOption(3, true);
provider.startTimer(context);
provider.swipeCardLeft();
}, },
child: Container( child: Container(
height: 60, height: 60,
width: MediaQuery.of(context).size.width - 75, width: MediaQuery.of(context).size.width - 75,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
decoration: MyDecorations.answerContainerDecoration, decoration: getContainerColor(3),
child: Center( child: Center(
child: Text( child: Text(
question.opt3!, widget.question.opt3!,
style: const TextStyle( style: TextStyle(
color: MyColors.darkTextColor, color: isSelectedOptions[3] ? MyColors.white : MyColors.darkTextColor,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16, fontSize: 16,
), ),

14
lib/ui/marathon/winner_screen.dart
Unescape Escape View File

@ -9,7 +9,7 @@ import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_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/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/ui/marathon/widgets/marathon_header.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class WinnerScreen extends StatelessWidget { class WinnerScreen extends StatelessWidget {
const WinnerScreen({Key? key}) : super(key: key); const WinnerScreen({Key? key}) : super(key: key);
@ -18,10 +18,10 @@ class WinnerScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: MyColors.backgroundColor, backgroundColor: MyColors.backgroundColor,
appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr()),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
const MarathonHeader(),
60.height, 60.height,
Container( Container(
width: double.infinity, width: double.infinity,
@ -75,12 +75,12 @@ class WinnerScreen extends StatelessWidget {
], ],
), ),
5.height, 5.height,
Image.network( Image.asset(
"https://cdn.pixabay.com/photo/2014/08/27/07/53/blog-428950_1280.jpg", "assets/images/logos/main_mohemm_logo.png",
height: 50, height: 40,
fit: BoxFit.fill, fit: BoxFit.fill,
width: 120, width: 150,
), )
], ],
), ),
).paddingOnly(left: 21, right: 21), ).paddingOnly(left: 21, right: 21),

Write Preview
Loading…
Cancel
Save