AmityCo · jetrinn · Apr 29, 2024 · Apr 29, 2024 · May 2, 2024 · May 2, 2024
diff --git a/example/lib/main.dart b/example/lib/main.dart
diff --git a/lib/components/bottom_sheet.dart b/lib/components/bottom_sheet.dart
@@ -1,4 +1,5 @@
 import 'package:amity_sdk/amity_sdk.dart';
+import 'package:amity_uikit_beta_service/components/theme_config.dart';
 import 'package:amity_uikit_beta_service/viewmodel/user_viewmodel.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -11,35 +12,37 @@ void showOptionsBottomSheet(
       backgroundColor: Colors.transparent,
       context: context,
       builder: (BuildContext bc) {
-        return Container(
-          padding: const EdgeInsets.only(top: 20, bottom: 20),
-          decoration: const BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(20.0),
-              topRight: Radius.circular(20.0),
+        return ThemeConfig(
+          child: Container(
+            padding: const EdgeInsets.only(top: 20, bottom: 20),
+            decoration: const BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.only(
+                topLeft: Radius.circular(20.0),
+                topRight: Radius.circular(20.0),
+              ),
+            ),
+            child: Wrap(
+              children: [
+                user.isFlaggedByMe
+                    ? ListTile(
+                        title: const Text('Unreport User'),
+                        onTap: () {
+                          Provider.of<UserVM>(context, listen: false)
+                              .reportOrUnReportUser(user);
+                          Navigator.pop(context);
+                        },
+                      )
+                    : ListTile(
+                        title: const Text('Report User'),
+                        onTap: () {
+                          Provider.of<UserVM>(context, listen: false)
+                              .reportOrUnReportUser(user);
+                          Navigator.pop(context);
+                        },
+                      ),
+              ],
             ),
-          ),
-          child: Wrap(
-            children: [
-              user.isFlaggedByMe
-                  ? ListTile(
-                      title: const Text('Unreport User'),
-                      onTap: () {
-                        Provider.of<UserVM>(context, listen: false)
-                            .reportOrUnReportUser(user);
-                        Navigator.pop(context);
-                      },
-                    )
-                  : ListTile(
-                      title: const Text('Report User'),
-                      onTap: () {
-                        Provider.of<UserVM>(context, listen: false)
-                            .reportOrUnReportUser(user);
-                        Navigator.pop(context);
-                      },
-                    ),
-            ],
           ),
         );
       });

diff --git a/lib/components/custom_user_avatar.dart b/lib/components/custom_user_avatar.dart
@@ -6,13 +6,23 @@ import '../viewmodel/configuration_viewmodel.dart';
 
 Widget getAvatarImage(String? url, {double? radius = 20, String? fileId}) {
   return Builder(builder: (context) {
-    return CircleAvatar(
+    return Provider.of<AmityUIConfiguration>(context)
+        .currentUserImageUrl==true?CircleAvatar(
+        radius: radius,
+        backgroundColor:
+        Provider.of<AmityUIConfiguration>(context).appColors.primaryShade3,
+        backgroundImage: url != null&&url!='' ? NetworkImage(url) : null,
+        child: url != null&&url!='' ? const SizedBox()
+            : Icon(
+          Icons.person,
+          color: Colors.white,
+          size: radius! * 1.5,
+        )):CircleAvatar(
         radius: radius,
         backgroundColor:
             Provider.of<AmityUIConfiguration>(context).appColors.primaryShade3,
         backgroundImage: url != null ? NetworkImage("$url?size=medium") : null,
-        child: url != null
-            ? const SizedBox()
+        child: url != null ? const SizedBox()
             : Icon(
                 Icons.person,
                 color: Colors.white,

diff --git a/lib/components/post_profile.dart b/lib/components/post_profile.dart
@@ -1,10 +1,13 @@
+import 'package:amity_sdk/amity_sdk.dart';
 import 'package:amity_uikit_beta_service/components/custom_user_avatar.dart';
 import 'package:amity_uikit_beta_service/view/UIKit/social/general_component.dart';
 import 'package:amity_uikit_beta_service/view/user/user_profile_v2.dart';
 import 'package:amity_uikit_beta_service/viewmodel/user_feed_viewmodel.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../viewmodel/configuration_viewmodel.dart';
+
 // Custom Widget that mimics ListTile but without padding
 class CustomListTile extends StatelessWidget {
   final String? avatarUrl;
@@ -28,6 +31,9 @@ class CustomListTile extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
+      if (userId ==  AmityCoreClient.getCurrentUser().userId&&Provider.of<AmityUIConfiguration>(context,listen: false).customUserProfileNavigate) {
+        Provider.of<AmityUIConfiguration>(context,listen: false).onUserProfile(context);
+      }else{
         Navigator.of(context).push(MaterialPageRoute(
           builder: (context) => ChangeNotifierProvider(
             create: (context) =>
@@ -37,7 +43,7 @@ class CustomListTile extends StatelessWidget {
               amityUser: user,
             ),
           ),
-        ));
+        ));}
       },
       child: Container(
         padding: const EdgeInsets.only(bottom: 2, top: 2),
@@ -46,6 +52,9 @@ class CustomListTile extends StatelessWidget {
           children: [
             GestureDetector(
               onTap: () async {
+                if (userId ==  AmityCoreClient.getCurrentUser().userId&&Provider.of<AmityUIConfiguration>(context,listen: false).customUserProfileNavigate) {
+                  Provider.of<AmityUIConfiguration>(context,listen: false).onUserProfile(context);
+                }else{
                 Navigator.of(context).push(MaterialPageRoute(
                   builder: (context) => ChangeNotifierProvider(
                     create: (context) =>
@@ -55,7 +64,7 @@ class CustomListTile extends StatelessWidget {
                       amityUser: user,
                     ),
                   ),
-                ));
+                ));}
               },
               child: GestureDetector(child: getAvatarImage(avatarUrl)
                   // If avatarUrl can be null, consider handling it with a placeholder image

diff --git a/lib/components/theme_config.dart b/lib/components/theme_config.dart
@@ -0,0 +1,43 @@
+import 'package:amity_uikit_beta_service/viewmodel/configuration_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class ThemeConfig extends StatelessWidget {
+  const ThemeConfig({
+    super.key,
+    required this.child,
+  });
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    final uiConfig = Provider.of<AmityUIConfiguration>(context);
+
+    Widget themeOr(Widget mediaQueryOr) {
+      if (uiConfig.themeData != null) {
+        return Theme(
+          data: uiConfig.themeData!,
+          child: mediaQueryOr,
+        );
+      } else {
+        return mediaQueryOr;
+      }
+    }
+
+    Widget mediaQueryOr() {
+      if (uiConfig.mediaQueryData != null) {
+        return MediaQuery(
+          data: uiConfig.mediaQueryData!,
+          child: child,
+        );
+      } else {
+        return child;
+      }
+    }
+
+    return themeOr(
+      mediaQueryOr(),
+    );
+  }
+}
diff --git a/lib/components/video_player.dart b/lib/components/video_player.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:amity_sdk/amity_sdk.dart';
+import 'package:amity_uikit_beta_service/components/theme_config.dart';
 import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -149,77 +150,81 @@ class _VideoPlayerScreenState extends State<VideoPlayerScreen> {
         ? _controllers != null && _controllers!.isNotEmpty
             ? FullScreenVideoPlayerWidget(
                 videoPlayerController: _controllers![0])
-            : Scaffold(
-                appBar: AppBar(
-                  backgroundColor: Colors.black,
-                  leading: IconButton(
-                    icon: const Icon(
-                      Icons.close,
-                      color: Colors.white,
+            : ThemeConfig(
+                child: Scaffold(
+                    appBar: AppBar(
+                      backgroundColor: Colors.black,
+                      leading: IconButton(
+                        icon: const Icon(
+                          Icons.close,
+                          color: Colors.white,
+                        ),
+                        onPressed: () => Navigator.of(context).pop(),
+                      ),
                     ),
-                    onPressed: () => Navigator.of(context).pop(),
-                  ),
-                ),
-                backgroundColor: Colors.black,
-                body: const Center(child: CircularProgressIndicator()))
-        : Scaffold(
-            backgroundColor: Colors.black,
-            appBar: AppBar(
+                    backgroundColor: Colors.black,
+                    body: const Center(child: CircularProgressIndicator())),
+              )
+        : ThemeConfig(
+            child: Scaffold(
               backgroundColor: Colors.black,
-              title: Text('${_currentIndex + 1}/${widget.files.length}'),
-              leading: IconButton(
-                icon: const Icon(
-                  Icons.close,
-                  color: Colors.white,
+              appBar: AppBar(
+                backgroundColor: Colors.black,
+                title: Text('${_currentIndex + 1}/${widget.files.length}'),
+                leading: IconButton(
+                  icon: const Icon(
+                    Icons.close,
+                    color: Colors.white,
+                  ),
+                  onPressed: () => Navigator.of(context).pop(),
                 ),
-                onPressed: () => Navigator.of(context).pop(),
               ),
-            ),
-            body: _controllers != null && _controllers!.isNotEmpty
-                ? PageView.builder(
-                    controller:
-                        PageController(initialPage: widget.initialIndex),
-                    itemCount: widget.files.length,
-                    onPageChanged: (index) {
-                      setState(() {
-                        _currentIndex = index;
-                      });
-                    },
-                    itemBuilder: (context, index) {
-                      var controller = _controllers![index];
-                      var videoData = widget.files[index].data as VideoData;
-                      return GestureDetector(
-                        onTap: () {
-                          _openFullScreenVideo(controller);
-                        },
-                        child: Padding(
-                          padding: const EdgeInsets.all(2.0),
-                          child: Stack(
-                            children: [
-                              Container(
-                                decoration: BoxDecoration(
-                                  image: DecorationImage(
-                                    image: NetworkImage(
-                                        videoData.thumbnail!.fileUrl!),
-                                    fit: BoxFit.fitWidth,
+              body: _controllers != null && _controllers!.isNotEmpty
+                  ? PageView.builder(
+                      controller:
+                          PageController(initialPage: widget.initialIndex),
+                      itemCount: widget.files.length,
+                      onPageChanged: (index) {
+                        setState(() {
+                          _currentIndex = index;
+                        });
+                      },
+                      itemBuilder: (context, index) {
+                        var controller = _controllers![index];
+                        var videoData = widget.files[index].data as VideoData;
+                        return GestureDetector(
+                          onTap: () {
+                            _openFullScreenVideo(controller);
+                          },
+                          child: Padding(
+                            padding: const EdgeInsets.all(2.0),
+                            child: Stack(
+                              children: [
+                                Container(
+                                  decoration: BoxDecoration(
+                                    image: DecorationImage(
+                                      image: NetworkImage(
+                                          videoData.thumbnail!.fileUrl!),
+                                      fit: BoxFit.fitWidth,
+                                    ),
                                   ),
                                 ),
-                              ),
-                              const Align(
-                                alignment: Alignment.center,
-                                child: Icon(
-                                  Icons.play_arrow,
-                                  size: 70.0,
-                                  color: Colors.white,
+                                const Align(
+                                  alignment: Alignment.center,
+                                  child: Icon(
+                                    Icons.play_arrow,
+                                    size: 70.0,
+                                    color: Colors.white,
+                                  ),
                                 ),
-                              ),
-                            ],
+                              ],
+                            ),
                           ),
-                        ),
-                      );
-                    },
-                  )
-                : const Center(child: CircularProgressIndicator()),
+                        );
+                      },
+                    )
+                  : const Center(child: CircularProgressIndicator()),
+            ),
           );
   }
 }
@@ -259,21 +264,23 @@ class _FullScreenVideoPlayerWidgetState
         minChildSize: 0.5,
         initialChildSize: 1.0,
         builder: (BuildContext context, ScrollController scrollController) {
-          return Scaffold(
-            backgroundColor: Colors.black,
-            appBar: AppBar(
+          return ThemeConfig(
+            child: Scaffold(
               backgroundColor: Colors.black,
-              leading: IconButton(
-                icon: const Icon(
-                  Icons.close,
-                  color: Colors.white,
+              appBar: AppBar(
+                backgroundColor: Colors.black,
+                leading: IconButton(
+                  icon: const Icon(
+                    Icons.close,
+                    color: Colors.white,
+                  ),
+                  onPressed: () => Navigator.of(context).pop(),
                 ),
-                onPressed: () => Navigator.of(context).pop(),
               ),
-            ),
-            body: SafeArea(
-              child: Chewie(
-                controller: _chewieController,
+              body: SafeArea(
+                child: Chewie(
+                  controller: _chewieController,
+                ),
               ),
             ),
           );