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

Removed Edit Profile button and Added individuals buttons for edit profile pic and bio #293

Closed
wants to merge 6 commits into from
+160 −125
Closed

Removed Edit Profile button and Added individuals buttons for edit profile pic and bio #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd08a01
remove edit profile btn add profile pic & bio btn
developer-rachit Oct 8, 2022
c82076d
red top right
developer-rachit Oct 8, 2022
c6a6d80
alignment set
developer-rachit Oct 18, 2022
63c122f
Merge branch 'development' into rachit/edit-profile-new-design
developer-rachit Oct 20, 2022
d81e0fc
add isBioEditing false
developer-rachit Nov 1, 2022
cb96857
Merge branch 'development' into rachit/edit-profile-new-design
Xazin Nov 28, 2022
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
39 changes: 30 additions & 9 deletions lib/application/user/profile/profile_bloc.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,45 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
await userOrFailure.fold(
(failure) => const ProfileState(
userProfile: null,
isEditing: false,
isPicEditing: false,
isBioEditing: false,
),
(userProfile) => state.copyWith(
userProfile: userProfile,
isEditing: false,
isPicEditing: false,
isBioEditing: false,
),
),
);
});

on<EditProfile>((event, emit) {
emit(state.copyWith(isEditing: true));
on<EditBio>((event, emit) {
emit(state.copyWith(isBioEditing: true));
});

on<SaveProfile>((event, emit) async {
on<EditProfilePic>((event, emit) {
emit(state.copyWith(isPicEditing: true));
});

on<SaveBio>((event, emit) async {
if (event.bio != null) {
await _profileRepository.saveProfile(bio: event.bio);
}

final userOrFailure = await _profileRepository.getUserProfile();

emit(
userOrFailure.fold(
(failure) => state.copyWith(isBioEditing: false),
(userProfile) => state.copyWith(
userProfile: userProfile,
isBioEditing: false,
),
),
);
});

on<SaveProfilePic>((event, emit) async {
final wasImageUpdated = event.image != null;
if (wasImageUpdated) {
await _avatarRepository.uploadAvatar(event.image!);
Expand All @@ -53,18 +74,18 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {

emit(
userOrFailure.fold(
(failure) => state.copyWith(isEditing: false),
(failure) => state.copyWith(isPicEditing: false),
(userProfile) => state.copyWith(
userProfile: userProfile,
isEditing: false,
isPicEditing: false,
wasProfilePictureUpdated: wasImageUpdated,
),
),
);
});

on<CancelEditProfile>((event, emit) {
emit(state.copyWith(isEditing: false));
on<CancelEditProfilePic>((event, emit) {
emit(state.copyWith(isPicEditing: false));
});
}
}
19 changes: 14 additions & 5 deletions lib/application/user/profile/profile_event.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,25 @@ abstract class ProfileEvent {}

class GetUserProfile extends ProfileEvent {}

class EditProfile extends ProfileEvent {}
class EditBio extends ProfileEvent {}

class SaveProfile extends ProfileEvent {
class SaveBio extends ProfileEvent {
final String? bio;
SaveBio({
this.bio,
});
}

class CancelBio extends ProfileEvent {}

class EditProfilePic extends ProfileEvent {}

class SaveProfilePic extends ProfileEvent {
final File? image;

SaveProfile({
this.bio,
SaveProfilePic({
this.image,
});
}

class CancelEditProfile extends ProfileEvent {}
class CancelEditProfilePic extends ProfileEvent {}
18 changes: 12 additions & 6 deletions lib/application/user/profile/profile_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,39 @@ part of 'profile_bloc.dart';
class ProfileState extends Equatable {
const ProfileState({
required this.userProfile,
this.isEditing,
this.isPicEditing,
this.isBioEditing,
this.wasProfilePictureUpdated,
});

final UserProfile? userProfile;
final bool? isEditing;
final bool? isPicEditing;
final bool? isBioEditing;
final bool? wasProfilePictureUpdated;

factory ProfileState.initial() => const ProfileState(
userProfile: null,
isEditing: false,
isPicEditing: false,
isBioEditing: false,
wasProfilePictureUpdated: false,
);

ProfileState copyWith({
UserProfile? userProfile,
bool? isEditing,
bool? isPicEditing,
bool? isBioEditing,
bool? wasProfilePictureUpdated,
}) {
return ProfileState(
userProfile: userProfile ?? this.userProfile,
isEditing: isEditing ?? this.isEditing,
isPicEditing: isPicEditing ?? this.isPicEditing,
isBioEditing: isBioEditing ?? this.isBioEditing,
wasProfilePictureUpdated:
wasProfilePictureUpdated ?? false, // Reset state implicitly
);
}

@override
List<Object?> get props => [userProfile, isEditing, wasProfilePictureUpdated];
List<Object?> get props =>
[userProfile, isPicEditing, isBioEditing, wasProfilePictureUpdated];
}
203 changes: 100 additions & 103 deletions lib/presentation/profile/profile_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,59 @@ class _UserProfilePageState extends State<UserProfilePage> {
maxRadius: 50,
),
),
if (state.isEditing == true) ...[
if (state.userProfile != null) ...[
Positioned(
bottom: 0,
right: 0,
child: FloatingActionButton(
onPressed: () =>
PhotoSelector.showPhotoSelector(
context,
onSelected: (image) {
setState(() => _image = image);
},
),
onPressed: () {
PhotoSelector.showPhotoSelector(
context,
onSelected: (image) {
setState(() => _image = image);
},
);
context
.read<ProfileBloc>()
.add(EditProfilePic());
Copy link
Member

Choose a reason for hiding this comment

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

I don't remember how this works, but shouldn't the image be passed to this event?

},
backgroundColor: kAccentColor,
mini: true,
child: const Icon(Icons.edit),
),
),
],
if (state.isPicEditing == true) ...[
Positioned(
bottom: 0,
right: 0,
child: FloatingActionButton(
onPressed: () {
BlocProvider.of<ProfileBloc>(context)
.add(
SaveProfilePic(
image: _image,
),
);
},
backgroundColor: kAccentColor,
mini: true,
child: const Icon(Icons.add),
child: const Icon(Icons.check),
),
),
Positioned(
bottom: 0,
left: 0,
child: FloatingActionButton(
onPressed: () {
BlocProvider.of<ProfileBloc>(context)
.add(CancelEditProfilePic());

_image = null;
},
backgroundColor: kErrorColor,
mini: true,
child: const Icon(Icons.close),
),
),
]
Expand All @@ -162,17 +200,59 @@ class _UserProfilePageState extends State<UserProfilePage> {
),
if (state.userProfile != null) ...[
const SizedBox(height: 40),
const Text(
'About me',
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 11,
color: Color(0xFF666666),
),
textAlign: TextAlign.left,
Row(
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this could be a Widget itself?

mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'About me',
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 11,
color: Color(0xFF666666),
),
textAlign: TextAlign.left,
),
TextButton(
key: const Key('save_edit_bio_button'),
style: ButtonStyle(
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(200),
),
),
),
onPressed: () {
if (state.isBioEditing == true) {
/// TODO: Implement save profile image
Copy link
Member

Choose a reason for hiding this comment

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

Not relevant comment?


BlocProvider.of<ProfileBloc>(context).add(
SaveBio(
bio: bioController.text,
),
);
} else {
context
.read<ProfileBloc>()
.add(EditBio());
}
},
child: Text(
state.isBioEditing == true
? 'Save changes'
: 'Edit Bio',
style: const TextStyle(
fontSize: 11,
color: kAccentColor,
fontWeight: FontWeight.w700,
),
),
),
],
),
const SizedBox(height: 10),
if (state.isEditing == true) ...[
if (state.isBioEditing == true) ...[
//idhr bio editing start
Copy link
Member

Choose a reason for hiding this comment

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

Remove

Row(
children: [
Expanded(
Expand Down Expand Up @@ -215,8 +295,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
),
const SizedBox(height: 4),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
const SizedBox(width: 16),
Text(
'Maximum 150 characters',
style: Theme.of(context)
Expand Down Expand Up @@ -265,90 +346,6 @@ class _UserProfilePageState extends State<UserProfilePage> {
],
),
),
const SizedBox(height: 40),
TextButton(
key: const Key('save_edit_button'),
style: ButtonStyle(
overlayColor: MaterialStateColor.resolveWith(
(states) => state.isEditing == true
? Colors.white.withOpacity(0.1)
: kAccentColor.withOpacity(0.1),
),
backgroundColor: state.isEditing == true
? MaterialStateProperty.all(
kAccentColor,
)
: null,
minimumSize: MaterialStateProperty.all(
const Size(double.infinity * 0.75, 52),
),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(200),
side: const BorderSide(
color: kAccentColor,
),
),
),
),
onPressed: () {
if (state.isEditing == true) {
BlocProvider.of<ProfileBloc>(context).add(
SaveProfile(
bio: bioController.text,
image: _image,
),
);
} else {
context
.read<ProfileBloc>()
.add(EditProfile());
}
},
child: Text(
state.isEditing == true
? 'Save changes'
: 'Edit profile',
style: TextStyle(
color: state.isEditing == true
? Colors.white
: kAccentColor,
fontWeight: FontWeight.w700,
),
),
),
if (state.isEditing == true) ...[
const SizedBox(height: 10),
TextButton(
key: const Key('cancel_edit_button'),
style: ButtonStyle(
minimumSize: MaterialStateProperty.all(
const Size(double.infinity * 0.75, 52),
),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(200),
),
),
),
onPressed: () {
BlocProvider.of<ProfileBloc>(context)
.add(CancelEditProfile());

_image = null;
bioController.value = TextEditingValue(
text: state.userProfile?.profile.bio ?? '',
);
},
child: const Text(
'Cancel',
style: TextStyle(
color: kAccentColor,
fontWeight: FontWeight.w700,
),
),
),
],
] else ...[
// TODO only for MVP (remove later)
Copy link
Member

Choose a reason for hiding this comment

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

Not sure if this comment is still relevant?

const SizedBox(height: 40),
Expand Down
Loading