Skip to content

Commit bd34169

Browse files
committed
update
1 parent 96a2096 commit bd34169

6 files changed

Lines changed: 26 additions & 30 deletions

File tree

lib/src/_utils/current_platform.dart

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

13-
import 'package:flutter/foundation.dart'
14-
show TargetPlatform, defaultTargetPlatform, kIsWeb;
13+
import 'package:flutter/foundation.dart';
14+
1515
import 'package:flutter/widgets.dart' show MediaQueryData, WidgetsBinding;
1616

1717
import 'package:device_info_plus/device_info_plus.dart' as device_info_plus;

lib/src/screen_states/adaptive_screen_state/adaptive_screen_state.dart

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ abstract base class AdaptiveScreenState<TScreen extends Screen,
6363
// foregroundBuilder: foreground,
6464
// paddingBuilder: padding,
6565
// );
66+
6667
final screenSize = MediaQuery.of(context).size;
6768
final calculator = ScreenCalculator(screenSize.width, screenSize.height);
6869
final appLayout = AppLayout.fromScreenCalculator(calculator);
@@ -167,14 +168,16 @@ abstract base class AdaptiveScreenState<TScreen extends Screen,
167168
],
168169
),
169170
),
170-
bottomSide is PreferredSizeWidget
171-
? ConstrainedBox(
172-
constraints: BoxConstraints.loose(
173-
bottomSide.preferredSize,
174-
),
175-
child: bottomSide,
176-
)
177-
: bottomSide,
171+
Container(
172+
child: bottomSide is PreferredSizeWidget
173+
? ConstrainedBox(
174+
constraints: BoxConstraints.loose(
175+
bottomSide.preferredSize,
176+
),
177+
child: bottomSide,
178+
)
179+
: bottomSide,
180+
),
178181
],
179182
),
180183
],
@@ -186,11 +189,7 @@ abstract base class AdaptiveScreenState<TScreen extends Screen,
186189
background(context),
187190
foreground(context),
188191
);
189-
final body5 = ColoredBox(
190-
color: Theme.of(context).colorScheme.surface,
191-
child: body4,
192-
);
193-
return body5;
192+
return body4;
194193
},
195194
);
196195
}

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

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

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

21-
base mixin DefaultScrollableAlignScreenMixin<TScreen extends Screen, TController extends ScreenController>
22-
on AdaptiveScreenStateInterface<TScreen, TController> {
21+
base mixin DefaultScrollableAlignScreenMixin<TScreen extends Screen,
22+
TController extends ScreenController> on AdaptiveScreenStateInterface<TScreen, TController> {
2323
@override
2424
Widget align(BuildContext context, Widget body, EdgeInsets sideInsets) {
2525
return Align(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:flutter/material.dart';
1515
import '../_adaptive_screen_state_interface.dart';
1616

1717
import '/src/_src.g.dart';
18-
import '../../../_utils/_utils.g.dart';
18+
import '/src/_utils/_utils.g.dart';
1919

2020
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2121

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ import '/src/_src.g.dart';
1919

2020
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
2121

22-
base mixin RotateIconHorizontalMobileLayoutScreenMixin<TScreen extends Screen, TController extends ScreenController>
23-
on AdaptiveScreenStateInterface<TScreen, TController> {
22+
base mixin RotateIconHorizontalMobileLayoutScreenMixin<TScreen extends Screen,
23+
TController extends ScreenController> on AdaptiveScreenStateInterface<TScreen, TController> {
2424
@override
2525
Widget horizontalMobileLayout(BuildContext context, Widget body) {
26-
return ColoredBox(
27-
color: Theme.of(context).colorScheme.tertiary,
28-
child: Center(
29-
child: Icon(
30-
Icons.rotate_90_degrees_ccw,
31-
size: 48.sc,
32-
color: Theme.of(context).colorScheme.onTertiary,
33-
),
26+
return Center(
27+
child: Icon(
28+
Icons.rotate_90_degrees_ccw,
29+
size: 48.sc,
30+
color: Theme.of(context).colorScheme.primary,
3431
),
3532
);
3633
}

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ dependencies:
3737
df_collection: ^0.9.1
3838
df_config: ^0.7.1
3939
df_debouncer: ^0.4.6
40-
df_di: ^0.10.22
40+
df_di: ^0.10.24
4141
df_generate_dart_models_core: ^0.9.8
4242
df_log: ^0.3.5
4343
df_pod: ^0.16.10
4444
df_scalable: ^0.8.1
4545
df_screen_core: ^0.5.1
4646
df_type: ^0.10.3
47-
df_router: ^0.4.1
47+
df_router: ^0.4.4
4848
device_info_plus: ^11.4.0
4949
meta: ^1.16.0
5050

0 commit comments

Comments
 (0)