diff --git a/RewardProcessing/assets/images/gi1.png b/RewardProcessing/assets/images/gi1.png index c319bbb..a9f9946 100644 Binary files a/RewardProcessing/assets/images/gi1.png and b/RewardProcessing/assets/images/gi1.png differ diff --git a/RewardProcessing/assets/images/gi2.png b/RewardProcessing/assets/images/gi2.png index 1be1069..fc0c341 100644 Binary files a/RewardProcessing/assets/images/gi2.png and b/RewardProcessing/assets/images/gi2.png differ diff --git a/RewardProcessing/assets/images/gi3.png b/RewardProcessing/assets/images/gi3.png index 692979f..e5acb30 100644 Binary files a/RewardProcessing/assets/images/gi3.png and b/RewardProcessing/assets/images/gi3.png differ diff --git a/RewardProcessing/assets/images/gi4.png b/RewardProcessing/assets/images/gi4.png index 9406751..8a4e3d9 100644 Binary files a/RewardProcessing/assets/images/gi4.png and b/RewardProcessing/assets/images/gi4.png differ diff --git a/RewardProcessing/assets/images/gi5.png b/RewardProcessing/assets/images/gi5.png index 198f209..4b85b4f 100644 Binary files a/RewardProcessing/assets/images/gi5.png and b/RewardProcessing/assets/images/gi5.png differ diff --git a/RewardProcessing/lib/game/game_instructions.dart b/RewardProcessing/lib/game/game_instructions.dart index 842ca4c..3e49e26 100644 --- a/RewardProcessing/lib/game/game_instructions.dart +++ b/RewardProcessing/lib/game/game_instructions.dart @@ -11,8 +11,6 @@ class GameInstructions extends StatefulWidget { } class _GameInstructionsState extends State { - bool _showText = true; - @override void initState() { super.initState(); @@ -20,68 +18,52 @@ class _GameInstructionsState extends State { DeviceOrientation.landscapeRight, DeviceOrientation.landscapeLeft, ]); - Future.delayed(const Duration(seconds: 2), () { - setState(() { - _showText = false; - }); - }); } @override Widget build(BuildContext context) { return WillPopScope( - onWillPop: () async { + onWillPop: ()async { return false; // disable back page }, child: Scaffold( - backgroundColor: const Color(0xff000000), - body: Stack( - children: [ - GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => GameInstructions2(id: widget.id)), - ); - }, - child: Center( - child: Column( + backgroundColor: const Color(0xFFFFFFFF), + body: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'assets/images/gi1.png', - scale: 2.9, - ), - ], - ), - ), - ), - if (_showText) - Positioned( - bottom: 20, - left: 0, - right: 0, - child: AnimatedContainer( - duration: const Duration(milliseconds: 200), - curve: Curves.easeInOut, - height: 50, - decoration: BoxDecoration( - color: Colors.white.withOpacity(0.4), - ), - child: const Center( - child:Text( - 'Click anywhere to continue', - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 23, - fontWeight: FontWeight.bold, - ), + children: [ + Image.asset('assets/images/gi1.png', + scale: 3, ), - ), - ), - ), - ], - ), + ElevatedButton( + onPressed: () { + Navigator.push( + context, + // MaterialPageRoute(builder: (context) => const Questionnaire()) + MaterialPageRoute(builder: (context) => GameInstructions2(id: widget.id)) + ); + }, + style: ElevatedButton.styleFrom( + fixedSize: const Size(100, 20), + backgroundColor: const Color(0xFF00A8AF), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(100)), + elevation: 2.0,), + child: const Text( + 'Continue', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white, + fontSize: 15, + fontWeight: FontWeight.w300 + ) + ) + ) + ] + ) + ], + ) ) ); } diff --git a/RewardProcessing/lib/game/game_instructions2.dart b/RewardProcessing/lib/game/game_instructions2.dart index 8ee4f7a..b0216d5 100644 --- a/RewardProcessing/lib/game/game_instructions2.dart +++ b/RewardProcessing/lib/game/game_instructions2.dart @@ -22,27 +22,49 @@ class _GameInstructions2State extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: const Color(0xff000000), - body: GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => GameInstructions3(id: widget.id)), - ); + return WillPopScope( + onWillPop: ()async { + return false; // disable back page }, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'assets/images/gi2.png', - scale: 2.9, - ), - ], - ), - ), - ), + child: Scaffold( + backgroundColor: const Color(0xFFFFFFFF), + body: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/images/gi2.png', + scale: 3, + ), + ElevatedButton( + onPressed: () { + Navigator.push( + context, + // MaterialPageRoute(builder: (context) => const Questionnaire()) + MaterialPageRoute(builder: (context) => GameInstructions3(id: widget.id)) + ); + }, + style: ElevatedButton.styleFrom( + fixedSize: const Size(100, 20), + backgroundColor: const Color(0xFF00A8AF), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(100)), + elevation: 2.0,), + child: const Text( + 'Continue', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white, + fontSize: 15, + fontWeight: FontWeight.w300 + ) + ) + ) + ] + ) + ], + ) + ) ); } -} +} \ No newline at end of file diff --git a/RewardProcessing/lib/game/game_instructions3.dart b/RewardProcessing/lib/game/game_instructions3.dart index c6ab5a1..72b4dbc 100644 --- a/RewardProcessing/lib/game/game_instructions3.dart +++ b/RewardProcessing/lib/game/game_instructions3.dart @@ -22,27 +22,49 @@ class _GameInstructions3State extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: const Color(0xff000000), - body: GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => GameInstructions4(id: widget.id)), - ); + return WillPopScope( + onWillPop: ()async { + return false; // disable back page }, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'assets/images/gi3.png', - scale: 2.9, - ), - ], - ), - ), - ), + child: Scaffold( + backgroundColor: const Color(0xFFFFFFFF), + body: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/images/gi3.png', + scale: 3, + ), + ElevatedButton( + onPressed: () { + Navigator.push( + context, + // MaterialPageRoute(builder: (context) => const Questionnaire()) + MaterialPageRoute(builder: (context) => GameInstructions4(id: widget.id)) + ); + }, + style: ElevatedButton.styleFrom( + fixedSize: const Size(100, 20), + backgroundColor: const Color(0xFF00A8AF), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(100)), + elevation: 2.0,), + child: const Text( + 'Continue', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white, + fontSize: 15, + fontWeight: FontWeight.w300 + ) + ) + ) + ] + ) + ], + ) + ) ); } -} +} \ No newline at end of file diff --git a/RewardProcessing/lib/game/game_instructions4.dart b/RewardProcessing/lib/game/game_instructions4.dart index f4b04cb..96bcfbf 100644 --- a/RewardProcessing/lib/game/game_instructions4.dart +++ b/RewardProcessing/lib/game/game_instructions4.dart @@ -22,27 +22,49 @@ class _GameInstructions4State extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: const Color(0xff000000), - body: GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => GameInstructions5(id: widget.id)), - ); + return WillPopScope( + onWillPop: ()async { + return false; // disable back page }, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'assets/images/gi4.png', - scale: 2.9, - ), - ], - ), - ), - ), + child: Scaffold( + backgroundColor: const Color(0xFFFFFFFF), + body: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/images/gi4.png', + scale: 3, + ), + ElevatedButton( + onPressed: () { + Navigator.push( + context, + // MaterialPageRoute(builder: (context) => const Questionnaire()) + MaterialPageRoute(builder: (context) => GameInstructions5(id: widget.id)) + ); + }, + style: ElevatedButton.styleFrom( + fixedSize: const Size(100, 20), + backgroundColor: const Color(0xFF00A8AF), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(100)), + elevation: 2.0,), + child: const Text( + 'Continue', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white, + fontSize: 15, + fontWeight: FontWeight.w300 + ) + ) + ) + ] + ) + ], + ) + ) ); } -} +} \ No newline at end of file diff --git a/RewardProcessing/lib/game/game_instructions5.dart b/RewardProcessing/lib/game/game_instructions5.dart index a2eb035..609e90d 100644 --- a/RewardProcessing/lib/game/game_instructions5.dart +++ b/RewardProcessing/lib/game/game_instructions5.dart @@ -22,27 +22,49 @@ class _GameInstructions5State extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: const Color(0xff000000), - body: GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => Aim(id: widget.id)), - ); + return WillPopScope( + onWillPop: ()async { + return false; // disable back page }, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'assets/images/gi5.png', - scale: 2.9, - ), - ], - ), - ), - ), + child: Scaffold( + backgroundColor: const Color(0xFFFFFFFF), + body: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/images/gi5.png', + scale: 3, + ), + ElevatedButton( + onPressed: () { + Navigator.push( + context, + // MaterialPageRoute(builder: (context) => const Questionnaire()) + MaterialPageRoute(builder: (context) => Aim(id: widget.id)) + ); + }, + style: ElevatedButton.styleFrom( + fixedSize: const Size(100, 20), + backgroundColor: const Color(0xFF00A8AF), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(100)), + elevation: 2.0,), + child: const Text( + 'Continue', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white, + fontSize: 15, + fontWeight: FontWeight.w300 + ) + ) + ) + ] + ) + ], + ) + ) ); } -} +} \ No newline at end of file diff --git a/RewardProcessing/lib/questionnaire/intro.dart b/RewardProcessing/lib/questionnaire/intro.dart index 0d9c3d6..67bd4d2 100644 --- a/RewardProcessing/lib/questionnaire/intro.dart +++ b/RewardProcessing/lib/questionnaire/intro.dart @@ -114,7 +114,9 @@ class _IntroState extends State { onPressed:() { Navigator.push( context, - MaterialPageRoute(builder: (context) => const ProlificID() + MaterialPageRoute(builder: + (context) => const + ProlificID() ) ); }, diff --git a/RewardProcessing/lib/questionnaire/prolific_id.dart b/RewardProcessing/lib/questionnaire/prolific_id.dart index ac464f1..bfac6b7 100644 --- a/RewardProcessing/lib/questionnaire/prolific_id.dart +++ b/RewardProcessing/lib/questionnaire/prolific_id.dart @@ -160,7 +160,7 @@ class _ProlificIDState extends State { validator: (val) { return (RegExp("[A-Za-z0-9]").hasMatch( prolificID) && - prolificID.length <= 15) + prolificID.length <= 30) ? null : "Request body length over limit"; }, @@ -194,7 +194,7 @@ class _ProlificIDState extends State { activeButton = value.isNotEmpty ? true : false; _textEditingController.text = value; - if (value.length > 15) { + if (value.length > 30) { counterTextColor = Colors.red; } else { counterTextColor = Colors.black; @@ -211,7 +211,7 @@ class _ProlificIDState extends State { Text( '${_textEditingController.text .trim() - .length}/15', + .length}/30', style: TextStyle( color: counterTextColor ) diff --git a/RewardProcessing/lib/questionnaire/questionnaire.dart b/RewardProcessing/lib/questionnaire/questionnaire.dart index 7f82199..3b574b6 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire.dart @@ -52,7 +52,7 @@ class _QuestionnaireState extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire10.dart b/RewardProcessing/lib/questionnaire/questionnaire10.dart index c47b045..a45bda6 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire10.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire10.dart @@ -50,7 +50,7 @@ class _Questionnaire10State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire11.dart b/RewardProcessing/lib/questionnaire/questionnaire11.dart index f6ccca8..27dcc1d 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire11.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire11.dart @@ -50,7 +50,7 @@ class _Questionnaire11State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire12.dart b/RewardProcessing/lib/questionnaire/questionnaire12.dart index 67f406a..6fbe3de 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire12.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire12.dart @@ -50,7 +50,7 @@ class _Questionnaire12State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire2.dart b/RewardProcessing/lib/questionnaire/questionnaire2.dart index fa771ea..6acbb61 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire2.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire2.dart @@ -49,7 +49,7 @@ class _Questionnaire2State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire3.dart b/RewardProcessing/lib/questionnaire/questionnaire3.dart index 51870ab..5ad80b4 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire3.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire3.dart @@ -52,7 +52,7 @@ class _Questionnaire3State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire4.dart b/RewardProcessing/lib/questionnaire/questionnaire4.dart index b993e03..d1bdb41 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire4.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire4.dart @@ -51,7 +51,7 @@ class _Questionnaire4State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire5.dart b/RewardProcessing/lib/questionnaire/questionnaire5.dart index ff0a981..55dac6e 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire5.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire5.dart @@ -51,7 +51,7 @@ class _Questionnaire5State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire6.dart b/RewardProcessing/lib/questionnaire/questionnaire6.dart index 20e48ac..0a94ec2 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire6.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire6.dart @@ -51,7 +51,7 @@ class _Questionnaire6State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire7.dart b/RewardProcessing/lib/questionnaire/questionnaire7.dart index 9a632f3..4be0268 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire7.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire7.dart @@ -51,7 +51,7 @@ class _Questionnaire7State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire8.dart b/RewardProcessing/lib/questionnaire/questionnaire8.dart index 2b0f944..1e04c20 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire8.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire8.dart @@ -50,7 +50,7 @@ class _Questionnaire8State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17, diff --git a/RewardProcessing/lib/questionnaire/questionnaire9.dart b/RewardProcessing/lib/questionnaire/questionnaire9.dart index 5d00ead..746e6a5 100644 --- a/RewardProcessing/lib/questionnaire/questionnaire9.dart +++ b/RewardProcessing/lib/questionnaire/questionnaire9.dart @@ -50,7 +50,7 @@ class _Questionnaire9State extends State { child: Container( margin: const EdgeInsets.only(left: 20, right: 20), child: const Text( - 'Using the bar below, rate how you feel right now:', + 'Using the sliding scale below, rate how you feel right now:', textAlign: TextAlign.center, style: TextStyle( fontSize: 17,