laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show group options above the request cards, even when collapsed

Browse Source 
Move each group's options panel to render right under the group header,
outside the expanded check, so the remember and scope selectors are
always visible without expanding the group or scrolling past its cards.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01REtTRsYA3aUGpmbjENbNVb
This commit is contained in:
Claude
2026-07-13 14:02:55 +00:00
parent 3e1d5579a7
commit aa7262e69e
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/BunkerMultiEventHomeScreen.kt
+13 -13
View File
@@ -190,6 +190,19 @@ fun BunkerMultiEventHomeScreen(
)
}
}
if (groupKey.hasGroupOptions()) {
item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
RequestGroupOptions(
groupKey = groupKey,
rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
)
}
}
if (expanded) {
items(groupItems, key = { it.request.id }) { bunkerRequest ->
BunkerRequestCard(
@@ -202,19 +215,6 @@ fun BunkerMultiEventHomeScreen(
},
)
}
if (groupKey.hasGroupOptions()) {
item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
RequestGroupOptions(
groupKey = groupKey,
rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
)
}
}
}
}
}
app/src/main/java/com/greenart7c3/nostrsigner/ui/components/IntentMultiEventHomeScreen.kt
+13 -13
View File
@@ -156,6 +156,19 @@ fun IntentMultiEventHomeScreen(
)
}
}
if (groupKey.hasGroupOptions()) {
item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
RequestGroupOptions(
groupKey = groupKey,
rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
)
}
}
if (expanded) {
items(groupIntents, key = { it.id }) { intent ->
IntentRequestCard(
@@ -168,19 +181,6 @@ fun IntentMultiEventHomeScreen(
},
)
}
if (groupKey.hasGroupOptions()) {
item(key = "group-options:${groupKey.type.name}:${groupKey.payload?.name ?: ""}:${groupKey.kind ?: ""}") {
RequestGroupOptions(
groupKey = groupKey,
rememberType = groupRememberTypes[groupKey] ?: RememberType.NEVER,
onRememberTypeChanged = { groupRememberTypes[groupKey] = it },
relayAuthScope = groupRelayAuthScopes[groupKey] ?: RelayAuthScope.SPECIFIC,
onRelayAuthScopeChanged = { groupRelayAuthScopes[groupKey] = it },
decryptTypeScope = groupDecryptScopes[groupKey] ?: defaultDecryptTypeScope(groupKey.type),
onDecryptTypeScopeChanged = { groupDecryptScopes[groupKey] = it },
)
}
}
}
}
}