diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index e69b5747..a4078e58 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -25,9 +25,9 @@ LSRequiresIPhoneOS NSCameraUsageDescription - Flotilla uses the camera for video in voice rooms. + Flotilla uses the camera when you enable it in a voice room. NSMicrophoneUsageDescription - Flotilla uses the microphone for voice chat in rooms. + Flotilla uses the microphone when you enable it in a voice room. UIBackgroundModes remote-notification diff --git a/src/app.css b/src/app.css index 18cfd961..0c6c3c53 100644 --- a/src/app.css +++ b/src/app.css @@ -30,7 +30,6 @@ --saib: var(--safe-area-inset-bottom, env(safe-area-inset-bottom)); --sail: var(--safe-area-inset-left, env(safe-area-inset-left)); --sair: var(--safe-area-inset-right, env(safe-area-inset-right)); - --video-call-panel-bg: #181e24; } @utility py-sai { diff --git a/src/app/components/VideoCallContent.svelte b/src/app/components/VideoCallContent.svelte index 6fda6390..b947ce03 100644 --- a/src/app/components/VideoCallContent.svelte +++ b/src/app/components/VideoCallContent.svelte @@ -152,11 +152,11 @@ const panelChrome = $derived( cx( variant === "mobile" && - "cb top-[calc(var(--sait)+6rem)] cw z-compose bg-[var(--video-call-panel-bg)] fixed inset-x-0 flex min-h-0 flex-col gap-2 overflow-y-auto overflow-x-hidden px-2 pb-2 pt-1 md:hidden", + "flex min-h-0 w-full flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden bg-base-200 px-2 pt-4 md:hidden pb-[calc(3.5rem+var(--saib))]", variant === "desktop-split" && - "cb ct cw-split-video z-compose bg-[var(--video-call-panel-bg)] fixed hidden min-h-0 flex-col gap-2 overflow-hidden p-2 md:flex", + "flex min-h-0 w-full min-w-0 flex-1 flex-col gap-2 overflow-hidden bg-base-200 px-2 pb-2 pt-4", variant === "desktop-full" && - "cb ct cw z-compose bg-[var(--video-call-panel-bg)] fixed hidden min-h-0 flex-col gap-2 overflow-hidden p-2 md:flex", + "flex min-h-0 w-full min-w-0 flex-1 flex-col gap-2 overflow-hidden bg-base-200 px-2 pb-2 pt-4", className, ), ) @@ -246,7 +246,7 @@
{@render videoPanelBody()}
-
+
diff --git a/src/app/components/VoiceWidget.svelte b/src/app/components/VoiceWidget.svelte index 6287f106..ec9afd81 100644 --- a/src/app/components/VoiceWidget.svelte +++ b/src/app/components/VoiceWidget.svelte @@ -123,7 +123,7 @@ const onLayoutToggle = () => { if (!showVoiceLayoutToggle) return if (isMd) { - voiceDesktopRoomPanel.update(p => (p === "split" ? "chat" : "split")) + voiceDesktopRoomPanel.update(p => (p === "split" ? "video" : "split")) } else { voiceMobileRoomPanel.update(p => (p === "chat" ? "video" : "chat")) } diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte index 5fefdc54..3febac72 100644 --- a/src/routes/spaces/[relay]/[h]/+page.svelte +++ b/src/routes/spaces/[relay]/[h]/+page.svelte @@ -456,72 +456,72 @@ : "flex flex-col-reverse pt-4", pageContentHiddenDesktopVideoOnly && "md:hidden", )}> - {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted} -
-
-

You aren't currently a member of this room.

- {#if $membershipStatus === MembershipStatus.Pending} - - {:else} - {:else} - + {/if} - Join Room - - {/if} -
-
- {:else} - {#if loadingForward} -

- Looking for messages... -

- {/if} - {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)} - {#if type === "new-messages"} -
-
-

New Messages

-
-
- {:else if type === "date"} - {value} - {:else} - {@const event = $state.snapshot(value as TrustedEvent)} - {#if event.kind === ROOM_ADD_MEMBER} - - {:else} -
-
- {/if} - {/if} - {/each} -

- {#if loadingBackward} - Looking for messages... + {:else} - End of message history + {#if loadingForward} +

+ Looking for messages... +

+ {/if} + {#each elements as { type, id, value, showPubkey, addSpaceBelow } (id)} + {#if type === "new-messages"} +
+
+

New Messages

+
+
+ {:else if type === "date"} + {value} + {:else} + {@const event = $state.snapshot(value as TrustedEvent)} + {#if event.kind === ROOM_ADD_MEMBER} + + {:else} +
+ +
+ {/if} + {/if} + {/each} +

+ {#if loadingBackward} + Looking for messages... + {:else} + End of message history + {/if} +

{/if} -

- {/if} -
+
- {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted} - - {:else if $room.isRestricted && $membershipStatus !== MembershipStatus.Granted} -
-

Only members are allowed to post to this room.

- {#if $membershipStatus === MembershipStatus.Pending} - - {:else} - {:else} - + {/if} - Ask to Join - +
+ {:else} +
+ {#if parent} + + {/if} + {#if share} + + {/if} + {#if eventToEdit} + + {/if} +
+ {#key eventToEdit} + + {/key} {/if}
- {:else} -
- {#if parent} - - {/if} - {#if share} - - {/if} - {#if eventToEdit} - - {/if} -
- {#key eventToEdit} - - {/key} - {/if} -
- {#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected} -
- -
- {/if} + {#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected} +
+ +
+ {/if}