Skip to content
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

Add setting to control the casing of material3 text #452

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Add setting to control the casing of material3 text #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d864f
Add setting to control the casing of material3 text
Jan 31, 2024
12b2dc5
Update ios project file
Feb 15, 2024
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
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -349,7 +349,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -398,7 +398,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
7 changes: 7 additions & 0 deletions lib/src/platform_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,19 @@ class PlatformSettingsData {
/// Set to true (wrapped) by default which could be a breaking change. If it is then set this value to false
final bool wrapCupertinoAppBarMiddleWithMediaQuery;

/// With Material3 spec defining buttons text as being non ALL CAPS (see https://m3.material.io/components/buttons/overview#388f6096-c34d-4a22-8b1f-11ad69963f7c)
/// If this is set to true then using [PlatformText] with material3 style will default to sentence case and not ALL CAPS. Material 2 will continue to be ALL CAPS
/// If this is set to false then it will default to previous behavour of ALL CAPS.
/// Going forward [PlatformText] will likely be removed when the material3 property on ThemeData is removed and all material widgets will assume material3 style.
final bool matchMaterialCaseForPlatformText;

PlatformSettingsData({
this.iosUsesMaterialWidgets = false,
this.iosUseZeroPaddingForAppbarPlatformIcon = false,
this.legacyIosUsesMaterialWidgets = false,
this.platformStyle = const PlatformStyleData(),
this.wrapCupertinoAppBarMiddleWithMediaQuery = true,
this.matchMaterialCaseForPlatformText = true,
});
}

Expand Down
15 changes: 15 additions & 0 deletions lib/src/platform_text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,27 @@

import 'dart:ui' as ui show TextHeightBehavior;

import 'package:flutter/material.dart' show Theme;
import 'package:flutter/widgets.dart';

import 'platform.dart' show isMaterial;
import 'platform_provider.dart' show PlatformProvider;
import 'platform_theme.dart' show PlatformTheme;

String formatData(BuildContext context, String data) {
if (isMaterial(context)) {
final providerState = PlatformProvider.of(context);
final matchMaterialCaseForPlatformText =
providerState?.settings.matchMaterialCaseForPlatformText ?? true;

final m3 = PlatformTheme.of(context)?.isMaterial3 ??
Theme.of(context).useMaterial3;

// If it material3 and we want to match the casing as defined for material3 then do not return ALL CAPS
if (m3 && matchMaterialCaseForPlatformText) {
return data;
}

return data.toUpperCase();
}
return data;
Expand Down
5 changes: 5 additions & 0 deletions lib/src/platform_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ class _PlatformThemeState extends State<PlatformTheme>
applyToBothDarkAndLightTheme: applyToBothDarkAndLightTheme);
}

bool get isMaterial3 =>
(isDark ? _materialDarkTheme : _materialLightTheme)?.useMaterial3 ??
false;

void _setMaterialThemeType({
required bool? useMaterial3,
bool applyToBothDarkAndLightTheme = false,
Expand Down Expand Up @@ -167,6 +171,7 @@ class PlatformThemeState {
set themeMode(ThemeMode? themeMode) => _parent.themeMode = themeMode;

bool get isDark => _parent.isDark;
bool get isMaterial3 => _parent.isMaterial3;

CupertinoThemeData? get cupertinoLightTheme => _parent._cupertinoLightTheme;
CupertinoThemeData? get cupertinoDarkTheme => _parent._cupertinoDarkTheme;
Expand Down