Skip to content

Commit e191c88

Browse files
fix(mobile): dictation buttons line up with the send button on every composer
On the tall iPad/sidebar composer the dictation confirm button sat flush against the composer's rounded edge, while the send button is inset. The confirm button now uses the send button's 62pt slot and Android scaling, the dictation toolbar's stop/resume/send buttons get the large size, and the toolbar uses the same vertical padding as the draft row (it sat 4pt low on the Android floating composer). Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 531cee6 commit e191c88

2 files changed

Lines changed: 21 additions & 9 deletions

File tree

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
576576
const floatingSidebarComposer = useAndroidFloatingTabs() && layout.usesSplitView;
577577
const usesLargeControls =
578578
useSidebarWorkspaceTabs() === "picker" || (Platform.OS === "ios" && Platform.isPad);
579+
const surfacePaddingVertical = usesLargeControls ? 9 : floatingSidebarComposer ? 6 : 2;
579580
const [compactRowWidth, setCompactRowWidth] = useState(0);
580581
const compactAttachmentLimit = compactRowWidth >= 500 ? 3 : 1;
581582
const compactEditor = useCompactComposerEditor(bodyText, draftMessage);
@@ -871,7 +872,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
871872
borderRadius: usesLargeControls ? 31 : 27,
872873
borderCurve: "circular",
873874
overflow: "hidden",
874-
paddingVertical: usesLargeControls ? 9 : floatingSidebarComposer ? 6 : 2,
875+
paddingVertical: surfacePaddingVertical,
875876
}}
876877
>
877878
{isExpanded ? editingAttachments : null}
@@ -1122,7 +1123,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
11221123
collapsable={false}
11231124
importantForAccessibility={isToolbarVisible ? "auto" : "no-hide-descendants"}
11241125
pointerEvents={isToolbarVisible ? "auto" : "none"}
1125-
style={{ position: "absolute", bottom: usesLargeControls ? 9 : 2, left: 0, right: 0 }}
1126+
style={{ position: "absolute", bottom: surfacePaddingVertical, left: 0, right: 0 }}
11261127
>
11271128
<ComposerDictationToolbar
11281129
showsDictation={isVoiceInputPresented}
@@ -1174,6 +1175,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
11741175
/>
11751176
{showStopAction ? (
11761177
<ComposerActionButton
1178+
size={usesLargeControls ? "large" : "regular"}
11771179
accessibilityLabel="Stop agent"
11781180
icon="stop.fill"
11791181
variant="danger"
@@ -1182,13 +1184,15 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
11821184
/>
11831185
) : showResumeAction && voicePresentation.showsSend ? (
11841186
<ComposerActionButton
1187+
size={usesLargeControls ? "large" : "regular"}
11851188
accessibilityLabel="Resume queue"
11861189
icon="play"
11871190
disabled={!props.canOperateThread || resumingQueue}
11881191
onPress={() => void handleResumeQueue()}
11891192
/>
11901193
) : voicePresentation.showsSend ? (
11911194
<SendActionButton
1195+
size={usesLargeControls ? "large" : "regular"}
11921196
accessibilityLabel={sendBlockedReason ?? sendLabel}
11931197
presentation={sendPresentation}
11941198
disabled={!canSend}

‎apps/mobile/src/features/voice-input/ComposerDictationControl.tsx‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import Animated, {
1515
import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
1616
import { AppText as Text } from "../../components/ui/AppText";
1717
import { SymbolView, type AppSymbolName } from "../../components/ui/AppSymbol";
18+
import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
1819
import { cn } from "../../lib/cn";
1920
import type { VoiceComposerPresentation } from "./voiceInputPresentation";
2021
import { VOICE_WAVEFORM_SAMPLE_COUNT } from "./voiceInputMetering";
@@ -258,8 +259,14 @@ function VoiceActionButton(props: {
258259
readonly onPress: () => void;
259260
readonly variant?: "plain" | "primary";
260261
}) {
262+
const { scale } = useAndroidControlSizing();
261263
const variant = props.variant ?? "plain";
262264
const loading = props.loading === true;
265+
const large = props.size === "large";
266+
const circleSize = Math.round((large ? 44 : 30) * scale);
267+
const iconSize = Math.round(
268+
(variant === "primary" ? (large ? 20 : 16) : large ? 24 : 20) * scale,
269+
);
263270
const primaryStyle = useAnimatedStyle(() => ({
264271
opacity: withTiming(loading ? 0 : 1, DICTATION_TIMING),
265272
}));
@@ -272,17 +279,18 @@ function VoiceActionButton(props: {
272279
className="size-[44px] shrink-0 items-center justify-center active:opacity-70"
273280
disabled={props.disabled}
274281
onPress={props.onPress}
275-
style={{ opacity: props.disabled && !props.loading ? 0.4 : 1 }}
282+
style={{
283+
opacity: props.disabled && !props.loading ? 0.4 : 1,
284+
// Matches ComposerActionButton so the circle stays concentric with the large composer corner.
285+
width: variant === "primary" && large ? 62 : undefined,
286+
}}
276287
>
277288
<View
278289
className={cn(
279290
"items-center justify-center",
280-
variant === "primary"
281-
? props.size === "large"
282-
? "size-[44px] rounded-full bg-subtle"
283-
: "size-[30px] rounded-full bg-subtle"
284-
: "size-[44px]",
291+
variant === "primary" ? "rounded-full bg-subtle" : "size-[44px]",
285292
)}
293+
style={variant === "primary" ? { width: circleSize, height: circleSize } : undefined}
286294
>
287295
{variant === "primary" ? (
288296
<Animated.View
@@ -296,7 +304,7 @@ function VoiceActionButton(props: {
296304
) : (
297305
<SymbolView
298306
name={props.icon}
299-
size={props.size === "large" ? 24 : variant === "primary" ? 16 : 20}
307+
size={iconSize}
300308
weight={variant === "primary" ? "semibold" : "regular"}
301309
tintColorClassName={
302310
variant === "primary" ? "accent-primary-foreground" : "accent-icon"

0 commit comments

Comments
 (0)