Use realName

lichess-org · Jun 28, 2024 · 2976187 · 2976187
1 parent 1caccf5
commit 2976187
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/lib/src/model/user/profile.dart b/lib/src/model/user/profile.dart
@@ -13,8 +13,7 @@ class Profile with _$Profile {
     String? country,
     String? location,
     String? bio,
-    String? firstName,
-    String? lastName,
+    String? realName,
     int? fideRating,
     int? uscfRating,
     int? ecfRating,
@@ -23,10 +22,6 @@ class Profile with _$Profile {
 
   const Profile._();
 
-  String? get fullName => firstName != null && lastName != null
-      ? '$firstName $lastName'
-      : firstName ?? lastName;
-
   factory Profile.fromJson(Map<String, dynamic> json) {
     return Profile.fromPick(pick(json).required());
   }
@@ -41,8 +36,7 @@ class Profile with _$Profile {
           pick('flag').asStringOrNull() ?? pick('country').asStringOrNull(),
       location: pick('location').asStringOrNull(),
       bio: pick('bio').asStringOrNull(),
-      firstName: pick('firstName').asStringOrNull(),
-      lastName: pick('lastName').asStringOrNull(),
+      realName: pick('realName').asStringOrNull(),
       fideRating: pick('fideRating').asIntOrNull(),
       uscfRating: pick('uscfRating').asIntOrNull(),
       ecfRating: pick('ecfRating').asIntOrNull(),

diff --git a/lib/src/view/account/edit_profile_screen.dart b/lib/src/view/account/edit_profile_screen.dart
@@ -182,20 +182,11 @@ class _EditProfileFormState extends ConsumerState<_EditProfileForm> {
             maxLength: 80,
           ),
           _textField(
-            label: context.l10n.firstName,
-            initialValue: widget.user.profile?.firstName,
-            formKey: 'firstName',
+            label: context.l10n.name,
+            initialValue: widget.user.profile?.realName,
+            formKey: 'realName',
             controller: TextEditingController(
-              text: widget.user.profile?.firstName,
-            ),
-            maxLength: 20,
-          ),
-          _textField(
-            label: context.l10n.lastName,
-            initialValue: widget.user.profile?.lastName,
-            formKey: 'lastName',
-            controller: TextEditingController(
-              text: widget.user.profile?.lastName,
+              text: widget.user.profile?.realName,
             ),
             maxLength: 20,
           ),

diff --git a/lib/src/view/user/user_profile.dart b/lib/src/view/user/user_profile.dart
@@ -36,9 +36,9 @@ class UserProfileWidget extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final userFullName = user.profile?.fullName != null
+    final userFullName = user.profile?.realName != null
         ? Text(
-            user.profile!.fullName!,
+            user.profile!.realName!,
             style: _userNameStyle,
           )
         : null;

diff --git a/test/view/user/user_screen_test.dart b/test/view/user/user_screen_test.dart
@@ -109,8 +109,7 @@ const testUserResponse = '''
     "country": "France",
     "location": "Lille",
     "bio": "test bio",
-    "firstName": "John",
-    "lastName": "Doe",
+    "realName": "John Doe",
     "fideRating": 1800,
     "links": "http://test.com"
   }