Skip to content

Commit d24b850

Browse files
t0mb3rrt0mb3rr
committed
update
1 parent 0b4dae4 commit d24b850

File tree

2 files changed

+57
-85
lines changed

2 files changed

+57
-85
lines changed

‎example/lib/screens/home_screen/_bindings.g.dart‎

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ class HomeScreenConfiguration extends ModelScreenConfiguration {
3232
//
3333

3434
HomeScreenConfiguration.optional({Map<dynamic, dynamic>? args})
35-
: super.optional(
36-
title: null,
37-
path: _PATH,
38-
args: args ?? {},
39-
isAccessibleOnlyIfLoggedInAndVerified:
40-
_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
41-
isAccessibleOnlyIfLoggedIn: _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
42-
isAccessibleOnlyIfLoggedOut: _IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
43-
isRedirectable: _IS_REDIRECTABLE,
44-
);
35+
: super.optional(
36+
title: null,
37+
path: _PATH,
38+
args: args ?? {},
39+
isAccessibleOnlyIfLoggedInAndVerified: _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
40+
isAccessibleOnlyIfLoggedIn: _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
41+
isAccessibleOnlyIfLoggedOut: _IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
42+
isRedirectable: _IS_REDIRECTABLE,
43+
);
4544

4645
//
4746
//
@@ -60,16 +59,14 @@ class HomeScreenConfiguration extends ModelScreenConfiguration {
6059
static const TR_KEY = _TR_KEY;
6160

6261
/// Whether the corresponding [Screen] is only accessible if the user is logged in and verified.
63-
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_IN =
64-
_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN;
62+
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_IN = _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN;
6563

6664
/// Whether the corresponding [Screen] is only accessible if the user is logged in.
6765
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED =
6866
_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED;
6967

7068
/// Whether the corresponding [Screen] is only accessible if the user is logged out.
71-
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT =
72-
_IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT;
69+
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT = _IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT;
7370

7471
/// Whether the corresponding [Screen] is redirectable, i.e., if it can be requested from the browser URL.
7572
static const IS_REDIRECTABLE = _IS_REDIRECTABLE;
@@ -87,15 +84,13 @@ abstract base class _ControllerBroker<T1 extends HomeScreen, T2 extends _State>
8784
late final state = super.superState as T2;
8885

8986
/// The [ModelScreenConfiguration] that corresponds to `this` controller.
90-
late final configuration =
91-
screen.extra is HomeScreenConfiguration
92-
? screen.extra as HomeScreenConfiguration
93-
: HomeScreenConfiguration.optional(
94-
args:
95-
screen.extra is ModelScreenConfiguration
96-
? (screen.extra as ModelScreenConfiguration).args
97-
: {},
98-
);
87+
late final configuration = screen.extra is HomeScreenConfiguration
88+
? screen.extra as HomeScreenConfiguration
89+
: HomeScreenConfiguration.optional(
90+
args: screen.extra is ModelScreenConfiguration
91+
? (screen.extra as ModelScreenConfiguration).args
92+
: {},
93+
);
9994

10095
_ControllerBroker(super.superScreen, super.superState, [super.extra]);
10196
}
@@ -111,17 +106,13 @@ final generatedHomeScreenRoute = GoRoute(
111106
key: state.pageKey,
112107
child: HomeScreen(
113108
key: _globalKey,
114-
extra:
115-
extra ??
109+
extra: extra ??
116110
urlToScreenConfiguration(
117111
url: state.uri,
118-
isAccessibleOnlyIfLoggedIn:
119-
HomeScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
112+
isAccessibleOnlyIfLoggedIn: HomeScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
120113
isAccessibleOnlyIfLoggedInAndVerified:
121-
HomeScreenConfiguration
122-
.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
123-
isAccessibleOnlyIfLoggedOut:
124-
HomeScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
114+
HomeScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
115+
isAccessibleOnlyIfLoggedOut: HomeScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
125116
isRedirectable: HomeScreenConfiguration.IS_REDIRECTABLE,
126117
title: null,
127118
),
@@ -141,8 +132,7 @@ Screen? makerHomeScreen(
141132
bool isLoggedIn,
142133
bool isLoggedOut,
143134
) {
144-
if ((_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED &&
145-
!isLoggedInAndVerified) ||
135+
if ((_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED && !isLoggedInAndVerified) ||
146136
(_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN && !isLoggedIn) ||
147137
(_IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT && !isLoggedOut)) {
148138
return null;
@@ -165,27 +155,23 @@ Screen? makerHomeScreen(
165155
typedef THomeScreenController = _ControllerBroker<HomeScreen, _State>;
166156

167157
/// A [AdaptiveScreenState] type corresponding to [HomeScreen].
168-
typedef TAdaptiveHomeScreenState =
169-
AdaptiveScreenState<
170-
HomeScreen,
171-
HomeScreenConfiguration,
172-
HomeScreenController
173-
>;
158+
typedef TAdaptiveHomeScreenState
159+
= AdaptiveScreenState<HomeScreen, HomeScreenConfiguration, HomeScreenController>;
174160

175161
/// A [ScreenState] type corresponding to [HomeScreen].
176-
typedef THomeScreenState =
177-
ScreenState<HomeScreen, HomeScreenConfiguration, HomeScreenController>;
162+
typedef THomeScreenState = ScreenState<HomeScreen, HomeScreenConfiguration, HomeScreenController>;
178163

179164
/// A [ScreenPageState] type corresponding to [HomeScreen].
180-
typedef THomeScreenPageState<T extends ScreenPage> =
181-
ScreenPageState<T, HomeScreenConfiguration, HomeScreenController>;
165+
typedef THomeScreenPageState<T extends ScreenPage>
166+
= ScreenPageState<T, HomeScreenConfiguration, HomeScreenController>;
182167

183168
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
184169

185170
base class _HomeScreen extends Screen {
186171
const _HomeScreen({
187172
required super.key,
188173
required super.extra,
174+
// ignore: unused_element_parameter
189175
super.controllerTimeout = Duration.zero,
190176
});
191177

‎example/lib/screens/login_screen/_bindings.g.dart‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ class LoginScreenConfiguration extends ModelScreenConfiguration {
3232
//
3333

3434
LoginScreenConfiguration.optional({Map<dynamic, dynamic>? args})
35-
: super.optional(
36-
title: null,
37-
path: _PATH,
38-
args: args ?? {},
39-
isAccessibleOnlyIfLoggedInAndVerified:
40-
_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
41-
isAccessibleOnlyIfLoggedIn: _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
42-
isAccessibleOnlyIfLoggedOut: _IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
43-
isRedirectable: _IS_REDIRECTABLE,
44-
);
35+
: super.optional(
36+
title: null,
37+
path: _PATH,
38+
args: args ?? {},
39+
isAccessibleOnlyIfLoggedInAndVerified: _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
40+
isAccessibleOnlyIfLoggedIn: _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
41+
isAccessibleOnlyIfLoggedOut: _IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
42+
isRedirectable: _IS_REDIRECTABLE,
43+
);
4544

4645
//
4746
//
@@ -60,16 +59,14 @@ class LoginScreenConfiguration extends ModelScreenConfiguration {
6059
static const TR_KEY = _TR_KEY;
6160

6261
/// Whether the corresponding [Screen] is only accessible if the user is logged in and verified.
63-
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_IN =
64-
_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN;
62+
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_IN = _IS_ACCESSIBLE_ONLY_IF_LOGGED_IN;
6563

6664
/// Whether the corresponding [Screen] is only accessible if the user is logged in.
6765
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED =
6866
_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED;
6967

7068
/// Whether the corresponding [Screen] is only accessible if the user is logged out.
71-
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT =
72-
_IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT;
69+
static const IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT = _IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT;
7370

7471
/// Whether the corresponding [Screen] is redirectable, i.e., if it can be requested from the browser URL.
7572
static const IS_REDIRECTABLE = _IS_REDIRECTABLE;
@@ -87,15 +84,13 @@ abstract base class _ControllerBroker<T1 extends LoginScreen, T2 extends _State>
8784
late final state = super.superState as T2;
8885

8986
/// The [ModelScreenConfiguration] that corresponds to `this` controller.
90-
late final configuration =
91-
screen.extra is LoginScreenConfiguration
92-
? screen.extra as LoginScreenConfiguration
93-
: LoginScreenConfiguration.optional(
94-
args:
95-
screen.extra is ModelScreenConfiguration
96-
? (screen.extra as ModelScreenConfiguration).args
97-
: {},
98-
);
87+
late final configuration = screen.extra is LoginScreenConfiguration
88+
? screen.extra as LoginScreenConfiguration
89+
: LoginScreenConfiguration.optional(
90+
args: screen.extra is ModelScreenConfiguration
91+
? (screen.extra as ModelScreenConfiguration).args
92+
: {},
93+
);
9994

10095
_ControllerBroker(super.superScreen, super.superState, [super.extra]);
10196
}
@@ -111,15 +106,12 @@ final generatedLoginScreenRoute = GoRoute(
111106
key: state.pageKey,
112107
child: LoginScreen(
113108
key: _globalKey,
114-
extra:
115-
extra ??
109+
extra: extra ??
116110
urlToScreenConfiguration(
117111
url: state.uri,
118-
isAccessibleOnlyIfLoggedIn:
119-
LoginScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
112+
isAccessibleOnlyIfLoggedIn: LoginScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN,
120113
isAccessibleOnlyIfLoggedInAndVerified:
121-
LoginScreenConfiguration
122-
.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
114+
LoginScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED,
123115
isAccessibleOnlyIfLoggedOut:
124116
LoginScreenConfiguration.IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT,
125117
isRedirectable: LoginScreenConfiguration.IS_REDIRECTABLE,
@@ -141,8 +133,7 @@ Screen? makerLoginScreen(
141133
bool isLoggedIn,
142134
bool isLoggedOut,
143135
) {
144-
if ((_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED &&
145-
!isLoggedInAndVerified) ||
136+
if ((_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED && !isLoggedInAndVerified) ||
146137
(_IS_ACCESSIBLE_ONLY_IF_LOGGED_IN && !isLoggedIn) ||
147138
(_IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT && !isLoggedOut)) {
148139
return null;
@@ -165,28 +156,23 @@ Screen? makerLoginScreen(
165156
typedef TLoginScreenController = _ControllerBroker<LoginScreen, _State>;
166157

167158
/// A [AdaptiveScreenState] type corresponding to [LoginScreen].
168-
typedef TAdaptiveLoginScreenState =
169-
AdaptiveScreenState<
170-
LoginScreen,
171-
LoginScreenConfiguration,
172-
LoginScreenController
173-
>;
159+
typedef TAdaptiveLoginScreenState
160+
= AdaptiveScreenState<LoginScreen, LoginScreenConfiguration, LoginScreenController>;
174161

175162
/// A [ScreenState] type corresponding to [LoginScreen].
176-
typedef TLoginScreenState =
177-
ScreenState<LoginScreen, LoginScreenConfiguration, LoginScreenController>;
163+
typedef TLoginScreenState
164+
= ScreenState<LoginScreen, LoginScreenConfiguration, LoginScreenController>;
178165

179166
/// A [ScreenPageState] type corresponding to [LoginScreen].
180-
typedef TLoginScreenPageState<T extends ScreenPage> =
181-
ScreenPageState<T, LoginScreenConfiguration, LoginScreenController>;
167+
typedef TLoginScreenPageState<T extends ScreenPage>
168+
= ScreenPageState<T, LoginScreenConfiguration, LoginScreenController>;
182169

183170
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
184171

185172
base class _LoginScreen extends Screen {
186173
const _LoginScreen({
187174
required super.key,
188175
required super.extra,
189-
super.controllerTimeout = Duration.zero,
190176
});
191177

192178
@override

0 commit comments

Comments
 (0)