Skip to content

Enhance user profile navigation and details #454

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enhance user profile navigation and details #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 29 additions & 27 deletions lib/src/pages/home/profile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import 'package:http/http.dart' as http;
/// Page that displays the stats of a user registered on BLT,
/// shows dummy data for Guest login.
class UserProfile extends ConsumerStatefulWidget {
final User user;

const UserProfile({
Key? key,
User? user,
required this.user,
}) : super(key: key);

@override
Expand All @@ -19,10 +21,10 @@ class _UserProfileState extends ConsumerState<UserProfile> {
late Future<List<Issue>?> getFlaggedList;

ImageProvider<Object> getProfilePicture() {
if (currentUser!.pfpLink == null) {
if (widget.user.pfpLink == null) {
return AssetImage("assets/default_profile.png");
} else {
return NetworkImage(currentUser!.pfpLink!);
return NetworkImage(widget.user.pfpLink!);
}
}

Expand Down Expand Up @@ -335,30 +337,30 @@ class _UserProfileState extends ConsumerState<UserProfile> {

@override
void initState() {
getLikedList = (currentUser! == guestUser)
getLikedList = (widget.user == guestUser)
? getAnonymousUserIssueList()
: getIssueList(
currentUser!.likedIssueId != null
? (currentUser!.likedIssueId!.length > 0
? currentUser!.likedIssueId!
widget.user.likedIssueId != null
? (widget.user.likedIssueId!.length > 0
? widget.user.likedIssueId!
: null)
: null,
);
getSavedList = (currentUser! == guestUser)
getSavedList = (widget.user == guestUser)
? getAnonymousUserIssueList()
: getIssueList(
currentUser!.savedIssueId != null
? (currentUser!.savedIssueId!.length > 0
? currentUser!.savedIssueId!
widget.user.savedIssueId != null
? (widget.user.savedIssueId!.length > 0
? widget.user.savedIssueId!
: null)
: null,
);
getFlaggedList = (currentUser! == guestUser)
getFlaggedList = (widget.user == guestUser)
? getAnonymousUserIssueList()
: getIssueList(
currentUser!.flaggedIssueId != null
? (currentUser!.flaggedIssueId!.length > 0
? currentUser!.flaggedIssueId!
widget.user.flaggedIssueId != null
? (widget.user.flaggedIssueId!.length > 0
? widget.user.flaggedIssueId!
: null)
: null,
);
Expand All @@ -381,7 +383,7 @@ class _UserProfileState extends ConsumerState<UserProfile> {
Navigator.of(context).pop();
},
),
title: Text(currentUser!.username!),
title: Text(widget.user.username!),
actions: [
IconButton(
onPressed: () async {
Expand Down Expand Up @@ -412,7 +414,7 @@ class _UserProfileState extends ConsumerState<UserProfile> {
AppLocalizations.of(context)!.updatingProfilePicture),
);
ScaffoldMessenger.of(context).showSnackBar(updatingSnack);
await UserApiClient.updatePfp(image, currentUser!);
await UserApiClient.updatePfp(image, widget.user);
setState(() {});
break;

Expand Down Expand Up @@ -472,7 +474,7 @@ class _UserProfileState extends ConsumerState<UserProfile> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
currentUser!.username!,
widget.user.username!,
style: GoogleFonts.ubuntu(
textStyle: TextStyle(
color: Color(0xFFDC4654),
Expand All @@ -482,7 +484,7 @@ class _UserProfileState extends ConsumerState<UserProfile> {
),
),
Text(
'#${currentUser!.id!}',
'#${widget.user.id!}',
style: GoogleFonts.aBeeZee(
textStyle: TextStyle(
color: Color(0xFF737373).withOpacity(0.5),
Expand All @@ -497,8 +499,8 @@ class _UserProfileState extends ConsumerState<UserProfile> {
vertical: 5.0,
),
child: Text(
(currentUser!.description != null)
? currentUser!.description!
(widget.user.description != null)
? widget.user.description!
: AppLocalizations.of(context)!
.noDescriptionWriteOne,
style: GoogleFonts.aBeeZee(
Expand All @@ -511,11 +513,11 @@ class _UserProfileState extends ConsumerState<UserProfile> {
),
),
SizedBox(
child: (currentUser!.following != null)
child: (widget.user.following != null)
? TextButton(
onPressed: () {},
child: Text(
currentUser!.following!.length.toString() +
widget.user.following!.length.toString() +
AppLocalizations.of(context)!.following,
style: GoogleFonts.aBeeZee(
textStyle: TextStyle(
Expand All @@ -531,12 +533,12 @@ class _UserProfileState extends ConsumerState<UserProfile> {
thickness: 2,
),
SizedBox(
child: (currentUser!.following != null)
child: (widget.user.following != null)
? TextButton(
onPressed: () {},
child: Text(
(currentUser!.totalScore != null)
? "${AppLocalizations.of(context)!.score} : ${currentUser!.totalScore!} "
(widget.user.totalScore != null)
? "${AppLocalizations.of(context)!.score} : ${widget.user.totalScore!} "
: "${AppLocalizations.of(context)!.score} : 0 ",
style: GoogleFonts.aBeeZee(
textStyle: TextStyle(
Expand Down Expand Up @@ -732,7 +734,7 @@ class _UserProfileState extends ConsumerState<UserProfile> {
Center(
child: TextButton(
onPressed: () async {
if (currentUser == guestUser) {
if (widget.user == guestUser) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Anonymous User !!")));
} else {
Expand Down
14 changes: 13 additions & 1 deletion lib/src/pages/issues/issue_detail.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,19 @@ class IssueDetailPage extends StatelessWidget {
padding: EdgeInsets.all(0),
selectable: true,
onTapLink: (text, href, title) {
_launchUrl(href!);
if (href != null && href.startsWith('user:')) {
final username = href.substring(5);
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => UserProfile(
user: User(username: username),
),
),
);
} else {
_launchUrl(href!);
}
},
styleSheet: MarkdownStyleSheet.fromTheme(
ThemeData(
Expand Down
11 changes: 10 additions & 1 deletion lib/src/pages/leaderboards/global_leaderboard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,16 @@ class _GlobalLeaderBoardPageState extends State<GlobalLeaderBoardPage> {
itemBuilder: (context, index) {
int title = list[index].title;
return ListTile(
onTap: () {},
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => UserProfile(
user: list[index].user,
),
),
);
},
shape: RoundedRectangleBorder(
borderRadius: index == 0
? BorderRadius.only(
Expand Down
11 changes: 10 additions & 1 deletion lib/src/pages/leaderboards/monthly_leaderboard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,16 @@ class _MonthlyLeaderBoardPageState
itemCount: list.length,
itemBuilder: (context, index) {
return ListTile(
onTap: () {},
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => UserProfile(
user: list[index].user,
),
),
);
},
shape: RoundedRectangleBorder(
borderRadius: index == 0
? BorderRadius.only(
Expand Down
2 changes: 2 additions & 0 deletions lib/src/pages/sizzle/sizzle_state_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:blt/src/models/user_model.dart';

// Define your providers here
final usernameProvider = StateProvider<String?>((ref) => null);
final selectedUserProvider = StateProvider<User?>((ref) => null);
Loading