Skip to content

Commit 3d4a714

Browse files
committed
refactor: remove AdaptiveScaffold
- Simplifies routing - Removes unused dependency
1 parent af336f3 commit 3d4a714

File tree

4 files changed

+40
-105
lines changed

4 files changed

+40
-105
lines changed

lib/app/view/app_scaffold.dart

Lines changed: 0 additions & 48 deletions
This file was deleted.

lib/router/router.dart

Lines changed: 40 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
33
import 'package:go_router/go_router.dart';
44
import 'package:ht_main/app/bloc/app_bloc.dart';
5-
import 'package:ht_main/app/view/app_scaffold.dart';
65
import 'package:ht_main/authentication/view/authentication_page.dart';
76
import 'package:ht_main/headline-details/view/headline_details_page.dart';
87
import 'package:ht_main/headlines-feed/view/headlines_feed_page.dart';
@@ -13,34 +12,57 @@ final appRouter = GoRouter(
1312
initialLocation: Routes.headlinesFeed,
1413
redirect: (BuildContext context, GoRouterState state) {
1514
final appStatus = context.read<AppBloc>().state.status;
16-
if (appStatus == AppStatus.authenticated) {
15+
if (appStatus != AppStatus.authenticated) {
1716
return Routes.headlinesFeed;
1817
} else {
1918
return Routes.authentication;
2019
}
2120
},
2221
routes: [
23-
ShellRoute(
24-
builder: (context, state, child) {
25-
return AppScaffold(child: child);
22+
GoRoute(
23+
path: Routes.authentication,
24+
name: Routes.authenticationName,
25+
builder: (BuildContext context, GoRouterState state) {
26+
return const AuthenticationPage();
2627
},
2728
routes: [
2829
GoRoute(
29-
path: Routes.headlinesFeed,
30-
name: Routes.headlinesFeedName,
30+
path: Routes.forgotPassword,
31+
name: Routes.forgotPasswordName,
3132
builder: (BuildContext context, GoRouterState state) {
32-
return const HeadlinesFeedPage();
33+
return const Placeholder(child: Text('Forgot Password Page'));
34+
},
35+
),
36+
GoRoute(
37+
path: Routes.resetPassword,
38+
name: Routes.resetPasswordName,
39+
builder: (BuildContext context, GoRouterState state) {
40+
return const Placeholder(child: Text('Reset Password Page'));
41+
},
42+
),
43+
GoRoute(
44+
path: Routes.confirmEmail,
45+
name: Routes.confirmEmailName,
46+
builder: (BuildContext context, GoRouterState state) {
47+
return const Placeholder(child: Text('Confirm Email Page'));
48+
},
49+
),
50+
],
51+
),
52+
GoRoute(
53+
path: Routes.headlinesFeed,
54+
name: Routes.headlinesFeedName,
55+
builder: (BuildContext context, GoRouterState state) {
56+
return const HeadlinesFeedPage();
57+
},
58+
routes: [
59+
GoRoute(
60+
path: 'article/:id',
61+
name: Routes.articleDetailsName,
62+
builder: (BuildContext context, GoRouterState state) {
63+
final id = state.pathParameters['id']!;
64+
return HeadlineDetailsPage(headlineId: id);
3365
},
34-
routes: [
35-
GoRoute(
36-
path: 'article/:id',
37-
name: Routes.articleDetailsName,
38-
builder: (BuildContext context, GoRouterState state) {
39-
final id = state.pathParameters['id']!;
40-
return HeadlineDetailsPage(headlineId: id);
41-
},
42-
),
43-
],
4466
),
4567
GoRoute(
4668
path: Routes.search,
@@ -58,36 +80,6 @@ final appRouter = GoRouter(
5880
);
5981
},
6082
),
61-
GoRoute(
62-
path: Routes.authentication,
63-
name: Routes.authenticationName,
64-
builder: (BuildContext context, GoRouterState state) {
65-
return const AuthenticationPage();
66-
},
67-
routes: [
68-
GoRoute(
69-
path: Routes.forgotPassword,
70-
name: Routes.forgotPasswordName,
71-
builder: (BuildContext context, GoRouterState state) {
72-
return const Placeholder(child: Text('Forgot Password Page'));
73-
},
74-
),
75-
GoRoute(
76-
path: Routes.resetPassword,
77-
name: Routes.resetPasswordName,
78-
builder: (BuildContext context, GoRouterState state) {
79-
return const Placeholder(child: Text('Reset Password Page'));
80-
},
81-
),
82-
GoRoute(
83-
path: Routes.confirmEmail,
84-
name: Routes.confirmEmailName,
85-
builder: (BuildContext context, GoRouterState state) {
86-
return const Placeholder(child: Text('Confirm Email Page'));
87-
},
88-
),
89-
],
90-
),
9183
],
9284
),
9385
],

pubspec.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,6 @@ packages:
262262
description: flutter
263263
source: sdk
264264
version: "0.0.0"
265-
flutter_adaptive_scaffold:
266-
dependency: "direct main"
267-
description:
268-
name: flutter_adaptive_scaffold
269-
sha256: "7279d74da2f2531a16d21c2ec327308778c3aedd672dfe4eaf3bf416463501f8"
270-
url: "https://pub.dev"
271-
source: hosted
272-
version: "0.3.2"
273265
flutter_bloc:
274266
dependency: "direct main"
275267
description:

pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies:
1515
flex_color_scheme: ^8.1.1
1616
flutter:
1717
sdk: flutter
18-
flutter_adaptive_scaffold: ^0.3.2
1918
flutter_bloc: ^9.1.0
2019
flutter_localizations:
2120
sdk: flutter

0 commit comments

Comments
 (0)