edison/chanora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(android): prompt from locked channel rows

Browse Source
This commit is contained in:
Edison Jwa
2026-05-20 14:52:34 +09:00
parent f8b6485390
commit 48a38dba46
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/chanora_flutter/lib/main.dart
+17 -14
View File
@@ -2160,20 +2160,21 @@ class _SnapshotView extends StatelessWidget {
? null ? null
: () => onJoinChannelWithPassword(ch), : () => onJoinChannelWithPassword(ch),
), ),
IconButton( if (!ch.hasPassword)
icon: Icon( IconButton(
ch.id == pendingVoiceChannelId icon: Icon(
? Icons.hourglass_top ch.id == pendingVoiceChannelId
: Icons.login, ? Icons.hourglass_top
: Icons.login,
),
tooltip: ch.id == pendingVoiceChannelId
? l10n.statusConnecting
: l10n.joinChannelAction,
onPressed:
hasJoinPending || ch.id == pendingVoiceChannelId
? null
: () => onJoinChannel(ch),
), ),
tooltip: ch.id == pendingVoiceChannelId
? l10n.statusConnecting
: l10n.joinChannelAction,
onPressed:
hasJoinPending || ch.id == pendingVoiceChannelId
? null
: () => onJoinChannel(ch),
),
], ],
), ),
selected: ch.id == currentVoiceChannelId, selected: ch.id == currentVoiceChannelId,
@@ -2182,7 +2183,9 @@ class _SnapshotView extends StatelessWidget {
!canJoinVoiceChannel || !canJoinVoiceChannel ||
ch.id == currentVoiceChannelId ch.id == currentVoiceChannelId
? null ? null
: () => onJoinChannel(ch), : () => ch.hasPassword
? onJoinChannelWithPassword(ch)
: onJoinChannel(ch),
), ),
), ),
for (final cl in byChannel[ch.id] ?? const <rust.BridgeClient>[]) for (final cl in byChannel[ch.id] ?? const <rust.BridgeClient>[])