Skip to content

Commit a8cd013

Browse files
committed
update
1 parent 8d0ee86 commit a8cd013

15 files changed

Lines changed: 25 additions & 148 deletions

example/lib/main.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ final class ExampleScreenController extends ScreenController {
3333
ExampleScreenController(super.screen, super.state);
3434
}
3535

36-
final class ExampleScreenState extends AdaptiveScreenState<ExampleScreen,
37-
Object?, ExampleScreenController> {
36+
final class ExampleScreenState extends AdaptiveScreenState<ExampleScreen, ExampleScreenController> {
3837
@override
3938
Widget wideBody(BuildContext context) {
4039
return Container(

lib/src/_hidden/_hidden.g.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
88
//.title~
99

10-
export './capture_widget.dart';
1110
export './view_insets_builder.dart';
1211
export './image_painter.dart';
1312
export './current_platform.dart';

lib/src/_hidden/capture_widget.dart

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

lib/src/_src.g.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
88
//.title~
99

10-
export './screen_page.dart';
1110
export './screen_bread_crumb_bar.dart';
1211
export './screen_states/adaptive_screen_state/mixins/default_padding_screen_mixin.dart';
1312
export './screen_states/adaptive_screen_state/mixins/default_scrollable_align_screen_mixin.dart';

lib/src/screen_controller.dart

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,25 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13-
import 'package:df_pod/df_pod.dart';
1413
import 'package:flutter/foundation.dart';
1514

1615
import '../df_screen.dart';
1716

1817
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1918

20-
base class ScreenController<TExtra extends Object?> {
19+
base class ScreenController {
2120
//
2221
//
2322
//
2423

2524
final Screen? superScreen;
2625
final ScreenState? superState;
27-
final RootPod<TExtra>? pExtra;
2826

2927
//
3028
//
3129
//
3230

33-
ScreenController(this.superScreen, this.superState, [TExtra? extra])
34-
: pExtra = extra != null ? RootPod(extra) : null;
31+
ScreenController(this.superScreen, this.superState);
3532

3633
//
3734
//
@@ -47,7 +44,5 @@ base class ScreenController<TExtra extends Object?> {
4744

4845
@mustCallSuper
4946
@visibleForOverriding
50-
void dispose() {
51-
pExtra?.dispose();
52-
}
47+
void dispose() {}
5348
}

lib/src/screen_page.dart

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

lib/src/screen_state.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
// ignore_for_file: invalid_use_of_visible_for_overriding_member
1414

15-
import 'package:df_pod/df_pod.dart';
1615
import 'package:flutter/material.dart';
1716

1817
import 'package:df_debouncer/df_debouncer.dart';
@@ -22,8 +21,8 @@ import '../df_screen.dart';
2221

2322
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2423

25-
abstract base class ScreenState<TScreen extends Screen, TExtra extends Object?,
26-
TController extends ScreenController<TExtra>> extends State<TScreen> {
24+
abstract base class ScreenState<TScreen extends Screen, TController extends ScreenController>
25+
extends State<TScreen> {
2726
//
2827
//
2928
//
@@ -35,6 +34,7 @@ abstract base class ScreenState<TScreen extends Screen, TExtra extends Object?,
3534

3635
@override
3736
void initState() {
37+
print('INIT STATE: ${widget.runtimeType}');
3838
this._initController();
3939
super.initState();
4040
}
@@ -87,12 +87,7 @@ abstract base class ScreenState<TScreen extends Screen, TExtra extends Object?,
8787
@nonVirtual
8888
@override
8989
Widget build(BuildContext context) {
90-
return c.pExtra != null
91-
? PodBuilder(
92-
pod: c.pExtra!,
93-
builder: (context, snapshot) => buildWidget(context),
94-
)
95-
: buildWidget(context);
90+
return buildWidget(context);
9691
}
9792

9893
@visibleForOverriding

lib/src/screen_states/adaptive_screen_state/_adaptive_screen_state_interface.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ import '/src/_src.g.dart';
1818

1919
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2020

21-
abstract base class AdaptiveScreenStateInterface<TScreen extends Screen,
22-
TExtra extends Object?, TController extends ScreenController<TExtra>>
23-
extends ScreenState<TScreen, TExtra, TController> {
21+
abstract base class AdaptiveScreenStateInterface<TScreen extends Screen, TController extends ScreenController>
22+
extends ScreenState<TScreen, TController> {
2423
/// Activates for mobile device screen sizes. Override to customize the
2524
/// layout for these sizes. The [body] includes the widget returned by
2625
/// [mobileBody].

lib/src/screen_states/adaptive_screen_state/adaptive_screen_state.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import '_adaptive_screen_state_interface.dart';
2222

2323
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2424

25-
abstract base class AdaptiveScreenState<TScreen extends Screen, TExtra extends Object?,
26-
TController extends ScreenController<TExtra>>
27-
extends AdaptiveScreenStateInterface<TScreen, TExtra, TController>
25+
abstract base class AdaptiveScreenState<TScreen extends Screen,
26+
TController extends ScreenController>
27+
extends AdaptiveScreenStateInterface<TScreen, TController>
2828
with
2929
MobileFrameWideLayoutScreenMixin,
3030
DefaultScrollableAlignScreenMixin,

lib/src/screen_states/adaptive_screen_state/mixins/default_no_scrollable_align_screen_mixin.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ import '/src/_src.g.dart';
1818

1919
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2020

21-
base mixin DefaultNoScrollableAlignScreenMixin<TScreen extends Screen,
22-
TExtra extends Object?, TController extends ScreenController<TExtra>>
23-
on AdaptiveScreenStateInterface<TScreen, TExtra, TController> {
21+
base mixin DefaultNoScrollableAlignScreenMixin<TScreen extends Screen, TController extends ScreenController>
22+
on AdaptiveScreenStateInterface<TScreen, TController> {
2423
@override
2524
Widget align(BuildContext context, Widget body, EdgeInsets sideInsets) {
2625
return Align(

0 commit comments

Comments
 (0)