KB8PMY
/
meshcore-client
mirror of https://github.com/OffbandMesh/meshcore-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatting fix

Browse Source
chore/offband-rebrand
Ben Allfree 5 months ago
parent bf4f52a4e3
commit 35498c1b90
2 changed files with 67 additions and 35 deletions
Show Stats Download Patch File Download Diff File

52
lib/screens/channel_chat_screen.dart
Unescape View File

@ -367,17 +367,24 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: Icon( child: Icon(
(message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty) (message.status ==
ChannelMessageStatus.sent &&
displayPath.isNotEmpty)
? Icons.check_circle ? Icons.check_circle
: message.status == ChannelMessageStatus.failed : message.status ==
? Icons.cancel ChannelMessageStatus.failed
: Icons.cloud, ? Icons.cancel
: Icons.cloud,
size: 14, size: 14,
color: (message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty) color:
(message.status ==
ChannelMessageStatus.sent &&
displayPath.isNotEmpty)
? Colors.green ? Colors.green
: message.status == ChannelMessageStatus.failed : message.status ==
? Colors.red ChannelMessageStatus.failed
: Colors.white70, ? Colors.red
: Colors.white70,
), ),
), ),
), ),
@ -402,8 +409,10 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
defaultToHttps: false, defaultToHttps: false,
), ),
linkifiers: const [UrlLinkifier()], linkifiers: const [UrlLinkifier()],
onOpen: (link) => onOpen: (link) => LinkHandler.handleLinkTap(
LinkHandler.handleLinkTap(context, link.url), context,
link.url,
),
), ),
), ),
if (!enableTracing && isOutgoing) ...[ if (!enableTracing && isOutgoing) ...[
@ -411,17 +420,24 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
Padding( Padding(
padding: const EdgeInsets.only(bottom: 2), padding: const EdgeInsets.only(bottom: 2),
child: Icon( child: Icon(
(message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty) (message.status ==
ChannelMessageStatus.sent &&
displayPath.isNotEmpty)
? Icons.check_circle ? Icons.check_circle
: message.status == ChannelMessageStatus.failed : message.status ==
? Icons.cancel ChannelMessageStatus.failed
: Icons.cloud, ? Icons.cancel
: Icons.cloud,
size: 14, size: 14,
color: (message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty) color:
(message.status ==
ChannelMessageStatus.sent &&
displayPath.isNotEmpty)
? Colors.green ? Colors.green
: message.status == ChannelMessageStatus.failed : message.status ==
? Colors.red ChannelMessageStatus.failed
: Colors.grey, ? Colors.red
: Colors.grey,
), ),
), ),
], ],

50
lib/screens/chat_screen.dart
Unescape View File

@ -1274,21 +1274,30 @@ class _MessageBubble extends StatelessWidget {
child: Container( child: Container(
padding: const EdgeInsets.all(2), padding: const EdgeInsets.all(2),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.black.withValues(alpha: 0.3), color: Colors.black.withValues(
alpha: 0.3,
),
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: Icon( child: Icon(
(message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty) (message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Icons.check_circle ? Icons.check_circle
: message.status == MessageStatus.failed : message.status ==
? Icons.cancel MessageStatus.failed
: Icons.cloud, ? Icons.cancel
: Icons.cloud,
size: 14, size: 14,
color: (message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty) color:
(message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Colors.green ? Colors.green
: message.status == MessageStatus.failed : message.status ==
? Colors.red MessageStatus.failed
: Colors.white70, ? Colors.red
: Colors.white70,
), ),
), ),
), ),
@ -1312,8 +1321,10 @@ class _MessageBubble extends StatelessWidget {
defaultToHttps: false, defaultToHttps: false,
), ),
linkifiers: const [UrlLinkifier()], linkifiers: const [UrlLinkifier()],
onOpen: (link) => onOpen: (link) => LinkHandler.handleLinkTap(
LinkHandler.handleLinkTap(context, link.url), context,
link.url,
),
), ),
), ),
if (!enableTracing && isOutgoing) ...[ if (!enableTracing && isOutgoing) ...[
@ -1321,17 +1332,22 @@ class _MessageBubble extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(bottom: 2), padding: const EdgeInsets.only(bottom: 2),
child: Icon( child: Icon(
(message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty) (message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Icons.check_circle ? Icons.check_circle
: message.status == MessageStatus.failed : message.status == MessageStatus.failed
? Icons.cancel ? Icons.cancel
: Icons.cloud, : Icons.cloud,
size: 14, size: 14,
color: (message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty) color:
(message.status ==
MessageStatus.delivered &&
message.pathBytes.isNotEmpty)
? Colors.green ? Colors.green
: message.status == MessageStatus.failed : message.status == MessageStatus.failed
? Colors.red ? Colors.red
: Colors.grey, : Colors.grey,
), ),
), ),
], ],

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.