From 3a52a6235a7d3b4875d2a5d32b4e0f269be525ac Mon Sep 17 00:00:00 2001 From: anonymous Date: Mon, 28 Nov 2022 17:42:34 +0800 Subject: [PATCH] update flutter uikit to 1.0.1 --- CHANGELOG.md | 5 + example/pubspec.lock | 4 +- lib/base_widgets/tim_ui_kit_base.dart | 3 +- lib/base_widgets/tim_ui_kit_state.dart | 1 - .../tim_ui_kit_statelesswidget.dart | 1 - .../view_models/tui_theme_view_model.dart | 16 - lib/data_services/core/core_services.dart | 2 +- .../core/core_services_implements.dart | 6 +- lib/data_services/services_locatar.dart | 2 +- lib/tencent_cloud_chat_uikit.dart | 5 +- lib/ui/utils/color.dart | 32 -- lib/ui/utils/message.dart | 2 +- lib/ui/utils/permission.dart | 2 +- lib/ui/utils/shared_theme.dart | 22 -- lib/ui/utils/tui_theme.dart | 111 ------- .../tim_uikit_add_friend.dart | 2 +- .../tim_uikit_send_application.dart | 4 +- .../TIMUIKitAddGroup/tim_uikit_add_group.dart | 2 +- .../tim_uikit_send_application.dart | 4 +- .../tim_uikit_black_list.dart | 4 +- .../TIMUIKitTongue/tim_uikit_tongue_item.dart | 4 +- ..._uikit_chat_history_message_list_item.dart | 28 +- .../tim_uikit_chat_message_tooltip.dart | 2 +- .../TIMUIKitAppBar/tim_uikit_appbar.dart | 2 +- .../tim_uikit_message_reaction_detail.dart | 4 +- ...m_uikit_message_reaction_select_emoji.dart | 3 +- .../tim_uikit_message_reaction_show_item.dart | 2 +- .../tim_uikit_chat_file_elem.dart | 4 +- .../tim_uikit_chat_group_tips_elem.dart | 4 +- .../tim_uikit_chat_group_trtc_tips_elem.dart | 293 ------------------ .../tim_uikit_chat_image_elem.dart | 4 +- .../tim_uikit_chat_reply_elem.dart | 6 +- .../tim_uikit_chat_sound_elem.dart | 2 +- .../tim_uikit_chat_video_elem.dart | 2 +- .../tim_uikit_merger_message_elem.dart | 4 +- .../TIMUIKitTextField/tim_uikit_at_text.dart | 4 +- .../tim_uikit_call_invite_list.dart | 2 +- .../tim_uikit_more_panel.dart | 8 +- .../tim_uikit_send_sound_message.dart | 4 +- .../tim_uikit_text_field.dart | 2 +- lib/ui/views/TIMUIKitChat/tim_uikit_chat.dart | 4 +- .../tim_uikit_multi_select_panel.dart | 4 +- .../tim_uikit_conversation.dart | 4 +- .../tim_uikit_conversation_draft_text.dart | 2 +- .../tim_uikit_conversation_item.dart | 11 +- .../tim_uikit_conversation_last_msg.dart | 42 +-- .../views/TIMUIKitGroup/tim_uikit_group.dart | 4 +- .../tim_uikit_group_application_list.dart | 6 +- ...tim_uikit_group_application_list_item.dart | 2 +- .../group_member/tui_add_group_member.dart | 4 +- .../group_member/tui_delete_group_member.dart | 4 +- .../group_member/tui_group_member_list.dart | 4 +- .../widgets/tim_ui_group_member_search.dart | 2 +- .../widgets/tim_ui_group_search_msg.dart | 4 +- .../widgets/tim_uikit_group_add_opt.dart | 4 +- .../widgets/tim_uikit_group_button_area.dart | 2 +- .../widgets/tim_uikit_group_detail_card.dart | 2 +- .../widgets/tim_uikit_group_manage.dart | 6 +- .../widgets/tim_uikit_group_member_tile.dart | 4 +- .../widgets/tim_uikit_group_name_card.dart | 4 +- .../widgets/tim_uikit_group_notification.dart | 4 +- .../widgets/tim_uikit_group_type.dart | 4 +- .../tim_uikit_new_contact.dart | 3 - .../widget/tim_uikit_operation_item.dart | 2 +- .../tim_uikit_profile_userinfo_card.dart | 2 +- .../widget/tim_uikit_profile_widget.dart | 2 +- .../pureUI/tim_uikit_search_folder.dart | 4 +- .../pureUI/tim_uikit_search_input.dart | 4 +- .../pureUI/tim_uikit_search_item.dart | 2 +- .../pureUI/tim_uikit_search_showAll.dart | 3 +- .../TIMUIKitSearch/tim_uikit_search.dart | 2 +- .../tim_uikit_search_not_support.dart | 2 +- lib/ui/widgets/avatar.dart | 2 - lib/ui/widgets/az_list_view.dart | 2 +- lib/ui/widgets/center_loading.dart | 3 +- lib/ui/widgets/contact_list.dart | 4 +- lib/ui/widgets/forward_message_screen.dart | 2 +- lib/ui/widgets/group_member_list.dart | 4 - lib/ui/widgets/merger_message_screen.dart | 3 - lib/ui/widgets/message_read_receipt.dart | 4 +- lib/ui/widgets/radio_button.dart | 3 +- lib/ui/widgets/recent_conversation_list.dart | 2 +- .../widgets/transimit_group_owner_select.dart | 2 +- lib/ui/widgets/unread_message.dart | 3 +- lib/ui/widgets/video_custom_control.dart | 3 +- pubspec.lock | 2 +- pubspec.yaml | 4 +- 87 files changed, 132 insertions(+), 678 deletions(-) delete mode 100644 lib/business_logic/view_models/tui_theme_view_model.dart delete mode 100644 lib/ui/utils/color.dart delete mode 100644 lib/ui/utils/shared_theme.dart delete mode 100644 lib/ui/utils/tui_theme.dart delete mode 100644 lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_trtc_tips_elem.dart diff --git a/CHANGELOG.md b/CHANGELOG.md index 9be230a..02c1052 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.0.1 + +* Modify: Remove `groupTRTCTipsItemBuilder` from `MessageItemBuilder`, please use `customMessageItemBuilder` instead. +* Modify: Remove default rendering for calling messages, you can choose to use the default widgets, `CallMessageItem` and `GroupCallMessageItem`, from our call plugin `tim_ui_kit_calling_plugin` directly. Refer to the [Demo](https://github.com/TencentCloud/chat-demo-flutter/tree/main/lib/utils/custom_message/custom_message_element.dart). + ## 1.0.0 * Add: Support adding Flutter module to Native APP, for details, please refer to [this documentation](https://www.tencentcloud.com/document/product/1047/51456) to implement. diff --git a/example/pubspec.lock b/example/pubspec.lock index be95703..9ab12b1 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1012,7 +1012,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0+1" + version: "1.0.1" tencent_extended_text: dependency: transitive description: @@ -1040,7 +1040,7 @@ packages: name: tencent_im_base url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.7" tencent_im_sdk_plugin_platform_interface: dependency: transitive description: diff --git a/lib/base_widgets/tim_ui_kit_base.dart b/lib/base_widgets/tim_ui_kit_base.dart index 6703a01..bdbc55f 100644 --- a/lib/base_widgets/tim_ui_kit_base.dart +++ b/lib/base_widgets/tim_ui_kit_base.dart @@ -1,4 +1,5 @@ -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class TUIKitBuildValue { // 这里预留以后可以扩展全局通用能力 diff --git a/lib/base_widgets/tim_ui_kit_state.dart b/lib/base_widgets/tim_ui_kit_state.dart index 2bc561b..d39284c 100644 --- a/lib/base_widgets/tim_ui_kit_state.dart +++ b/lib/base_widgets/tim_ui_kit_state.dart @@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart'; import 'package:provider/provider.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/core_services_implements.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; diff --git a/lib/base_widgets/tim_ui_kit_statelesswidget.dart b/lib/base_widgets/tim_ui_kit_statelesswidget.dart index 8302020..f9d3125 100644 --- a/lib/base_widgets/tim_ui_kit_statelesswidget.dart +++ b/lib/base_widgets/tim_ui_kit_statelesswidget.dart @@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart'; import 'package:provider/provider.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/core_services_implements.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; diff --git a/lib/business_logic/view_models/tui_theme_view_model.dart b/lib/business_logic/view_models/tui_theme_view_model.dart deleted file mode 100644 index bffa6d1..0000000 --- a/lib/business_logic/view_models/tui_theme_view_model.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; - -class TUIThemeViewModel extends ChangeNotifier { - TUITheme _theme = CommonColor.defaultTheme; - - TUITheme get theme { - return _theme; - } - - set theme(TUITheme theme) { - _theme = theme; - notifyListeners(); - } -} diff --git a/lib/data_services/core/core_services.dart b/lib/data_services/core/core_services.dart index 21bf894..5024f36 100644 --- a/lib/data_services/core/core_services.dart +++ b/lib/data_services/core/core_services.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/tim_uikit_config.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + enum AppStatus { foreground, background } diff --git a/lib/data_services/core/core_services_implements.dart b/lib/data_services/core/core_services_implements.dart index aeb3a24..421db3c 100644 --- a/lib/data_services/core/core_services_implements.dart +++ b/lib/data_services/core/core_services_implements.dart @@ -8,13 +8,13 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_glo import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_conversation_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/core/core_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/tim_uikit_config.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:disk_space/disk_space.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/web_support/uikit_web_support.dart' if (dart.library.html) 'package:tencent_cloud_chat_uikit/data_services/core/web_support/uikit_web_support_implement.dart'; diff --git a/lib/data_services/services_locatar.dart b/lib/data_services/services_locatar.dart index 04115d8..97369d1 100644 --- a/lib/data_services/services_locatar.dart +++ b/lib/data_services/services_locatar.dart @@ -4,7 +4,6 @@ import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_conversation_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/conversation/conversation_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/conversation/conversation_services_implements.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/core_services_implements.dart'; @@ -16,6 +15,7 @@ import 'package:tencent_cloud_chat_uikit/data_services/message/message_service_i import 'package:tencent_cloud_chat_uikit/data_services/message/message_services.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_search_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; +import 'package:tencent_im_base/theme/tui_theme_view_model.dart'; final serviceLocator = GetIt.instance; bool boolIsInitailized = false; diff --git a/lib/tencent_cloud_chat_uikit.dart b/lib/tencent_cloud_chat_uikit.dart index 94f738f..a6b7ccd 100644 --- a/lib/tencent_cloud_chat_uikit.dart +++ b/lib/tencent_cloud_chat_uikit.dart @@ -5,9 +5,8 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'data_services/core/core_services_implements.dart'; export 'data_services/core/core_services_implements.dart'; - -// Global -export 'ui/utils/tui_theme.dart'; +export 'package:tencent_im_base/theme/tui_theme.dart'; +export 'package:tencent_im_base/theme/color.dart'; // Widgets export 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitConversation/tim_uikit_conversation.dart'; diff --git a/lib/ui/utils/color.dart b/lib/ui/utils/color.dart deleted file mode 100644 index 5324251..0000000 --- a/lib/ui/utils/color.dart +++ /dev/null @@ -1,32 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; - -Color hexToColor(String hexString) { - return Color(int.parse(hexString, radix: 16)).withAlpha(255); -} - -class CommonColor { - static const weakBackgroundColor = Color(0xFFEDEDED); - static const weakDividerColor = Color(0xFFE5E6E9); - static const primaryColor = Color(0xFF147AFF); - static const lightPrimaryColor = Color(0xFFC0E1FF); - static const secondaryColor = Color(0xFF147AFF); - static const weakTextColor = Color(0xFF999999); - static const infoColor = Color(0xFFFF9C19); - static const cautionColor = Color(0xFFFF584C); - static const ownerColor = Colors.orange; - static const adminColor = Colors.blue; - - static const defaultTheme = TUITheme( - weakBackgroundColor: Color(0xFFEDEDED), - weakDividerColor: Color(0xFFE5E6E9), - primaryColor: Color(0xFF147AFF), - secondaryColor: Color(0xFF147AFF), - infoColor: Color(0xFFFF9C19), - lightPrimaryColor: Color(0xFFC0E1FF), - weakTextColor: Color(0xFF999999), - darkTextColor: Color(0xFF444444), - cautionColor: Color(0xFFFF584C), - ownerColor: Colors.orange, - adminColor: Colors.blue); -} diff --git a/lib/ui/utils/message.dart b/lib/ui/utils/message.dart index 0345dff..d5f89bd 100644 --- a/lib/ui/utils/message.dart +++ b/lib/ui/utils/message.dart @@ -6,7 +6,7 @@ import 'package:flutter/cupertino.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/ui/constants/history_message_constant.dart'; import 'package:tencent_cloud_chat_uikit/ui/constants/time.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + class MessageUtils { // 判断CallingData的方式和Trtc的方法一致 diff --git a/lib/ui/utils/permission.dart b/lib/ui/utils/permission.dart index 01ec029..68770f3 100644 --- a/lib/ui/utils/permission.dart +++ b/lib/ui/utils/permission.dart @@ -11,7 +11,7 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + class PermissionRequestInfo extends StatefulWidget { final Function removeOverLay; diff --git a/lib/ui/utils/shared_theme.dart b/lib/ui/utils/shared_theme.dart deleted file mode 100644 index f194d1c..0000000 --- a/lib/ui/utils/shared_theme.dart +++ /dev/null @@ -1,22 +0,0 @@ -// ignore_for_file: unused_import - -import 'package:flutter/material.dart'; -import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; - -// class SharedThemeWidget extends InheritedWidget { -// final TUITheme theme; - -// const SharedThemeWidget( -// {Key? key, required Widget child, required this.theme}) -// : super(key: key, child: child); - -// //定义一个便捷方法，方便子树中的widget获取共享数据 -// static SharedThemeWidget? of(BuildContext context) { -// return context.dependOnInheritedWidgetOfExactType(); -// } - -// @override -// bool updateShouldNotify(covariant SharedThemeWidget oldWidget) { -// return oldWidget.theme != theme; -// } -// } diff --git a/lib/ui/utils/tui_theme.dart b/lib/ui/utils/tui_theme.dart deleted file mode 100644 index d9b82f0..0000000 --- a/lib/ui/utils/tui_theme.dart +++ /dev/null @@ -1,111 +0,0 @@ -import 'package:flutter/material.dart'; - -class TUITheme { - const TUITheme({ - this.primaryColor = const Color(0xFF00449E), - this.secondaryColor = const Color(0xFF147AFF), - this.infoColor = const Color(0xFFFF9C19), - this.weakBackgroundColor = const Color(0xFFEDEDED), - this.weakDividerColor = const Color(0xFFE5E6E9), - this.weakTextColor = const Color(0xFF999999), - this.darkTextColor = const Color(0xFF444444), - this.lightPrimaryColor = const Color(0xFF3371CD), - this.textColor, - this.cautionColor = const Color(0xFFFF584C), - this.ownerColor = Colors.orange, - this.adminColor = Colors.blue, - }); - - // 应用主色 - // Primary Color For The App - final Color? primaryColor; - // 应用次色 - // Secondary Color For The App - final Color? secondaryColor; - // 提示颜色，用于次级操作或提示 - // Info Color, Used For Secondary Action Or Info - final Color? infoColor; - // 浅背景颜色，比主背景颜色浅，用于填充缝隙或阴影 - // Weak Background Color, Lighter Than Main Background, Used For Marginal Space Or Shadowy Space - final Color? weakBackgroundColor; - // 浅分割线颜色，用于分割线或边框 - // Weak Divider Color, Used For Divider Or Border - final Color? weakDividerColor; - // 浅字色 - // Weak Text Color - final Color? weakTextColor; - // 深字色 - // Dark Text Color - final Color? darkTextColor; - // 浅主色，用于AppBar或Panels - // Light Primary Color, Used For AppBar Or Several Panels - final Color? lightPrimaryColor; - // 字色 - // TextColor - final Color? textColor; - // 警示色，用于危险操作 - // Caution Color, Used For Warning Actions - final Color? cautionColor; - // 群主标识色 - // Group Owner Identification Color - final Color? ownerColor; - // 群管理员标识色 - // Group Admin Identification Color - final Color? adminColor; - - static const TUITheme light = TUITheme(); - static const TUITheme dark = TUITheme(); - - MaterialColor get primaryMaterialColor => createMaterialColor(primaryColor!); - MaterialColor get lightPrimaryMaterialColor => - createMaterialColor(lightPrimaryColor!); - - TUITheme.fromJson(Map json) - : primaryColor = json['primaryColor'] as Color?, - secondaryColor = json['secondaryColor'] as Color?, - infoColor = json['infoColor'] as Color?, - weakBackgroundColor = json['weakBackgroundColor'] as Color?, - weakDividerColor = json['weakDividerColor'] as Color?, - weakTextColor = json['weakTextColor'] as Color?, - darkTextColor = json['darkTextColor'] as Color?, - lightPrimaryColor = json['lightPrimaryColor'] as Color?, - textColor = json['textColor'] as Color?, - cautionColor = json['cautionColor'] as Color?, - ownerColor = json['ownerColor'] as Color?, - adminColor = json['adminColor'] as Color?; - - toJson() => { - 'primaryColor': primaryColor, - 'secondaryColor': secondaryColor, - 'infoColor': infoColor, - 'weakBackgroundColor': weakBackgroundColor, - 'weakDividerColor': weakDividerColor, - 'weakTextColor': weakTextColor, - 'darkTextColor': darkTextColor, - 'lightPrimaryColor': lightPrimaryColor, - 'textColor': textColor, - 'cautionColor': cautionColor, - 'ownerColor': ownerColor, - 'adminColor': adminColor - }; - - MaterialColor createMaterialColor(Color color) { - List strengths = [.05]; - Map swatch = {}; - final int r = color.red, g = color.green, b = color.blue; - - for (int i = 1; i < 10; i++) { - strengths.add(0.1 * i); - } - for (var strength in strengths) { - final double ds = 0.5 - strength; - swatch[(strength * 1000).round()] = Color.fromRGBO( - r + ((ds < 0 ? r : (255 - r)) * ds).round(), - g + ((ds < 0 ? g : (255 - g)) * ds).round(), - b + ((ds < 0 ? b : (255 - b)) * ds).round(), - 1, - ); - } - return MaterialColor(color.value, swatch); - } -} diff --git a/lib/ui/views/TIMUIKitAddFriend/tim_uikit_add_friend.dart b/lib/ui/views/TIMUIKitAddFriend/tim_uikit_add_friend.dart index e18ffb8..2264ddb 100644 --- a/lib/ui/views/TIMUIKitAddFriend/tim_uikit_add_friend.dart +++ b/lib/ui/views/TIMUIKitAddFriend/tim_uikit_add_friend.dart @@ -8,7 +8,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_inf import 'package:tencent_cloud_chat_uikit/data_services/core/core_services_implements.dart'; import 'package:tencent_cloud_chat_uikit/data_services/friendShip/friendship_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitAddFriend/tim_uikit_send_application.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; diff --git a/lib/ui/views/TIMUIKitAddFriend/tim_uikit_send_application.dart b/lib/ui/views/TIMUIKitAddFriend/tim_uikit_send_application.dart index f778f3a..cc1e61c 100644 --- a/lib/ui/views/TIMUIKitAddFriend/tim_uikit_send_application.dart +++ b/lib/ui/views/TIMUIKitAddFriend/tim_uikit_send_application.dart @@ -5,8 +5,8 @@ import 'package:tencent_cloud_chat_uikit/business_logic/life_cycle/add_friend_li import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/friendShip/friendship_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitAddGroup/tim_uikit_add_group.dart b/lib/ui/views/TIMUIKitAddGroup/tim_uikit_add_group.dart index 40dedd7..a575db6 100644 --- a/lib/ui/views/TIMUIKitAddGroup/tim_uikit_add_group.dart +++ b/lib/ui/views/TIMUIKitAddGroup/tim_uikit_add_group.dart @@ -6,7 +6,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendsh import 'package:tencent_cloud_chat_uikit/data_services/conversation/conversation_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitAddGroup/tim_uikit_send_application.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitAddGroup/tim_uikit_send_application.dart b/lib/ui/views/TIMUIKitAddGroup/tim_uikit_send_application.dart index 79eb6c4..49fbba9 100644 --- a/lib/ui/views/TIMUIKitAddGroup/tim_uikit_send_application.dart +++ b/lib/ui/views/TIMUIKitAddGroup/tim_uikit_send_application.dart @@ -5,8 +5,8 @@ import 'package:tencent_cloud_chat_uikit/business_logic/life_cycle/add_group_lif import 'package:tencent_cloud_chat_uikit/data_services/core/core_services_implements.dart'; import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitBlackList/tim_uikit_black_list.dart b/lib/ui/views/TIMUIKitBlackList/tim_uikit_black_list.dart index 77b948b..9bc10fe 100644 --- a/lib/ui/views/TIMUIKitBlackList/tim_uikit_black_list.dart +++ b/lib/ui/views/TIMUIKitBlackList/tim_uikit_black_list.dart @@ -4,10 +4,10 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/life_cycle/block_list_life_cycle.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/TIMUIKitTongue/tim_uikit_tongue_item.dart b/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/TIMUIKitTongue/tim_uikit_tongue_item.dart index 3d74660..e23b9c1 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/TIMUIKitTongue/tim_uikit_tongue_item.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/TIMUIKitTongue/tim_uikit_tongue_item.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart b/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart index 922b79c..c31dfe8 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart @@ -13,7 +13,7 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/message/message_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; @@ -27,7 +27,6 @@ import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageIt import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/main.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_custom_elem.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_face_elem.dart'; -import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_trtc_tips_elem.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/tim_uikit_cloud_custom_data.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/loading.dart'; @@ -101,9 +100,6 @@ class MessageItemBuilder { /// merger message builder final MessageItemContent? mergerMessageItemBuilder; - /// group calling message builder, show without avatar and nickname - final MessageItemContent? groupTRTCTipsItemBuilder; - /// The builder for the whole message line, expect for those message type without avatar and nickname. /// [Update] You can only re-define the message types you need, returns null means using default row layout. final MessageRowBuilder? messageRowBuilder; @@ -124,7 +120,6 @@ class MessageItemBuilder { this.groupTipsMessageItemBuilder, this.mergerMessageItemBuilder, this.messageRowBuilder, - this.groupTRTCTipsItemBuilder, this.messageNickNameBuilder, }); } @@ -546,14 +541,6 @@ class _TIMUIKItHistoryMessageListItemState TIMUIKitGroupTipsElem(groupTipsElem: messageItem.groupTipsElem!)); } - Widget _groupTRTCTipsMessageBuilder() { - final messageItem = widget.message; - return TIMUIKitGroupTrtcTipsElem( - key: ValueKey(messageItem.msgID), - customMessage: messageItem, - ); - } - Widget _selfRevokeEditMessageBuilder(theme, model) { return Container( margin: const EdgeInsets.symmetric(vertical: 20), @@ -832,19 +819,6 @@ class _TIMUIKItHistoryMessageListItemState return _groupTipsMessageBuilder(); } - if (MessageUtils.isGroupCallingMessage(message)) { - if (widget.messageItemBuilder?.groupTRTCTipsItemBuilder != null) { - final groupTrtcTipsMessage = - widget.messageItemBuilder!.groupTRTCTipsItemBuilder!( - message, - (model.jumpMsgID == message.msgID), - clearJump, - ); - return groupTrtcTipsMessage ?? _groupTRTCTipsMessageBuilder(); - } - return _groupTRTCTipsMessageBuilder(); - } - if (isRevokedMsg) { final displayName = isSelf ? TIM_t("您") : message.nickName ?? message.sender; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_message_tooltip.dart b/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_message_tooltip.dart index 1fc5f83..2d9d5a6 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_message_tooltip.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_message_tooltip.dart @@ -12,7 +12,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/screen_utils.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKItMessageList/tim_uikit_chat_history_message_list_item.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/forward_message_screen.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitAppBar/tim_uikit_appbar.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitAppBar/tim_uikit_appbar.dart index 37b728f..a62e19c 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitAppBar/tim_uikit_appbar.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitAppBar/tim_uikit_appbar.dart @@ -9,7 +9,7 @@ import 'package:tencent_cloud_chat_uikit/data_services/friendShip/friendship_ser import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitAppBar/tim_uikit_appbar_title.dart'; import 'package:tuple/tuple.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_detail.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_detail.dart index 5983a56..43fba23 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_detail.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_detail.dart @@ -4,8 +4,8 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; class TIMUIKitMessageReactionDetail extends StatefulWidget { diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_select_emoji.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_select_emoji.dart index 8b11ffc..0a3706e 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_select_emoji.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_select_emoji.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/message_reaction_emoji.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_emoji_panel.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/emoji.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_show_item.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_show_item.dart index e433909..925e31a 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_show_item.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_show_item.dart @@ -9,7 +9,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/message/message_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_utils.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/extended_wrap/extended_wrap.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_file_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_file_elem.dart index 0f7f5fe..ce90e9f 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_file_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_file_elem.dart @@ -16,10 +16,10 @@ import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/permission.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_wrapper.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_file_icon.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/textSize.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_tips_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_tips_elem.dart index 189dce6..c5a964e 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_tips_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_tips_elem.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; class TIMUIKitGroupTipsElem extends TIMUIKitStatelessWidget { diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_trtc_tips_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_trtc_tips_elem.dart deleted file mode 100644 index 361a1d1..0000000 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_group_trtc_tips_elem.dart +++ /dev/null @@ -1,293 +0,0 @@ -// ignore_for_file: unrelated_type_equality_checks, unused_import - -import 'dart:convert'; - -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; -import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; - -import 'package:tencent_cloud_chat_uikit/ui/utils/shared_theme.dart'; - -import '../../../utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; - -class TIMUIKitGroupTrtcTipsElem extends StatefulWidget { - final V2TimMessage? customMessage; - - const TIMUIKitGroupTrtcTipsElem({ - Key? key, - this.customMessage, - }) : super(key: key); - - static CallingMessage? getCallMessage(V2TimCustomElem? customElem) { - try { - if (customElem?.data != null) { - final customMessage = jsonDecode(customElem!.data!); - return CallingMessage.fromJSON(customMessage); - } - return null; - } catch (err) { - return null; - } - } - - static String twoDigits(int n) { - if (n >= 10) return "$n"; - return "0$n"; - } - - static String getActionType(int actionType) { - final actionMessage = { - 1: TIM_t("发起通话"), - 2: TIM_t("取消通话"), - 3: TIM_t("接受通话"), - 4: TIM_t("拒绝通话"), - 5: TIM_t("超时未接听"), - }; - return actionMessage[actionType] ?? ""; - } - - static isCallEndExist(CallingMessage callMsg) { - int? callEnd = callMsg.callEnd; - int? actionType = callMsg.actionType; - if (actionType == 2) return false; - return callEnd == null - ? false - : callEnd > 0 - ? true - : false; - } - - static getShowTime(int seconds) { - int secondsShow = seconds % 60; - int minutsShow = seconds ~/ 60; - return "${twoDigits(minutsShow)}:${twoDigits(secondsShow)}"; - } - - @override - State createState() => _TIMUIKitGroupTrtcTipsElemState(); -} - -class _TIMUIKitGroupTrtcTipsElemState - extends TIMUIKitState { - final GroupServices groupServices = serviceLocator(); - // CustomMessage最终展示的内容 - String customMessageShowText = TIM_t("[自定义]"); - - @override - void initState() { - super.initState(); - final customElem = widget.customMessage?.customElem; - final groupId = widget.customMessage?.groupID; - final callingMessage = TIMUIKitGroupTrtcTipsElem.getCallMessage(customElem); - getShowActionType(callingMessage!, groupId: groupId); - } - - String getShowName(V2TimGroupMemberFullInfo info) { - if (info.friendRemark != null && info.friendRemark!.isNotEmpty) { - return info.friendRemark!; - } else if (info.nickName != null && info.nickName!.isNotEmpty) { - return info.nickName!; - } else if (info.nameCard != null && info.nameCard!.isNotEmpty) { - return info.nameCard!; - } else { - return info.userID; - } - } - - getShowNameListFromGroupList( - List inviteList, List groupInfoList) { - final showNameList = []; - for (var info in groupInfoList) { - final isContains = inviteList.contains(info!.userID); - if (isContains) { - showNameList.add(getShowName(info)); - } - } - - return showNameList; - } - -// 先更新为userID的封装 - handleShowUserIDFrominviteList( - List inviteeList, String actionTypeText) { - String nameStr = ""; - for (String showName in inviteeList) { - nameStr = "$nameStr、$showName"; - } - nameStr = nameStr.substring(1); - setState(() { - customMessageShowText = "$nameStr $actionTypeText"; - }); - } - - // 后更新showNamd的封装 - handleShowNameStringFromList( - List showNameList, String actionTypeText) { - if (showNameList.isEmpty) { - return; - } - if (mounted) { - if (showNameList.length == 1) { - setState(() { - customMessageShowText = "${showNameList[0]} $actionTypeText"; - }); - } else { - String nameStr = ""; - for (String showName in showNameList) { - nameStr = "$nameStr、$showName"; - } - nameStr = nameStr.substring(1); - setState(() { - customMessageShowText = "$nameStr $actionTypeText"; - }); - } - } - } - - // 封装需要节流获取情况用户成员的情况 - handleThrotGetShwoName( - String groupId, String actionTypeText, CallingMessage callingMessage) { - handleShowUserIDFrominviteList(callingMessage.inviteeList!, actionTypeText); - // groupServices.getGroupMembersInfoThrottle( - // groupID: groupId, - // memberList: callingMessage.inviteeList!, - // callBack: (List list) { - // List showNameList = - // getShowNameListFromGroupList(callingMessage.inviteeList!, list); - // // 如果是自己会有为空的情况,需啊自己手动添加一下 - // if (showNameList.isEmpty) { - // final CoreServicesImpl _coreInstance = TIMUIKitCore.getInstance(); - // final selfShowName = _coreInstance.loginUserInfo?.nickName ?? - // _coreInstance.loginUserInfo!.userID; - // showNameList.add(selfShowName); - // } - // handleShowNameStringFromList(showNameList, actionTypeText); - // }); - } - - getShowActionType(CallingMessage callingMessage, {String? groupId}) async { - final actionType = callingMessage.actionType!; - final actionTypeText = TIMUIKitGroupTrtcTipsElem.getActionType(actionType); - // 1发起通话 - if (actionType == 1 && groupId != null) { - String nameStr = ""; - groupServices.getGroupMembersInfo(groupID: groupId, memberList: [ - callingMessage.inviter! - ]).then((V2TimValueCallback> res) { - List? infoList = res.data ?? []; - for (var element in infoList) { - final showName = getShowName(element); - nameStr = "$nameStr$showName"; - } - setState(() { - customMessageShowText = "$nameStr $actionTypeText"; - }); - }); - } - // 2取消通话 - if (actionType == 2 && groupId != null) { - setState(() { - customMessageShowText = actionTypeText; - }); - } - // 3为接受 - if (actionType == 3 && groupId != null) { - handleThrotGetShwoName(groupId, actionTypeText, callingMessage); - } - // 4为拒绝 - if (actionType == 4 && groupId != null) { - List inviteeShowNameList = []; - V2TimValueCallback> - getGroupMembersInfoRes = await TencentImSDKPlugin.v2TIMManager - .getGroupManager() - .getGroupMembersInfo( - groupID: groupId, // 需要获取的群组id - memberList: callingMessage.inviteeList ?? [], // 需要获取的用户id列表 - ); - if (getGroupMembersInfoRes.code == 0) { - // 获取成功 - getGroupMembersInfoRes.data?.forEach((element) { - inviteeShowNameList.add(getShowName(element)); - }); - } - callingMessage.inviteeList = inviteeShowNameList; - handleThrotGetShwoName(groupId, actionTypeText, callingMessage); - } - // 5 为超时 - if (actionType == 5 && groupId != null) { - String nameStr = ""; - groupServices - .getGroupMembersInfo( - groupID: groupId, memberList: callingMessage.inviteeList!) - .then((V2TimValueCallback> res) { - List? infoList = res.data ?? []; - for (var element in infoList) { - final showName = getShowName(element); - nameStr = "$nameStr、$showName"; - } - nameStr = nameStr.substring(1); - - setState(() { - customMessageShowText = "$nameStr $actionTypeText"; - }); - }); - } - - // return TIMUIKitCustomElem.getActionType(actionType); - } - - static isCallEndExist(CallingMessage callMsg) { - int? callEnd = callMsg.callEnd; - int? actionType = callMsg.actionType; - if (actionType == 2) return false; - return callEnd == null - ? false - : callEnd > 0 - ? true - : false; - } - - Widget _callElemBuilder(BuildContext context) { - final customElem = widget.customMessage?.customElem; - final callingMessage = TIMUIKitGroupTrtcTipsElem.getCallMessage(customElem); - if (callingMessage != null) { - String showText = TIM_t("[自定义]"); - // 如果是结束消息 - final isCallEnd = isCallEndExist(callingMessage); - - String? option2 = ""; - if (isCallEnd) { - option2 = - TIMUIKitGroupTrtcTipsElem.getShowTime(callingMessage.callEnd!); - } - showText = isCallEnd - ? TIM_t_para("通话时间：{{option2}}", "通话时间：$option2")(option2: option2) - : customMessageShowText; - - return Text( - showText, - style: TextStyle( - fontSize: 12, - fontWeight: FontWeight.w400, - color: hexToColor("888888")), - textAlign: TextAlign.center, - softWrap: true, - ); - } else { - return Text(TIM_t("[自定义]")); - } - } - - @override - Widget tuiBuild(BuildContext context, TUIKitBuildValue value) { - final TUITheme theme = value.theme; - - return MessageUtils.wrapMessageTips(_callElemBuilder(context), theme); - } -} diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_image_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_image_elem.dart index 423fbc6..13db4c7 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_image_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_image_elem.dart @@ -22,7 +22,7 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; import 'package:tencent_cloud_chat_uikit/ui/constants/history_message_constant.dart'; @@ -35,7 +35,7 @@ import 'package:tencent_cloud_chat_uikit/ui/widgets/toast.dart'; import 'package:transparent_image/transparent_image.dart'; import 'package:image_gallery_saver/image_gallery_saver.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/shared_theme.dart'; + class TIMUIKitImageElem extends StatefulWidget { final V2TimMessage message; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_reply_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_reply_elem.dart index b9e2bc4..fc1ff3e 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_reply_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_reply_elem.dart @@ -10,15 +10,15 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_show_panel.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/main.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_face_elem.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/shared_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/tim_uikit_chat_config.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/tim_uikit_cloud_custom_data.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/link_preview/link_preview_entry.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_sound_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_sound_elem.dart index 54d94e2..33e8aac 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_sound_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_sound_elem.dart @@ -10,7 +10,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_glo import 'package:tencent_cloud_chat_uikit/data_services/message/message_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/constants/history_message_constant.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/sound_record.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_video_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_video_elem.dart index f9a784d..ec90c39 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_video_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_video_elem.dart @@ -15,7 +15,7 @@ import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/TIMUIKitMessageReaction/tim_uikit_message_reaction_wrapper.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/video_screen.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_merger_message_elem.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_merger_message_elem.dart index 2bd5c75..051fb5e 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_merger_message_elem.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_merger_message_elem.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/merger_message_screen.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_at_text.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_at_text.dart index 80bb3d2..7257e91 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_at_text.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_at_text.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/group_member_list.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_call_invite_list.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_call_invite_list.dart index 3410b53..54afc63 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_call_invite_list.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_call_invite_list.dart @@ -4,7 +4,7 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/group_member_list.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart index 99a61ed..3374e54 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_more_panel.dart @@ -16,13 +16,13 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/permission.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitTextField/intl_camer_picker.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/toast.dart'; import 'package:video_thumbnail/video_thumbnail.dart' as video_thumbnail; @@ -31,7 +31,7 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; // ignore: unnecessary_import import 'dart:typed_data'; -import 'package:tencent_cloud_chat_uikit/ui/utils/shared_theme.dart'; + import 'package:universal_html/html.dart' as html; class MorePanelConfig { diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_send_sound_message.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_send_sound_message.dart index d0c7737..d203a3b 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_send_sound_message.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_send_sound_message.dart @@ -11,13 +11,13 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/permission.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/sound_record.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/toast.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart index e8dadc0..7ba1631 100644 --- a/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart +++ b/lib/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field.dart @@ -16,7 +16,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_conversa import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitTextField/tim_uikit_at_text.dart'; diff --git a/lib/ui/views/TIMUIKitChat/tim_uikit_chat.dart b/lib/ui/views/TIMUIKitChat/tim_uikit_chat.dart index f580770..6d530f8 100644 --- a/lib/ui/views/TIMUIKitChat/tim_uikit_chat.dart +++ b/lib/ui/views/TIMUIKitChat/tim_uikit_chat.dart @@ -10,12 +10,12 @@ import 'package:tencent_cloud_chat_uikit/business_logic/life_cycle/chat_life_cyc import 'package:tencent_cloud_chat_uikit/business_logic/listener_model/tui_group_listener_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; import 'package:tencent_cloud_chat_uikit/ui/constants/history_message_constant.dart'; import 'package:tencent_cloud_chat_uikit/ui/controller/tim_uikit_chat_controller.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/custom_emoji_face_data_class.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/frame.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/optimize_utils.dart'; diff --git a/lib/ui/views/TIMUIKitChat/tim_uikit_multi_select_panel.dart b/lib/ui/views/TIMUIKitChat/tim_uikit_multi_select_panel.dart index f477653..c309cea 100644 --- a/lib/ui/views/TIMUIKitChat/tim_uikit_multi_select_panel.dart +++ b/lib/ui/views/TIMUIKitChat/tim_uikit_multi_select_panel.dart @@ -4,8 +4,8 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/forward_message_screen.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; diff --git a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation.dart b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation.dart index 5289642..5f8c0ef 100644 --- a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation.dart +++ b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation.dart @@ -7,10 +7,10 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget import 'package:tencent_cloud_chat_uikit/business_logic/life_cycle/conversation_life_cycle.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_conversation_view_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/controller/tim_uikit_conversation_controller.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitConversation/tim_uikit_conversation_item.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/customize_ball_pulse_header.dart'; diff --git a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_draft_text.dart b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_draft_text.dart index a592757..46a5c94 100644 --- a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_draft_text.dart +++ b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_draft_text.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_im_base/tencent_im_base.dart'; class TIMUIKitDraftText extends TIMUIKitStatelessWidget { diff --git a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_item.dart b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_item.dart index c94a3a7..540ff9d 100644 --- a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_item.dart +++ b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_item.dart @@ -3,16 +3,16 @@ import 'package:flutter/material.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/time_ago.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitConversation/tim_uikit_conversation_draft_text.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitConversation/tim_uikit_conversation_last_msg.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/unread_message.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; -typedef LastMessageBuilder = Widget Function( +typedef LastMessageBuilder = Widget? Function( V2TimMessage? lastMsg, List groupAtInfoList); class TIMUIKitConversationItem extends TIMUIKitStatelessWidget { @@ -58,8 +58,9 @@ class TIMUIKitConversationItem extends TIMUIKitStatelessWidget { draftText: draftText ?? "", ); } else if (lastMsg != null) { - if (lastMessageBuilder != null) { - return lastMessageBuilder!(lastMsg, groupAtInfoList); + if (lastMessageBuilder != null && + lastMessageBuilder!(lastMsg, groupAtInfoList) != null) { + return lastMessageBuilder!(lastMsg, groupAtInfoList)!; } return TIMUIKitLastMsg( groupAtInfoList: groupAtInfoList, diff --git a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_last_msg.dart b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_last_msg.dart index b429512..5190c77 100644 --- a/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_last_msg.dart +++ b/lib/ui/views/TIMUIKitConversation/tim_uikit_conversation_last_msg.dart @@ -4,10 +4,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; @@ -34,47 +34,11 @@ class TIMUIKitLastMsg extends TIMUIKitStatelessWidget { return _getLastMsgShowText(lastMsg, context); } - static String handleCustomMessage(V2TimMessage message) { - final customElem = message.customElem; - final callingMessage = CallingMessage.getCallMessage(customElem); - String customLastMsgShow = TIM_t("[自定义]"); - if (customElem?.data == "group_create") { - customLastMsgShow = TIM_t("群聊创建成功！"); - } - if (callingMessage != null) { - // 如果是结束消息 - final isCallEnd = CallingMessage.isCallEndExist(callingMessage); - - final isVoiceCall = callingMessage.callType == 1; - - String? callTime = ""; - - if (isCallEnd) { - callTime = CallingMessage.getShowTime(callingMessage.callEnd!); - } - - final option3 = callTime; - customLastMsgShow = isCallEnd - ? TIM_t_para("通话时间：{{option3}}", "通话时间：$option3")(option3: option3) - : CallingMessage.getActionType(callingMessage.actionType!); - - final option1 = customLastMsgShow; - final option2 = customLastMsgShow; - customLastMsgShow = isVoiceCall - ? TIM_t_para("[语音通话]：{{option1}}", "[语音通话]：$option1")( - option1: option1) - : TIM_t_para("[视频通话]：{{option2}}", "[视频通话]：$option2")( - option2: option2); - } - return customLastMsgShow; - } - String _getLastMsgShowText(V2TimMessage? message, BuildContext context) { final msgType = message!.elemType; switch (msgType) { case MessageElemType.V2TIM_ELEM_TYPE_CUSTOM: - return handleCustomMessage(message); - // TIM_t("[自定义]"); + return TIM_t("[自定义]"); case MessageElemType.V2TIM_ELEM_TYPE_SOUND: return TIM_t("[语音]"); case MessageElemType.V2TIM_ELEM_TYPE_TEXT: diff --git a/lib/ui/views/TIMUIKitGroup/tim_uikit_group.dart b/lib/ui/views/TIMUIKitGroup/tim_uikit_group.dart index 8c77129..eb04886 100644 --- a/lib/ui/views/TIMUIKitGroup/tim_uikit_group.dart +++ b/lib/ui/views/TIMUIKitGroup/tim_uikit_group.dart @@ -6,9 +6,9 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/listener_model/tui_group_listener_model.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/az_list_view.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list.dart b/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list.dart index e39fef8..69bf2bb 100644 --- a/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list.dart +++ b/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list.dart @@ -3,11 +3,11 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/group/group_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list_item.dart b/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list_item.dart index f1723d3..749474e 100644 --- a/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list_item.dart +++ b/lib/ui/views/TIMUIKitGroup/tim_uikit_group_application_list_item.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_add_group_member.dart b/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_add_group_member.dart index ec3efb9..e89bf65 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_add_group_member.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_add_group_member.dart @@ -3,8 +3,8 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/contact_list.dart'; class AddGroupMemberPage extends StatefulWidget { diff --git a/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_delete_group_member.dart b/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_delete_group_member.dart index 558751b..a23b7f7 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_delete_group_member.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_delete_group_member.dart @@ -4,8 +4,8 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/group_member_list.dart'; class DeleteGroupMemberPage extends StatefulWidget { diff --git a/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_group_member_list.dart b/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_group_member_list.dart index 49eebf0..0aaab63 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_group_member_list.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/group_member/tui_group_member_list.dart @@ -6,9 +6,9 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/group_member_list.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart index d8d5c34..ccfbaee 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/optimize_utils.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_search_msg.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_search_msg.dart index 55e9eab..23f1033 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_search_msg.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_search_msg.dart @@ -4,10 +4,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitSearch/tim_uikit_search.dart'; import 'package:tencent_cloud_chat_uikit/data_services/conversation/conversation_services.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_add_opt.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_add_opt.dart index 26b4b58..5484a73 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_add_opt.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_add_opt.dart @@ -4,8 +4,8 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_button_area.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_button_area.dart index 8e28906..16d00b5 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_button_area.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_button_area.dart @@ -5,7 +5,7 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; import 'package:tencent_cloud_chat_uikit/ui/controller/tim_uikit_chat_controller.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; class GroupProfileButtonArea extends TIMUIKitStatelessWidget { diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_detail_card.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_detail_card.dart index 95d9727..9b4c0db 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_detail_card.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_detail_card.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_manage.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_manage.dart index e78fb0c..2487a2a 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_manage.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_manage.dart @@ -6,10 +6,10 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; + import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/radio_button.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_member_tile.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_member_tile.dart index 2f348ef..1b6661f 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_member_tile.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_member_tile.dart @@ -5,8 +5,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/group_member/tui_add_group_member.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/group_member/tui_delete_group_member.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/group_member/tui_group_member_list.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_name_card.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_name_card.dart index 7ef15f4..59696aa 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_name_card.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_name_card.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_notification.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_notification.dart index 32638c6..a45c2e8 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_notification.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_notification.dart @@ -4,8 +4,8 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_type.dart b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_type.dart index da741c6..0b24447 100644 --- a/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_type.dart +++ b/lib/ui/views/TIMUIKitGroupProfile/widgets/tim_uikit_group_type.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; diff --git a/lib/ui/views/TIMUIKitNewContact/tim_uikit_new_contact.dart b/lib/ui/views/TIMUIKitNewContact/tim_uikit_new_contact.dart index 0ab7c8b..cfc071c 100644 --- a/lib/ui/views/TIMUIKitNewContact/tim_uikit_new_contact.dart +++ b/lib/ui/views/TIMUIKitNewContact/tim_uikit_new_contact.dart @@ -3,11 +3,8 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/life_cycle/new_contact_life_cycle.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; - import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; diff --git a/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_operation_item.dart b/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_operation_item.dart index efbe0f7..b0b4821 100644 --- a/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_operation_item.dart +++ b/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_operation_item.dart @@ -1,8 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class TIMUIKitOperationItem extends TIMUIKitStatelessWidget { final String operationName; diff --git a/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_userinfo_card.dart b/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_userinfo_card.dart index 59d3515..78bf76a 100644 --- a/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_userinfo_card.dart +++ b/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_userinfo_card.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; class TIMUIKitProfileUserInfoCard extends TIMUIKitStatelessWidget { diff --git a/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_widget.dart b/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_widget.dart index 7db6fb1..e92da05 100644 --- a/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_widget.dart +++ b/lib/ui/views/TIMUIKitProfile/widget/tim_uikit_profile_widget.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_class.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; class TIMUIKitProfileWidget extends TIMUIKitClass { diff --git a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_folder.dart b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_folder.dart index 350a8bb..86351c0 100644 --- a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_folder.dart +++ b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_folder.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; - -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class TIMUIKitSearchFolder extends TIMUIKitStatelessWidget { final String folderName; diff --git a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_input.dart b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_input.dart index c93477a..ea36cba 100644 --- a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_input.dart +++ b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_input.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + class TIMUIKitSearchInput extends StatefulWidget { final ValueChanged onChange; diff --git a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_item.dart b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_item.dart index e05feb8..5d49743 100644 --- a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_item.dart +++ b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_item.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; diff --git a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_showAll.dart b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_showAll.dart index 3ad05af..590bb2c 100644 --- a/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_showAll.dart +++ b/lib/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_showAll.dart @@ -2,8 +2,9 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class TIMUIKitSearchShowALl extends TIMUIKitStatelessWidget { final String textShow; diff --git a/lib/ui/views/TIMUIKitSearch/tim_uikit_search.dart b/lib/ui/views/TIMUIKitSearch/tim_uikit_search.dart index ec84c26..d259f27 100644 --- a/lib/ui/views/TIMUIKitSearch/tim_uikit_search.dart +++ b/lib/ui/views/TIMUIKitSearch/tim_uikit_search.dart @@ -3,7 +3,7 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_search_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitSearch/tim_uikit_search_friend.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitSearch/pureUI/tim_uikit_search_input.dart'; diff --git a/lib/ui/views/TIMUIKitSearch/tim_uikit_search_not_support.dart b/lib/ui/views/TIMUIKitSearch/tim_uikit_search_not_support.dart index bb703f3..f0c3137 100644 --- a/lib/ui/views/TIMUIKitSearch/tim_uikit_search_not_support.dart +++ b/lib/ui/views/TIMUIKitSearch/tim_uikit_search_not_support.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + class TIMUIKitSearchNotSupport extends TIMUIKitStatelessWidget { TIMUIKitSearchNotSupport({Key? key}) : super(key: key); diff --git a/lib/ui/widgets/avatar.dart b/lib/ui/widgets/avatar.dart index 07da086..ecc7966 100644 --- a/lib/ui/widgets/avatar.dart +++ b/lib/ui/widgets/avatar.dart @@ -4,8 +4,6 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/data_services/core/core_services_implements.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; class Avatar extends TIMUIKitStatelessWidget { diff --git a/lib/ui/widgets/az_list_view.dart b/lib/ui/widgets/az_list_view.dart index 48e7301..95462eb 100644 --- a/lib/ui/widgets/az_list_view.dart +++ b/lib/ui/widgets/az_list_view.dart @@ -2,9 +2,9 @@ import 'package:azlistview/azlistview.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class AZListViewContainer extends StatefulWidget { final List? memberList; diff --git a/lib/ui/widgets/center_loading.dart b/lib/ui/widgets/center_loading.dart index aac3080..d206fea 100644 --- a/lib/ui/widgets/center_loading.dart +++ b/lib/ui/widgets/center_loading.dart @@ -3,8 +3,9 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_global_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class CenterLoading extends TIMUIKitStatelessWidget { CenterLoading({Key? key, this.messageID}) : super(key: key); diff --git a/lib/ui/widgets/contact_list.dart b/lib/ui/widgets/contact_list.dart index 7f2453c..eb3d18c 100644 --- a/lib/ui/widgets/contact_list.dart +++ b/lib/ui/widgets/contact_list.dart @@ -5,8 +5,8 @@ import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_friendship_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/az_list_view.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/radio_button.dart'; diff --git a/lib/ui/widgets/forward_message_screen.dart b/lib/ui/widgets/forward_message_screen.dart index 4706e63..21d0a10 100644 --- a/lib/ui/widgets/forward_message_screen.dart +++ b/lib/ui/widgets/forward_message_screen.dart @@ -5,7 +5,7 @@ import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_chat_glo import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_self_info_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/recent_conversation_list.dart'; diff --git a/lib/ui/widgets/group_member_list.dart b/lib/ui/widgets/group_member_list.dart index fa843a6..9972d16 100644 --- a/lib/ui/widgets/group_member_list.dart +++ b/lib/ui/widgets/group_member_list.dart @@ -7,11 +7,7 @@ import 'package:lpinyin/lpinyin.dart'; import 'package:provider/provider.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; - -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/optimize_utils.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/az_list_view.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/radio_button.dart'; diff --git a/lib/ui/widgets/merger_message_screen.dart b/lib/ui/widgets/merger_message_screen.dart index ef16687..ab8ccac 100644 --- a/lib/ui/widgets/merger_message_screen.dart +++ b/lib/ui/widgets/merger_message_screen.dart @@ -6,12 +6,9 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_theme_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/message/message_services.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/main.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_face_elem.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/tim_uikit_cloud_custom_data.dart'; diff --git a/lib/ui/widgets/message_read_receipt.dart b/lib/ui/widgets/message_read_receipt.dart index ae074c8..f2f9bbf 100644 --- a/lib/ui/widgets/message_read_receipt.dart +++ b/lib/ui/widgets/message_read_receipt.dart @@ -6,10 +6,10 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_im_base/tencent_im_base.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_chat_separate_view_model.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/message.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/time_ago.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_face_elem.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_file_elem.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitChat/TIMUIKitMessageItem/tim_uikit_chat_image_elem.dart'; diff --git a/lib/ui/widgets/radio_button.dart b/lib/ui/widgets/radio_button.dart index c8c997d..f6fec15 100644 --- a/lib/ui/widgets/radio_button.dart +++ b/lib/ui/widgets/radio_button.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; class CheckBoxButton extends TIMUIKitStatelessWidget { diff --git a/lib/ui/widgets/recent_conversation_list.dart b/lib/ui/widgets/recent_conversation_list.dart index 03f69c9..15c5d71 100644 --- a/lib/ui/widgets/recent_conversation_list.dart +++ b/lib/ui/widgets/recent_conversation_list.dart @@ -3,7 +3,7 @@ import 'package:provider/provider.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/view_models/tui_conversation_view_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:tencent_cloud_chat_uikit/ui/widgets/avatar.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/az_list_view.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/radio_button.dart'; diff --git a/lib/ui/widgets/transimit_group_owner_select.dart b/lib/ui/widgets/transimit_group_owner_select.dart index f31f59a..52f1ce3 100644 --- a/lib/ui/widgets/transimit_group_owner_select.dart +++ b/lib/ui/widgets/transimit_group_owner_select.dart @@ -3,7 +3,7 @@ import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/business_logic/separate_models/tui_group_profile_model.dart'; import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.dart'; import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; + import 'package:tencent_cloud_chat_uikit/ui/utils/platform.dart'; import 'package:tencent_cloud_chat_uikit/ui/views/TIMUIKitGroupProfile/widgets/tim_ui_group_member_search.dart'; import 'package:tencent_cloud_chat_uikit/ui/widgets/group_member_list.dart'; diff --git a/lib/ui/widgets/unread_message.dart b/lib/ui/widgets/unread_message.dart index 97c00df..3fa51c8 100644 --- a/lib/ui/widgets/unread_message.dart +++ b/lib/ui/widgets/unread_message.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/color.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; class UnreadMessage extends TIMUIKitStatelessWidget { diff --git a/lib/ui/widgets/video_custom_control.dart b/lib/ui/widgets/video_custom_control.dart index 0c815d5..82f23f6 100644 --- a/lib/ui/widgets/video_custom_control.dart +++ b/lib/ui/widgets/video_custom_control.dart @@ -9,10 +9,11 @@ import 'package:chewie/src/material/material_progress_bar.dart'; import 'package:flutter/material.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_state.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_statelesswidget.dart'; -import 'package:tencent_cloud_chat_uikit/ui/utils/tui_theme.dart'; + import 'package:video_player/video_player.dart'; import 'center_play_button.dart'; import 'package:tencent_cloud_chat_uikit/base_widgets/tim_ui_kit_base.dart'; +import 'package:tencent_cloud_chat_uikit/tencent_cloud_chat_uikit.dart'; class VideoCustomControls extends StatefulWidget { const VideoCustomControls({required this.downloadFn, Key? key}) diff --git a/pubspec.lock b/pubspec.lock index 19b8582..3cb594a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1105,7 +1105,7 @@ packages: name: tencent_im_base url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.7" tencent_im_sdk_plugin_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a9c0295..1f4a71b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: tencent_cloud_chat_uikit description: UI components library and basic chat business logic for Tencent Cloud Chat service, helping you build In-APP Chat module easily. -version: 1.0.0+1 +version: 1.0.1 homepage: https://www.tencentcloud.com/products/im?from=pub repository: https://github.com/TencentCloud/tc-chat-uikit-flutter documentation: https://comm.qq.com/im/doc/flutter/en/TUIKit/readme.html @@ -64,7 +64,7 @@ dependencies: url_launcher: ^6.1.4 universal_html: ^2.0.8 link_preview_generator: ^1.2.0 - tencent_im_base: ^1.0.3 + tencent_im_base: ^1.0.7 disk_space: ^0.2.1 http: ^0.13.5 crypto: ^3.0.2