Skip to content

fix: fill in the blanks rendering layout #1480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 13, 2025
Merged

fix: fill in the blanks rendering layout #1480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5e362b
fix: fill in the blanks rendering layout
Sembauke May 9, 2025
d5aada9
fix: adjust cursor height
Sembauke May 12, 2025
05bfdb6
fix: update padding for fill in the blank challenge card
Sembauke May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions mobile-app/lib/ui/views/learn/challenge/templates/english/english_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,13 @@ class EnglishView extends StatelessWidget {
if (challenge.fillInTheBlank != null)
ChallengeCard(
title: 'Fill in the Blank',
child: Wrap(
children: model.getFillInBlankWidgets(
challenge,
context,
child: Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
children: model.getFillInBlankWidgets(
challenge,
context,
),
),
),
),
Expand Down
157 changes: 88 additions & 69 deletions mobile-app/lib/ui/views/learn/challenge/templates/english/english_viewmodel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:freecodecamp/service/learn/learn_offline_service.dart';
import 'package:freecodecamp/service/learn/learn_service.dart';
import 'package:freecodecamp/ui/theme/fcc_theme.dart';
import 'package:freecodecamp/ui/views/learn/superblock/superblock_view.dart';
import 'package:html/parser.dart';
import 'package:stacked/stacked.dart';

class EnglishViewModel extends BaseViewModel {
Expand Down Expand Up @@ -125,90 +126,108 @@ class EnglishViewModel extends BaseViewModel {
BuildContext context,
) {
List<Widget> widgets = [];
List<String> words = challenge.fillInTheBlank!.sentence.split(' ');

int blankIndex = 0;

for (String word in words) {
if (word.contains('BLANK')) {
String uniqueId = 'blank_$blankIndex';

if (currentBlankValues[uniqueId] == null) {
currentBlankValues.addAll({uniqueId: ''});
}
List<String> sentences = challenge.fillInTheBlank!.sentence.split('\n');

// The blank word is sometimes concatenated with the previous or next word
List splitWord = word.split('BLANK');

if (splitWord.isNotEmpty) {
widgets.add(
Text(
splitWord[0].replaceAll('<p>', ''),
style: const TextStyle(fontSize: 20, letterSpacing: 0),
int blankIndex = 0;
for (String sentence in sentences) {
List<Widget> children = [];

List<String> words = sentence.split(' ');
for (String word in words) {
if (word.contains('BLANK')) {
String uniqueId = 'blank_$blankIndex';

if (currentBlankValues[uniqueId] == null) {
currentBlankValues.addAll({uniqueId: ''});
}

// The blank word is sometimes concatenated with the previous or next word
List splitWord = word.split('BLANK');

if (splitWord.isNotEmpty) {
children.add(
Text(
parseFragment(splitWord[0]).text ?? '',
textAlign: TextAlign.start,
style: const TextStyle(fontSize: 20, letterSpacing: 0),
),
);
}

children.add(
Container(
margin: const EdgeInsets.only(
left: 5,
right: 5,
),
width: calculateTextWidth(
challenge.fillInTheBlank!.blanks[blankIndex].answer,
const TextStyle(fontSize: 20),
) +
20,
child: TextFormField(
initialValue: currentBlankValues[uniqueId],
cursorHeight: 19,
onChanged: (value) {
Map<String, String> local = currentBlankValues;
local[uniqueId] = value;
fills.add(local);
},
smartQuotesType: SmartQuotesType.disabled,
spellCheckConfiguration:
const SpellCheckConfiguration.disabled(),
autocorrect: false,
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
horizontal: 8,
),
focusedBorder: handleInputBorderColor(blankIndex),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(5),
),
isDense: true,
enabledBorder: handleInputBorderColor(blankIndex),
),
style: const TextStyle(
fontSize: 19,
letterSpacing: 0,
),
),
),
);
}

widgets.add(
Container(
margin: const EdgeInsets.only(
left: 5,
right: 5,
),
width: calculateTextWidth(
challenge.fillInTheBlank!.blanks[blankIndex].answer,
const TextStyle(fontSize: 20),
) +
20,
child: TextFormField(
initialValue: currentBlankValues[uniqueId],
onChanged: (value) {
Map<String, String> local = currentBlankValues;
local[uniqueId] = value;
fills.add(local);
},
smartQuotesType: SmartQuotesType.disabled,
spellCheckConfiguration: const SpellCheckConfiguration.disabled(),
autocorrect: false,
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(horizontal: 8),
focusedBorder: handleInputBorderColor(blankIndex),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(5),
),
isDense: true,
enabledBorder: handleInputBorderColor(blankIndex),
if (splitWord.length > 1) {
children.add(
Text(
parseFragment(splitWord[1]).text ?? '',
style: const TextStyle(fontSize: 20, letterSpacing: 0),
),
style: const TextStyle(
fontSize: 19,
letterSpacing: 0,
),
),
),
);
);
}

if (splitWord.length > 1) {
widgets.add(
blankIndex++;
} else {
children.add(
Text(
splitWord[splitWord.length - 1].replaceAll('</p>', ''),
parseFragment(word).text ?? '',
style: const TextStyle(fontSize: 20, letterSpacing: 0),
),
);
}
}

blankIndex++;
} else {
widgets.add(
Padding(
padding: const EdgeInsets.only(right: 5),
child: Text(
word.replaceAll(RegExp('<p>|</p>'), ''),
style: const TextStyle(fontSize: 20, letterSpacing: 0),
),
widgets.add(
Padding(
padding: const EdgeInsets.only(top: 16),
child: Align(
alignment: Alignment.topLeft,
child: Wrap(spacing: 3, runSpacing: 3, children: children),
),
);
}
),
);
}

return widgets;
}

Expand Down
Loading