From e719f05705c6ea25560b3a8c41606737811e458c Mon Sep 17 00:00:00 2001 From: Gleb Mihalkov <61373729+luffan@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:13:27 +0300 Subject: [PATCH] Update to 0.4.2 (#76) --- CHANGELOG.md | 3 + example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 2 +- example/ios/Podfile.lock | 27 +--- example/ios/Runner.xcodeproj/project.pbxproj | 31 ++--- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/pubspec.lock | 130 +++++++++++++----- example/pubspec.yaml | 2 +- .../create_edit_suggestion_bottom_sheet.dart | 21 +-- .../pages/suggestion/suggestion_page.dart | 18 +-- .../suggestions/widgets/list_description.dart | 4 +- .../suggestions/widgets/suggestion_card.dart | 2 +- .../widgets/suggestions_tab_bar.dart | 2 +- .../pages/widgets/add_event_photo_button.dart | 9 +- .../pages/widgets/avatar_widget.dart | 4 +- .../confirmation_bottom_sheet.dart | 8 +- .../create_comment_bottom_sheet.dart | 6 +- .../edit_delete_bottom_sheet.dart | 8 +- .../bottom_sheets/label_bottom_sheet.dart | 4 +- .../notification_bottom_sheet.dart | 6 +- .../bottom_sheets/sorting_bottom_sheet.dart | 6 +- .../bottom_sheets/status_bottom_sheet.dart | 4 +- lib/src/presentation/pages/widgets/fab.dart | 2 +- .../pages/widgets/icon_button.dart | 2 +- .../widgets/suggestions_back_button.dart | 2 +- .../widgets/suggestions_radio_button.dart | 8 +- .../pages/widgets/suggestions_switch.dart | 2 +- .../pages/widgets/suggestions_text_field.dart | 14 +- pubspec.yaml | 4 +- 29 files changed, 181 insertions(+), 154 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3edeb40..eab0a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.4.2 +* Updates to support flutter version 3.22.2 + ## 0.4.1 * Updates to support flutter version 3.16.0 diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 88359b2..279576f 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +# platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index e9ce891..042aaa1 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,37 +1,16 @@ PODS: - Flutter (1.0.0) - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) - - path_provider_ios (0.0.1): - - Flutter - - sqflite (0.0.2): - - Flutter - - FMDB (>= 2.7.5) DEPENDENCIES: - Flutter (from `Flutter`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - sqflite (from `.symlinks/plugins/sqflite/ios`) - -SPEC REPOS: - trunk: - - FMDB EXTERNAL SOURCES: Flutter: :path: Flutter - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" - sqflite: - :path: ".symlinks/plugins/sqflite/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 -PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 +PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011 -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 415db97..f0b9ee6 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -139,7 +139,6 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 8099648746AF95F2DD82E533 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -156,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -200,10 +199,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -212,25 +213,9 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8099648746AF95F2DD82E533 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -340,7 +325,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; @@ -417,7 +402,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; @@ -466,7 +451,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; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a..5e31d3d 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.2.0-194.0.dev <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 75276f7..ff2157c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.5 - intl: ^0.18.0 + intl: ^0.19.0 dev_dependencies: flutter_test: diff --git a/lib/src/presentation/pages/suggestion/create_edit/create_edit_suggestion_bottom_sheet.dart b/lib/src/presentation/pages/suggestion/create_edit/create_edit_suggestion_bottom_sheet.dart index 4afebf6..728e11f 100644 --- a/lib/src/presentation/pages/suggestion/create_edit/create_edit_suggestion_bottom_sheet.dart +++ b/lib/src/presentation/pages/suggestion/create_edit/create_edit_suggestion_bottom_sheet.dart @@ -207,9 +207,9 @@ class _CreateEditSuggestionBottomSheet extends StatelessWidget { onOpen: titleFocusNode.requestFocus, onClose: ([_]) => onClose(), backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, - previousNavBarColor: context.theme.colorScheme.background, - previousStatusBarColor: context.theme.colorScheme.surfaceVariant, + context.theme.colorScheme.surface, + previousNavBarColor: context.theme.colorScheme.surface, + previousStatusBarColor: context.theme.colorScheme.surfaceContainerHighest, initialSnapping: 0.85, contentBuilder: (context, sheetState) { return _EditSuggestionBottomSheetListView( @@ -260,7 +260,7 @@ class _LabelItems extends StatelessWidget { AssetStrings.plusIconThickImage, package: AssetStrings.packageName, colorFilter: ColorFilter.mode( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), height: Dimensions.defaultSize, @@ -518,14 +518,14 @@ class _AddButton extends StatelessWidget { ? CircularProgressIndicator( strokeWidth: 1, valueColor: AlwaysStoppedAnimation( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, ), ) : SvgPicture.asset( AssetStrings.plusIconThickImage, package: AssetStrings.packageName, colorFilter: ColorFilter.mode( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), height: isSmall ? Dimensions.smallSize : Dimensions.defaultSize, @@ -567,7 +567,8 @@ class _PhotoPreviewState extends State<_PhotoPreview> { child: SmallPhotoPreview( src: widget.suggestionImages[0], heroTag: 'photo_view', - backgroundColor: context.theme.colorScheme.surfaceVariant, + backgroundColor: + context.theme.colorScheme.surfaceContainerHighest, ), ), if (widget.suggestionImages.length >= 2) @@ -577,7 +578,8 @@ class _PhotoPreviewState extends State<_PhotoPreview> { child: SmallPhotoPreview( src: widget.suggestionImages[1], heroTag: 'photo_view', - backgroundColor: context.theme.colorScheme.surfaceVariant, + backgroundColor: + context.theme.colorScheme.surfaceContainerHighest, ), ), if (widget.suggestionImages.length >= 3) @@ -587,7 +589,8 @@ class _PhotoPreviewState extends State<_PhotoPreview> { child: SmallPhotoPreview( src: widget.suggestionImages[2], heroTag: 'photo_view', - backgroundColor: context.theme.colorScheme.surfaceVariant, + backgroundColor: + context.theme.colorScheme.surfaceContainerHighest, ), ), ], diff --git a/lib/src/presentation/pages/suggestion/suggestion_page.dart b/lib/src/presentation/pages/suggestion/suggestion_page.dart index 6027010..7504f7b 100644 --- a/lib/src/presentation/pages/suggestion/suggestion_page.dart +++ b/lib/src/presentation/pages/suggestion/suggestion_page.dart @@ -276,7 +276,7 @@ class _SuggestionInfo extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: context.theme.colorScheme.surfaceVariant, + color: context.theme.colorScheme.surfaceContainerHighest, padding: const EdgeInsets.only( left: Dimensions.marginDefault, right: Dimensions.marginBig, @@ -333,7 +333,7 @@ class _AttachedImages extends StatelessWidget { right: Dimensions.marginDefault, bottom: Dimensions.marginBig, ), - color: context.theme.colorScheme.surfaceVariant, + color: context.theme.colorScheme.surfaceContainerHighest, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -375,7 +375,7 @@ class _CommentList extends StatelessWidget { children: [ Container( width: double.infinity, - color: context.theme.colorScheme.surfaceVariant, + color: context.theme.colorScheme.surfaceContainerHighest, padding: const EdgeInsets.only( top: Dimensions.marginDefault, left: Dimensions.marginDefault, @@ -415,7 +415,7 @@ class _Avatar extends StatelessWidget { right: Dimensions.marginSmall, ), child: AvatarWidget( - backgroundColor: context.theme.colorScheme.surfaceVariant, + backgroundColor: context.theme.colorScheme.surfaceContainerHighest, avatar: avatar, iconPadding: Dimensions.marginMicro, size: Dimensions.defaultSize, @@ -496,7 +496,7 @@ class _WrappedAttachedImage extends StatelessWidget { : null, initialIndex: images.indexOf(attachedImage), photos: images, - previousNavBarColor: context.theme.colorScheme.background, + previousNavBarColor: context.theme.colorScheme.surface, ); }, ); @@ -533,7 +533,7 @@ class _CommentCard extends StatelessWidget { : null, child: Container( padding: const EdgeInsets.all(Dimensions.marginDefault), - color: context.theme.colorScheme.surfaceVariant, + color: context.theme.colorScheme.surfaceContainerHighest, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -774,10 +774,10 @@ class _NewCommentButton extends StatelessWidget { ), child: FilledButton( style: context.theme.filledButtonTheme.style?.copyWith( - backgroundColor: MaterialStateProperty.resolveWith( + backgroundColor: WidgetStateProperty.resolveWith( (states) => context.theme.colorScheme.secondaryContainer, ), - foregroundColor: MaterialStatePropertyAll( + foregroundColor: WidgetStatePropertyAll( context.theme.colorScheme.onSecondaryContainer, ), ), @@ -848,7 +848,7 @@ class _CommentInfo extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ AvatarWidget( - backgroundColor: context.theme.colorScheme.background, + backgroundColor: context.theme.colorScheme.surface, avatar: author.avatar, size: Dimensions.bigSize, ), diff --git a/lib/src/presentation/pages/suggestions/widgets/list_description.dart b/lib/src/presentation/pages/suggestions/widgets/list_description.dart index 56b7e26..93c937f 100644 --- a/lib/src/presentation/pages/suggestions/widgets/list_description.dart +++ b/lib/src/presentation/pages/suggestions/widgets/list_description.dart @@ -71,7 +71,7 @@ class ListDescription extends StatelessWidget { TextSpan( text: statusHeader, style: context.theme.textTheme.titleMedium?.copyWith( - color: context.theme.colorScheme.onBackground, + color: context.theme.colorScheme.onSurface, ), ), TextSpan( @@ -94,7 +94,7 @@ class ListDescription extends StatelessWidget { horizontal: Dimensions.marginSmall, ), decoration: BoxDecoration( - color: context.theme.colorScheme.surfaceVariant, + color: context.theme.colorScheme.surfaceContainerHighest, borderRadius: const BorderRadius.all( Radius.circular(Dimensions.verySmallCircularRadius), ), diff --git a/lib/src/presentation/pages/suggestions/widgets/suggestion_card.dart b/lib/src/presentation/pages/suggestions/widgets/suggestion_card.dart index fbe6f57..f89b81f 100644 --- a/lib/src/presentation/pages/suggestions/widgets/suggestion_card.dart +++ b/lib/src/presentation/pages/suggestions/widgets/suggestion_card.dart @@ -40,7 +40,7 @@ class _SuggestionCardState extends State { bottom: Dimensions.marginDefault, ), child: Material( - color: context.theme.colorScheme.surfaceVariant, + color: context.theme.colorScheme.surfaceContainerHighest, borderRadius: const BorderRadius.all( Radius.circular(Dimensions.mediumCircularRadius), ), diff --git a/lib/src/presentation/pages/suggestions/widgets/suggestions_tab_bar.dart b/lib/src/presentation/pages/suggestions/widgets/suggestions_tab_bar.dart index 69ea8f1..f6d5246 100644 --- a/lib/src/presentation/pages/suggestions/widgets/suggestions_tab_bar.dart +++ b/lib/src/presentation/pages/suggestions/widgets/suggestions_tab_bar.dart @@ -114,7 +114,7 @@ class _TabIcon extends StatelessWidget { package: AssetStrings.packageName, colorFilter: ColorFilter.mode( isActive - ? context.theme.colorScheme.onBackground + ? context.theme.colorScheme.onSurface : context.theme.colorScheme.onSurfaceVariant, BlendMode.srcIn, ), diff --git a/lib/src/presentation/pages/widgets/add_event_photo_button.dart b/lib/src/presentation/pages/widgets/add_event_photo_button.dart index 3f06d8a..8be09d6 100644 --- a/lib/src/presentation/pages/widgets/add_event_photo_button.dart +++ b/lib/src/presentation/pages/widgets/add_event_photo_button.dart @@ -37,7 +37,7 @@ class AddPhotoButton extends StatelessWidget { ? CircularProgressIndicator( strokeWidth: 1, valueColor: AlwaysStoppedAnimation( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, ), ) : _AddButton( @@ -64,7 +64,7 @@ class _AddButton extends StatelessWidget { package: AssetStrings.packageName, height: Dimensions.defaultSize, colorFilter: ColorFilter.mode( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), @@ -72,8 +72,9 @@ class _AddButton extends StatelessWidget { padding: const EdgeInsets.only(top: Dimensions.marginSmall), child: Text( localization.add, - style: - style.copyWith(color: context.theme.colorScheme.onBackground), + style: style.copyWith( + color: context.theme.colorScheme.onSurface, + ), ), ), ], diff --git a/lib/src/presentation/pages/widgets/avatar_widget.dart b/lib/src/presentation/pages/widgets/avatar_widget.dart index 387d3a2..9081e09 100644 --- a/lib/src/presentation/pages/widgets/avatar_widget.dart +++ b/lib/src/presentation/pages/widgets/avatar_widget.dart @@ -25,7 +25,7 @@ class AvatarWidget extends StatelessWidget { width: size, height: size, decoration: BoxDecoration( - color: backgroundColor ?? context.theme.colorScheme.background, + color: backgroundColor ?? context.theme.colorScheme.surface, borderRadius: BorderRadius.all(Radius.circular(size)), ), child: ClipRRect( @@ -38,7 +38,7 @@ class AvatarWidget extends StatelessWidget { AssetStrings.profileIconImage, package: AssetStrings.packageName, colorFilter: ColorFilter.mode( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/confirmation_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/confirmation_bottom_sheet.dart index e93f7a5..f806749 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/confirmation_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/confirmation_bottom_sheet.dart @@ -37,9 +37,9 @@ class ConfirmationBottomSheet extends StatelessWidget { Widget build(BuildContext context) { return BaseBottomSheet( backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, - previousNavBarColor: context.theme.colorScheme.background, - previousStatusBarColor: context.theme.colorScheme.background, + context.theme.colorScheme.surface, + previousNavBarColor: context.theme.colorScheme.surface, + previousStatusBarColor: context.theme.colorScheme.surface, controller: controller, onClose: ([ClosureType? closureType]) { if (closureType == ClosureType.backButton) { @@ -184,7 +184,7 @@ class _Cancel extends StatelessWidget { width: Dimensions.defaultSize, height: Dimensions.defaultSize, colorFilter: ColorFilter.mode( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/create_comment_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/create_comment_bottom_sheet.dart index 4e54e36..8f9c626 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/create_comment_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/create_comment_bottom_sheet.dart @@ -62,9 +62,9 @@ class _CreateCommentBottomSheetState extends State { onOpen: _inputFocusNode.requestFocus, onClose: ([_]) => widget.onClose(), backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, - previousNavBarColor: context.theme.colorScheme.background, - previousStatusBarColor: context.theme.colorScheme.background, + context.theme.colorScheme.surface, + previousNavBarColor: context.theme.colorScheme.surface, + previousStatusBarColor: context.theme.colorScheme.surface, contentBuilder: (_, __) { return ListView( padding: const EdgeInsets.only( diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/edit_delete_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/edit_delete_bottom_sheet.dart index 5de4674..eb98787 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/edit_delete_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/edit_delete_bottom_sheet.dart @@ -38,9 +38,9 @@ class _EditDeleteSuggestionBottomSheetState controller: widget.controller, onClose: ([_]) => widget.onCancel(), backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, - previousNavBarColor: context.theme.colorScheme.background, - previousStatusBarColor: context.theme.colorScheme.background, + context.theme.colorScheme.surface, + previousNavBarColor: context.theme.colorScheme.surface, + previousStatusBarColor: context.theme.colorScheme.surface, contentBuilder: (context, _) { return ListView( padding: const EdgeInsets.only( @@ -105,7 +105,7 @@ class _EditItem extends StatelessWidget { height: Dimensions.defaultSize, width: Dimensions.defaultSize, colorFilter: ColorFilter.mode( - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/label_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/label_bottom_sheet.dart index 41281be..f0789a7 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/label_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/label_bottom_sheet.dart @@ -44,7 +44,7 @@ class _LabelBottomSheetState extends State { titleBottomPadding: 0, controller: widget.controller, previousNavBarColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, + context.theme.colorScheme.surface, previousStatusBarColor: context.theme.colorScheme.surface, onClose: ([ClosureType? closureType]) async { if (closureType == ClosureType.backButton) { @@ -55,7 +55,7 @@ class _LabelBottomSheetState extends State { } }, backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, + context.theme.colorScheme.surface, contentBuilder: (_, __) { return _LabelsListView( onTap: (label) => setState( diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/notification_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/notification_bottom_sheet.dart index 51fca51..9dfb804 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/notification_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/notification_bottom_sheet.dart @@ -41,9 +41,9 @@ class _NotificationSuggestionBottomSheetState controller: widget.controller, onClose: ([_]) => widget.onCancel(), backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, - previousNavBarColor: context.theme.colorScheme.background, - previousStatusBarColor: context.theme.colorScheme.background, + context.theme.colorScheme.surface, + previousNavBarColor: context.theme.colorScheme.surface, + previousStatusBarColor: context.theme.colorScheme.surface, contentBuilder: (BuildContext context, SheetState sheetState) { return ListView( padding: const EdgeInsets.symmetric( diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/sorting_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/sorting_bottom_sheet.dart index f2bd0e9..56aa83f 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/sorting_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/sorting_bottom_sheet.dart @@ -33,9 +33,9 @@ class _SortingBottomSheetState extends State { controller: _controller, onClose: ([_]) => _onClose(), backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, - previousNavBarColor: context.theme.colorScheme.background, - previousStatusBarColor: context.theme.colorScheme.background, + context.theme.colorScheme.surface, + previousNavBarColor: context.theme.colorScheme.surface, + previousStatusBarColor: context.theme.colorScheme.surface, title: localization.sortBy, contentBuilder: (context, _) { final textStyle = context.theme.textTheme.titleMedium; diff --git a/lib/src/presentation/pages/widgets/bottom_sheets/status_bottom_sheet.dart b/lib/src/presentation/pages/widgets/bottom_sheets/status_bottom_sheet.dart index 64beb59..55c699a 100644 --- a/lib/src/presentation/pages/widgets/bottom_sheets/status_bottom_sheet.dart +++ b/lib/src/presentation/pages/widgets/bottom_sheets/status_bottom_sheet.dart @@ -44,7 +44,7 @@ class _StatusBottomSheetState extends State { titleBottomPadding: 0, controller: widget.controller, previousNavBarColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, + context.theme.colorScheme.surface, previousStatusBarColor: context.theme.colorScheme.surface, onClose: ([ClosureType? closureType]) async { if (closureType == ClosureType.backButton) { @@ -55,7 +55,7 @@ class _StatusBottomSheetState extends State { } }, backgroundColor: context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, + context.theme.colorScheme.surface, contentBuilder: (BuildContext context, SheetState sheetState) { return ListView( padding: const EdgeInsets.only(bottom: Dimensions.marginMiddle), diff --git a/lib/src/presentation/pages/widgets/fab.dart b/lib/src/presentation/pages/widgets/fab.dart index 3ac17b5..cf452f3 100644 --- a/lib/src/presentation/pages/widgets/fab.dart +++ b/lib/src/presentation/pages/widgets/fab.dart @@ -96,7 +96,7 @@ class _SuggestionsFabState extends State width: Dimensions.defaultSize, height: Dimensions.defaultSize, colorFilter: ColorFilter.mode( - widget.iconColor ?? context.theme.colorScheme.onBackground, + widget.iconColor ?? context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/src/presentation/pages/widgets/icon_button.dart b/lib/src/presentation/pages/widgets/icon_button.dart index 2e2c0ea..c228c21 100644 --- a/lib/src/presentation/pages/widgets/icon_button.dart +++ b/lib/src/presentation/pages/widgets/icon_button.dart @@ -47,7 +47,7 @@ class _SuggestionsIconButtonState extends State { colorFilter: ColorFilter.mode( _pressed ? theme.actionPressedColor - : widget.color ?? context.theme.colorScheme.onBackground, + : widget.color ?? context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/src/presentation/pages/widgets/suggestions_back_button.dart b/lib/src/presentation/pages/widgets/suggestions_back_button.dart index 1f5d15a..0f246bd 100644 --- a/lib/src/presentation/pages/widgets/suggestions_back_button.dart +++ b/lib/src/presentation/pages/widgets/suggestions_back_button.dart @@ -31,7 +31,7 @@ class SuggestionsBackButton extends StatelessWidget { width: Dimensions.defaultSize, colorFilter: ColorFilter.mode( context.theme.appBarTheme.iconTheme?.color ?? - context.theme.colorScheme.onBackground, + context.theme.colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/lib/src/presentation/pages/widgets/suggestions_radio_button.dart b/lib/src/presentation/pages/widgets/suggestions_radio_button.dart index f85c385..931cd14 100644 --- a/lib/src/presentation/pages/widgets/suggestions_radio_button.dart +++ b/lib/src/presentation/pages/widgets/suggestions_radio_button.dart @@ -21,20 +21,20 @@ class SuggestionsRadioButton extends StatelessWidget { child: DecoratedBox( decoration: BoxDecoration( border: Border.all( - color: context.theme.colorScheme.onBackground, + color: context.theme.colorScheme.onSurface, width: 0.5, ), color: selected - ? context.theme.colorScheme.onBackground + ? context.theme.colorScheme.onSurface : context.theme.bottomSheetTheme.backgroundColor ?? - context.theme.colorScheme.background, + context.theme.colorScheme.surface, shape: BoxShape.circle, ), child: selected ? Icon( Icons.check, size: Dimensions.smallSize, - color: context.theme.colorScheme.background, + color: context.theme.colorScheme.surface, ) : null, ), diff --git a/lib/src/presentation/pages/widgets/suggestions_switch.dart b/lib/src/presentation/pages/widgets/suggestions_switch.dart index 540afce..4be9b6e 100644 --- a/lib/src/presentation/pages/widgets/suggestions_switch.dart +++ b/lib/src/presentation/pages/widgets/suggestions_switch.dart @@ -16,7 +16,7 @@ class SuggestionsSwitch extends StatelessWidget { return CupertinoSwitch( value: value, activeColor: context.theme.colorScheme.primary, - trackColor: context.theme.colorScheme.background, + trackColor: context.theme.colorScheme.surface, thumbColor: value ? context.theme.colorScheme.onPrimary : context.theme.dividerColor, diff --git a/lib/src/presentation/pages/widgets/suggestions_text_field.dart b/lib/src/presentation/pages/widgets/suggestions_text_field.dart index d2367e0..8e993ed 100644 --- a/lib/src/presentation/pages/widgets/suggestions_text_field.dart +++ b/lib/src/presentation/pages/widgets/suggestions_text_field.dart @@ -48,7 +48,7 @@ class SuggestionsTextField extends StatelessWidget { border: isShowError ? Border.all(color: context.theme.colorScheme.error) : null, - color: context.theme.colorScheme.background, + color: context.theme.colorScheme.surface, borderRadius: BorderRadius.circular( Dimensions.smallCircularRadius, ), @@ -117,7 +117,7 @@ class _CommonTextField extends StatelessWidget { focusNode: focusNode, keyboardAppearance: keyboardAppearance, controller: controller, - cursorColor: context.theme.colorScheme.onBackground, + cursorColor: context.theme.colorScheme.onSurface, style: context.theme.textTheme.bodyMedium, autofocus: autofocus, maxLines: null, @@ -128,9 +128,9 @@ class _CommonTextField extends StatelessWidget { isDense: true, hintText: hintText, hintStyle: context.theme.textTheme.bodyMedium?.copyWith( - color: context.theme.colorScheme.onBackground.withOpacity(0.7), + color: context.theme.colorScheme.onSurface.withOpacity(0.7), ), - fillColor: context.theme.colorScheme.background, + fillColor: context.theme.colorScheme.surface, filled: true, contentPadding: padding, border: const OutlineInputBorder( @@ -190,7 +190,7 @@ class _IosTextField extends StatelessWidget { controller: controller, focusNode: focusNode, keyboardAppearance: keyboardAppearance, - cursorColor: context.theme.colorScheme.onBackground, + cursorColor: context.theme.colorScheme.onSurface, style: context.theme.textTheme.bodyMedium, autofocus: autofocus, maxLines: null, @@ -198,11 +198,11 @@ class _IosTextField extends StatelessWidget { textInputAction: textInputAction, placeholder: hintText, placeholderStyle: context.theme.textTheme.bodyMedium?.copyWith( - color: context.theme.colorScheme.onBackground.withOpacity(0.7), + color: context.theme.colorScheme.onSurface.withOpacity(0.7), ), cursorHeight: 20, decoration: BoxDecoration( - color: context.theme.colorScheme.background, + color: context.theme.colorScheme.surface, borderRadius: const BorderRadius.all( Radius.circular(Dimensions.smallCircularRadius), ), diff --git a/pubspec.yaml b/pubspec.yaml index 41f51f4..5d5d3ad 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: suggest_a_feature description: Ready-made Flutter package for collecting suggestions from users. -version: 0.4.1 +version: 0.4.2 repository: https://github.com/What-the-Flutter/Suggest-a-Feature homepage: https://pub.dev/packages/suggest_a_feature @@ -18,7 +18,7 @@ dependencies: flutter: sdk: flutter flutter_svg: ^2.0.9 - intl: ^0.18.1 + intl: ^0.19.0 wtf_sliding_sheet: ^1.1.3 dev_dependencies: