diff --git a/lib/ui/routes/main_route/main_route.dart b/lib/ui/routes/main_route/main_route.dart index ba252f5..35d5f66 100644 --- a/lib/ui/routes/main_route/main_route.dart +++ b/lib/ui/routes/main_route/main_route.dart @@ -115,8 +115,11 @@ abstract class MainController extends State { id: groupID)); /// Display the list of friends of current user - void openFriendsList() => pushPage( - PageInfo(type: PageType.FRIENDS_LIST_PAGE, child: FriendsListScreen())); + void openFriendsList() => pushPage(PageInfo( + type: PageType.FRIENDS_LIST_PAGE, + child: FriendsListScreen(), + canShowAsDialog: true, + )); /// Open search page void openSearchPage() => pushPage(PageInfo(child: SearchScreen())); @@ -127,7 +130,10 @@ abstract class MainController extends State { /// Display the list of friends of a user void openUserFriendsList(int id) { if (id != userID()) - pushPage(PageInfo(child: OtherUserFriendsListScreen(userID: id))); + pushPage(PageInfo( + child: OtherUserFriendsListScreen(userID: id), + canShowAsDialog: true, + )); else openFriendsList(); } diff --git a/lib/ui/screens/friends_list_screen.dart b/lib/ui/screens/friends_list_screen.dart index 4365671..59465b9 100644 --- a/lib/ui/screens/friends_list_screen.dart +++ b/lib/ui/screens/friends_list_screen.dart @@ -43,7 +43,6 @@ class _FriendsListScreenState extends SafeState { error = _friendsList == null ? _ErrorsLevel.MAJOR : _ErrorsLevel.MINOR; } - @override void didChangeDependencies() { super.didChangeDependencies(); @@ -69,7 +68,7 @@ class _FriendsListScreenState extends SafeState { final list = await _friendsHelper.getList(online: online); // Check if there is no cache yet - if(!online && list.isEmpty) return; + if (!online && list.isEmpty) return; // Check for errors if (list == null) return _gotError(); @@ -103,7 +102,14 @@ class _FriendsListScreenState extends SafeState { ); @override - Widget build(BuildContext context) { + Widget build(BuildContext context) => Scaffold( + appBar: AppBar( + title: Text(tr("Your friends list")), + ), + body: _buildBody(), + ); + + Widget _buildBody() { if (_error == _ErrorsLevel.MAJOR) return _buildError(); if (_friendsList == null) return buildCenteredProgressBar(); @@ -161,23 +167,23 @@ class _FriendsListScreenState extends SafeState { final choice = await showDialog( context: context, builder: (b) => AlertDialog( - title: Text(tr("Delete friend")), - content: Text(tr( - "Are you sure do you want to remove this friend from your list of friends ? A friendship request will have to be sent to get this user back to your list!")), - actions: [ - FlatButton( - onPressed: () => Navigator.pop(context, false), - child: Text(tr("Cancel").toUpperCase()), - ), - FlatButton( - onPressed: () => Navigator.pop(context, true), - child: Text( - tr("Confirm").toUpperCase(), - style: TextStyle(color: Colors.red), - ), - ), - ], + title: Text(tr("Delete friend")), + content: Text(tr( + "Are you sure do you want to remove this friend from your list of friends ? A friendship request will have to be sent to get this user back to your list!")), + actions: [ + FlatButton( + onPressed: () => Navigator.pop(context, false), + child: Text(tr("Cancel").toUpperCase()), ), + FlatButton( + onPressed: () => Navigator.pop(context, true), + child: Text( + tr("Confirm").toUpperCase(), + style: TextStyle(color: Colors.red), + ), + ), + ], + ), ); if (choice == null || !choice) return;