Skip to content

Commit

Permalink
Flutter 3.10 (#828)
Browse files Browse the repository at this point in the history
  • Loading branch information
bdlukaa authored May 10, 2023
2 parents b7768ab + 37809cf commit 7021f64
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 65 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## next
## 4.6.0 - Flutter 3.10

- **BREAKING** Removed `FluentApp.useInheritedMediaQuery`
- Upgrade the `scroll_pos` dependency (from @WinXaito) to version v0.4.0 ([#831](https://github.com/bdlukaa/fluent_ui/pull/831))
- Added support for Urdu language ([#832](https://github.com/bdlukaa/fluent_ui/pull/832))

Expand Down
4 changes: 2 additions & 2 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ class MyApp extends StatelessWidget {
accentColor: appTheme.color,
visualDensity: VisualDensity.standard,
focusTheme: FocusThemeData(
glowFactor: is10footScreen() ? 2.0 : 0.0,
glowFactor: is10footScreen(context) ? 2.0 : 0.0,
),
),
theme: FluentThemeData(
accentColor: appTheme.color,
visualDensity: VisualDensity.standard,
focusTheme: FocusThemeData(
glowFactor: is10footScreen() ? 2.0 : 0.0,
glowFactor: is10footScreen(context) ? 2.0 : 0.0,
),
),
locale: appTheme.locale,
Expand Down
4 changes: 2 additions & 2 deletions example/lib/screens/forms/text_box.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ class TextBoxPage extends ScrollablePage {
'enabled by default.',
),
subtitle(content: const Text('A simple TextBox')),
CardHighlight(
child: Row(children: const [
const CardHighlight(
child: Row(children: [
Expanded(child: TextBox()),
SizedBox(width: 10.0),
Expanded(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/screens/surface/acrylic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ class _AcrylicPageState extends State<AcrylicPage> with PageMixin {
'to app surfaces to add depth and help establish a visual hierarchy.',
),
subtitle(content: const Text('Default background acrylic brush.')),
Card(
const Card(
child: SizedBox(
height: 300,
width: 500,
child: Stack(children: const [
child: Stack(children: [
_AcrylicChildren(),
Positioned.fill(
child: Padding(
Expand Down
4 changes: 2 additions & 2 deletions example/lib/screens/surface/progress_indicators.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class _ProgressIndicatorsPageState extends State<ProgressIndicatorsPage>
'completion time is unknown.',
),
),
CardHighlight(
const CardHighlight(
child: RepaintBoundary(
child: Row(children: const [
child: Row(children: [
ProgressBar(),
SizedBox(width: 20.0),
ProgressRing(),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/screens/theming/colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class ColorsPage extends ScrollablePage {
InfoLabel(
label: 'All Shades',
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row(children: const [
const Row(children: [
ColorBlock(
name: 'Black',
color: Colors.black,
Expand Down
2 changes: 1 addition & 1 deletion example/lib/widgets/card_highlight.dart
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class _CardHighlightState extends State<CardHighlight>
color: theme.resources.textOnAccentFillColorPrimary,
size: 18,
)
: Row(children: const [
: const Row(children: [
Icon(FluentIcons.copy),
SizedBox(width: 6.0),
Text('Copy')
Expand Down
4 changes: 2 additions & 2 deletions example/lib/widgets/sponsor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class SponsorDialog extends StatelessWidget {
),
],
),
content: Row(
content: const Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: const [
children: [
Expanded(
child: _Tier(
name: 'Royal Secretary',
Expand Down
38 changes: 19 additions & 19 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ packages:
dependency: transitive
description:
name: async
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.10.0"
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
Expand All @@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.3.0"
checked_yaml:
dependency: transitive
description:
Expand Down Expand Up @@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.17.0"
version: "1.17.1"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -241,18 +241,18 @@ packages:
dependency: transitive
description:
name: intl
sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
url: "https://pub.dev"
source: hosted
version: "0.17.0"
version: "0.18.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.6.5"
version: "0.6.7"
json_annotation:
dependency: transitive
description:
Expand Down Expand Up @@ -297,10 +297,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.13"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
Expand All @@ -321,10 +321,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.9.1"
nested:
dependency: transitive
description:
Expand All @@ -337,10 +337,10 @@ packages:
dependency: transitive
description:
name: path
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
url: "https://pub.dev"
source: hosted
version: "1.8.2"
version: "1.8.3"
petitparser:
dependency: transitive
description:
Expand Down Expand Up @@ -462,10 +462,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.4.16"
version: "0.5.1"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -587,5 +587,5 @@ packages:
source: hosted
version: "3.1.1"
sdks:
dart: ">=2.18.5 <3.0.0"
dart: ">=3.0.0-0 <4.0.0"
flutter: ">=3.7.0"
7 changes: 0 additions & 7 deletions lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ class FluentApp extends StatefulWidget {
this.themeMode,
this.restorationScopeId,
this.scrollBehavior = const FluentScrollBehavior(),
this.useInheritedMediaQuery = false,
}) : routeInformationProvider = null,
routeInformationParser = null,
routerDelegate = null,
Expand Down Expand Up @@ -116,7 +115,6 @@ class FluentApp extends StatefulWidget {
this.actions,
this.restorationScopeId,
this.scrollBehavior = const FluentScrollBehavior(),
this.useInheritedMediaQuery = false,
}) : assert(() {
if (routerConfig != null) {
assert(
Expand Down Expand Up @@ -368,9 +366,6 @@ class FluentApp extends StatefulWidget {
/// in a subtree.
final ScrollBehavior scrollBehavior;

/// {@macro flutter.widgets.widgetsApp.useInheritedMediaQuery}
final bool useInheritedMediaQuery;

@override
State<FluentApp> createState() => _FluentAppState();
}
Expand Down Expand Up @@ -500,7 +495,6 @@ class _FluentAppState extends State<FluentApp> {
actions: widget.actions,
restorationScopeId: widget.restorationScopeId,
localizationsDelegates: _localizationsDelegates,
useInheritedMediaQuery: widget.useInheritedMediaQuery,
);
}

Expand Down Expand Up @@ -531,7 +525,6 @@ class _FluentAppState extends State<FluentApp> {
actions: widget.actions,
restorationScopeId: widget.restorationScopeId,
localizationsDelegates: _localizationsDelegates,
useInheritedMediaQuery: widget.useInheritedMediaQuery,
pageRouteBuilder: <T>(RouteSettings settings, WidgetBuilder builder) {
return FluentPageRoute<T>(settings: settings, builder: builder);
},
Expand Down
4 changes: 2 additions & 2 deletions lib/src/controls/form/text_box.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ class _TextBoxSelectionGestureDetectorBuilder
final _TextBoxState _state;

@override
void onSingleTapUp(TapUpDetails details) {
void onSingleTapUp(TapDragUpDetails details) {
super.onSingleTapUp(details);
_state._requestKeyboard();
_state.widget.onTap?.call();
}

@override
void onDragSelectionEnd(DragEndDetails details) {
void onDragSelectionEnd(TapDragEndDetails details) {
_state._requestKeyboard();
}
}
Expand Down
5 changes: 2 additions & 3 deletions lib/src/utils.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:math' as math;
import 'dart:ui' as ui;

import 'package:fluent_ui/fluent_ui.dart';

Expand Down Expand Up @@ -78,8 +77,8 @@ bool debugCheckHasFluentLocalizations(BuildContext context) {
///
/// [width] is the width of the current screen. If not provided,
/// [SingletonFlutterWindow.physicalSize] is used
bool is10footScreen([double? width]) {
width ??= ui.window.physicalSize.width;
bool is10footScreen(BuildContext context) {
final width = View.of(context).physicalSize.width;
return width >= 11520;
}

Expand Down
Loading

0 comments on commit 7021f64

Please sign in to comment.