Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/expo/app/(app)/pack-categories/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default function PackCategoriesScreen() {
</ScrollView>
) : (
<View className="flex-1 items-center justify-center">
<Text>{t('packs.noCategorizedItems')}</Text>
<Text className="text-center">{t('packs.noCategorizedItems')}</Text>
</View>
)}
</>
Expand Down
12 changes: 8 additions & 4 deletions apps/expo/features/weather/components/LocationPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { assertNonNull } from 'expo-app/utils/typeAssertions';
import { useRouter } from 'expo-router';
import { useState } from 'react';
import { Modal, Pressable, ScrollView, TouchableOpacity, View } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import { useActiveLocation, useLocations } from '../hooks';
import type { WeatherLocation } from '../types';

Expand Down Expand Up @@ -53,7 +54,7 @@ export function LocationPicker({
return (
<>
<Modal visible={open} animationType="slide" presentationStyle="pageSheet">
<View className="flex-1 bg-background">
<SafeAreaView className="flex-1 bg-background">
<View className="px-4 mb-4 py-2 border-b border-border flex-row gap-2 justify-between items-center">
<View className="flex-row flex-1 items-center gap-2">
<TouchableOpacity onPress={onClose}>
Expand Down Expand Up @@ -110,7 +111,10 @@ export function LocationPicker({
<View className="flex-1 items-center justify-center p-8 gap-4 mt-8">
<View className="h-16 w-16 rounded-full items-center justify-center bg-neutral-300 dark:bg-neutral-600">
<Icon
materialIcon={{ name: 'location-searching', type: 'MaterialIcons' }}
materialIcon={{
name: 'location-searching',
type: 'MaterialIcons',
}}
ios={{ name: 'location' }}
size={32}
color={colors.grey}
Expand All @@ -128,7 +132,7 @@ export function LocationPicker({
</View>
)}
</ScrollView>
<View className="px-4 pb-2 flex-row self-end items-center gap-2 justify-between">
<View className="px-4 pb-4 flex-row self-end items-center gap-2 justify-between">
{onSkip && (
<Button
onPress={() => {
Expand All @@ -152,7 +156,7 @@ export function LocationPicker({
<Text>{displaySelectText}</Text>
</Button>
</View>
</View>
</SafeAreaView>
</Modal>
</>
);
Expand Down
5 changes: 2 additions & 3 deletions apps/expo/features/weather/screens/LocationSearchScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function LocationSearchScreen() {
const [query, setQuery] = useState('');
const { isLoading, results, error, search, addSearchResult, searchByCoordinates } =
useLocationSearch();
const searchInputRef = useRef<SearchInputRef>(null);
const searchInputRef: SearchInputRef = useRef(null);
const [recentSearches, setRecentSearches] = useState<string[]>([]);
const [isAdding, setIsAdding] = useState(false);
const [addingLocationId, setAddingLocationId] = useState<number | null>(null);
Expand All @@ -43,7 +43,7 @@ export default function LocationSearchScreen() {
useEffect(() => {
setTimeout(() => {
searchInputRef.current?.focus();
}, 300);
}, 600);
}, []);

// Load recent searches from AsyncStorage
Expand Down Expand Up @@ -396,7 +396,6 @@ export default function LocationSearchScreen() {
value={query}
onChangeText={handleSearchChange}
containerClassName="border border-border"
autoFocus
clearButtonMode="while-editing"
/>
</View>
Expand Down
Loading