diff --git a/lib/ui/routes/main_route/main_route.dart b/lib/ui/routes/main_route/main_route.dart index 04d3c93..316611c 100644 --- a/lib/ui/routes/main_route/main_route.dart +++ b/lib/ui/routes/main_route/main_route.dart @@ -101,14 +101,10 @@ abstract class MainController extends State { PageInfo(type: PageType.LATEST_POSTS_PAGE, child: NewestPostsScreen())); /// Open user page - void openUserPage(int userID) { - final key = GlobalKey(); - pushPage(PageInfo( - type: PageType.USER_PAGE, - child: UserPageScreen(userID: userID, key: key), - id: userID, - widgetKey: key)); - } + void openUserPage(int userID) => pushPage(PageInfo( + type: PageType.USER_PAGE, + child: UserPageScreen(userID: userID), + id: userID)); void openUserAccessDeniedPage(int userID) => pushPage(PageInfo(child: UserAccessDeniedScreen(userID: userID))); diff --git a/lib/ui/routes/main_route/page_info.dart b/lib/ui/routes/main_route/page_info.dart index 968f945..9585d27 100644 --- a/lib/ui/routes/main_route/page_info.dart +++ b/lib/ui/routes/main_route/page_info.dart @@ -24,7 +24,6 @@ class PageInfo { /// Unique identification of this child final key = UniqueKey(); - final GlobalKey? widgetKey; PageInfo({ this.type = PageType.OTHER_PAGE, @@ -32,6 +31,5 @@ class PageInfo { this.id, this.hideNavBar = false, this.canShowAsDialog = false, - this.widgetKey }); } diff --git a/lib/ui/screens/user_page_screen.dart b/lib/ui/screens/user_page_screen.dart index 0a9d8ad..fa1a7b9 100644 --- a/lib/ui/screens/user_page_screen.dart +++ b/lib/ui/screens/user_page_screen.dart @@ -20,7 +20,8 @@ enum _PageStatus { LOADING, ERROR, READY } class UserPageScreen extends StatefulWidget { final int userID; - const UserPageScreen({Key? key, required this.userID}) : super(key: key); + const UserPageScreen({Key? key, required this.userID}) + : super(key: key); @override _UserPageScreenState createState() => _UserPageScreenState(); @@ -32,23 +33,18 @@ class _UserPageScreenState extends SafeState { // Objects members _PageStatus _status = _PageStatus.LOADING; - AdvancedUserInfo? _userInfo; + late AdvancedUserInfo _userInfo; FriendStatus? _frienshipStatus; final _refreshIndicatorKey = GlobalKey(); - final _pageKey = GlobalKey(); - _setStatus(_PageStatus s) => setState(() => _status = s); @override void didChangeDependencies() { super.didChangeDependencies(); - if(_userInfo?.id != widget.userID) - _getUserInfo(); + _getUserInfo(); } - - Future _getUserInfo() async { _setStatus(_PageStatus.LOADING); @@ -116,14 +112,12 @@ class _UserPageScreenState extends SafeState { Widget _buildBody() { return isTablet(context) ? UserPageTablet( - key: _pageKey, - userInfo: _userInfo!, + userInfo: _userInfo, onNeedRefresh: () => _refreshIndicatorKey.currentState!.show(), friendshipStatus: _frienshipStatus, ) : UserMobilePage( - key: _pageKey, - userInfo: _userInfo!, + userInfo: _userInfo, onNeedRefresh: () => _refreshIndicatorKey.currentState!.show(), ); } diff --git a/lib/ui/widgets/tablet_mode/user_page_tablet.dart b/lib/ui/widgets/tablet_mode/user_page_tablet.dart index cf02a3c..bac03fb 100644 --- a/lib/ui/widgets/tablet_mode/user_page_tablet.dart +++ b/lib/ui/widgets/tablet_mode/user_page_tablet.dart @@ -38,8 +38,6 @@ class UserPageTablet extends StatefulWidget { } class _UserPageTabletState extends State { - final _formKey = GlobalKey(); - AdvancedUserInfo get _userInfo => widget.userInfo; bool get _isCurrentUser => _userInfo.id == userID(); @@ -72,7 +70,6 @@ class _UserPageTabletState extends State { topWidgets: [ _userInfo.canPostTexts ? PostCreateFormWidget( - key: _formKey, postTarget: PostTarget.USER_PAGE, targetID: _userInfo.id, onCreated: widget.onNeedRefresh,