diff --git a/lib/src/core/design_system/components/molecules/create_media_sheet.dart b/lib/src/core/design_system/components/molecules/create_media_sheet.dart index b19ec512..6f25e3d1 100644 --- a/lib/src/core/design_system/components/molecules/create_media_sheet.dart +++ b/lib/src/core/design_system/components/molecules/create_media_sheet.dart @@ -14,58 +14,65 @@ Future showCreateMediaSheet( context: context, backgroundColor: Colors.transparent, builder: (BuildContext context) { - return Container( - padding: const EdgeInsets.all(16), - decoration: BoxDecoration( - color: colorScheme.surface, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(20), - topRight: Radius.circular(20), - ), + return Material( + color: colorScheme.surface, + borderRadius: const BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), ), - child: SafeArea( - child: Wrap( - children: [ - if (onRecord != null) - ListTile( - leading: Icon(Icons.camera_alt, color: colorScheme.onSurface), - title: Text( - 'Record', - style: TextStyle(color: colorScheme.onSurface), - ), - onTap: () { - Navigator.of(context).pop(); - onRecord(); - }, - ), - if (onUploadVideo != null) - ListTile( - leading: Icon(Icons.videocam, color: colorScheme.onSurface), - title: Text( - 'Upload Video', - style: TextStyle(color: colorScheme.onSurface), + clipBehavior: Clip.antiAlias, + child: Padding( + padding: const EdgeInsets.all(16), + child: SafeArea( + child: Wrap( + children: [ + if (onRecord != null) + ListTile( + splashColor: Colors.transparent, + leading: Icon( + Icons.camera_alt, + color: colorScheme.onSurface, + ), + title: Text( + 'Record', + style: TextStyle(color: colorScheme.onSurface), + ), + onTap: () { + Navigator.of(context).pop(); + onRecord(); + }, ), - onTap: () { - Navigator.of(context).pop(); - onUploadVideo(); - }, - ), - if (onUploadImages != null) - ListTile( - leading: Icon( - Icons.photo_library, - color: colorScheme.onSurface, + if (onUploadVideo != null) + ListTile( + splashColor: Colors.transparent, + leading: Icon(Icons.videocam, color: colorScheme.onSurface), + title: Text( + 'Upload Video', + style: TextStyle(color: colorScheme.onSurface), + ), + onTap: () { + Navigator.of(context).pop(); + onUploadVideo(); + }, ), - title: Text( - 'Upload Images', - style: TextStyle(color: colorScheme.onSurface), + if (onUploadImages != null) + ListTile( + splashColor: Colors.transparent, + leading: Icon( + Icons.photo_library, + color: colorScheme.onSurface, + ), + title: Text( + 'Upload Images', + style: TextStyle(color: colorScheme.onSurface), + ), + onTap: () { + Navigator.of(context).pop(); + onUploadImages(); + }, ), - onTap: () { - Navigator.of(context).pop(); - onUploadImages(); - }, - ), - ], + ], + ), ), ), ); diff --git a/lib/src/features/settings/ui/pages/legal_page.dart b/lib/src/features/settings/ui/pages/legal_page.dart index 2f650720..abc7e7fd 100644 --- a/lib/src/features/settings/ui/pages/legal_page.dart +++ b/lib/src/features/settings/ui/pages/legal_page.dart @@ -81,12 +81,12 @@ class LegalPage extends StatelessWidget { itemBuilder: (context, index) { final path = _legalPaths[index]; - return Container( - decoration: BoxDecoration( - color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), - borderRadius: BorderRadius.circular(12), - ), + return Material( + color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: Text( _titleForPath(path, l10n), style: const TextStyle( diff --git a/lib/src/features/settings/ui/pages/settings_page.dart b/lib/src/features/settings/ui/pages/settings_page.dart index 75d80675..bf271c1d 100644 --- a/lib/src/features/settings/ui/pages/settings_page.dart +++ b/lib/src/features/settings/ui/pages/settings_page.dart @@ -122,14 +122,14 @@ class _SettingsPageState extends ConsumerState { children: [ Padding( padding: const EdgeInsets.symmetric(vertical: 8), - child: Container( - decoration: BoxDecoration( - color: Theme.of( - context, - ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), - borderRadius: BorderRadius.circular(12), - ), + child: Material( + color: Theme.of( + context, + ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: Text( l10n.pageTitleYourFeeds, style: const TextStyle( @@ -148,14 +148,14 @@ class _SettingsPageState extends ConsumerState { ), Padding( padding: const EdgeInsets.symmetric(vertical: 8), - child: Container( - decoration: BoxDecoration( - color: Theme.of( - context, - ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), - borderRadius: BorderRadius.circular(12), - ), + child: Material( + color: Theme.of( + context, + ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: Text( l10n.pageTitleLabelers, style: const TextStyle( @@ -175,14 +175,14 @@ class _SettingsPageState extends ConsumerState { ), Padding( padding: const EdgeInsets.symmetric(vertical: 8), - child: Container( - decoration: BoxDecoration( - color: Theme.of( - context, - ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), - borderRadius: BorderRadius.circular(12), - ), + child: Material( + color: Theme.of( + context, + ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: Text( l10n.pageTitleBlockedUsers, style: const TextStyle( @@ -201,14 +201,14 @@ class _SettingsPageState extends ConsumerState { ), Padding( padding: const EdgeInsets.symmetric(vertical: 8), - child: Container( - decoration: BoxDecoration( - color: Theme.of( - context, - ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), - borderRadius: BorderRadius.circular(12), - ), + child: Material( + color: Theme.of( + context, + ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: const Text( 'Manage Account', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), @@ -224,14 +224,14 @@ class _SettingsPageState extends ConsumerState { ), Padding( padding: const EdgeInsets.symmetric(vertical: 8), - child: Container( - decoration: BoxDecoration( - color: Theme.of( - context, - ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), - borderRadius: BorderRadius.circular(12), - ), + child: Material( + color: Theme.of( + context, + ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: const Text( 'Legal', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), @@ -247,14 +247,12 @@ class _SettingsPageState extends ConsumerState { ), Padding( padding: const EdgeInsets.symmetric(vertical: 8), - child: Container( - decoration: BoxDecoration( - color: Theme.of( - context, - ).colorScheme.error.withValues(alpha: 0.1), - borderRadius: BorderRadius.circular(12), - ), + child: Material( + color: Theme.of(context).colorScheme.error.withValues(alpha: 0.1), + borderRadius: BorderRadius.circular(12), + clipBehavior: Clip.antiAlias, child: ListTile( + splashColor: Colors.transparent, title: const Text( 'Logout', style: TextStyle(