Skip to content

Commit

Permalink
fix: rename handleChallengeTemplateView to challengeTemplateView and …
Browse files Browse the repository at this point in the history
…update related navigation
  • Loading branch information
Sembauke committed Feb 27, 2025
1 parent d5b6d15 commit 2434183
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 35 deletions.
4 changes: 2 additions & 2 deletions mobile-app/lib/app/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import 'package:freecodecamp/service/dio_service.dart';
import 'package:freecodecamp/service/news/api_service.dart';

import 'package:freecodecamp/ui/views/code_radio/code_radio_view.dart';
import 'package:freecodecamp/ui/views/learn/challenge/templates/template_handler_view.dart';
import 'package:freecodecamp/ui/views/learn/challenge/templates/template_view.dart';
import 'package:freecodecamp/ui/views/learn/landing/landing_view.dart';
import 'package:freecodecamp/ui/views/learn/superblock/superblock_view.dart';
import 'package:freecodecamp/ui/views/login/native_login_view.dart';
Expand Down Expand Up @@ -48,7 +48,7 @@ import 'package:stacked_services/stacked_services.dart';
MaterialRoute(page: NewsAuthorView),
MaterialRoute(page: NewsImageView),
MaterialRoute(page: CodeRadioView),
MaterialRoute(page: HandleChallengeTemplateView),
MaterialRoute(page: ChallengeTemplateView),
MaterialRoute(page: ProfileView),
MaterialRoute(page: LearnLandingView, initial: true),
MaterialRoute(page: NativeLoginView),
Expand Down
35 changes: 17 additions & 18 deletions mobile-app/lib/app/app.router.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mobile-app/lib/service/firebase/analytics_observer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class AnalyticsObserver extends RouteObserver {
route.settings.arguments as NewsBookmarkTutorialViewArguments;
screenName += '/${routeArgs.tutorial.tutorialTitle}';
break;
case HandleChallengeTemplateViewArguments:
case ChallengeTemplateViewArguments:
final routeArgs =
route.settings.arguments as HandleChallengeTemplateViewArguments;
route.settings.arguments as ChallengeTemplateViewArguments;
screenName += '/${routeArgs.challengeId}';
break;
default:
Expand Down
4 changes: 2 additions & 2 deletions mobile-app/lib/service/learn/learn_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ class LearnService {
_navigationService.back();
} else {
_navigationService.replaceWith(
Routes.handleChallengeTemplateView,
arguments: HandleChallengeTemplateViewArguments(
Routes.challengeTemplateView,
arguments: ChallengeTemplateViewArguments(
challengeId: block.challengeTiles[challengeIndex + 1].id,
block: block,
challengesCompleted: challengesCompleted + 1,
Expand Down
4 changes: 2 additions & 2 deletions mobile-app/lib/ui/views/learn/block/block_viewmodel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ class BlockViewModel extends BaseViewModel {

void routeToChallengeView(Block block, String challengeId) {
_navigationService.navigateTo(
Routes.handleChallengeTemplateView,
arguments: HandleChallengeTemplateViewArguments(
Routes.challengeTemplateView,
arguments: ChallengeTemplateViewArguments(
challengeId: challengeId,
block: block,
challengesCompleted: _challengesCompleted,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ class ChallengeViewModel extends BaseViewModel {
await prefs.remove(challengeUrl);

_navigationService.replaceWith(
Routes.handleChallengeTemplateView,
arguments: HandleChallengeTemplateViewArguments(
Routes.challengeTemplateView,
arguments: ChallengeTemplateViewArguments(
block: block!,
challengeId: currChallenge.id,
challengesCompleted: challengesCompleted,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import 'package:freecodecamp/ui/views/learn/challenge/templates/english/english_
import 'package:freecodecamp/ui/views/learn/challenge/templates/multiple_choice/multiple_choice_view.dart';
import 'package:freecodecamp/ui/views/learn/challenge/templates/python-project/python_project_view.dart';
import 'package:freecodecamp/ui/views/learn/challenge/templates/python/python_view.dart';
import 'package:freecodecamp/ui/views/learn/challenge/templates/template_handler_viewmodel.dart';
import 'package:freecodecamp/ui/views/learn/challenge/templates/template_viewmodel.dart';
import 'package:stacked/stacked.dart';

class HandleChallengeTemplateView extends StatelessWidget {
const HandleChallengeTemplateView({
class ChallengeTemplateView extends StatelessWidget {
const ChallengeTemplateView({
Key? key,
required this.block,
required this.challengeId,
Expand All @@ -23,9 +23,9 @@ class HandleChallengeTemplateView extends StatelessWidget {

@override
Widget build(BuildContext context) {
return ViewModelBuilder<HandleTemplateModel>.reactive(
return ViewModelBuilder<ChallengeTemplateViewModel>.reactive(
onViewModelReady: (model) => model.initiate(block, challengeId),
viewModelBuilder: () => HandleTemplateModel(),
viewModelBuilder: () => ChallengeTemplateViewModel(),
builder: (context, model, child) => FutureBuilder<Challenge?>(
future: model.challenge,
builder: (context, snapshot) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:freecodecamp/service/learn/learn_offline_service.dart';
import 'package:freecodecamp/service/learn/learn_service.dart';
import 'package:stacked/stacked.dart';

class HandleTemplateModel extends BaseViewModel {
class ChallengeTemplateViewModel extends BaseViewModel {
Future<Challenge>? _challenge;
Future<Challenge>? get challenge => _challenge;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class LearnLandingViewModel extends BaseViewModel {
hasInternet: true,
);

_navigationService.navigateToHandleChallengeTemplateView(
_navigationService.navigateToChallengeTemplateView(
block: block,
challengesCompleted: completedChallenges,
challengeId: challenge.id,
Expand Down

0 comments on commit 2434183

Please sign in to comment.