hy/yumi-flutter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hy:a73e2ff14bd2bfd46b9dbdcfe33b5bf42edce29b
Branches Tags
hy:main
hy:codex/perf-revival-start
hy:bug-fix
hy:develop
hy:feature
hy:test
..
compare: hy:13d0d1ef84d5bfb3acbdff119d6f58e4dc6338c6
Branches Tags
hy:main
hy:codex/perf-revival-start
hy:bug-fix
hy:develop
hy:feature
hy:test

No commits in common. "a73e2ff14bd2bfd46b9dbdcfe33b5bf42edce29b" and "13d0d1ef84d5bfb3acbdff119d6f58e4dc6338c6" have entirely different histories.
a73e2ff14b ... 13d0d1ef84

1 changed files with 71 additions and 82 deletions
Show Stats Expand all files Collapse all files

19
lib/modules/chat/message_chat_page.dart
View File

@ -1250,10 +1250,7 @@ class _MessageItem extends StatelessWidget {
_isDuplicateCpInviteMessageForConversation(customData)) { _isDuplicateCpInviteMessageForConversation(customData)) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
final isCpInviteMessage = final cpRelationFormedCard = _cpRelationFormedMessageCard();
customData != null && _isCpInvitePayload(customData);
final cpRelationFormedCard =
isCpInviteMessage ? null : _cpRelationFormedMessageCard();
final cpStatusLineText = _cpStatusLineTextForMessage(); final cpStatusLineText = _cpStatusLineTextForMessage();
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 15.w, vertical: 8.w), margin: EdgeInsets.symmetric(horizontal: 15.w, vertical: 8.w),
@ -1307,12 +1304,8 @@ class _MessageItem extends StatelessWidget {
), ),
child: cpRelationFormedCard, child: cpRelationFormedCard,
) )
else if (cpStatusLineText == null || isCpInviteMessage) else if (cpStatusLineText == null)
Padding( Row(
padding: EdgeInsets.only(
top: cpStatusLineText == null ? 0 : 10.w,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
textDirection: textDirection:
@ -1327,10 +1320,7 @@ class _MessageItem extends StatelessWidget {
SCNavigatorUtils.push( SCNavigatorUtils.push(
context, context,
replace: replace:
AccountStorage() AccountStorage().getCurrentUser()?.userProfile?.id !=
.getCurrentUser()
?.userProfile
?.id !=
message.sender, message.sender,
"${SCMainRoute.person}?isMe=${AccountStorage().getCurrentUser()?.userProfile?.id == message.sender}&tageId=${message.sender}", "${SCMainRoute.person}?isMe=${AccountStorage().getCurrentUser()?.userProfile?.id == message.sender}&tageId=${message.sender}",
); );
@ -1386,7 +1376,6 @@ class _MessageItem extends StatelessWidget {
Spacer(), Spacer(),
], ],
), ),
),
], ],
), ),
); );