feat: provide image as url + refactors

example/lib/main.dart

@@ -37,12 +37,12 @@ class _ProfileExampleState extends State<ProfileExample> {
   void initState() {
     super.initState();
     _user = User(
-      'Firstname',
+      firstName: 'Firstname',
-      'Lastname',
+      lastName: 'Lastname',
-      Uint8List.fromList(
+      image: Uint8List.fromList(
         [],
       ),
-      profileData,
+      profileData: profileData,
     );
   }
 
@@ -53,10 +53,10 @@ class _ProfileExampleState extends State<ProfileExample> {
         bottomActionText: 'Log out',
         itemBuilderOptions: ItemBuilderOptions(
           inputDecorationField: {
-            'firstName': const InputDecoration(
+            'first_name': const InputDecoration(
               label: Text('First name'),
             ),
-            'lastName': const InputDecoration(
+            'last_name': const InputDecoration(
               label: Text('Last name'),
             ),
             'email': const InputDecoration(
@@ -64,13 +64,13 @@ class _ProfileExampleState extends State<ProfileExample> {
             ),
           },
           validators: {
-            'firstName': (String? value) {
+            'first_name': (String? value) {
               if (value == null || value.isEmpty) {
                 return 'Field empty';
               }
               return null;
             },
-            'lastName': (String? value) {
+            'last_name': (String? value) {
               if (value == null || value.isEmpty) {
                 return 'Field empty';
               }

lib/flutter_profile.dart

@@ -2,7 +2,7 @@ library flutter_profile;
 
 export 'src/widgets/profile/profile_page.dart';
 export 'src/widgets/profile/profile_style.dart';
-export 'src/widgets/avatar/avatar.dart';
+export 'src/widgets/avatar/avatar_wrapper.dart';
 export 'src/widgets/avatar/avatar_style.dart';
 export 'src/services/profile_service.dart';
 export 'src/widgets/item_builder/item_builder.dart';

lib/src/models/user.dart

@@ -2,39 +2,42 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 
-/// User is used to contain all user data. It consists of three standard fields: firstName, lastName and image.
+/// User is used to contain all user data. It consists of three standard fields: firstName, lastName and image/imageUrl.
 ///
 /// For additional data profileData can be used.
 class User {
   String? firstName;
   String? lastName;
   Uint8List? image;
+  String? imageUrl;
   ProfileData? profileData;
 
-  User(
+  User({
     this.firstName,
     this.lastName,
     this.image,
+    this.imageUrl,
     this.profileData,
-  );
+  });
 
-  factory User.fromMap(Map<String, dynamic> data) {
+  String get displayName => '${firstName ?? ''} ${lastName ?? ''}';
-    return User(
+  String get initials => '${firstName?[0] ?? ''}${lastName?[0] ?? ''}';
-      data['firstName'],
-      data['lastName'],
-      data['image'],
-      data['profileData'],
-    );
-  }
 
-  Map<String, dynamic> toMap() {
+  factory User.fromMap(Map<String, dynamic> data) => User(
-    return {
+        firstName: data['first_name'],
-      'firstName': firstName,
+        lastName: data['last_name'],
-      'lastName': lastName,
+        image: data['image'],
-      'image': image,
+        imageUrl: data['image_url'],
-      'profileData': profileData,
+        profileData: data['profile_data'],
-    };
+      );
-  }
+
+  Map<String, dynamic> toMap() => {
+        'first_name': firstName,
+        'last_name': lastName,
+        'image': image,
+        'image_url': image,
+        'profile_data': profileData,
+      };
 }
 
 /// ProfileData is used to store custom/addintional data for a user.

lib/src/widgets/avatar/avatar_wrapper.dart

@@ -1,79 +1,76 @@
-import 'dart:typed_data';
-
 import 'package:flutter/material.dart';
+import 'package:flutter_profile/src/models/user.dart';
 import 'package:flutter_profile/src/widgets/avatar/avatar_style.dart';
 
-class Avatar extends StatelessWidget {
+class AvaterWrapper extends StatelessWidget {
-  const Avatar({
+  const AvaterWrapper({
     Key? key,
-    this.image,
+    required this.user,
-    this.firstName,
-    this.lastName,
     this.avatar,
     this.style = const AvatarStyle(),
   }) : super(key: key);
 
-  final Uint8List? image;
+  final User user;
-  final String? firstName;
-  final String? lastName;
   final Widget? avatar;
   final AvatarStyle style;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context) => Column(
-    return Column(
+        children: [
-      children: [
+          avatar ?? _generateAvatar(),
-        _avatar(),
+          const SizedBox(
-        const SizedBox(
+            height: 16,
-          height: 16,
+          ),
-        ),
+          if (user.firstName != null || user.firstName != null)
-        if (firstName != null || lastName != null)
+            Text(
-          Text(
+              user.displayName,
-            '${firstName ?? ''} ${lastName ?? ''}',
+              style: style.displayNameStyle,
-            style: style.displayNameStyle,
+            )
-          )
+        ],
-      ],
+      );
-    );
+
+  ImageProvider? _getImageProvider() {
+    if (user.image != null) {
+      return MemoryImage(user.image!);
+    } else if (user.imageUrl != null) {
+      return NetworkImage(user.imageUrl!);
+    }
+    return null;
   }
 
-  Widget _avatar() {
+  Widget _generateAvatar() {
-    if (avatar != null) {
+    var imageProvider = _getImageProvider();
-      return avatar!;
+
-    }
+    if (imageProvider != null) {
-    if (image != null && image!.isNotEmpty) {
       return Container(
         width: style.width,
         height: style.height,
         decoration: BoxDecoration(
           shape: BoxShape.circle,
           image: DecorationImage(
-            image: MemoryImage(image!),
+            image: imageProvider,
             fit: BoxFit.cover,
           ),
         ),
       );
-    } else if (firstName != null || lastName != null) {
+    } else if (user.firstName != null || user.lastName != null) {
       return Container(
         width: style.width,
         height: style.height,
         decoration: BoxDecoration(
-          color: _generateColorWithIntials(firstName, lastName),
+          color: _generateColorWithIntials(user.firstName, user.lastName),
           shape: BoxShape.circle,
         ),
         child: Center(
           child: Text(
             style: const TextStyle(fontSize: 40),
-            _getInitials(firstName, lastName),
+            user.initials,
           ),
         ),
       );
-    } else {
-      return Container();
     }
-  }
 
-  String _getInitials(String? firstName, String? lastName) {
+    return Container();
-    return (firstName?[0] ?? '') + (lastName?[0] ?? '');
   }
 
   Color _generateColorWithIntials(String? firstName, String? lastName) {

lib/src/widgets/profile/proifle_wrapper.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_profile/src/models/user.dart';
 import 'package:flutter_profile/src/services/profile_service.dart';
-import 'package:flutter_profile/src/widgets/avatar/avatar.dart';
+import 'package:flutter_profile/src/widgets/avatar/avatar_wrapper.dart';
 import 'package:flutter_profile/src/widgets/item_builder/item_builder.dart';
 import 'package:flutter_profile/src/widgets/item_builder/item_builder_options.dart';
 import 'package:flutter_profile/src/widgets/item_builder/item_list.dart';
@@ -143,12 +143,10 @@ class _ProfileWrapperState extends State<ProfileWrapper> {
                 onTap: () async {
                   await widget.service.uploadImage(context);
                 },
-                child: Avatar(
+                child: AvaterWrapper(
-                  firstName: widget.user.firstName,
+                  user: widget.user,
-                  lastName: widget.user.lastName,
                   style: widget.style.avatarStyle,
                   avatar: widget.customAvatar,
-                  image: widget.user.image,
                 ),
               ),
               SizedBox(

test/profile_test.dart

@@ -13,10 +13,10 @@ void main() {
         home: Material(
           child: ProfilePage(
             user: User(
-              'Firstname',
+              firstName: 'Firstname',
-              'Lastname',
+              lastName: 'Lastname',
-              Uint8List.fromList([]),
+              image: Uint8List.fromList([]),
-              TestProfileData(email: 'test@email.com'),
+              profileData: TestProfileData(email: 'test@email.com'),
             ),
             service: TestProfileService(),
           ),
@@ -39,10 +39,7 @@ void main() {
         home: Material(
           child: ProfilePage(
             user: User(
-              null,
+              profileData: TestProfileData(email: null),
-              null,
-              null,
-              TestProfileData(email: null),
             ),
             service: TestProfileService(),
           ),
@@ -58,10 +55,9 @@ void main() {
         home: Material(
           child: ProfilePage(
             user: User(
-              'Firstname',
+              firstName: 'Firstname',
-              'Lastname',
+              lastName: 'Lastname',
-              null,
+              profileData: TestProfileData(email: 'test@email.com'),
-              TestProfileData(email: 'test@email.com'),
             ),
             service: TestProfileService(),
           ),