Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:freecodecamp/ui/views/learn/widgets/audio/audio_player_view.dart
import 'package:freecodecamp/ui/views/learn/widgets/challenge_card.dart';
import 'package:freecodecamp/ui/views/learn/widgets/explanation_widget.dart';
import 'package:freecodecamp/ui/views/learn/widgets/quiz_widget.dart';
import 'package:freecodecamp/ui/views/learn/widgets/scene/scene_view.dart';
import 'package:freecodecamp/ui/views/learn/widgets/transcript_widget.dart';
import 'package:freecodecamp/ui/views/learn/widgets/youtube_player_widget.dart';
import 'package:freecodecamp/ui/views/news/html_handler/html_handler.dart';
Expand Down Expand Up @@ -82,7 +83,14 @@ class MultipleChoiceView extends StatelessWidget {
),
),
],
if (challenge.audio != null) ...[
if (challenge.scene != null) ...[
ChallengeCard(
title: 'Scene',
child: SceneView(
scene: challenge.scene!,
),
),
] else if (challenge.audio != null) ...[
ChallengeCard(
title: 'Listen to the Audio',
child: AudioPlayerView(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:freecodecamp/ui/views/learn/utils/challenge_utils.dart';
import 'package:freecodecamp/ui/views/learn/widgets/assignment_widget.dart';
import 'package:freecodecamp/ui/views/learn/widgets/audio/audio_player_view.dart';
import 'package:freecodecamp/ui/views/learn/widgets/challenge_card.dart';
import 'package:freecodecamp/ui/views/learn/widgets/scene/scene_view.dart';
import 'package:freecodecamp/ui/views/learn/widgets/transcript_widget.dart';
import 'package:freecodecamp/ui/views/learn/widgets/youtube_player_widget.dart';
import 'package:stacked/stacked.dart';
Expand Down Expand Up @@ -56,7 +57,14 @@ class ReviewView extends StatelessWidget {
),
const SizedBox(height: 12),
],
if (challenge.audio != null) ...[
if (challenge.scene != null) ...[
ChallengeCard(
title: 'Scene',
child: SceneView(
scene: challenge.scene!,
),
),
] else if (challenge.audio != null) ...[
ChallengeCard(
title: 'Listen to the Audio',
child: AudioPlayerView(
Expand Down
7 changes: 2 additions & 5 deletions mobile-app/lib/ui/views/learn/widgets/scene/scene_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,8 @@ class _CharacterSlot extends StatelessWidget {
final yPercent = state.position.y.toDouble() / 100;

final leftPos = (xPercent * canvasWidth) - (characterWidth / 2);

// I have no clue why this works, but it does.
final removeBottomYScale = characterHeight - canvasHeight;
final handleRemoveBottomYScale = yPercent <= 0 ? removeBottomYScale / 2 : removeBottomYScale * 2;
final bottomPos = (yPercent * canvasHeight) - handleRemoveBottomYScale;
final overflowHeight = characterHeight - canvasHeight;
final bottomPos = -(overflowHeight / 2) - (yPercent * canvasHeight);

return AnimatedPositioned(
duration: const Duration(milliseconds: 500),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class SceneViewModel extends BaseViewModel {

_hasStarted = true;
_applyInitialCommands();
_startBlinkAnimations();
notifyListeners();

await startAudio();
Expand All @@ -145,8 +144,10 @@ class SceneViewModel extends BaseViewModel {
audioService.playbackState.listen((state) {
_isPlaying = state.playing;

if (!_isPlaying) {
_stopAllMouthAnimations();
if (_isPlaying) {
_startBlinkAnimations();
} else {
_stopAllMouthAnimations();
_stopAllBlinkAnimations();
}

Expand Down
Loading