Skip to content

Scheduling infrastructure for absolutely everyone.

feat(companion): Update availability screen to use liquid glass (#26041)

Betoaebfd4919bd5
diff --git a/companion/app/(tabs)/(availability)/_layout.tsx b/companion/app/(tabs)/(availability)/_layout.tsx
new file mode 100644
index 00000000000..ca526206287
--- /dev/null
+++ b/companion/app/(tabs)/(availability)/_layout.tsx
@@ -0,0 +1,9 @@
+import { Stack } from "expo-router";
+
+export default function EventTypesLayout() {
+ return (
+ <Stack>
+ <Stack.Screen name="index" options={{}} />
+ </Stack>
+ );
+}
diff --git a/companion/app/(tabs)/availability.tsx b/companion/app/(tabs)/(availability)/index.tsx
similarity index 74%
rename from companion/app/(tabs)/availability.tsx
rename to companion/app/(tabs)/(availability)/index.tsx
index 1aa8f86882d..462015b486a 100644
--- a/companion/app/(tabs)/availability.tsx
+++ b/companion/app/(tabs)/(availability)/index.tsx
@@ -1,6 +1,6 @@
import { Ionicons } from "@expo/vector-icons";
-import { useRouter } from "expo-router";
-import React, { useState, useMemo } from "react";
+import { Stack, useRouter } from "expo-router";
+import React, { useState, useMemo, Activity } from "react";
import {
View,
Text,
@@ -10,27 +10,27 @@ import {
ActionSheetIOS,
Alert,
Platform,
- Modal,
TextInput,
- KeyboardAvoidingView,
ScrollView,
} from "react-native";
-import { CalComAPIService, Schedule } from "../../services/calcom";
-import { Header } from "../../components/Header";
-import { FullScreenModal } from "../../components/FullScreenModal";
-import { LoadingSpinner } from "../../components/LoadingSpinner";
-import { EmptyScreen } from "../../components/EmptyScreen";
-import { showErrorAlert } from "../../utils/alerts";
-import { offlineAwareRefresh } from "../../utils/network";
-import { shadows } from "../../utils/shadows";
+import { CalComAPIService, Schedule } from "../../../services/calcom";
+import { Header } from "../../../components/Header";
+import { FullScreenModal } from "../../../components/FullScreenModal";
+import { LoadingSpinner } from "../../../components/LoadingSpinner";
+import { EmptyScreen } from "../../../components/EmptyScreen";
+import { showErrorAlert } from "../../../utils/alerts";
+import { offlineAwareRefresh } from "../../../utils/network";
+import { shadows } from "../../../utils/shadows";
import {
useSchedules,
useCreateSchedule,
useDeleteSchedule,
useDuplicateSchedule,
useSetScheduleAsDefault,
-} from "../../hooks";
+} from "../../../hooks";
+import { isLiquidGlassAvailable } from "expo-glass-effect";
+import { AvailabilityListItem } from "../../../components/availability-list-item/AvailabilityListItem";
export default function Availability() {
const router = useRouter();
@@ -261,65 +261,6 @@ export default function Availability() {
);
};
- const renderSchedule = ({ item: schedule, index }: { item: Schedule; index: number }) => {
- return (
- <TouchableOpacity
- className="border-b border-[#E5E5EA] bg-white active:bg-[#F8F9FA]"
- onPress={() => handleSchedulePress(schedule)}
- onLongPress={() => handleScheduleLongPress(schedule)}
- style={{ paddingHorizontal: 16, paddingVertical: 16 }}
- >
- <View className="flex-row items-center justify-between">
- <View className="mr-4 flex-1">
- <View className="mb-1 flex-row flex-wrap items-center">
- <Text className="text-base font-semibold text-[#333]">{schedule.name}</Text>
- {schedule.isDefault ? (
- <View className="ml-2 rounded bg-[#666] px-2 py-0.5">
- <Text className="text-xs font-semibold text-white">Default</Text>
- </View>
- ) : null}
- </View>
-
- {schedule.availability && schedule.availability.length > 0 ? (
- <View>
- {schedule.availability.map((slot, slotIndex) => (
- <View
- key={`${schedule.id}-${slot.days.join("-")}-${slotIndex}`}
- className={slotIndex > 0 ? "mt-2" : ""}
- >
- <Text className="text-sm text-[#666]">
- {slot.days.join(", ")} {slot.startTime} - {slot.endTime}
- </Text>
- </View>
- ))}
- </View>
- ) : (
- <Text className="text-sm text-[#666]">No availability set</Text>
- )}
-
- <View className="mt-2 flex-row items-center">
- <Ionicons name="globe-outline" size={14} color="#666" />
- <Text className="ml-1.5 text-sm text-[#666]">{schedule.timeZone}</Text>
- </View>
- </View>
-
- {/* Three dots button - vertically centered on the right */}
- <TouchableOpacity
- className="items-center justify-center rounded-lg border border-[#E5E5EA]"
- style={{ width: 32, height: 32 }}
- onPress={(e) => {
- e.stopPropagation();
- setSelectedSchedule(schedule);
- setShowActionsModal(true);
- }}
- >
- <Ionicons name="ellipsis-horizontal" size={18} color="#3C3F44" />
- </TouchableOpacity>
- </View>
- </TouchableOpacity>
- );
- };
-
if (loading) {
return (
<View className="flex-1 bg-[#f8f9fa]">
@@ -356,93 +297,126 @@ export default function Availability() {
const showList = !showEmptyState && !showSearchEmptyState;
return (
- <View className="flex-1 bg-gray-100">
- <Header />
+ <>
+ <Stack.Header
+ style={{ backgroundColor: "transparent", shadowColor: "transparent" }}
+ blurEffect={isLiquidGlassAvailable() ? undefined : "light"} // Only looks cool on iOS 18 and below
+ hidden={Platform.OS === "android"}
+ >
+ <Stack.Header.Title large>Availability</Stack.Header.Title>
+ <Stack.Header.Right>
+ <Stack.Header.Button onPress={handleCreateNew} tintColor="#000" variant="prominent">
+ New
+ </Stack.Header.Button>
+ </Stack.Header.Right>
+ <Stack.Header.SearchBar
+ placeholder="Search schedules"
+ onChangeText={(e) => handleSearch(e.nativeEvent.text)}
+ obscureBackground={false}
+ barTintColor="#fff"
+ />
+ </Stack.Header>
+
+ <Activity mode={Platform.OS !== "ios" ? "visible" : "hidden"}>
+ <Header />
+ <View className="flex-row items-center gap-3 border-b border-gray-300 bg-gray-100 px-4 py-2">
+ <TextInput
+ className="flex-1 rounded-lg border border-gray-200 bg-white px-3 py-2 text-[17px] text-black focus:border-black focus:ring-2 focus:ring-black"
+ placeholder="Search schedules"
+ placeholderTextColor="#9CA3AF"
+ value={searchQuery}
+ onChangeText={handleSearch}
+ autoCapitalize="none"
+ autoCorrect={false}
+ clearButtonMode="while-editing"
+ />
+ <TouchableOpacity
+ className="min-w-[60px] flex-row items-center justify-center gap-1 rounded-lg bg-black px-2.5 py-2"
+ onPress={handleCreateNew}
+ >
+ <Ionicons name="add" size={18} color="#fff" />
+ <Text className="text-base font-semibold text-white">New</Text>
+ </TouchableOpacity>
+ </View>
+ </Activity>
{/* Empty state - no schedules */}
- {showEmptyState ? (
- <View className="flex-1 bg-gray-50" style={{ paddingBottom: 100 }}>
+ <Activity mode={showEmptyState ? "visible" : "hidden"}>
+ <ScrollView
+ style={{ backgroundColor: "white" }}
+ contentContainerStyle={{
+ flexGrow: 1,
+ justifyContent: "center",
+ alignItems: "center",
+ padding: 20,
+ paddingBottom: 90,
+ }}
+ refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
+ contentInsetAdjustmentBehavior="automatic"
+ >
+ <EmptyScreen
+ icon="time-outline"
+ headline="Create an availability schedule"
+ description="Creating availability schedules allows you to manage availability across event types. They can be applied to one or more event types."
+ buttonText="New"
+ onButtonPress={handleCreateNew}
+ />
+ </ScrollView>
+ </Activity>
+
+ {/* Search bar and content for non-empty states */}
+ <Activity mode={!showEmptyState ? "visible" : "hidden"}>
+ {/* Search empty state */}
+ <Activity mode={showSearchEmptyState ? "visible" : "hidden"}>
<ScrollView
+ style={{ backgroundColor: "white" }}
contentContainerStyle={{
flexGrow: 1,
justifyContent: "center",
alignItems: "center",
padding: 20,
+ paddingBottom: 90,
}}
refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
>
<EmptyScreen
- icon="time-outline"
- headline="Create an availability schedule"
- description="Creating availability schedules allows you to manage availability across event types. They can be applied to one or more event types."
- buttonText="New"
- onButtonPress={handleCreateNew}
+ icon="search-outline"
+ headline={`No results found for "${searchQuery}"`}
+ description="Try searching with different keywords"
/>
</ScrollView>
- </View>
- ) : null}
+ </Activity>
- {/* Search bar and content for non-empty states */}
- {!showEmptyState ? (
- <>
- <View className="flex-row items-center gap-3 border-b border-gray-300 bg-gray-100 px-4 py-2">
- <TextInput
- className="flex-1 rounded-lg border border-gray-200 bg-white px-3 py-2 text-[17px] text-black focus:border-black focus:ring-2 focus:ring-black"
- placeholder="Search schedules"
- placeholderTextColor="#9CA3AF"
- value={searchQuery}
- onChangeText={handleSearch}
- autoCapitalize="none"
- autoCorrect={false}
- clearButtonMode="while-editing"
- />
- <TouchableOpacity
- className="min-w-[60px] flex-row items-center justify-center gap-1 rounded-lg bg-black px-2.5 py-2"
- onPress={handleCreateNew}
- >
- <Ionicons name="add" size={18} color="#fff" />
- <Text className="text-base font-semibold text-white">New</Text>
- </TouchableOpacity>
- </View>
-
- {/* Search empty state */}
- {showSearchEmptyState ? (
- <View className="flex-1 bg-gray-50" style={{ paddingBottom: 100 }}>
- <ScrollView
- contentContainerStyle={{
- flexGrow: 1,
- justifyContent: "center",
- alignItems: "center",
- padding: 20,
- }}
- refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
- >
- <EmptyScreen
- icon="search-outline"
- headline={`No results found for "${searchQuery}"`}
- description="Try searching with different keywords"
- />
- </ScrollView>
- </View>
- ) : null}
-
- {/* Schedules list */}
- {showList ? (
- <View className="flex-1 px-2 pt-4 md:px-4">
- <View className="flex-1 overflow-hidden rounded-lg border border-[#E5E5EA] bg-white">
- <FlatList
- data={filteredSchedules}
- keyExtractor={(item) => item.id.toString()}
- renderItem={renderSchedule}
- contentContainerStyle={{ paddingBottom: 90 }}
- refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
- showsVerticalScrollIndicator={false}
- />
- </View>
- </View>
- ) : null}
- </>
- ) : null}
+ {/* Schedules list */}
+ <Activity mode={showList ? "visible" : "hidden"}>
+ <FlatList
+ className="flex-1 rounded-lg border border-[#E5E5EA] bg-white"
+ contentContainerStyle={{
+ paddingBottom: 90,
+ paddingHorizontal: 8,
+ paddingVertical: 4,
+ }}
+ data={filteredSchedules}
+ keyExtractor={(item) => item.id.toString()}
+ renderItem={({ item, index }) => (
+ <AvailabilityListItem
+ item={item}
+ index={index}
+ handleSchedulePress={handleSchedulePress}
+ handleScheduleLongPress={handleScheduleLongPress}
+ setSelectedSchedule={setSelectedSchedule}
+ setShowActionsModal={setShowActionsModal}
+ onDuplicate={handleDuplicate}
+ onDelete={handleDelete}
+ onSetAsDefault={handleSetAsDefault}
+ />
+ )}
+ refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
+ showsVerticalScrollIndicator={false}
+ contentInsetAdjustmentBehavior="automatic"
+ />
+ </Activity>
+ </Activity>
{/* Create Schedule Modal */}
<FullScreenModal
@@ -536,7 +510,9 @@ export default function Availability() {
{/* Actions List */}
<View className="p-2">
{/* Set as Default - only show if not already default */}
- {selectedSchedule && !selectedSchedule.isDefault ? (
+ <Activity
+ mode={selectedSchedule && !selectedSchedule.isDefault ? "visible" : "hidden"}
+ >
<>
<TouchableOpacity
onPress={() => {
@@ -553,7 +529,7 @@ export default function Availability() {
<View className="mx-4 my-2 h-px bg-gray-200" />
</>
- ) : null}
+ </Activity>
{/* Duplicate */}
<TouchableOpacity
@@ -651,6 +627,6 @@ export default function Availability() {
</View>
</View>
</FullScreenModal>
- </View>
+ </>
);
}
diff --git a/companion/app/(tabs)/(event-types)/index.tsx b/companion/app/(tabs)/(event-types)/index.tsx
index 941205d88d3..5a82fdea978 100644
--- a/companion/app/(tabs)/(event-types)/index.tsx
+++ b/companion/app/(tabs)/(event-types)/index.tsx
@@ -473,6 +473,7 @@ export default function EventTypes() {
<Stack.Header
style={{ backgroundColor: "transparent", shadowColor: "transparent" }}
blurEffect={isLiquidGlassAvailable() ? undefined : "light"} // Only looks cool on iOS 18 and below
+ hidden={Platform.OS === "android"}
>
<Stack.Header.Title large>Event Types</Stack.Header.Title>
<Stack.Header.Right>
@@ -487,7 +488,7 @@ export default function EventTypes() {
barTintColor="#fff"
/>
</Stack.Header>
- <Activity mode={Platform.OS === "web" ? "visible" : "hidden"}>
+ <Activity mode={Platform.OS === "web" || Platform.OS === "android" ? "visible" : "hidden"}>
<Header />
<View className="flex-row items-center gap-3 border-b border-gray-300 bg-gray-100 px-4 py-2">
<TextInput
diff --git a/companion/app/(tabs)/_layout.tsx b/companion/app/(tabs)/_layout.tsx
index 9e3068b796e..14705ceba47 100644
--- a/companion/app/(tabs)/_layout.tsx
+++ b/companion/app/(tabs)/_layout.tsx
@@ -28,7 +28,7 @@ export default function TabLayout() {
<NativeTabs.Trigger.Label>Bookings</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
- <NativeTabs.Trigger name="availability">
+ <NativeTabs.Trigger name="(availability)">
<NativeTabs.Trigger.Icon
sf="clock"
src={<VectorIcon family={MaterialCommunityIcons} name="clock" />}
diff --git a/companion/components/availability-list-item/AvailabilityListItem.ios.tsx b/companion/components/availability-list-item/AvailabilityListItem.ios.tsx
new file mode 100644
index 00000000000..907af3afd1f
--- /dev/null
+++ b/companion/components/availability-list-item/AvailabilityListItem.ios.tsx
@@ -0,0 +1,118 @@
+import { Ionicons } from "@expo/vector-icons";
+import { Pressable, Text, View } from "react-native";
+import { AvailabilityListItemProps } from "./AvailabilityListItem";
+import { Host, ContextMenu, Button, Image, HStack } from "@expo/ui/swift-ui";
+import { isLiquidGlassAvailable } from "expo-glass-effect";
+import { buttonStyle, frame, padding } from "@expo/ui/swift-ui/modifiers";
+
+export const AvailabilityListItem = ({
+ item: schedule,
+ handleSchedulePress,
+ onDuplicate,
+ onDelete,
+ onSetAsDefault,
+}: AvailabilityListItemProps) => {
+ const scheduleActions: {
+ label: string;
+ icon: any;
+ onPress: () => void;
+ role: "default" | "destructive";
+ }[] = [
+ ...(!schedule.isDefault && onSetAsDefault
+ ? [
+ {
+ label: "Set as Default",
+ icon: "star",
+ onPress: () => onSetAsDefault(schedule),
+ role: "default" as const,
+ },
+ ]
+ : []),
+ {
+ label: "Duplicate",
+ icon: "square.on.square",
+ onPress: () => onDuplicate?.(schedule),
+ role: "default",
+ },
+ {
+ label: "Delete",
+ icon: "trash",
+ onPress: () => onDelete?.(schedule),
+ role: "destructive",
+ },
+ ];
+
+ return (
+ <View
+ className="h-fill border-b border-[#E5E5EA]"
+ style={{ paddingLeft: 16, paddingVertical: 16 }}
+ >
+ <View className="flex-row items-center justify-between ">
+ <Pressable onPress={() => handleSchedulePress(schedule)} className="flex-grow">
+ <View className="mr-4 flex-1">
+ <View className="mb-1 flex-row flex-wrap items-center">
+ <Text className="text-base font-semibold text-[#333]">{schedule.name}</Text>
+ {schedule.isDefault && (
+ <View className="ml-2 rounded bg-[#666] px-2 py-0.5">
+ <Text className="text-xs font-semibold text-white">Default</Text>
+ </View>
+ )}
+ </View>
+
+ {schedule.availability && schedule.availability.length > 0 ? (
+ <View>
+ {schedule.availability.map((slot, slotIndex) => (
+ <View
+ key={`${schedule.id}-${slot.days.join("-")}-${slotIndex}`}
+ className={slotIndex > 0 ? "mt-2" : ""}
+ >
+ <Text className="text-sm text-[#666]">
+ {slot.days.join(", ")} {slot.startTime} - {slot.endTime}
+ </Text>
+ </View>
+ ))}
+ </View>
+ ) : (
+ <Text className="text-sm text-[#666]">No availability set</Text>
+ )}
+
+ <View className="mt-2 flex-row items-center">
+ <Ionicons name="globe-outline" size={14} color="#666" />
+ <Text className="ml-1.5 text-sm text-[#666]">{schedule.timeZone}</Text>
+ </View>
+ </View>
+ </Pressable>
+
+ {/* Three dots button - vertically centered on the right */}
+ <Host matchContents>
+ <ContextMenu
+ modifiers={[buttonStyle(isLiquidGlassAvailable() ? "glass" : "bordered"), padding()]}
+ activationMethod="singlePress"
+ >
+ <ContextMenu.Items>
+ {scheduleActions.map((scheduleAction) => (
+ <Button
+ key={scheduleAction.label}
+ systemImage={scheduleAction.icon}
+ onPress={scheduleAction.onPress}
+ role={scheduleAction.role}
+ label={scheduleAction.label}
+ />
+ ))}
+ </ContextMenu.Items>
+ <ContextMenu.Trigger>
+ <HStack>
+ <Image
+ systemName="ellipsis"
+ color="primary"
+ size={24}
+ modifiers={[frame({ height: 24, width: 17 })]}
+ />
+ </HStack>
+ </ContextMenu.Trigger>
+ </ContextMenu>
+ </Host>
+ </View>
+ </View>
+ );
+};
diff --git a/companion/components/availability-list-item/AvailabilityListItem.tsx b/companion/components/availability-list-item/AvailabilityListItem.tsx
new file mode 100644
index 00000000000..3c587a4f73a
--- /dev/null
+++ b/companion/components/availability-list-item/AvailabilityListItem.tsx
@@ -0,0 +1,80 @@
+import { Ionicons } from "@expo/vector-icons";
+import { Text, TouchableOpacity, View } from "react-native";
+import { Schedule } from "../../hooks";
+
+export interface AvailabilityListItemProps {
+ item: Schedule;
+ index: number;
+ handleSchedulePress: (schedule: Schedule) => void;
+ handleScheduleLongPress: (schedule: Schedule) => void;
+ setSelectedSchedule: (schedule: Schedule) => void;
+ setShowActionsModal: (show: boolean) => void;
+ onDuplicate?: (schedule: Schedule) => void;
+ onDelete?: (schedule: Schedule) => void;
+ onSetAsDefault?: (schedule: Schedule) => void;
+}
+
+export const AvailabilityListItem = ({
+ item: schedule,
+ handleSchedulePress,
+ handleScheduleLongPress,
+ setSelectedSchedule,
+ setShowActionsModal,
+}: AvailabilityListItemProps) => {
+ return (
+ <TouchableOpacity
+ className="border-b border-[#E5E5EA] bg-white active:bg-[#F8F9FA] "
+ onPress={() => handleSchedulePress(schedule)}
+ onLongPress={() => handleScheduleLongPress(schedule)}
+ style={{ paddingHorizontal: 16, paddingVertical: 16 }}
+ >
+ <View className="flex-row items-center justify-between">
+ <View className="mr-4 flex-1">
+ <View className="mb-1 flex-row flex-wrap items-center">
+ <Text className="text-base font-semibold text-[#333]">{schedule.name}</Text>
+ {schedule.isDefault && (
+ <View className="ml-2 rounded bg-[#666] px-2 py-0.5">
+ <Text className="text-xs font-semibold text-white">Default</Text>
+ </View>
+ )}
+ </View>
+
+ {schedule.availability && schedule.availability.length > 0 ? (
+ <View>
+ {schedule.availability.map((slot, slotIndex) => (
+ <View
+ key={`${schedule.id}-${slot.days.join("-")}-${slotIndex}`}
+ className={slotIndex > 0 ? "mt-2" : ""}
+ >
+ <Text className="text-sm text-[#666]">
+ {slot.days.join(", ")} {slot.startTime} - {slot.endTime}
+ </Text>
+ </View>
+ ))}
+ </View>
+ ) : (
+ <Text className="text-sm text-[#666]">No availability set</Text>
+ )}
+
+ <View className="mt-2 flex-row items-center">
+ <Ionicons name="globe-outline" size={14} color="#666" />
+ <Text className="ml-1.5 text-sm text-[#666]">{schedule.timeZone}</Text>
+ </View>
+ </View>
+
+ {/* Three dots button - vertically centered on the right */}
+ <TouchableOpacity
+ className="items-center justify-center rounded-lg border border-[#E5E5EA]"
+ style={{ width: 32, height: 32 }}
+ onPress={(e) => {
+ e.stopPropagation();
+ setSelectedSchedule(schedule);
+ setShowActionsModal(true);
+ }}
+ >
+ <Ionicons name="ellipsis-horizontal" size={18} color="#3C3F44" />
+ </TouchableOpacity>
+ </View>
+ </TouchableOpacity>
+ );
+};