From ad2cf6d4f943d1454b0efdd6bb8a0edd7fae7834 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Sat, 13 Mar 2021 15:38:43 +0100 Subject: [PATCH] Continue to fix deprecation warnings --- lib/ui/screens/user_access_denied_screen.dart | 2 +- lib/ui/tiles/post_tile.dart | 15 +++++++-------- lib/ui/widgets/FrienshipStatusWidget.dart | 9 +++++---- lib/ui/widgets/init_widget.dart | 3 +-- lib/ui/widgets/tablet_mode/user_page_tablet.dart | 2 +- lib/utils/files_utils.dart | 4 ++-- lib/utils/post_utils.dart | 2 +- lib/utils/ui_utils.dart | 8 ++++---- 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/lib/ui/screens/user_access_denied_screen.dart b/lib/ui/screens/user_access_denied_screen.dart index 78bf8aa..06e40af 100644 --- a/lib/ui/screens/user_access_denied_screen.dart +++ b/lib/ui/screens/user_access_denied_screen.dart @@ -61,7 +61,7 @@ class _UserAccessDeniedScreenState extends SafeState { Widget _buildPage() { final size = MediaQuery.of(context).size; return Container( - constraints: BoxConstraints.loose(size), + width: size.width, child: SingleChildScrollView( child: Padding( padding: const EdgeInsets.all(8.0), diff --git a/lib/ui/tiles/post_tile.dart b/lib/ui/tiles/post_tile.dart index 3946537..2a54ca7 100644 --- a/lib/ui/tiles/post_tile.dart +++ b/lib/ui/tiles/post_tile.dart @@ -25,6 +25,7 @@ import 'package:comunic/utils/navigation_utils.dart'; import 'package:comunic/utils/post_utils.dart'; import 'package:comunic/utils/ui_utils.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; import 'package:image_picker/image_picker.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -264,9 +265,9 @@ class _PostTileState extends State { } Widget _buildPostYouTube() { - return RaisedButton( - color: Colors.red, - textColor: Colors.white, + return ElevatedButton( + style: + ButtonStyle(backgroundColor: MaterialStateProperty.all(Colors.red)), child: Row( mainAxisSize: MainAxisSize.min, children: [ @@ -321,7 +322,7 @@ class _PostTileState extends State { } Widget _buildPostPDF() { - return RaisedButton.icon( + return ElevatedButton.icon( onPressed: () { launch(widget.post.fileURL); }, @@ -442,8 +443,7 @@ class _PostTileState extends State { // Image button Container( width: 30, - child: FlatButton( - padding: EdgeInsets.only(), + child: TextButton( onPressed: _pickImageForComment, child: Icon( Icons.image, @@ -455,8 +455,7 @@ class _PostTileState extends State { // Submit button Container( width: 40, - child: FlatButton( - padding: EdgeInsets.only(), + child: TextButton( onPressed: _canSubmitComment ? () => _submitComment() : null, child: Icon( Icons.send, diff --git a/lib/ui/widgets/FrienshipStatusWidget.dart b/lib/ui/widgets/FrienshipStatusWidget.dart index 8181712..5cefd8d 100644 --- a/lib/ui/widgets/FrienshipStatusWidget.dart +++ b/lib/ui/widgets/FrienshipStatusWidget.dart @@ -47,7 +47,7 @@ class _FriendshipStatusWidgetState extends State { // No request sent yet if (widget.status.noRequestExchanged) { - return RaisedButton( + return ElevatedButton( child: Text(tr("Send request").toUpperCase()), onPressed: () => executeRequest(() => _friendsHelper.sendRequest(friendID)), @@ -56,12 +56,13 @@ class _FriendshipStatusWidgetState extends State { // Already sent a friendship request if (widget.status.sentRequest) { - return RaisedButton( + return ElevatedButton( child: Text( tr("Cancel request").toUpperCase(), style: WhiteTextColorStyle, ), - color: Colors.red, + style: + ButtonStyle(backgroundColor: MaterialStateProperty.all(Colors.red)), onPressed: () => executeRequest(() => _friendsHelper.cancelRequest(friendID)), ); @@ -94,7 +95,7 @@ class _FriendshipStatusWidgetState extends State { } // The two users are friends, offers to follow him - return RaisedButton( + return ElevatedButton( child: Text((widget.status.following ? tr("Following") : tr("Follow")) .toUpperCase()), onPressed: () => executeRequest(() => diff --git a/lib/ui/widgets/init_widget.dart b/lib/ui/widgets/init_widget.dart index a546200..08c5b29 100644 --- a/lib/ui/widgets/init_widget.dart +++ b/lib/ui/widgets/init_widget.dart @@ -153,8 +153,7 @@ class _InitializeWidgetState extends SafeState { SizedBox( height: 30, ), - RaisedButton( - color: Colors.indigo, + ElevatedButton( onPressed: () => _tryConnect(), child: Text(tr("Try again")), ), diff --git a/lib/ui/widgets/tablet_mode/user_page_tablet.dart b/lib/ui/widgets/tablet_mode/user_page_tablet.dart index 1430915..78d1f91 100644 --- a/lib/ui/widgets/tablet_mode/user_page_tablet.dart +++ b/lib/ui/widgets/tablet_mode/user_page_tablet.dart @@ -135,7 +135,7 @@ class _UserPageTabletState extends State { // Private messages !_isCurrentUser ? Expanded( - child: OutlineButton( + child: OutlinedButton( onPressed: () => openPrivateConversation(context, _userInfo.id), child: Icon(Icons.message), diff --git a/lib/utils/files_utils.dart b/lib/utils/files_utils.dart index e170d0b..61788e8 100644 --- a/lib/utils/files_utils.dart +++ b/lib/utils/files_utils.dart @@ -20,7 +20,7 @@ Future pickImage(BuildContext context) async { title: Text(tr("Choose an image")), actions: [ //Gallery - FlatButton( + TextButton( onPressed: () => Navigator.pop(context, _ChooseImageSource.GALLERY), child: Text( tr("Image gallery").toUpperCase(), @@ -28,7 +28,7 @@ Future pickImage(BuildContext context) async { ), // Camera - FlatButton( + TextButton( onPressed: () => Navigator.pop(context, _ChooseImageSource.CAMERA), child: Text( tr("Camera").toUpperCase(), diff --git a/lib/utils/post_utils.dart b/lib/utils/post_utils.dart index 1fd703d..b3d8075 100644 --- a/lib/utils/post_utils.dart +++ b/lib/utils/post_utils.dart @@ -62,7 +62,7 @@ Future showPostVisibilityPicker({ // Dialog actions actions: [ // Cancel - FlatButton( + TextButton( child: Text(tr("Cancel").toUpperCase()), onPressed: () => Navigator.pop(c, null), ), diff --git a/lib/utils/ui_utils.dart b/lib/utils/ui_utils.dart index 559d098..0082dec 100644 --- a/lib/utils/ui_utils.dart +++ b/lib/utils/ui_utils.dart @@ -169,11 +169,11 @@ class __InputTextDialogState extends State<_InputTextDialog> { ), ), actions: [ - FlatButton( + TextButton( child: Text(tr("Cancel").toUpperCase()), onPressed: () => Navigator.pop(c, false), ), - FlatButton( + TextButton( child: Text(tr("OK")), onPressed: widget.controller.text.length >= widget.minLength ? () => Navigator.pop(c, true) @@ -203,11 +203,11 @@ Future showConfirmDialog({ title: Text(title), content: Text(message), actions: [ - FlatButton( + TextButton( onPressed: () => Navigator.pop(context, false), child: Text(tr("Cancel").toUpperCase()), ), - FlatButton( + TextButton( onPressed: () => Navigator.pop(context, true), child: Text( tr("Confirm").toUpperCase(),