Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor navigation to community/user pages, and fixes to iOS swipe back not working properly #723

Merged
merged 3 commits into from
Sep 9, 2023
Merged

Refactor navigation to community/user pages, and fixes to iOS swipe back not working properly #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93a456a
refactored code to handle navigateToCommunityPage/nagivateToUserPage,…
hjiangsu Sep 8, 2023
501ec03
Merge branch 'develop' of github.com:thunder-app/thunder into fix/swi…
hjiangsu Sep 8, 2023
7e5bb2b
Merge branch 'develop' of github.com:thunder-app/thunder into fix/swi…
hjiangsu Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 5 additions & 51 deletions lib/community/utils/post_card_action_helpers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import 'package:thunder/shared/picker_item.dart';
import 'package:thunder/shared/snackbar.dart';
import 'package:thunder/thunder/bloc/thunder_bloc.dart';
import 'package:thunder/user/pages/user_page.dart';
import 'package:thunder/utils/navigate_community.dart';
import 'package:thunder/utils/navigate_user.dart';
import 'package:thunder/utils/swipe.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

Expand Down Expand Up @@ -116,23 +118,7 @@ void showPostActionBottomModalSheet(BuildContext context, PostViewMedia postView
onTapCommunityName(context, postViewMedia.postView.community.id);
break;
case PostCardAction.visitProfile:
AccountBloc accountBloc = context.read<AccountBloc>();
AuthBloc authBloc = context.read<AuthBloc>();
ThunderBloc thunderBloc = context.read<ThunderBloc>();

Navigator.of(context).push(
SwipeablePageRoute(
canOnlySwipeFromEdge: disableFullPageSwipe(isUserLoggedIn: authBloc.state.isLoggedIn, state: thunderBloc.state, isFeedPage: true),
builder: (context) => MultiBlocProvider(
providers: [
BlocProvider.value(value: accountBloc),
BlocProvider.value(value: authBloc),
BlocProvider.value(value: thunderBloc),
],
child: UserPage(userId: postViewMedia.postView.post.creatorId),
),
),
);
navigateToUserPage(context, userId: postViewMedia.postView.post.creatorId);
break;
case PostCardAction.sharePost:
Share.share(postViewMedia.postView.post.apId);
Expand Down Expand Up @@ -183,41 +169,9 @@ void showPostActionBottomModalSheet(BuildContext context, PostViewMedia postView
}

void onTapCommunityName(BuildContext context, int communityId) {
AccountBloc accountBloc = context.read<AccountBloc>();
AuthBloc authBloc = context.read<AuthBloc>();
ThunderBloc thunderBloc = context.read<ThunderBloc>();

Navigator.of(context).push(
SwipeablePageRoute(
canOnlySwipeFromEdge: disableFullPageSwipe(isUserLoggedIn: authBloc.state.isLoggedIn, state: thunderBloc.state, isFeedPage: true),
builder: (context) => MultiBlocProvider(
providers: [
BlocProvider.value(value: accountBloc),
BlocProvider.value(value: authBloc),
BlocProvider.value(value: thunderBloc),
],
child: CommunityPage(communityId: communityId),
),
),
);
navigateToCommunityPage(context, communityId: communityId);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we even need these wrapper functions any more, or could we just put navigateToCommunityPage right in the tap handler?

}

void onTapUserName(BuildContext context, int userId) {
AccountBloc accountBloc = context.read<AccountBloc>();
AuthBloc authBloc = context.read<AuthBloc>();
ThunderBloc thunderBloc = context.read<ThunderBloc>();

Navigator.of(context).push(
SwipeablePageRoute(
canOnlySwipeFromEdge: disableFullPageSwipe(isUserLoggedIn: authBloc.state.isLoggedIn, state: thunderBloc.state, isFeedPage: true),
builder: (context) => MultiBlocProvider(
providers: [
BlocProvider.value(value: accountBloc),
BlocProvider.value(value: authBloc),
BlocProvider.value(value: thunderBloc),
],
child: UserPage(userId: userId),
),
),
);
navigateToUserPage(context, userId: userId);
}
27 changes: 9 additions & 18 deletions lib/community/widgets/community_sidebar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import 'package:thunder/core/singletons/preferences.dart';
import 'package:thunder/shared/snackbar.dart';
import 'package:thunder/shared/user_avatar.dart';
import 'package:thunder/utils/instance.dart';
import 'package:thunder/utils/navigate_user.dart';
import 'package:thunder/utils/swipe.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

import '../../shared/common_markdown_body.dart';
Expand Down Expand Up @@ -156,8 +158,11 @@ class _CommunitySidebarState extends State<CommunitySidebar> with TickerProvider
}
});

Navigator.of(context).push(
Navigator.of(context)
.push(
SwipeablePageRoute(
canOnlySwipeFromEdge: true,
backGestureDetectionWidth: 45,
builder: (context) {
return MultiBlocProvider(
providers: [
Expand All @@ -174,7 +179,8 @@ class _CommunitySidebarState extends State<CommunitySidebar> with TickerProvider
);
},
),
).whenComplete(() async {
)
.whenComplete(() async {
timer.cancel();

if (newDraftPost?.saveAsDraft == true && newDraftPost?.isNotEmpty == true) {
Expand Down Expand Up @@ -513,22 +519,7 @@ class _CommunitySidebarState extends State<CommunitySidebar> with TickerProvider
for (var mods in widget.communityInfo!.moderators)
GestureDetector(
onTap: () {
AccountBloc accountBloc = context.read<AccountBloc>();
AuthBloc authBloc = context.read<AuthBloc>();
ThunderBloc thunderBloc = context.read<ThunderBloc>();

Navigator.of(context).push(
SwipeablePageRoute(
builder: (context) => MultiBlocProvider(
providers: [
BlocProvider.value(value: accountBloc),
BlocProvider.value(value: authBloc),
BlocProvider.value(value: thunderBloc),
],
child: UserPage(userId: mods.moderator!.id),
),
),
);
navigateToUserPage(context, userId: mods.moderator!.id);
},
child: Padding(
padding: const EdgeInsets.only(bottom: 8.0),
Expand Down
5 changes: 4 additions & 1 deletion lib/community/widgets/post_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

Expand Down Expand Up @@ -269,7 +271,8 @@ class _PostCardState extends State<PostCard> {

await Navigator.of(context).push(
SwipeablePageRoute(
backGestureDetectionStartOffset: 45,
backGestureDetectionStartOffset: Platform.isAndroid ? 45 : 0,
backGestureDetectionWidth: 45,
canOnlySwipeFromEdge: disableFullPageSwipe(isUserLoggedIn: authBloc.state.isLoggedIn, state: thunderBloc.state, isPostPage: true),
builder: (context) {
return MultiBlocProvider(
Expand Down
8 changes: 6 additions & 2 deletions lib/core/enums/fab_action.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,11 @@ enum FeedFabAction {
}
});

Navigator.of(context).push(
Navigator.of(context)
.push(
SwipeablePageRoute(
canOnlySwipeFromEdge: true,
backGestureDetectionWidth: 45,
builder: (context) {
return MultiBlocProvider(
providers: [
Expand All @@ -157,7 +160,8 @@ enum FeedFabAction {
);
},
),
).whenComplete(() async {
)
.whenComplete(() async {
timer.cancel();

if (newDraftPost?.saveAsDraft == true && newDraftPost?.isNotEmpty == true) {
Expand Down
31 changes: 11 additions & 20 deletions lib/inbox/widgets/inbox_mentions_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:io';
import 'dart:async';
import 'dart:convert';

Expand All @@ -21,6 +22,7 @@ import 'package:thunder/shared/snackbar.dart';
import 'package:thunder/thunder/bloc/thunder_bloc.dart';
import 'package:thunder/utils/date_time.dart';
import 'package:thunder/utils/instance.dart';
import 'package:thunder/utils/navigate_community.dart';
import 'package:thunder/utils/swipe.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

Expand Down Expand Up @@ -53,7 +55,8 @@ class InboxMentionsView extends StatelessWidget {
// To to specific post for now, in the future, will be best to scroll to the position of the comment
await Navigator.of(context).push(
SwipeablePageRoute(
backGestureDetectionStartOffset: 45,
backGestureDetectionStartOffset: Platform.isAndroid ? 45 : 0,
backGestureDetectionWidth: 45,
canOnlySwipeFromEdge: disableFullPageSwipe(isUserLoggedIn: authBloc.state.isLoggedIn, state: thunderBloc.state, isPostPage: true),
builder: (context) => MultiBlocProvider(
providers: [
Expand Down Expand Up @@ -129,8 +132,11 @@ class InboxMentionsView extends StatelessWidget {
}
});

Navigator.of(context).push(
Navigator.of(context)
.push(
SwipeablePageRoute(
canOnlySwipeFromEdge: true,
backGestureDetectionWidth: 45,
builder: (context) {
return MultiBlocProvider(
providers: [
Expand All @@ -147,7 +153,8 @@ class InboxMentionsView extends StatelessWidget {
));
},
),
).whenComplete(() async {
)
.whenComplete(() async {
timer.cancel();

if (newDraftComment?.saveAsDraft == true && newDraftComment?.isNotEmpty == true) {
Expand Down Expand Up @@ -177,22 +184,6 @@ class InboxMentionsView extends StatelessWidget {
}

void onTapCommunityName(BuildContext context, int communityId) {
AccountBloc accountBloc = context.read<AccountBloc>();
AuthBloc authBloc = context.read<AuthBloc>();
ThunderBloc thunderBloc = context.read<ThunderBloc>();

Navigator.of(context).push(
SwipeablePageRoute(
canOnlySwipeFromEdge: disableFullPageSwipe(isUserLoggedIn: authBloc.state.isLoggedIn, state: thunderBloc.state, isFeedPage: true),
builder: (context) => MultiBlocProvider(
providers: [
BlocProvider.value(value: accountBloc),
BlocProvider.value(value: authBloc),
BlocProvider.value(value: thunderBloc),
],
child: CommunityPage(communityId: communityId),
),
),
);
navigateToCommunityPage(context, communityId: communityId);
}
}
Loading