Skip to content

Commit

Permalink
Merge pull request #750 from givtnl/develop
Browse files Browse the repository at this point in the history 
Production release (4.2.15)
  • Loading branch information
@Daniela510
Daniela510 committed May 16, 2024
2 parents 1fe5165 + 3942587 commit 67ccf03
Show file tree
Hide file tree
Showing 10 changed files with 452 additions and 232 deletions.
78 changes: 74 additions & 4 deletions assets/jsons/generosity_challenge/chat_scripts/chat_script_day_6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,81 @@
"main": {
"type": "textMessage",
"side": "interlocutor",
"text": "Still in progress.. Stay tuned for the new updates!"
"text": "Hey {lastName} Family. Your nearly at the end of this challenge!",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "Our sixth generosity activity is about giving with our money.",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "To do that I'll need to register the details you've given me so far.",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "One sec....",
"functionName": "registerUser",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "All done!",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "Now you can give your money to help people and causes that you care about.",
"next": {
"type": "buttonAnswer",
"side": "user",
"text": "Like who?",
"answerText": "Like who?",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "Great question. Today's assignment will guide you.",
"next": {
"type": "imageMessage",
"side": "interlocutor",
"path": "https://givtstoragedebug.blob.core.windows.net/public/cdn/generosity-challenge/Givt_Superhero_THUMBNAILS_010.png",
"mediaSourceType": "network",
"next": {
"type": "buttonAnswer",
"side": "user",
"text": "Let's give!",
"answerText": "Let's give!"
}
}
}
}
}
}
}
}
}
},
"postChat" :{
"postChat": {
"type": "textMessage",
"side": "interlocutor",
"text": "Awesome!"
"side": "user",
"text": "We gave to {organisation}",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "That's incredible. When we all join in, we can make a big impact.",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "That's why giving a little can become a lot when we all give together.",
"next": {
"type": "buttonAnswer",
"side": "user",
"text": "See you soon.",
"answerText": "See you soon.",
"next": {
"type": "textMessage",
"side": "interlocutor",
"text": "😊"
}
}
}
}
}
}
3 changes: 2 additions & 1 deletion lib/app/routes/app_router.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ class AppRouter {
create: (_) => GenerosityChallengeCubit(
getIt(),
getIt(),
getIt(),
)..loadFromCache(),
child: const GenerosityChallenge(),
);
Expand Down Expand Up @@ -862,7 +863,7 @@ class AppRouter {
final query = Uri(
queryParameters: params,
).query;

if (GenerosityChallengeHelper.isActivated ||
navigatingPage == Pages.generosityChallenge.path) {
return Pages.generosityChallenge.path;
Expand Down
163 changes: 10 additions & 153 deletions lib/features/children/add_member/widgets/add_member_form.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:givt_app/core/enums/country.dart';
import 'package:givt_app/features/auth/cubit/auth_cubit.dart';
import 'package:givt_app/features/children/add_member/cubit/add_member_cubit.dart';
import 'package:givt_app/features/children/add_member/models/member.dart';
import 'package:givt_app/features/children/add_member/widgets/allowance_counter.dart';
import 'package:givt_app/features/children/add_member/widgets/family_text_form_field.dart';
import 'package:givt_app/features/children/edit_child/widgets/giving_allowance_info_button.dart';
import 'package:givt_app/features/children/shared/profile_type.dart';
Expand All @@ -24,6 +25,7 @@ class AddMemberForm extends StatefulWidget {
required this.ageFocusNode,
super.key,
});

final bool firstMember;
final VoidCallback onRemove;
final FocusNode ageFocusNode;
Expand All @@ -38,36 +40,14 @@ class _AddMemberFormState extends State<AddMemberForm> {
final _emailParentController = TextEditingController();
final _ageController = TextEditingController();
bool isChildSelected = true;
int _allowanceController = 15;
int _allowance = 15;
final formKeyChild = GlobalKey<FormState>();
final formKeyParent = GlobalKey<FormState>();
late final FocusNode _childNameFocusNode;
late final FocusNode _parentNameFocusNode;
Timer? _timer;
Duration _heldDuration = Duration.zero;
int tapTime = 240;
int holdDownDuration = 1000;
int holdDownDuration2 = 2000;
int maxAllowance = 999;
int minAllowance = 1;
int allowanceIncrement = 5;
int allowanceIncrement2 = 10;

void _startTimer(void Function() callback) {
_timer = Timer.periodic(Duration(milliseconds: tapTime), (_) {
_heldDuration += Duration(milliseconds: tapTime);
callback();
});
}

void _stopTimer() {
_timer?.cancel();
_heldDuration = Duration.zero;
}

@override
void dispose() {
_stopTimer();
_childNameFocusNode.dispose();
_parentNameFocusNode.dispose();
super.dispose();
Expand All @@ -80,54 +60,6 @@ class _AddMemberFormState extends State<AddMemberForm> {
_parentNameFocusNode = FocusNode()..requestFocus();
}

void _incrementCounter() {
final isHeldDurationShortEnoughForIncrement1 =
(_heldDuration.inMilliseconds > holdDownDuration) &&
_allowanceController >= maxAllowance - allowanceIncrement;
final isHeldDurationShortEnoughForIncrement2 =
(_heldDuration.inMilliseconds > holdDownDuration2) &&
_allowanceController >= maxAllowance - allowanceIncrement2;

if (_allowanceController >= maxAllowance ||
isHeldDurationShortEnoughForIncrement1 ||
isHeldDurationShortEnoughForIncrement2) {
return;
}
setState(() {
HapticFeedback.lightImpact();
SystemSound.play(SystemSoundType.click);
_allowanceController += (_heldDuration.inMilliseconds < holdDownDuration)
? 1
: (_heldDuration.inMilliseconds < holdDownDuration2)
? allowanceIncrement
: allowanceIncrement2;
});
}

void _decrementCounter() {
final isHeldDurationLongEnoughForNegative1 =
(_heldDuration.inMilliseconds > holdDownDuration) &&
_allowanceController <= minAllowance + allowanceIncrement;
final isHeldDurationLongEnoughForNegative2 =
(_heldDuration.inMilliseconds > holdDownDuration2) &&
_allowanceController <= minAllowance + allowanceIncrement2;

if (_allowanceController <= minAllowance ||
isHeldDurationLongEnoughForNegative1 ||
isHeldDurationLongEnoughForNegative2) {
return;
}
setState(() {
HapticFeedback.lightImpact();
SystemSound.play(SystemSoundType.click);
_allowanceController -= (_heldDuration.inMilliseconds < holdDownDuration)
? 1
: (_heldDuration.inMilliseconds < holdDownDuration2)
? allowanceIncrement
: allowanceIncrement2;
});
}

@override
Widget build(BuildContext context) {
final user = context.read<AuthCubit>().state.user;
Expand Down Expand Up @@ -155,7 +87,7 @@ class _AddMemberFormState extends State<AddMemberForm> {
firstName: name,
dateOfBirth: dateOfBirth,
age: age,
allowance: _allowanceController,
allowance: _allowance,
key: formKeyChild.toString(),
type: ProfileType.Child,
);
Expand All @@ -169,7 +101,7 @@ class _AddMemberFormState extends State<AddMemberForm> {
eventProperties: {
'name': name,
'age': age,
'allowance': _allowanceController,
'allowance': _allowance,
},
);
} else {
Expand Down Expand Up @@ -342,85 +274,6 @@ class _AddMemberFormState extends State<AddMemberForm> {
);
}

Widget allowanceCounter(String currency) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTapDown: (_) {
_startTimer(_decrementCounter);
},
onTapUp: (_) {
_stopTimer();
},
onTapCancel: _stopTimer,
onTap: (_allowanceController < 2) ? null : _decrementCounter,
child: Container(
width: 32,
height: 32,
child: Icon(
FontAwesomeIcons.circleMinus,
size: 32,
color: (_allowanceController < 2)
? Colors.grey
: Theme.of(context).colorScheme.primary,
),
),
),
Container(
padding: const EdgeInsets.symmetric(horizontal: 15),
width: _allowanceController < 100 ? 75 : 95,
child: Text.rich(
TextSpan(
children: [
TextSpan(
text: currency,
style: const TextStyle(
fontSize: 16,
fontFamily: 'Raleway',
fontWeight: FontWeight.w700,
),
),
TextSpan(
text: '$_allowanceController',
style: const TextStyle(
fontSize: 24,
fontFamily: 'Raleway',
fontWeight: FontWeight.w700,
fontFeatures: <FontFeature>[FontFeature.liningFigures()],
),
),
],
),
textAlign: TextAlign.center,
),
),
GestureDetector(
onTapDown: (_) {
_startTimer(_incrementCounter);
},
onTapUp: (_) {
_stopTimer();
},
onTapCancel: _stopTimer,
onTap: (_allowanceController > 998) ? null : _incrementCounter,
child: Container(
width: 32,
height: 32,
child: Icon(
FontAwesomeIcons.circlePlus,
size: 32,
color: (_allowanceController > 998)
? Colors.grey
: Theme.of(context).colorScheme.primary,
),
),
),
],
);
}

Widget createChildForm(String currency) {
return Form(
key: formKeyChild,
Expand Down Expand Up @@ -472,7 +325,11 @@ class _AddMemberFormState extends State<AddMemberForm> {
),
const SizedBox(height: 10),
const GivingAllowanceInfoButton(),
allowanceCounter(currency),
AllowanceCounter(
currency: currency,
initialAllowance: _allowance,
onAllowanceChanged: (allowance) => _allowance = allowance,
),
],
),
);
Expand Down
Loading

0 comments on commit 67ccf03

Please sign in to comment.