From 00a3180499d680e550c7e3d03b9a372c8942d8f6 Mon Sep 17 00:00:00 2001 From: amirrezaghabeli Date: Sat, 25 Apr 2026 12:13:49 +0330 Subject: [PATCH] edit key word api added --- lib/data/repositories/profile_repository.dart | 6 + lib/data/services/api/profile_api.dart | 1 + .../model/profile_data/profile_data.dart | 1 + .../profile_data/profile_data.freezed.dart | 51 +-- .../model/profile_data/profile_data.g.dart | 3 + lib/data/services/profile_service.dart | 15 + lib/gen/assets.gen.dart | 4 + lib/view_models/profile_view_model.dart | 21 ++ lib/views/profile/pages/d_profile_page.dart | 3 +- lib/views/profile/pages/m_profile_page.dart | 2 +- .../widgets/edit_key_word_bottom_sheet.dart | 135 ++++++-- .../widgets/location_vottom_sheet.dart | 297 ++++++++++++++++++ lib/views/profile/widgets/subject_tab.dart | 72 ++++- 13 files changed, 542 insertions(+), 69 deletions(-) create mode 100644 lib/views/profile/widgets/location_vottom_sheet.dart diff --git a/lib/data/repositories/profile_repository.dart b/lib/data/repositories/profile_repository.dart index c5a11b7..3d8941f 100644 --- a/lib/data/repositories/profile_repository.dart +++ b/lib/data/repositories/profile_repository.dart @@ -16,4 +16,10 @@ class ProfileRepository { Future> getCompanyProfile() { return _profileService.getCompanyProfile(); } + + Future> updateProfileKeyWords({ + required List keyWords, + }) { + return _profileService.updateProfileKeyWords(keyWords: keyWords); + } } diff --git a/lib/data/services/api/profile_api.dart b/lib/data/services/api/profile_api.dart index c6e2336..6beb9f7 100644 --- a/lib/data/services/api/profile_api.dart +++ b/lib/data/services/api/profile_api.dart @@ -1,4 +1,5 @@ class ProfileApi { static const String profile = '/api/v1/profile'; static const String companyProfile = '/api/v1/companies'; + static const String updateProfileKeyWords = '/api/v1/profile/keywords'; } diff --git a/lib/data/services/model/profile_data/profile_data.dart b/lib/data/services/model/profile_data/profile_data.dart index 7fe2fd7..c7b57df 100644 --- a/lib/data/services/model/profile_data/profile_data.dart +++ b/lib/data/services/model/profile_data/profile_data.dart @@ -25,6 +25,7 @@ abstract class ProfileData with _$ProfileData { @JsonKey(name: 'last_login_at') required int? lastLoginAt, @JsonKey(name: 'created_at') required int? createdAt, @JsonKey(name: 'updated_at') required int? updatedAt, + List? keywords, }) = _ProfileData; factory ProfileData.fromJson(Map json) => diff --git a/lib/data/services/model/profile_data/profile_data.freezed.dart b/lib/data/services/model/profile_data/profile_data.freezed.dart index 7c04a93..9df2dbf 100644 --- a/lib/data/services/model/profile_data/profile_data.freezed.dart +++ b/lib/data/services/model/profile_data/profile_data.freezed.dart @@ -15,7 +15,7 @@ T _$identity(T value) => value; /// @nodoc mixin _$ProfileData { - String? get id;@JsonKey(name: 'full_name') String? get fullName; String? get username; String? get email; String? get role; String? get status; String? get department; String? get position; String? get phone; List? get companies;@JsonKey(name: 'profile_image') String? get profileImage;@JsonKey(name: 'is_verified') bool? get isVerified;@JsonKey(name: 'last_login_at') int? get lastLoginAt;@JsonKey(name: 'created_at') int? get createdAt;@JsonKey(name: 'updated_at') int? get updatedAt; + String? get id;@JsonKey(name: 'full_name') String? get fullName; String? get username; String? get email; String? get role; String? get status; String? get department; String? get position; String? get phone; List? get companies;@JsonKey(name: 'profile_image') String? get profileImage;@JsonKey(name: 'is_verified') bool? get isVerified;@JsonKey(name: 'last_login_at') int? get lastLoginAt;@JsonKey(name: 'created_at') int? get createdAt;@JsonKey(name: 'updated_at') int? get updatedAt; List? get keywords; /// Create a copy of ProfileData /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @@ -28,16 +28,16 @@ $ProfileDataCopyWith get copyWith => _$ProfileDataCopyWithImpl Object.hash(runtimeType,id,fullName,username,email,role,status,department,position,phone,const DeepCollectionEquality().hash(companies),profileImage,isVerified,lastLoginAt,createdAt,updatedAt); +int get hashCode => Object.hash(runtimeType,id,fullName,username,email,role,status,department,position,phone,const DeepCollectionEquality().hash(companies),profileImage,isVerified,lastLoginAt,createdAt,updatedAt,const DeepCollectionEquality().hash(keywords)); @override String toString() { - return 'ProfileData(id: $id, fullName: $fullName, username: $username, email: $email, role: $role, status: $status, department: $department, position: $position, phone: $phone, companies: $companies, profileImage: $profileImage, isVerified: $isVerified, lastLoginAt: $lastLoginAt, createdAt: $createdAt, updatedAt: $updatedAt)'; + return 'ProfileData(id: $id, fullName: $fullName, username: $username, email: $email, role: $role, status: $status, department: $department, position: $position, phone: $phone, companies: $companies, profileImage: $profileImage, isVerified: $isVerified, lastLoginAt: $lastLoginAt, createdAt: $createdAt, updatedAt: $updatedAt, keywords: $keywords)'; } @@ -48,7 +48,7 @@ abstract mixin class $ProfileDataCopyWith<$Res> { factory $ProfileDataCopyWith(ProfileData value, $Res Function(ProfileData) _then) = _$ProfileDataCopyWithImpl; @useResult $Res call({ - String? id,@JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies,@JsonKey(name: 'profile_image') String? profileImage,@JsonKey(name: 'is_verified') bool? isVerified,@JsonKey(name: 'last_login_at') int? lastLoginAt,@JsonKey(name: 'created_at') int? createdAt,@JsonKey(name: 'updated_at') int? updatedAt + String? id,@JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies,@JsonKey(name: 'profile_image') String? profileImage,@JsonKey(name: 'is_verified') bool? isVerified,@JsonKey(name: 'last_login_at') int? lastLoginAt,@JsonKey(name: 'created_at') int? createdAt,@JsonKey(name: 'updated_at') int? updatedAt, List? keywords }); @@ -65,7 +65,7 @@ class _$ProfileDataCopyWithImpl<$Res> /// Create a copy of ProfileData /// with the given fields replaced by the non-null parameter values. -@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? fullName = freezed,Object? username = freezed,Object? email = freezed,Object? role = freezed,Object? status = freezed,Object? department = freezed,Object? position = freezed,Object? phone = freezed,Object? companies = freezed,Object? profileImage = freezed,Object? isVerified = freezed,Object? lastLoginAt = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,}) { +@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? fullName = freezed,Object? username = freezed,Object? email = freezed,Object? role = freezed,Object? status = freezed,Object? department = freezed,Object? position = freezed,Object? phone = freezed,Object? companies = freezed,Object? profileImage = freezed,Object? isVerified = freezed,Object? lastLoginAt = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? keywords = freezed,}) { return _then(_self.copyWith( id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable as String?,fullName: freezed == fullName ? _self.fullName : fullName // ignore: cast_nullable_to_non_nullable @@ -82,7 +82,8 @@ as String?,isVerified: freezed == isVerified ? _self.isVerified : isVerified // as bool?,lastLoginAt: freezed == lastLoginAt ? _self.lastLoginAt : lastLoginAt // ignore: cast_nullable_to_non_nullable as int?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable as int?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable -as int?, +as int?,keywords: freezed == keywords ? _self.keywords : keywords // ignore: cast_nullable_to_non_nullable +as List?, )); } @@ -167,10 +168,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult maybeWhen(TResult Function( String? id, @JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies, @JsonKey(name: 'profile_image') String? profileImage, @JsonKey(name: 'is_verified') bool? isVerified, @JsonKey(name: 'last_login_at') int? lastLoginAt, @JsonKey(name: 'created_at') int? createdAt, @JsonKey(name: 'updated_at') int? updatedAt)? $default,{required TResult orElse(),}) {final _that = this; +@optionalTypeArgs TResult maybeWhen(TResult Function( String? id, @JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies, @JsonKey(name: 'profile_image') String? profileImage, @JsonKey(name: 'is_verified') bool? isVerified, @JsonKey(name: 'last_login_at') int? lastLoginAt, @JsonKey(name: 'created_at') int? createdAt, @JsonKey(name: 'updated_at') int? updatedAt, List? keywords)? $default,{required TResult orElse(),}) {final _that = this; switch (_that) { case _ProfileData() when $default != null: -return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_that.status,_that.department,_that.position,_that.phone,_that.companies,_that.profileImage,_that.isVerified,_that.lastLoginAt,_that.createdAt,_that.updatedAt);case _: +return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_that.status,_that.department,_that.position,_that.phone,_that.companies,_that.profileImage,_that.isVerified,_that.lastLoginAt,_that.createdAt,_that.updatedAt,_that.keywords);case _: return orElse(); } @@ -188,10 +189,10 @@ return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_t /// } /// ``` -@optionalTypeArgs TResult when(TResult Function( String? id, @JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies, @JsonKey(name: 'profile_image') String? profileImage, @JsonKey(name: 'is_verified') bool? isVerified, @JsonKey(name: 'last_login_at') int? lastLoginAt, @JsonKey(name: 'created_at') int? createdAt, @JsonKey(name: 'updated_at') int? updatedAt) $default,) {final _that = this; +@optionalTypeArgs TResult when(TResult Function( String? id, @JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies, @JsonKey(name: 'profile_image') String? profileImage, @JsonKey(name: 'is_verified') bool? isVerified, @JsonKey(name: 'last_login_at') int? lastLoginAt, @JsonKey(name: 'created_at') int? createdAt, @JsonKey(name: 'updated_at') int? updatedAt, List? keywords) $default,) {final _that = this; switch (_that) { case _ProfileData(): -return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_that.status,_that.department,_that.position,_that.phone,_that.companies,_that.profileImage,_that.isVerified,_that.lastLoginAt,_that.createdAt,_that.updatedAt);case _: +return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_that.status,_that.department,_that.position,_that.phone,_that.companies,_that.profileImage,_that.isVerified,_that.lastLoginAt,_that.createdAt,_that.updatedAt,_that.keywords);case _: throw StateError('Unexpected subclass'); } @@ -208,10 +209,10 @@ return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_t /// } /// ``` -@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? id, @JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies, @JsonKey(name: 'profile_image') String? profileImage, @JsonKey(name: 'is_verified') bool? isVerified, @JsonKey(name: 'last_login_at') int? lastLoginAt, @JsonKey(name: 'created_at') int? createdAt, @JsonKey(name: 'updated_at') int? updatedAt)? $default,) {final _that = this; +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? id, @JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies, @JsonKey(name: 'profile_image') String? profileImage, @JsonKey(name: 'is_verified') bool? isVerified, @JsonKey(name: 'last_login_at') int? lastLoginAt, @JsonKey(name: 'created_at') int? createdAt, @JsonKey(name: 'updated_at') int? updatedAt, List? keywords)? $default,) {final _that = this; switch (_that) { case _ProfileData() when $default != null: -return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_that.status,_that.department,_that.position,_that.phone,_that.companies,_that.profileImage,_that.isVerified,_that.lastLoginAt,_that.createdAt,_that.updatedAt);case _: +return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_that.status,_that.department,_that.position,_that.phone,_that.companies,_that.profileImage,_that.isVerified,_that.lastLoginAt,_that.createdAt,_that.updatedAt,_that.keywords);case _: return null; } @@ -223,7 +224,7 @@ return $default(_that.id,_that.fullName,_that.username,_that.email,_that.role,_t @JsonSerializable() class _ProfileData implements ProfileData { - const _ProfileData({required this.id, @JsonKey(name: 'full_name') required this.fullName, required this.username, required this.email, required this.role, required this.status, required this.department, required this.position, required this.phone, required final List? companies, @JsonKey(name: 'profile_image') required this.profileImage, @JsonKey(name: 'is_verified') required this.isVerified, @JsonKey(name: 'last_login_at') required this.lastLoginAt, @JsonKey(name: 'created_at') required this.createdAt, @JsonKey(name: 'updated_at') required this.updatedAt}): _companies = companies; + const _ProfileData({required this.id, @JsonKey(name: 'full_name') required this.fullName, required this.username, required this.email, required this.role, required this.status, required this.department, required this.position, required this.phone, required final List? companies, @JsonKey(name: 'profile_image') required this.profileImage, @JsonKey(name: 'is_verified') required this.isVerified, @JsonKey(name: 'last_login_at') required this.lastLoginAt, @JsonKey(name: 'created_at') required this.createdAt, @JsonKey(name: 'updated_at') required this.updatedAt, final List? keywords}): _companies = companies,_keywords = keywords; factory _ProfileData.fromJson(Map json) => _$ProfileDataFromJson(json); @override final String? id; @@ -249,6 +250,15 @@ class _ProfileData implements ProfileData { @override@JsonKey(name: 'last_login_at') final int? lastLoginAt; @override@JsonKey(name: 'created_at') final int? createdAt; @override@JsonKey(name: 'updated_at') final int? updatedAt; + final List? _keywords; +@override List? get keywords { + final value = _keywords; + if (value == null) return null; + if (_keywords is EqualUnmodifiableListView) return _keywords; + // ignore: implicit_dynamic_type + return EqualUnmodifiableListView(value); +} + /// Create a copy of ProfileData /// with the given fields replaced by the non-null parameter values. @@ -263,16 +273,16 @@ Map toJson() { @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is _ProfileData&&(identical(other.id, id) || other.id == id)&&(identical(other.fullName, fullName) || other.fullName == fullName)&&(identical(other.username, username) || other.username == username)&&(identical(other.email, email) || other.email == email)&&(identical(other.role, role) || other.role == role)&&(identical(other.status, status) || other.status == status)&&(identical(other.department, department) || other.department == department)&&(identical(other.position, position) || other.position == position)&&(identical(other.phone, phone) || other.phone == phone)&&const DeepCollectionEquality().equals(other._companies, _companies)&&(identical(other.profileImage, profileImage) || other.profileImage == profileImage)&&(identical(other.isVerified, isVerified) || other.isVerified == isVerified)&&(identical(other.lastLoginAt, lastLoginAt) || other.lastLoginAt == lastLoginAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is _ProfileData&&(identical(other.id, id) || other.id == id)&&(identical(other.fullName, fullName) || other.fullName == fullName)&&(identical(other.username, username) || other.username == username)&&(identical(other.email, email) || other.email == email)&&(identical(other.role, role) || other.role == role)&&(identical(other.status, status) || other.status == status)&&(identical(other.department, department) || other.department == department)&&(identical(other.position, position) || other.position == position)&&(identical(other.phone, phone) || other.phone == phone)&&const DeepCollectionEquality().equals(other._companies, _companies)&&(identical(other.profileImage, profileImage) || other.profileImage == profileImage)&&(identical(other.isVerified, isVerified) || other.isVerified == isVerified)&&(identical(other.lastLoginAt, lastLoginAt) || other.lastLoginAt == lastLoginAt)&&(identical(other.createdAt, createdAt) || other.createdAt == createdAt)&&(identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt)&&const DeepCollectionEquality().equals(other._keywords, _keywords)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,id,fullName,username,email,role,status,department,position,phone,const DeepCollectionEquality().hash(_companies),profileImage,isVerified,lastLoginAt,createdAt,updatedAt); +int get hashCode => Object.hash(runtimeType,id,fullName,username,email,role,status,department,position,phone,const DeepCollectionEquality().hash(_companies),profileImage,isVerified,lastLoginAt,createdAt,updatedAt,const DeepCollectionEquality().hash(_keywords)); @override String toString() { - return 'ProfileData(id: $id, fullName: $fullName, username: $username, email: $email, role: $role, status: $status, department: $department, position: $position, phone: $phone, companies: $companies, profileImage: $profileImage, isVerified: $isVerified, lastLoginAt: $lastLoginAt, createdAt: $createdAt, updatedAt: $updatedAt)'; + return 'ProfileData(id: $id, fullName: $fullName, username: $username, email: $email, role: $role, status: $status, department: $department, position: $position, phone: $phone, companies: $companies, profileImage: $profileImage, isVerified: $isVerified, lastLoginAt: $lastLoginAt, createdAt: $createdAt, updatedAt: $updatedAt, keywords: $keywords)'; } @@ -283,7 +293,7 @@ abstract mixin class _$ProfileDataCopyWith<$Res> implements $ProfileDataCopyWith factory _$ProfileDataCopyWith(_ProfileData value, $Res Function(_ProfileData) _then) = __$ProfileDataCopyWithImpl; @override @useResult $Res call({ - String? id,@JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies,@JsonKey(name: 'profile_image') String? profileImage,@JsonKey(name: 'is_verified') bool? isVerified,@JsonKey(name: 'last_login_at') int? lastLoginAt,@JsonKey(name: 'created_at') int? createdAt,@JsonKey(name: 'updated_at') int? updatedAt + String? id,@JsonKey(name: 'full_name') String? fullName, String? username, String? email, String? role, String? status, String? department, String? position, String? phone, List? companies,@JsonKey(name: 'profile_image') String? profileImage,@JsonKey(name: 'is_verified') bool? isVerified,@JsonKey(name: 'last_login_at') int? lastLoginAt,@JsonKey(name: 'created_at') int? createdAt,@JsonKey(name: 'updated_at') int? updatedAt, List? keywords }); @@ -300,7 +310,7 @@ class __$ProfileDataCopyWithImpl<$Res> /// Create a copy of ProfileData /// with the given fields replaced by the non-null parameter values. -@override @pragma('vm:prefer-inline') $Res call({Object? id = freezed,Object? fullName = freezed,Object? username = freezed,Object? email = freezed,Object? role = freezed,Object? status = freezed,Object? department = freezed,Object? position = freezed,Object? phone = freezed,Object? companies = freezed,Object? profileImage = freezed,Object? isVerified = freezed,Object? lastLoginAt = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,}) { +@override @pragma('vm:prefer-inline') $Res call({Object? id = freezed,Object? fullName = freezed,Object? username = freezed,Object? email = freezed,Object? role = freezed,Object? status = freezed,Object? department = freezed,Object? position = freezed,Object? phone = freezed,Object? companies = freezed,Object? profileImage = freezed,Object? isVerified = freezed,Object? lastLoginAt = freezed,Object? createdAt = freezed,Object? updatedAt = freezed,Object? keywords = freezed,}) { return _then(_ProfileData( id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable as String?,fullName: freezed == fullName ? _self.fullName : fullName // ignore: cast_nullable_to_non_nullable @@ -317,7 +327,8 @@ as String?,isVerified: freezed == isVerified ? _self.isVerified : isVerified // as bool?,lastLoginAt: freezed == lastLoginAt ? _self.lastLoginAt : lastLoginAt // ignore: cast_nullable_to_non_nullable as int?,createdAt: freezed == createdAt ? _self.createdAt : createdAt // ignore: cast_nullable_to_non_nullable as int?,updatedAt: freezed == updatedAt ? _self.updatedAt : updatedAt // ignore: cast_nullable_to_non_nullable -as int?, +as int?,keywords: freezed == keywords ? _self._keywords : keywords // ignore: cast_nullable_to_non_nullable +as List?, )); } diff --git a/lib/data/services/model/profile_data/profile_data.g.dart b/lib/data/services/model/profile_data/profile_data.g.dart index 30cfd4b..64c27a6 100644 --- a/lib/data/services/model/profile_data/profile_data.g.dart +++ b/lib/data/services/model/profile_data/profile_data.g.dart @@ -25,6 +25,8 @@ _ProfileData _$ProfileDataFromJson(Map json) => _ProfileData( lastLoginAt: (json['last_login_at'] as num?)?.toInt(), createdAt: (json['created_at'] as num?)?.toInt(), updatedAt: (json['updated_at'] as num?)?.toInt(), + keywords: + (json['keywords'] as List?)?.map((e) => e as String).toList(), ); Map _$ProfileDataToJson(_ProfileData instance) => @@ -44,4 +46,5 @@ Map _$ProfileDataToJson(_ProfileData instance) => 'last_login_at': instance.lastLoginAt, 'created_at': instance.createdAt, 'updated_at': instance.updatedAt, + 'keywords': instance.keywords, }; diff --git a/lib/data/services/profile_service.dart b/lib/data/services/profile_service.dart index 8e52722..0515f9c 100644 --- a/lib/data/services/profile_service.dart +++ b/lib/data/services/profile_service.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:tm_app/data/services/api/profile_api.dart'; import 'package:tm_app/data/services/model/company_profile_response/company_profile_response.dart'; import 'package:tm_app/data/services/model/profile_response/profile_response.dart'; @@ -28,4 +30,17 @@ class ProfileService { ); return result; } + + Future> updateProfileKeyWords({ + required List keyWords, + }) async { + Map data = {'keywords': keyWords}; + final result = await _networkManager.makeRequest( + ProfileApi.updateProfileKeyWords, + method: 'PUT', + data: jsonEncode(data), + (json) => ProfileResponse.fromJson(json), + ); + return result; + } } diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 11c769e..695fe8f 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -77,6 +77,9 @@ class $AssetsIconsGen { /// File path: assets/icons/edit.svg String get edit => 'assets/icons/edit.svg'; + /// File path: assets/icons/editting.svg + String get editting => 'assets/icons/editting.svg'; + /// File path: assets/icons/filter.svg String get filter => 'assets/icons/filter.svg'; @@ -200,6 +203,7 @@ class $AssetsIconsGen { danger, dislike, edit, + editting, filter, home, homeActive, diff --git a/lib/view_models/profile_view_model.dart b/lib/view_models/profile_view_model.dart index eb99915..fa2667a 100644 --- a/lib/view_models/profile_view_model.dart +++ b/lib/view_models/profile_view_model.dart @@ -94,4 +94,25 @@ class ProfileViewModel with ChangeNotifier { _loggedOut = false; notifyListeners(); } + + Future updateProfileKeyWords({required List keyWords}) async { + _isLoading = true; + _errorMessage = null; + notifyListeners(); + final result = await _profileRepository.updateProfileKeyWords( + keyWords: keyWords, + ); + switch (result) { + case Ok(): + _profileData = result.value.data; + break; + case Error(): + _errorMessage = result.error.toString(); + break; + } + _isLoading = false; + notifyListeners(); + _errorMessage = null; + notifyListeners(); + } } diff --git a/lib/views/profile/pages/d_profile_page.dart b/lib/views/profile/pages/d_profile_page.dart index eb6cdc9..61ebc05 100644 --- a/lib/views/profile/pages/d_profile_page.dart +++ b/lib/views/profile/pages/d_profile_page.dart @@ -12,6 +12,7 @@ import '../strings/profile_strings.dart'; import '../widgets/main_data_tab.dart'; import '../widgets/members_tab.dart'; import '../widgets/profile_tab_bar.dart'; +import '../widgets/subject_tab.dart'; class DesktopProfilePage extends StatefulWidget { const DesktopProfilePage({super.key}); @@ -98,7 +99,7 @@ class _DesktopProfilePageState extends State onLogout: () => viewModel.logout(), ), const MembersTab(), - const Center(child: Text('Subject Tab Content')), + const SubjectTab(), ], ), ), diff --git a/lib/views/profile/pages/m_profile_page.dart b/lib/views/profile/pages/m_profile_page.dart index 9715c4a..9b9e616 100644 --- a/lib/views/profile/pages/m_profile_page.dart +++ b/lib/views/profile/pages/m_profile_page.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tm_app/core/routes/app_routes.dart'; import 'package:tm_app/view_models/profile_view_model.dart'; -import 'package:tm_app/views/profile/widgets/main_data_tab.dart'; import '../../../core/constants/common_strings.dart'; import '../../../core/theme/colors.dart'; @@ -11,6 +10,7 @@ import '../../../core/utils/size_config.dart'; import '../../../view_models/auth_view_model.dart'; import '../../shared/tender_app_bar.dart'; import '../strings/profile_strings.dart'; +import '../widgets/main_data_tab.dart'; import '../widgets/members_tab.dart'; import '../widgets/profile_tab_bar.dart'; import '../widgets/subject_tab.dart'; diff --git a/lib/views/profile/widgets/edit_key_word_bottom_sheet.dart b/lib/views/profile/widgets/edit_key_word_bottom_sheet.dart index 9ec3a52..1a32b8d 100644 --- a/lib/views/profile/widgets/edit_key_word_bottom_sheet.dart +++ b/lib/views/profile/widgets/edit_key_word_bottom_sheet.dart @@ -1,29 +1,53 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:go_router/go_router.dart'; import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/views/login/widgets/widgets.dart'; import '../../../core/constants/assets.dart'; import '../../../core/theme/colors.dart'; -class EditKeyWordBottomSheet extends StatelessWidget { - const EditKeyWordBottomSheet({super.key}); +class EditKeyWordBottomSheet extends StatefulWidget { + const EditKeyWordBottomSheet({ + required this.keyWords, + required this.isDesktop, + this.onSubmit, + super.key, + }); + final List keyWords; + final Future Function(List keyWords)? onSubmit; + final bool isDesktop; + @override + State createState() => _EditKeyWordBottomSheetState(); +} + +class _EditKeyWordBottomSheetState extends State { + final TextEditingController _controller = TextEditingController(); + final FocusNode _focusNode = FocusNode(); + late final List _keywords = List.from(widget.keyWords); @override Widget build(BuildContext context) { return Wrap( children: [ Container( width: double.infinity, - padding: EdgeInsets.symmetric( - horizontal: 24.0.w(), - vertical: 24.0.h(), + padding: EdgeInsets.only( + left: 24.0.w(), + right: 24.0.w(), + top: 24.0.h(), + bottom: MediaQuery.of(context).viewInsets.bottom, ), decoration: BoxDecoration( color: AppColors.backgroundColor, - borderRadius: const BorderRadius.vertical(top: Radius.circular(24)), + borderRadius: BorderRadius.vertical( + top: const Radius.circular(24), + bottom: + widget.isDesktop ? const Radius.circular(24) : Radius.zero, + ), ), child: Column( + mainAxisSize: MainAxisSize.min, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -35,14 +59,17 @@ class EditKeyWordBottomSheet extends StatelessWidget { fontWeight: FontWeight.w600, ), ), - SvgPicture.asset( - AssetsManager.closeCircle, - width: 20.0.w(), - height: 20.0.w(), - fit: BoxFit.cover, - colorFilter: ColorFilter.mode( - AppColors.grey60, - BlendMode.srcIn, + IconButton( + onPressed: () => context.pop(), + icon: SvgPicture.asset( + AssetsManager.closeCircle, + width: 20.0.w(), + height: 20.0.w(), + fit: BoxFit.cover, + colorFilter: ColorFilter.mode( + AppColors.grey60, + BlendMode.srcIn, + ), ), ), ], @@ -51,6 +78,22 @@ class EditKeyWordBottomSheet extends StatelessWidget { Divider(color: AppColors.grey20), SizedBox(height: 24.0.h()), TextField( + focusNode: _focusNode, + controller: _controller, + onSubmitted: (value) { + if (value.trim().isEmpty) { + return; + } + + setState(() { + _keywords.add(value); + }); + _controller.clear(); + + Future.delayed(const Duration(milliseconds: 50), () { + _focusNode.requestFocus(); + }); + }, decoration: InputDecoration( hintText: 'Key Word', hintStyle: TextStyle( @@ -77,22 +120,40 @@ class EditKeyWordBottomSheet extends StatelessWidget { ), ), SizedBox(height: 16.0.h()), - Wrap( - spacing: 8, - runSpacing: 16.0.h(), - children: [ - _chip(label: 'UIUX', backgroundColor: Colors.green[200]!), - _chip( - label: 'Lorem ipsum', - backgroundColor: Colors.orange[100]!, + SizedBox( + height: 200.0.h(), // Set a fixed height for the container + child: SingleChildScrollView( + child: Wrap( + spacing: 8, + runSpacing: 16.0.h(), + children: + _keywords + .map( + (e) => _chip( + label: e, + backgroundColor: Colors.green[200]!, + onDelete: + () => setState(() { + _keywords.remove(e); + }), + ), + ) + .toList(), + // [ + // _chip(label: 'UIUX', backgroundColor: Colors.green[200]!), + // _chip( + // label: 'Lorem ipsum', + // backgroundColor: Colors.orange[100]!, + // ), + // _chip(label: 'sample', backgroundColor: Colors.grey[300]!), + // _chip(label: 'Unknown', backgroundColor: Colors.red[200]!), + // _chip( + // label: 'Lorem ipsum 02', + // backgroundColor: Colors.blue[100]!, + // ), + // ], ), - _chip(label: 'sample', backgroundColor: Colors.grey[300]!), - _chip(label: 'Unknown', backgroundColor: Colors.red[200]!), - _chip( - label: 'Lorem ipsum 02', - backgroundColor: Colors.blue[100]!, - ), - ], + ), ), SizedBox(height: 32.0.h()), BaseButton( @@ -100,8 +161,14 @@ class EditKeyWordBottomSheet extends StatelessWidget { text: 'Submit Request', backgroundColor: AppColors.primary20, textColor: AppColors.mainBlue, - onPressed: () {}, + onPressed: () async { + await widget.onSubmit?.call(_keywords); + if (context.mounted) { + context.pop(); + } + }, ), + SizedBox(height: 24.0.h()), ], ), ), @@ -109,11 +176,15 @@ class EditKeyWordBottomSheet extends StatelessWidget { ); } - Widget _chip({required String label, required Color backgroundColor}) { + Widget _chip({ + required String label, + required Color backgroundColor, + required VoidCallback onDelete, + }) { return InputChip( label: Text(label), backgroundColor: backgroundColor, - onDeleted: () {}, + onDeleted: onDelete, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(8), side: const BorderSide(color: Colors.transparent), diff --git a/lib/views/profile/widgets/location_vottom_sheet.dart b/lib/views/profile/widgets/location_vottom_sheet.dart new file mode 100644 index 0000000..448851d --- /dev/null +++ b/lib/views/profile/widgets/location_vottom_sheet.dart @@ -0,0 +1,297 @@ +import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; +import 'package:tm_app/core/utils/size_config.dart'; + +// Note: Ensure your size_config and theme imports are present +// import 'package:tm_app/core/utils/size_config.dart'; +// import 'package:tm_app/core/theme/colors.dart'; + +class EditKeyWordBottomSheet extends StatefulWidget { + const EditKeyWordBottomSheet({super.key}); + + @override + State createState() => _EditKeyWordBottomSheetState(); +} + +class _EditKeyWordBottomSheetState extends State { + final List _keywords = [ + '1234', + 'Lorem ipsum', + 'sample', + 'Unknown', + 'Lorem ipsum 02', + ]; + + // Location selection state + bool _isDropdownOpen = false; + final List> _selectedCountries = [ + {'code': 'NO', 'name': 'Norway', 'flag': 'πŸ‡³πŸ‡΄'}, + {'code': 'SE', 'name': 'Sweden', 'flag': 'πŸ‡ΈπŸ‡ͺ'}, + ]; + + final List> _allCountries = [ + {'code': 'AU', 'name': 'Australia', 'flag': 'πŸ‡¦πŸ‡Ί'}, + {'code': 'AT', 'name': 'Austria', 'flag': 'πŸ‡¦πŸ‡Ή'}, + {'code': 'AZ', 'name': 'Azerbaijan', 'flag': 'πŸ‡¦πŸ‡Ώ'}, + {'code': 'BS', 'name': 'Bahamas', 'flag': 'πŸ‡§πŸ‡Έ'}, + {'code': 'BH', 'name': 'Bahrain', 'flag': 'πŸ‡§πŸ‡­'}, + ]; + + @override + Widget build(BuildContext context) { + return Container( + width: double.infinity, + padding: EdgeInsets.only( + left: 24.0.w(), + right: 24.0.w(), + top: 24.0.h(), + bottom: MediaQuery.of(context).viewInsets.bottom + 24.0.h(), + ), + decoration: const BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.vertical(top: Radius.circular(32)), + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // KEY WORD SECTION + _buildSectionHeader('Key Word'), + SizedBox(height: 16.0.h()), + Wrap( + spacing: 8, + runSpacing: 12.0.h(), + children: _keywords.map((e) => _buildKeywordChip(e)).toList(), + ), + + SizedBox(height: 32.0.h()), + const Divider(color: Color(0xFFF1F1F1)), + SizedBox(height: 24.0.h()), + + // LOCATION SECTION + _buildSectionHeader('Location'), + SizedBox(height: 16.0.h()), + + Stack( + clipBehavior: Clip.none, + children: [ + // 1. Selected Country Chips (Below the input) + Padding( + padding: EdgeInsets.only(top: 64.0.h()), + child: Wrap( + spacing: 12, + runSpacing: 8, + children: + _selectedCountries + .map((c) => _buildCountryChip(c)) + .toList(), + ), + ), + + // 2. The Pseudo-TextField + GestureDetector( + onTap: () => setState(() => _isDropdownOpen = !_isDropdownOpen), + child: Container( + height: 52.0.h(), + padding: const EdgeInsets.symmetric(horizontal: 16), + decoration: BoxDecoration( + border: Border.all(color: const Color(0xFFD1E3FF)), + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Location', + style: TextStyle( + color: Colors.grey.shade400, + fontSize: 16.0.sp(), + ), + ), + Icon( + _isDropdownOpen + ? Icons.keyboard_arrow_up + : Icons.keyboard_arrow_down, + color: Colors.grey, + ), + ], + ), + ), + ), + + // 3. Floating Dropdown Menu (Positioned ABOVE the input field) + if (_isDropdownOpen) + Positioned( + bottom: 60.0.h(), // Sits above the text field + left: 0, + right: 0, + child: Material( + elevation: 12, + shadowColor: Colors.black26, + borderRadius: BorderRadius.circular(12), + color: Colors.white, + child: Container( + constraints: BoxConstraints(maxHeight: 220.0.h()), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + border: Border.all(color: Colors.grey.shade100), + ), + child: ListView.separated( + shrinkWrap: true, + padding: EdgeInsets.zero, + itemCount: _allCountries.length, + separatorBuilder: + (context, index) => const Divider( + height: 1, + color: Color(0xFFF5F5F5), + ), + itemBuilder: (context, index) { + final country = _allCountries[index]; + return ListTile( + contentPadding: const EdgeInsets.symmetric( + horizontal: 16, + ), + leading: Text( + country['flag']!, + style: const TextStyle(fontSize: 22), + ), + title: Text( + country['name']!, + style: TextStyle( + fontSize: 15.0.sp(), + color: Colors.black87, + ), + ), + onTap: () { + setState(() { + // Add if not already selected + if (!_selectedCountries.any( + (c) => c['code'] == country['code'], + )) { + _selectedCountries.add(country); + } + _isDropdownOpen = false; + }); + }, + ); + }, + ), + ), + ), + ), + ], + ), + + SizedBox(height: 40.0.h()), + + // SAVE BUTTON + SizedBox( + width: double.infinity, + height: 54.0.h(), + child: ElevatedButton( + onPressed: () => context.pop(), + style: ElevatedButton.styleFrom( + backgroundColor: const Color( + 0xFFE8F1FF, + ), // Matches "Save" blue background + foregroundColor: const Color( + 0xFF1A73E8, + ), // Matches "Save" text color + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(28), + ), + ), + child: Text( + 'Save', + style: TextStyle( + fontSize: 16.0.sp(), + fontWeight: FontWeight.bold, + ), + ), + ), + ), + ], + ), + ); + } + + Widget _buildSectionHeader(String title) { + return Row( + children: [ + Text( + title, + style: TextStyle( + fontSize: 18.0.sp(), + fontWeight: FontWeight.w500, + color: const Color(0xFF616161), + ), + ), + SizedBox(width: 8.0.w()), + Icon( + Icons.edit_outlined, + size: 20.0.w(), + color: const Color(0xFF757575), + ), + ], + ); + } + + Widget _buildKeywordChip(String label) { + // Coloring logic to match screenshot + Color bg = const Color(0xFFF5F5F5); + Color text = const Color(0xFF424242); + + if (label == '1234') bg = const Color(0xFFE8F5E9); + if (label == 'Lorem ipsum') bg = const Color(0xFFFFF3E0); + if (label == 'Unknown') bg = const Color(0xFFFFEBEE); + if (label == 'Lorem ipsum 02' || label == 'sample') + bg = const Color(0xFFECEFF1); + + return Container( + padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8), + decoration: BoxDecoration( + color: bg, + borderRadius: BorderRadius.circular(8), + ), + child: Text( + label, + style: TextStyle( + color: text, + fontSize: 14.0.sp(), + fontWeight: FontWeight.w400, + ), + ), + ); + } + + Widget _buildCountryChip(Map country) { + return Container( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), + decoration: BoxDecoration( + color: const Color(0xFFF5F5F5), + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + country['code']!, + style: TextStyle( + fontSize: 14.0.sp(), + fontWeight: FontWeight.w600, + color: const Color(0xFF424242), + ), + ), + SizedBox(width: 6.0.w()), + Text(country['flag']!, style: const TextStyle(fontSize: 18)), + SizedBox(width: 6.0.w()), + GestureDetector( + onTap: () => setState(() => _selectedCountries.remove(country)), + child: const Icon(Icons.cancel, size: 18, color: Colors.grey), + ), + ], + ), + ); + } +} diff --git a/lib/views/profile/widgets/subject_tab.dart b/lib/views/profile/widgets/subject_tab.dart index 6f0a2a9..8cf6220 100644 --- a/lib/views/profile/widgets/subject_tab.dart +++ b/lib/views/profile/widgets/subject_tab.dart @@ -1,16 +1,22 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:go_router/go_router.dart'; +import 'package:provider/provider.dart'; import 'package:tm_app/core/constants/assets.dart'; import 'package:tm_app/core/theme/colors.dart'; import 'package:tm_app/core/utils/size_config.dart'; +import '../../../view_models/profile_view_model.dart'; import 'edit_key_word_bottom_sheet.dart'; class SubjectTab extends StatelessWidget { const SubjectTab({super.key}); + final bool isDesktop = true; + @override Widget build(BuildContext context) { + final viewModel = context.read(); return Column( children: [ SizedBox(height: 36.0.h()), @@ -20,26 +26,62 @@ class SubjectTab extends StatelessWidget { SizedBox(height: 24.0.h()), _keyWord( onEditPressed: () { - showModalBottomSheet( - context: context, - isScrollControlled: true, - builder: (_) { - return const EditKeyWordBottomSheet(); - }, - ); + if (isDesktop) { + showDialog( + context: context, + builder: (_) { + return Dialog( + child: SizedBox( + width: 560, + child: EditKeyWordBottomSheet( + isDesktop: true, + keyWords: viewModel.profileData?.keywords ?? [], + onSubmit: (keyWords) async { + context.pop(); + await viewModel.updateProfileKeyWords( + keyWords: keyWords, + ); + }, + ), + ), + ); + }, + ); + } else { + showModalBottomSheet( + context: context, + isScrollControlled: true, + builder: (_) { + return EditKeyWordBottomSheet( + isDesktop: false, + keyWords: viewModel.profileData?.keywords ?? [], + onSubmit: (keyWords) async { + context.pop(); + await viewModel.updateProfileKeyWords(keyWords: keyWords); + }, + ); + }, + ); + } }, ), SizedBox(height: 16.0.h()), Wrap( spacing: 8, runSpacing: 16.0.h(), - children: [ - _chip(label: 'UIUX', backgroundColor: Colors.green[200]!), - _chip(label: 'Lorem ipsum', backgroundColor: Colors.orange[100]!), - _chip(label: 'sample', backgroundColor: Colors.grey[300]!), - _chip(label: 'Unknown', backgroundColor: Colors.red[200]!), - _chip(label: 'Lorem ipsum 02', backgroundColor: Colors.blue[100]!), - ], + // children: [ + // _chip(label: 'UIUX', backgroundColor: Colors.green[200]!), + // _chip(label: 'Lorem ipsum', backgroundColor: Colors.orange[100]!), + // _chip(label: 'sample', backgroundColor: Colors.grey[300]!), + // _chip(label: 'Unknown', backgroundColor: Colors.red[200]!), + // _chip(label: 'Lorem ipsum 02', backgroundColor: Colors.blue[100]!), + // ], + children: + viewModel.profileData!.keywords! + .map( + (e) => _chip(label: e, backgroundColor: Colors.green[200]!), + ) + .toList(), ), SizedBox(height: 24.0.h()), Divider(color: AppColors.grey20), @@ -118,7 +160,7 @@ class SubjectTab extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - 'Budget', + 'Key Word', style: TextStyle( fontSize: 16.0.sp(), fontWeight: FontWeight.w400,