Compare commits

...

2 Commits

4 changed files with 41 additions and 9 deletions

View File

@ -0,0 +1,30 @@
// ignore_for_file: constant_identifier_names
import 'package:flutter/material.dart';
/// UI间距和边距常量定义
class UISpacingConstant {
///
static const EdgeInsets chatMessageVerticalMargin =
EdgeInsets.symmetric(vertical: 10);
///
static const EdgeInsets revokedMessageVerticalMargin =
EdgeInsets.symmetric(vertical: 10);
///
static const EdgeInsets timeDividerVerticalMargin =
EdgeInsets.symmetric(vertical: 10);
///
static const EdgeInsets unreadDividerVerticalMargin =
EdgeInsets.symmetric(vertical: 10);
///
static const EdgeInsets groupTipsMessageMargin =
EdgeInsets.symmetric(vertical: 6, horizontal: 30);
///
static const EdgeInsets groupTipsMessagePadding =
EdgeInsets.only(bottom: 12);
}

View File

@ -29,6 +29,7 @@ import 'package:collection/collection.dart';
import 'package:tencent_cloud_chat_uikit/ui/utils/common_utils.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/common_utils.dart';
import 'package:tencent_cloud_chat_uikit/ui/utils/logger.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/logger.dart';
import 'package:tencent_cloud_chat_uikit/theme/tui_theme.dart'; import 'package:tencent_cloud_chat_uikit/theme/tui_theme.dart';
import 'package:tencent_cloud_chat_uikit/ui/constants/ui_spacing_constant.dart';
/// ///
class TipsTextSegment { class TipsTextSegment {
@ -536,7 +537,7 @@ class MessageUtils {
} }
static Widget wrapMessageTips(Widget child, TUITheme? theme) { static Widget wrapMessageTips(Widget child, TUITheme? theme) {
return Container(margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 30), child: child); return Container(margin: UISpacingConstant.groupTipsMessageMargin, child: child);
} }
static String getAbstractMessageAsync(V2TimMessage message, List<V2TimGroupMemberFullInfo?> groupMemberList) { static String getAbstractMessageAsync(V2TimMessage message, List<V2TimGroupMemberFullInfo?> groupMemberList) {

View File

@ -28,6 +28,7 @@ import 'package:tencent_cloud_chat_uikit/data_services/message/message_services.
import 'package:tencent_cloud_chat_uikit/data_services/services_locatar.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/tencent_cloud_chat_uikit.dart';
import 'package:tencent_cloud_chat_uikit/ui/constants/history_message_constant.dart'; import 'package:tencent_cloud_chat_uikit/ui/constants/history_message_constant.dart';
import 'package:tencent_cloud_chat_uikit/ui/constants/ui_spacing_constant.dart';
import 'package:tencent_cloud_chat_uikit/ui/utils/message.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/platform.dart';
import 'package:tencent_cloud_chat_uikit/ui/utils/screen_utils.dart'; import 'package:tencent_cloud_chat_uikit/ui/utils/screen_utils.dart';
@ -629,7 +630,7 @@ class _TIMUIKItHistoryMessageListItemState extends TIMUIKitState<TIMUIKitHistory
Widget _groupTipsMessageBuilder(TUIChatSeparateViewModel model) { Widget _groupTipsMessageBuilder(TUIChatSeparateViewModel model) {
final messageItem = widget.message; final messageItem = widget.message;
return Container( return Container(
padding: const EdgeInsets.only(bottom: 20), padding: UISpacingConstant.groupTipsMessagePadding,
child: TIMUIKitGroupTipsElem( child: TIMUIKitGroupTipsElem(
groupTipsElem: messageItem.groupTipsElem!, groupTipsElem: messageItem.groupTipsElem!,
groupMemberList: model.groupMemberList ?? [], groupMemberList: model.groupMemberList ?? [],
@ -638,7 +639,7 @@ class _TIMUIKItHistoryMessageListItemState extends TIMUIKitState<TIMUIKitHistory
Widget _selfRevokeEditMessageBuilder(theme, TUIChatSeparateViewModel model) { Widget _selfRevokeEditMessageBuilder(theme, TUIChatSeparateViewModel model) {
return Container( return Container(
margin: const EdgeInsets.symmetric(vertical: 20), margin: UISpacingConstant.revokedMessageVerticalMargin,
alignment: Alignment.center, alignment: Alignment.center,
child: Text.rich(TextSpan(children: [ child: Text.rich(TextSpan(children: [
TextSpan( TextSpan(
@ -658,7 +659,7 @@ class _TIMUIKItHistoryMessageListItemState extends TIMUIKitState<TIMUIKitHistory
Widget _revokedMessageBuilder(theme, String option2) { Widget _revokedMessageBuilder(theme, String option2) {
return Container( return Container(
margin: const EdgeInsets.symmetric(vertical: 20), margin: UISpacingConstant.revokedMessageVerticalMargin,
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
TIM_t_para("{{option2}}撤回了一条消息", "$option2撤回了一条消息")(option2: option2), TIM_t_para("{{option2}}撤回了一条消息", "$option2撤回了一条消息")(option2: option2),
@ -669,7 +670,7 @@ class _TIMUIKItHistoryMessageListItemState extends TIMUIKitState<TIMUIKitHistory
Widget _timeDividerBuilder(theme, int timeStamp, TUIChatSeparateViewModel model) { Widget _timeDividerBuilder(theme, int timeStamp, TUIChatSeparateViewModel model) {
return Container( return Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: const EdgeInsets.symmetric(vertical: 20), margin: UISpacingConstant.timeDividerVerticalMargin,
child: Text( child: Text(
model.chatConfig.timeDividerConfig?.timestampParser != null model.chatConfig.timeDividerConfig?.timestampParser != null
? (model.chatConfig.timeDividerConfig?.timestampParser!(timeStamp))! ? (model.chatConfig.timeDividerConfig?.timestampParser!(timeStamp))!
@ -686,7 +687,7 @@ class _TIMUIKItHistoryMessageListItemState extends TIMUIKitState<TIMUIKitHistory
Widget _latestDividerBuilder(TUITheme theme) { Widget _latestDividerBuilder(TUITheme theme) {
return Container( return Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: const EdgeInsets.symmetric(vertical: 20), margin: UISpacingConstant.unreadDividerVerticalMargin,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [

View File

@ -60,7 +60,7 @@ class TIMUIKitConversationItem extends TIMUIKitStatelessWidget {
// //
final msgFontSize = final msgFontSize =
isDesktopScreen ? 12.0 : (isAndroid ? 13.0 : 14.0); // 使 isDesktopScreen ? 12.0 : (isAndroid ? 14.0 : 14.0); // 使
if (lastMsg != null && if (lastMsg != null &&
lastMessageBuilder != null && lastMessageBuilder != null &&
@ -119,7 +119,7 @@ class TIMUIKitConversationItem extends TIMUIKitStatelessWidget {
// //
final titleFontSize = final titleFontSize =
isDesktopScreen ? 12.0 : (isAndroid ? 14.0 : 15.0); // 使 isDesktopScreen ? 12.0 : (isAndroid ? 16.0 : 16.0); // 使
return Container( return Container(
padding: const EdgeInsets.only(top: 6, bottom: 6, left: 16, right: 16), padding: const EdgeInsets.only(top: 6, bottom: 6, left: 16, right: 16),
@ -189,7 +189,7 @@ class TIMUIKitConversationItem extends TIMUIKitStatelessWidget {
height: 1.2, height: 1.2,
color: theme.conversationItemTitleTextColor, color: theme.conversationItemTitleTextColor,
fontSize: titleFontSize, fontSize: titleFontSize,
fontWeight: FontWeight.w400, fontWeight: FontWeight.bold,
), ),
)), )),
Flexible( Flexible(