ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: go back to base screen on back button from launch screen with activity card (#3645)

Browse source
This commit is contained in:
ggurdin 2025-08-06 15:56:36 -04:00 • committed by GitHub
parent 3557c897ba
commit 4cb1e801d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 223 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

431
lib/pangea/activity_generator/activity_generator_view.dart
View file

@ -29,45 +29,66 @@ class ActivityGeneratorView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final l10n = L10n.of(context);
Widget? body;
if (controller.loading) {
body = const Padding(
padding: EdgeInsets.all(32.0),
child: Center(child: CircularProgressIndicator()),
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context).makeYourOwnActivity),
),
body: const Padding(
padding: EdgeInsets.all(32.0),
child: Center(child: CircularProgressIndicator()),
),
);
} else if (controller.error != null || controller.room == null) {
body = Center(
child: Column(
spacing: 16.0,
mainAxisAlignment: MainAxisAlignment.center,
children: [
ErrorIndicator(
message: l10n.errorGenerateActivityMessage,
),
ElevatedButton(
onPressed: controller.generate,
child: Text(l10n.tryAgain),
),
],
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context).makeYourOwnActivity),
),
body: Center(
child: Column(
spacing: 16.0,
mainAxisAlignment: MainAxisAlignment.center,
children: [
ErrorIndicator(
message: l10n.errorGenerateActivityMessage,
),
ElevatedButton(
onPressed: controller.generate,
child: Text(l10n.tryAgain),
),
],
),
),
);
} else if (controller.activities != null &&
controller.activities!.isNotEmpty) {
body = ListView.builder(
padding: const EdgeInsets.all(16),
itemCount: controller.activities!.length,
itemBuilder: (context, index) {
return ActivityPlannerBuilder(
initialActivity: controller.activities![index],
initialFilename: controller.filename,
room: controller.room!,
builder: (c) {
return ActivityPlanCard(
regenerate: () => controller.generate(force: true),
controller: c,
);
},
return ActivityPlannerBuilder(
initialActivity: controller.activities!.first,
initialFilename: controller.filename,
room: controller.room!,
builder: (c) {
return Scaffold(
appBar: AppBar(
title: Text(L10n.of(context).makeYourOwnActivity),
leading: BackButton(
onPressed: () {
c.isLaunching
? c.setLaunchState(ActivityLaunchState.base)
: controller.clearActivities();
},
),
),
body: ListView.builder(
padding: const EdgeInsets.all(16),
itemCount: controller.activities!.length,
itemBuilder: (context, index) {
return ActivityPlanCard(
regenerate: () => controller.generate(force: true),
controller: c,
);
},
),
);
},
);
@ -87,195 +108,187 @@ class ActivityGeneratorView extends StatelessWidget {
},
),
),
body: body ??
Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 600),
child: Form(
key: controller.formKey,
child: ListView(
padding: const EdgeInsets.all(16),
body: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 600),
child: Form(
key: controller.formKey,
child: ListView(
padding: const EdgeInsets.all(16),
children: [
const InstructionsInlineTooltip(
instructionsEnum: InstructionsEnum.activityPlannerOverview,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0),
),
clipBehavior: Clip.hardEdge,
alignment: Alignment.center,
child: ClipRRect(
child: CachedNetworkImage(
fit: BoxFit.cover,
imageUrl:
"${AppConfig.assetsBaseURL}/${ActivitySuggestionsConstants.makeActivityAssetPath}",
placeholder: (context, url) {
return const Center(
child: CircularProgressIndicator(),
);
},
errorWidget: (context, url, error) => const SizedBox(),
),
),
),
const SizedBox(height: 16.0),
PLanguageDropdown(
languages:
MatrixState.pangeaController.pLanguageStore.baseOptions,
onChange: (val) => controller
.setSelectedLanguageOfInstructions(val.langCode),
initialLanguage: controller.selectedLanguageOfInstructions !=
null
? PLanguageStore.byLangCode(
controller.selectedLanguageOfInstructions!,
)
: MatrixState.pangeaController.languageController.userL1,
isL2List: false,
decorationText: L10n.of(context).languageOfInstructionsLabel,
),
const SizedBox(height: 16.0),
PLanguageDropdown(
languages:
MatrixState.pangeaController.pLanguageStore.targetOptions,
onChange: (val) =>
controller.setSelectedTargetLanguage(val.langCode),
initialLanguage: controller.selectedTargetLanguage != null
? PLanguageStore.byLangCode(
controller.selectedTargetLanguage!,
)
: MatrixState.pangeaController.languageController.userL2,
decorationText: L10n.of(context).targetLanguageLabel,
isL2List: true,
),
const SizedBox(height: 16.0),
SuggestionFormField(
suggestions: controller.topicItems,
validator: controller.validateNotNull,
maxLength: 50,
label: l10n.topicLabel,
placeholder: l10n.topicPlaceholder,
controller: controller.topicController,
),
const SizedBox(height: 16.0),
SuggestionFormField(
suggestions: controller.objectiveItems,
validator: controller.validateNotNull,
maxLength: 140,
label: l10n.learningObjectiveLabel,
placeholder: l10n.learningObjectivePlaceholder,
controller: controller.objectiveController,
),
const SizedBox(height: 16.0),
SuggestionFormField(
suggestions: controller.modeItems,
validator: controller.validateNotNull,
maxLength: 50,
label: l10n.modeLabel,
placeholder: l10n.modePlaceholder,
controller: controller.modeController,
),
const SizedBox(height: 16.0),
TextFormField(
decoration: InputDecoration(
labelText: l10n.numberOfLearners,
),
textInputAction: TextInputAction.done,
validator: (value) {
if (value == null || value.isEmpty) {
return l10n.mustBeInteger;
}
final n = int.tryParse(value);
if (n == null || n <= 0) {
return l10n.mustBeInteger;
}
if (n > 50) {
return l10n.maxFifty;
}
return null;
},
onChanged: (val) => controller
.setSelectedNumberOfParticipants(int.tryParse(val)),
initialValue:
controller.selectedNumberOfParticipants?.toString(),
onTapOutside: (_) =>
FocusManager.instance.primaryFocus?.unfocus(),
onFieldSubmitted: (_) {
if (controller.formKey.currentState?.validate() ?? false) {
controller.generate();
}
},
),
const SizedBox(height: 16.0),
LanguageLevelDropdown(
onChanged: controller.setSelectedCefrLevel,
initialLevel: controller.selectedCefrLevel,
),
const SizedBox(height: 16.0),
Row(
children: [
const InstructionsInlineTooltip(
instructionsEnum:
InstructionsEnum.activityPlannerOverview,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12.0),
),
clipBehavior: Clip.hardEdge,
alignment: Alignment.center,
child: ClipRRect(
child: CachedNetworkImage(
fit: BoxFit.cover,
imageUrl:
"${AppConfig.assetsBaseURL}/${ActivitySuggestionsConstants.makeActivityAssetPath}",
placeholder: (context, url) {
return const Center(
child: CircularProgressIndicator(),
);
},
errorWidget: (context, url, error) =>
const SizedBox(),
),
),
),
const SizedBox(height: 16.0),
PLanguageDropdown(
languages: MatrixState
.pangeaController.pLanguageStore.baseOptions,
onChange: (val) => controller
.setSelectedLanguageOfInstructions(val.langCode),
initialLanguage:
controller.selectedLanguageOfInstructions != null
? PLanguageStore.byLangCode(
controller.selectedLanguageOfInstructions!,
)
: MatrixState
.pangeaController.languageController.userL1,
isL2List: false,
decorationText:
L10n.of(context).languageOfInstructionsLabel,
),
const SizedBox(height: 16.0),
PLanguageDropdown(
languages: MatrixState
.pangeaController.pLanguageStore.targetOptions,
onChange: (val) =>
controller.setSelectedTargetLanguage(val.langCode),
initialLanguage: controller.selectedTargetLanguage != null
? PLanguageStore.byLangCode(
controller.selectedTargetLanguage!,
)
: MatrixState
.pangeaController.languageController.userL2,
decorationText: L10n.of(context).targetLanguageLabel,
isL2List: true,
),
const SizedBox(height: 16.0),
SuggestionFormField(
suggestions: controller.topicItems,
validator: controller.validateNotNull,
maxLength: 50,
label: l10n.topicLabel,
placeholder: l10n.topicPlaceholder,
controller: controller.topicController,
),
const SizedBox(height: 16.0),
SuggestionFormField(
suggestions: controller.objectiveItems,
validator: controller.validateNotNull,
maxLength: 140,
label: l10n.learningObjectiveLabel,
placeholder: l10n.learningObjectivePlaceholder,
controller: controller.objectiveController,
),
const SizedBox(height: 16.0),
SuggestionFormField(
suggestions: controller.modeItems,
validator: controller.validateNotNull,
maxLength: 50,
label: l10n.modeLabel,
placeholder: l10n.modePlaceholder,
controller: controller.modeController,
),
const SizedBox(height: 16.0),
TextFormField(
decoration: InputDecoration(
labelText: l10n.numberOfLearners,
),
textInputAction: TextInputAction.done,
validator: (value) {
if (value == null || value.isEmpty) {
return l10n.mustBeInteger;
}
final n = int.tryParse(value);
if (n == null || n <= 0) {
return l10n.mustBeInteger;
}
if (n > 50) {
return l10n.maxFifty;
}
return null;
},
onChanged: (val) => controller
.setSelectedNumberOfParticipants(int.tryParse(val)),
initialValue:
controller.selectedNumberOfParticipants?.toString(),
onTapOutside: (_) =>
FocusManager.instance.primaryFocus?.unfocus(),
onFieldSubmitted: (_) {
if (controller.formKey.currentState?.validate() ??
false) {
controller.generate();
}
},
),
const SizedBox(height: 16.0),
LanguageLevelDropdown(
onChanged: controller.setSelectedCefrLevel,
initialLevel: controller.selectedCefrLevel,
),
const SizedBox(height: 16.0),
Row(
children: [
Expanded(
child: Padding(
padding: const EdgeInsets.only(right: 8.0),
child: ElevatedButton(
onPressed: controller.clearSelections,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Symbols.reset_focus),
const SizedBox(width: 8),
Text(L10n.of(context).clear),
],
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(right: 8.0),
child: ElevatedButton(
onPressed: controller.clearSelections,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Symbols.reset_focus),
const SizedBox(width: 8),
Text(L10n.of(context).clear),
],
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(left: 8.0),
child: ElevatedButton(
onPressed: controller.randomizeSelections,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.shuffle),
const SizedBox(width: 8),
Text(L10n.of(context).randomize),
],
),
),
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(left: 8.0),
child: ElevatedButton(
onPressed: controller.randomizeSelections,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.shuffle),
const SizedBox(width: 8),
Text(L10n.of(context).randomize),
],
),
),
],
),
const SizedBox(height: 24.0),
ElevatedButton(
onPressed: () {
if (controller.formKey.currentState?.validate() ??
false) {
controller.generate();
}
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.lightbulb_outline),
const SizedBox(width: 8),
Text(l10n.generateActivitiesButton),
],
),
),
],
),
),
const SizedBox(height: 24.0),
ElevatedButton(
onPressed: () {
if (controller.formKey.currentState?.validate() ?? false) {
controller.generate();
}
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.lightbulb_outline),
const SizedBox(width: 8),
Text(l10n.generateActivitiesButton),
],
),
),
],
),
),
),
),
);
}
}

1
lib/pangea/activity_planner/activity_plan_card.dart
View file

@ -619,6 +619,7 @@ class ActivityPlanCardState extends State<ActivityPlanCard> {
Column(
spacing: 12.0,
children: [
const SizedBox(),
Row(
spacing: 12.0,
children: [