fix(android): use row-only channel joins
This commit is contained in:
@@ -2147,36 +2147,15 @@ class _SnapshotView extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
title: Text(ch.name),
|
title: Text(ch.name),
|
||||||
subtitle: Text('id=${ch.id} parent=${ch.parent}'),
|
subtitle: Text('id=${ch.id} parent=${ch.parent}'),
|
||||||
trailing: ch.id == currentVoiceChannelId
|
trailing: ch.hasPassword && ch.id != currentVoiceChannelId
|
||||||
? null
|
? Tooltip(
|
||||||
: Row(
|
message: l10n.channelPasswordTitle,
|
||||||
mainAxisSize: MainAxisSize.min,
|
child: Icon(
|
||||||
children: [
|
Icons.lock_outline,
|
||||||
if (ch.hasPassword)
|
color: theme.colorScheme.onSurfaceVariant,
|
||||||
IconButton(
|
),
|
||||||
icon: const Icon(Icons.lock_outline),
|
)
|
||||||
tooltip: l10n.channelPasswordTitle,
|
: null,
|
||||||
onPressed: hasJoinPending
|
|
||||||
? null
|
|
||||||
: () => onJoinChannelWithPassword(ch),
|
|
||||||
),
|
|
||||||
if (!ch.hasPassword)
|
|
||||||
IconButton(
|
|
||||||
icon: Icon(
|
|
||||||
ch.id == pendingVoiceChannelId
|
|
||||||
? Icons.hourglass_top
|
|
||||||
: Icons.login,
|
|
||||||
),
|
|
||||||
tooltip: ch.id == pendingVoiceChannelId
|
|
||||||
? l10n.statusConnecting
|
|
||||||
: l10n.joinChannelAction,
|
|
||||||
onPressed:
|
|
||||||
hasJoinPending || ch.id == pendingVoiceChannelId
|
|
||||||
? null
|
|
||||||
: () => onJoinChannel(ch),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
selected: ch.id == currentVoiceChannelId,
|
selected: ch.id == currentVoiceChannelId,
|
||||||
onTap:
|
onTap:
|
||||||
hasJoinPending ||
|
hasJoinPending ||
|
||||||
|
|||||||
Reference in New Issue
Block a user