Skip to content

Fix: minTextAdapt ignored by default fontSizeResolver (Added FontSizeResolvers.auto) #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emeleonufavour wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: minTextAdapt ignored by default fontSizeResolver (Added FontSizeResolvers.auto) #609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions lib/src/screenutil_init.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ abstract class FontSizeResolvers {
static double diagonal(num fontSize, ScreenUtil instance) {
return instance.diagonal(fontSize);
}

/// This uses the [scaleText] logic that respects [minTextAdapt]
static double auto(num fontSize, ScreenUtil instance) {
return fontSize * instance.scaleText;
}
}

class ScreenUtilInit extends StatefulWidget {
Expand All @@ -78,7 +83,7 @@ class ScreenUtilInit extends StatefulWidget {
this.enableScaleText,
this.responsiveWidgets,
this.excludeWidgets,
this.fontSizeResolver = FontSizeResolvers.width,
this.fontSizeResolver = FontSizeResolvers.auto,
}) : super(key: key);

final ScreenUtilInitBuilder? builder;
Expand All @@ -101,7 +106,8 @@ class ScreenUtilInit extends StatefulWidget {
State<ScreenUtilInit> createState() => _ScreenUtilInitState();
}

class _ScreenUtilInitState extends State<ScreenUtilInit> with WidgetsBindingObserver {
class _ScreenUtilInitState extends State<ScreenUtilInit>
with WidgetsBindingObserver {
final _canMarkedToBuild = HashSet<String>();
final _excludedWidgets = HashSet<String>();
MediaQueryData? _mediaQueryData;
Expand All @@ -114,7 +120,8 @@ class _ScreenUtilInitState extends State<ScreenUtilInit> with WidgetsBindingObse
_canMarkedToBuild.addAll(widget.responsiveWidgets!);
}

ScreenUtil.enableScale(enableWH: widget.enableScaleWH, enableText: widget.enableScaleText);
ScreenUtil.enableScale(
enableWH: widget.enableScaleWH, enableText: widget.enableScaleText);

_validateSize().then(_screenSizeCompleter.complete);

Expand Down