fix: tab bar not visible on Android #21
@@ -0,0 +1 @@
|
|||||||
|
{"pid":1390854,"startedAt":1783459832497}
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
import { Tabs } from 'expo-router';
|
import { Tabs } from 'expo-router';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { View, StyleSheet, Platform } from 'react-native';
|
import { View, StyleSheet, Platform, useWindowDimensions } from 'react-native';
|
||||||
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
||||||
import { colors, shadows } from '../../constants/theme';
|
import { colors, shadows } from '../../constants/theme';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
function ScanIcon({ color, size }: { color: string; size: number }) {
|
function ScanIcon({ color, size }: { color: string; size: number }) {
|
||||||
return (
|
return (
|
||||||
<View style={styles.fabContainer}>
|
<View style={styles.fabContainer}>
|
||||||
@@ -16,6 +18,8 @@ function ScanIcon({ color, size }: { color: string; size: number }) {
|
|||||||
|
|
||||||
export default function TabLayout() {
|
export default function TabLayout() {
|
||||||
const insets = useSafeAreaInsets();
|
const insets = useSafeAreaInsets();
|
||||||
|
const { width } = useWindowDimensions();
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
const bottomPadding = Platform.OS === 'ios' ? insets.bottom : 8;
|
const bottomPadding = Platform.OS === 'ios' ? insets.bottom : 8;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -24,14 +28,20 @@ export default function TabLayout() {
|
|||||||
tabBarActiveTintColor: colors.primary,
|
tabBarActiveTintColor: colors.primary,
|
||||||
tabBarInactiveTintColor: colors.textSecondary,
|
tabBarInactiveTintColor: colors.textSecondary,
|
||||||
tabBarStyle: {
|
tabBarStyle: {
|
||||||
...styles.tabBar,
|
...(isTablet ? styles.tabBarTablet : styles.tabBar),
|
||||||
height: 60 + bottomPadding,
|
height: (isTablet ? 64 : 60) + bottomPadding,
|
||||||
paddingBottom: bottomPadding,
|
paddingBottom: bottomPadding,
|
||||||
},
|
},
|
||||||
tabBarLabelStyle: styles.tabBarLabel,
|
tabBarLabelStyle: {
|
||||||
|
...styles.tabBarLabel,
|
||||||
|
...(isTablet ? styles.tabBarLabelTablet : {}),
|
||||||
|
},
|
||||||
headerStyle: styles.header,
|
headerStyle: styles.header,
|
||||||
headerTintColor: colors.primary,
|
headerTintColor: colors.primary,
|
||||||
headerTitleStyle: styles.headerTitle,
|
headerTitleStyle: {
|
||||||
|
...styles.headerTitle,
|
||||||
|
...(isTablet ? styles.headerTitleTablet : {}),
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Tabs.Screen
|
<Tabs.Screen
|
||||||
@@ -94,10 +104,19 @@ const styles = StyleSheet.create({
|
|||||||
borderTopColor: colors.border,
|
borderTopColor: colors.border,
|
||||||
paddingTop: 8,
|
paddingTop: 8,
|
||||||
},
|
},
|
||||||
|
tabBarTablet: {
|
||||||
|
backgroundColor: colors.card,
|
||||||
|
borderTopColor: colors.border,
|
||||||
|
paddingTop: 10,
|
||||||
|
paddingHorizontal: 24,
|
||||||
|
},
|
||||||
tabBarLabel: {
|
tabBarLabel: {
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
fontWeight: '500',
|
fontWeight: '500',
|
||||||
},
|
},
|
||||||
|
tabBarLabelTablet: {
|
||||||
|
fontSize: 13,
|
||||||
|
},
|
||||||
header: {
|
header: {
|
||||||
backgroundColor: colors.card,
|
backgroundColor: colors.card,
|
||||||
shadowColor: '#000',
|
shadowColor: '#000',
|
||||||
@@ -111,6 +130,9 @@ const styles = StyleSheet.create({
|
|||||||
fontWeight: '600',
|
fontWeight: '600',
|
||||||
fontSize: 17,
|
fontSize: 17,
|
||||||
},
|
},
|
||||||
|
headerTitleTablet: {
|
||||||
|
fontSize: 20,
|
||||||
|
},
|
||||||
fabContainer: {
|
fabContainer: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
top: -16,
|
top: -16,
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import { View, Text, StyleSheet, FlatList, TouchableOpacity, Alert } from 'react-native';
|
import { View, Text, StyleSheet, FlatList, TouchableOpacity, Alert, useWindowDimensions } from 'react-native';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { colors, spacing, borderRadius, shadows } from '../../constants/theme';
|
import { colors, spacing, borderRadius, shadows } from '../../constants/theme';
|
||||||
import { LoadingSpinner } from '../../components/LoadingSpinner';
|
import { LoadingSpinner } from '../../components/LoadingSpinner';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
interface NotificationItem {
|
interface NotificationItem {
|
||||||
scope: string;
|
scope: string;
|
||||||
id: number;
|
id: number;
|
||||||
@@ -16,6 +18,8 @@ interface NotificationItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function AlertsScreen() {
|
export default function AlertsScreen() {
|
||||||
|
const { width } = useWindowDimensions();
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
const [items, setItems] = useState<NotificationItem[]>([]);
|
const [items, setItems] = useState<NotificationItem[]>([]);
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
@@ -127,15 +131,15 @@ export default function AlertsScreen() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<View style={styles.header}>
|
<View style={[styles.header, isTablet && styles.headerTablet]}>
|
||||||
<Text style={styles.title}>Notificaciones Guardadas</Text>
|
<Text style={[styles.title, isTablet && styles.titleTablet]}>Notificaciones Guardadas</Text>
|
||||||
<Text style={styles.subtitle}>
|
<Text style={[styles.subtitle, isTablet && styles.subtitleTablet]}>
|
||||||
Recibe avisos cuando medicamentos sin stock se repongan
|
Recibe avisos cuando medicamentos sin stock se repongan
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<View style={styles.errorContainer}>
|
<View style={[styles.errorContainer, isTablet && styles.errorContainerTablet]}>
|
||||||
<Text style={styles.errorText}>{error}</Text>
|
<Text style={styles.errorText}>{error}</Text>
|
||||||
<TouchableOpacity onPress={loadNotifications} style={styles.retryButton}>
|
<TouchableOpacity onPress={loadNotifications} style={styles.retryButton}>
|
||||||
<Text style={styles.retryText}>Reintentar</Text>
|
<Text style={styles.retryText}>Reintentar</Text>
|
||||||
@@ -145,9 +149,9 @@ export default function AlertsScreen() {
|
|||||||
|
|
||||||
{!error && items.length === 0 && (
|
{!error && items.length === 0 && (
|
||||||
<View style={styles.emptyContainer}>
|
<View style={styles.emptyContainer}>
|
||||||
<Ionicons name="notifications-off-outline" size={64} color={colors.border} />
|
<Ionicons name="notifications-off-outline" size={isTablet ? 80 : 64} color={colors.border} />
|
||||||
<Text style={styles.emptyTitle}>Sin notificaciones</Text>
|
<Text style={[styles.emptyTitle, isTablet && styles.emptyTitleTablet]}>Sin notificaciones</Text>
|
||||||
<Text style={styles.emptyText}>
|
<Text style={[styles.emptyText, isTablet && styles.emptyTextTablet]}>
|
||||||
Toca la campana en una farmacia sin stock para recibir notificaciones cuando se reponga.
|
Toca la campana en una farmacia sin stock para recibir notificaciones cuando se reponga.
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
@@ -158,7 +162,7 @@ export default function AlertsScreen() {
|
|||||||
data={items}
|
data={items}
|
||||||
keyExtractor={(item) => `${item.scope}:${item.id}`}
|
keyExtractor={(item) => `${item.scope}:${item.id}`}
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
contentContainerStyle={styles.list}
|
contentContainerStyle={[styles.list, isTablet && styles.listTablet]}
|
||||||
showsVerticalScrollIndicator={false}
|
showsVerticalScrollIndicator={false}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -176,22 +180,39 @@ const styles = StyleSheet.create({
|
|||||||
paddingTop: spacing.lg,
|
paddingTop: spacing.lg,
|
||||||
paddingBottom: spacing.md,
|
paddingBottom: spacing.md,
|
||||||
},
|
},
|
||||||
|
headerTablet: {
|
||||||
|
maxWidth: 700,
|
||||||
|
alignSelf: 'center',
|
||||||
|
width: '100%',
|
||||||
|
},
|
||||||
title: {
|
title: {
|
||||||
fontSize: 22,
|
fontSize: 22,
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
color: colors.text,
|
color: colors.text,
|
||||||
},
|
},
|
||||||
|
titleTablet: {
|
||||||
|
fontSize: 28,
|
||||||
|
},
|
||||||
subtitle: {
|
subtitle: {
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
color: colors.textSecondary,
|
color: colors.textSecondary,
|
||||||
marginTop: spacing.xs,
|
marginTop: spacing.xs,
|
||||||
lineHeight: 20,
|
lineHeight: 20,
|
||||||
},
|
},
|
||||||
|
subtitleTablet: {
|
||||||
|
fontSize: 16,
|
||||||
|
lineHeight: 24,
|
||||||
|
},
|
||||||
list: {
|
list: {
|
||||||
paddingHorizontal: spacing.lg,
|
paddingHorizontal: spacing.lg,
|
||||||
paddingBottom: spacing.xl,
|
paddingBottom: spacing.xl,
|
||||||
gap: spacing.sm,
|
gap: spacing.sm,
|
||||||
},
|
},
|
||||||
|
listTablet: {
|
||||||
|
maxWidth: 700,
|
||||||
|
alignSelf: 'center',
|
||||||
|
width: '100%',
|
||||||
|
},
|
||||||
item: {
|
item: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
@@ -249,6 +270,10 @@ const styles = StyleSheet.create({
|
|||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: spacing.sm,
|
gap: spacing.sm,
|
||||||
},
|
},
|
||||||
|
errorContainerTablet: {
|
||||||
|
maxWidth: 700,
|
||||||
|
alignSelf: 'center',
|
||||||
|
},
|
||||||
errorText: {
|
errorText: {
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
color: colors.danger,
|
color: colors.danger,
|
||||||
@@ -275,10 +300,18 @@ const styles = StyleSheet.create({
|
|||||||
fontWeight: '600',
|
fontWeight: '600',
|
||||||
color: colors.text,
|
color: colors.text,
|
||||||
},
|
},
|
||||||
|
emptyTitleTablet: {
|
||||||
|
fontSize: 24,
|
||||||
|
},
|
||||||
emptyText: {
|
emptyText: {
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
color: colors.textSecondary,
|
color: colors.textSecondary,
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
lineHeight: 20,
|
lineHeight: 20,
|
||||||
},
|
},
|
||||||
|
emptyTextTablet: {
|
||||||
|
fontSize: 16,
|
||||||
|
maxWidth: 400,
|
||||||
|
lineHeight: 24,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,51 +1,55 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { View, Text, StyleSheet, TouchableOpacity, Image } from 'react-native';
|
import { View, Text, StyleSheet, TouchableOpacity, Image, useWindowDimensions } from 'react-native';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { useRouter } from 'expo-router';
|
import { useRouter } from 'expo-router';
|
||||||
import { colors, spacing, borderRadius, shadows } from '../../constants/theme';
|
import { colors, spacing, borderRadius, shadows } from '../../constants/theme';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
export default function HomeScreen() {
|
export default function HomeScreen() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { width } = useWindowDimensions();
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<View style={styles.hero}>
|
<View style={[styles.hero, isTablet && styles.heroTablet]}>
|
||||||
<Image
|
<Image
|
||||||
source={require('../../assets/farmaclic_logo.png')}
|
source={require('../../assets/farmaclic_logo.png')}
|
||||||
style={styles.logo}
|
style={[styles.logo, isTablet && styles.logoTablet]}
|
||||||
resizeMode="contain"
|
resizeMode="contain"
|
||||||
/>
|
/>
|
||||||
<Text style={styles.brandName}>FarmaClic</Text>
|
<Text style={[styles.brandName, isTablet && styles.brandNameTablet]}>FarmaClic</Text>
|
||||||
<Text style={styles.description}>
|
<Text style={[styles.description, isTablet && styles.descriptionTablet]}>
|
||||||
Encuentra tus medicamentos en farmacias cercanas
|
Encuentra tus medicamentos en farmacias cercanas
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
<View style={styles.cards}>
|
<View style={[styles.cards, isTablet && styles.cardsTablet]}>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.card}
|
style={[styles.card, isTablet && styles.cardTablet]}
|
||||||
activeOpacity={0.85}
|
activeOpacity={0.85}
|
||||||
onPress={() => router.push('/(tabs)')}
|
onPress={() => router.push('/(tabs)')}
|
||||||
>
|
>
|
||||||
<View style={[styles.cardIcon, styles.cardIconSearch]}>
|
<View style={[styles.cardIcon, styles.cardIconSearch]}>
|
||||||
<Ionicons name="search" size={24} color={colors.onPrimaryContainer} />
|
<Ionicons name="search" size={isTablet ? 28 : 24} color={colors.onPrimaryContainer} />
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.cardContent}>
|
<View style={styles.cardContent}>
|
||||||
<Text style={styles.cardLabel}>Buscar Medicamento</Text>
|
<Text style={[styles.cardLabel, isTablet && styles.cardLabelTablet]}>Buscar Medicamento</Text>
|
||||||
<Ionicons name="chevron-forward" size={20} color={colors.onPrimaryContainer} style={{ opacity: 0.7 }} />
|
<Ionicons name="chevron-forward" size={20} color={colors.onPrimaryContainer} style={{ opacity: 0.7 }} />
|
||||||
</View>
|
</View>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.card, styles.cardScan]}
|
style={[styles.card, styles.cardScan, isTablet && styles.cardTablet]}
|
||||||
activeOpacity={0.85}
|
activeOpacity={0.85}
|
||||||
onPress={() => router.push('/scanner')}
|
onPress={() => router.push('/scanner')}
|
||||||
>
|
>
|
||||||
<View style={[styles.cardIcon, styles.cardIconScan]}>
|
<View style={[styles.cardIcon, styles.cardIconScan]}>
|
||||||
<Ionicons name="scan" size={24} color="#ffffff" />
|
<Ionicons name="scan" size={isTablet ? 28 : 24} color="#ffffff" />
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.cardContent}>
|
<View style={styles.cardContent}>
|
||||||
<Text style={[styles.cardLabel, styles.cardLabelScan]}>Escanear TSI</Text>
|
<Text style={[styles.cardLabel, styles.cardLabelScan, isTablet && styles.cardLabelTablet]}>Escanear TSI</Text>
|
||||||
<Ionicons name="chevron-forward" size={20} color="#ffffff" style={{ opacity: 0.7 }} />
|
<Ionicons name="chevron-forward" size={20} color="#ffffff" style={{ opacity: 0.7 }} />
|
||||||
</View>
|
</View>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
@@ -68,17 +72,27 @@ const styles = StyleSheet.create({
|
|||||||
gap: spacing.sm,
|
gap: spacing.sm,
|
||||||
marginBottom: spacing.md,
|
marginBottom: spacing.md,
|
||||||
},
|
},
|
||||||
|
heroTablet: {
|
||||||
|
marginBottom: spacing.xl,
|
||||||
|
},
|
||||||
logo: {
|
logo: {
|
||||||
width: 120,
|
width: 120,
|
||||||
height: 120,
|
height: 120,
|
||||||
marginBottom: spacing.xs,
|
marginBottom: spacing.xs,
|
||||||
},
|
},
|
||||||
|
logoTablet: {
|
||||||
|
width: 160,
|
||||||
|
height: 160,
|
||||||
|
},
|
||||||
brandName: {
|
brandName: {
|
||||||
fontSize: 28,
|
fontSize: 28,
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
color: colors.text,
|
color: colors.text,
|
||||||
letterSpacing: -0.5,
|
letterSpacing: -0.5,
|
||||||
},
|
},
|
||||||
|
brandNameTablet: {
|
||||||
|
fontSize: 36,
|
||||||
|
},
|
||||||
description: {
|
description: {
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
color: colors.textSecondary,
|
color: colors.textSecondary,
|
||||||
@@ -86,11 +100,19 @@ const styles = StyleSheet.create({
|
|||||||
maxWidth: 260,
|
maxWidth: 260,
|
||||||
lineHeight: 24,
|
lineHeight: 24,
|
||||||
},
|
},
|
||||||
|
descriptionTablet: {
|
||||||
|
fontSize: 18,
|
||||||
|
maxWidth: 400,
|
||||||
|
lineHeight: 28,
|
||||||
|
},
|
||||||
cards: {
|
cards: {
|
||||||
width: '100%',
|
width: '100%',
|
||||||
maxWidth: 320,
|
maxWidth: 320,
|
||||||
gap: spacing.md,
|
gap: spacing.md,
|
||||||
},
|
},
|
||||||
|
cardsTablet: {
|
||||||
|
maxWidth: 480,
|
||||||
|
},
|
||||||
card: {
|
card: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
@@ -101,6 +123,10 @@ const styles = StyleSheet.create({
|
|||||||
minHeight: 64,
|
minHeight: 64,
|
||||||
...shadows.card,
|
...shadows.card,
|
||||||
},
|
},
|
||||||
|
cardTablet: {
|
||||||
|
padding: spacing.lg,
|
||||||
|
minHeight: 72,
|
||||||
|
},
|
||||||
cardScan: {
|
cardScan: {
|
||||||
backgroundColor: colors.scanButton,
|
backgroundColor: colors.scanButton,
|
||||||
},
|
},
|
||||||
@@ -131,6 +157,9 @@ const styles = StyleSheet.create({
|
|||||||
color: colors.onPrimaryContainer,
|
color: colors.onPrimaryContainer,
|
||||||
lineHeight: 24,
|
lineHeight: 24,
|
||||||
},
|
},
|
||||||
|
cardLabelTablet: {
|
||||||
|
fontSize: 20,
|
||||||
|
},
|
||||||
cardLabelScan: {
|
cardLabelScan: {
|
||||||
color: '#ffffff',
|
color: '#ffffff',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { View, FlatList, StyleSheet, Text, TouchableOpacity } from 'react-native';
|
import { View, FlatList, StyleSheet, Text, TouchableOpacity, useWindowDimensions } from 'react-native';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { useRouter } from 'expo-router';
|
import { useRouter } from 'expo-router';
|
||||||
import { SearchBar } from '../../components/SearchBar';
|
import { SearchBar } from '../../components/SearchBar';
|
||||||
@@ -11,13 +11,17 @@ import { colors, spacing, borderRadius } from '../../constants/theme';
|
|||||||
import { Medicine } from '../../types';
|
import { Medicine } from '../../types';
|
||||||
import { config } from '../../constants/config';
|
import { config } from '../../constants/config';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
export default function HomeScreen() {
|
export default function HomeScreen() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { width } = useWindowDimensions();
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
const [query, setQuery] = useState('');
|
const [query, setQuery] = useState('');
|
||||||
const [results, setResults] = useState<Medicine[]>([]);
|
const [results, setResults] = useState<Medicine[]>([]);
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
const debouncedQuery = useDebounce(query, config.SEARCH_DEBOUNCE_MS);
|
const debouncedQuery = useDebounce(query, config.SEARCH_DEBOUNCE_MS);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -49,7 +53,7 @@ export default function HomeScreen() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<View style={styles.searchContainer}>
|
<View style={[styles.searchContainer, isTablet && styles.searchContainerTablet]}>
|
||||||
<SearchBar
|
<SearchBar
|
||||||
onSearch={handleSearch}
|
onSearch={handleSearch}
|
||||||
value={query}
|
value={query}
|
||||||
@@ -62,26 +66,26 @@ export default function HomeScreen() {
|
|||||||
<Ionicons name="scan" size={22} color="#ffffff" />
|
<Ionicons name="scan" size={22} color="#ffffff" />
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{isLoading && <LoadingSpinner message="Buscando medicamentos..." />}
|
{isLoading && <LoadingSpinner message="Buscando medicamentos..." />}
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
<View style={styles.errorContainer}>
|
<View style={[styles.errorContainer, isTablet && styles.errorContainerTablet]}>
|
||||||
<Text style={styles.errorText}>{error}</Text>
|
<Text style={styles.errorText}>{error}</Text>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!isLoading && !error && results.length === 0 && query.length >= 2 && (
|
{!isLoading && !error && results.length === 0 && query.length >= 2 && (
|
||||||
<View style={styles.emptyContainer}>
|
<View style={styles.emptyContainer}>
|
||||||
<Text style={styles.emptyText}>No se encontraron medicamentos</Text>
|
<Text style={styles.emptyText}>No se encontraron medicamentos</Text>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<FlatList
|
<FlatList
|
||||||
data={results}
|
data={results}
|
||||||
keyExtractor={(item) => item.nregistro}
|
keyExtractor={(item) => item.nregistro}
|
||||||
renderItem={({ item }) => <MedicineCard medicine={item} />}
|
renderItem={({ item }) => <MedicineCard medicine={item} />}
|
||||||
contentContainerStyle={styles.list}
|
contentContainerStyle={[styles.list, isTablet && styles.listTablet]}
|
||||||
showsVerticalScrollIndicator={false}
|
showsVerticalScrollIndicator={false}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
@@ -98,6 +102,11 @@ const styles = StyleSheet.create({
|
|||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
paddingRight: spacing.lg,
|
paddingRight: spacing.lg,
|
||||||
},
|
},
|
||||||
|
searchContainerTablet: {
|
||||||
|
maxWidth: 700,
|
||||||
|
alignSelf: 'center',
|
||||||
|
width: '100%',
|
||||||
|
},
|
||||||
scannerButton: {
|
scannerButton: {
|
||||||
width: 44,
|
width: 44,
|
||||||
height: 44,
|
height: 44,
|
||||||
@@ -114,12 +123,21 @@ const styles = StyleSheet.create({
|
|||||||
list: {
|
list: {
|
||||||
paddingBottom: spacing.xl,
|
paddingBottom: spacing.xl,
|
||||||
},
|
},
|
||||||
|
listTablet: {
|
||||||
|
maxWidth: 700,
|
||||||
|
alignSelf: 'center',
|
||||||
|
width: '100%',
|
||||||
|
},
|
||||||
errorContainer: {
|
errorContainer: {
|
||||||
padding: spacing.md,
|
padding: spacing.md,
|
||||||
marginHorizontal: spacing.lg,
|
marginHorizontal: spacing.lg,
|
||||||
backgroundColor: colors.dangerContainer,
|
backgroundColor: colors.dangerContainer,
|
||||||
borderRadius: borderRadius.lg,
|
borderRadius: borderRadius.lg,
|
||||||
},
|
},
|
||||||
|
errorContainerTablet: {
|
||||||
|
maxWidth: 700,
|
||||||
|
alignSelf: 'center',
|
||||||
|
},
|
||||||
errorText: {
|
errorText: {
|
||||||
color: colors.danger,
|
color: colors.danger,
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { View, Text, StyleSheet, TouchableOpacity, Alert, TextInput, ScrollView, Image, ActivityIndicator, Modal, Pressable } from 'react-native';
|
import { View, Text, StyleSheet, TouchableOpacity, Alert, TextInput, ScrollView, Image, ActivityIndicator, Modal, Pressable, useWindowDimensions } from 'react-native';
|
||||||
import { useRouter } from 'expo-router';
|
import { useRouter } from 'expo-router';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import * as ImagePicker from 'expo-image-picker';
|
import * as ImagePicker from 'expo-image-picker';
|
||||||
import { useAuth } from '../../hooks/useAuth';
|
import { useAuth } from '../../hooks/useAuth';
|
||||||
import { colors, spacing, borderRadius } from '../../constants/theme';
|
import { colors, spacing, borderRadius } from '../../constants/theme';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
const AVATARS = [
|
const AVATARS = [
|
||||||
require('../../assets/avatars/avatar1.png'),
|
require('../../assets/avatars/avatar1.png'),
|
||||||
require('../../assets/avatars/avatar2.png'),
|
require('../../assets/avatars/avatar2.png'),
|
||||||
@@ -44,6 +46,8 @@ interface Address {
|
|||||||
|
|
||||||
export default function ProfileScreen() {
|
export default function ProfileScreen() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { width } = useWindowDimensions();
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
const { user, isAuthenticated, isLoading, logout, isAdmin } = useAuth();
|
const { user, isAuthenticated, isLoading, logout, isAdmin } = useAuth();
|
||||||
|
|
||||||
const [firstName, setFirstName] = useState(user?.first_name || '');
|
const [firstName, setFirstName] = useState(user?.first_name || '');
|
||||||
@@ -388,16 +392,16 @@ export default function ProfileScreen() {
|
|||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<View style={styles.authPrompt}>
|
<View style={styles.authPrompt}>
|
||||||
<Ionicons name="person-outline" size={64} color={colors.textSecondary} />
|
<Ionicons name="person-outline" size={isTablet ? 80 : 64} color={colors.textSecondary} />
|
||||||
<Text style={styles.authTitle}>Inicia Sesión</Text>
|
<Text style={[styles.authTitle, isTablet && styles.authTitleTablet]}>Inicia Sesión</Text>
|
||||||
<Text style={styles.authSubtitle}>
|
<Text style={[styles.authSubtitle, isTablet && styles.authSubtitleTablet]}>
|
||||||
Inicia sesión para acceder a todas las funcionalidades
|
Inicia sesión para acceder a todas las funcionalidades
|
||||||
</Text>
|
</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.button}
|
style={[styles.button, isTablet && styles.buttonTablet]}
|
||||||
onPress={() => router.push('/auth/login')}
|
onPress={() => router.push('/auth/login')}
|
||||||
>
|
>
|
||||||
<Text style={styles.buttonText}>Iniciar Sesión</Text>
|
<Text style={[styles.buttonText, isTablet && styles.buttonTextTablet]}>Iniciar Sesión</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={styles.linkButton}
|
style={styles.linkButton}
|
||||||
|
|||||||
@@ -1,29 +1,33 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
|
import { View, Text, StyleSheet, TouchableOpacity, useWindowDimensions } from 'react-native';
|
||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { useRouter } from 'expo-router';
|
import { useRouter } from 'expo-router';
|
||||||
import { colors, spacing, borderRadius, shadows } from '../../constants/theme';
|
import { colors, spacing, borderRadius, shadows } from '../../constants/theme';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
export default function ScanTabScreen() {
|
export default function ScanTabScreen() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
const { width } = useWindowDimensions();
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.container}>
|
<View style={styles.container}>
|
||||||
<View style={styles.content}>
|
<View style={[styles.content, isTablet && styles.contentTablet]}>
|
||||||
<View style={styles.iconContainer}>
|
<View style={[styles.iconContainer, isTablet && styles.iconContainerTablet]}>
|
||||||
<Ionicons name="scan" size={64} color={colors.scanButton} />
|
<Ionicons name="scan" size={isTablet ? 80 : 64} color={colors.scanButton} />
|
||||||
</View>
|
</View>
|
||||||
<Text style={styles.title}>Escanear TSI</Text>
|
<Text style={[styles.title, isTablet && styles.titleTablet]}>Escanear TSI</Text>
|
||||||
<Text style={styles.description}>
|
<Text style={[styles.description, isTablet && styles.descriptionTablet]}>
|
||||||
Escanea el código de barras de tu tarjeta sanitaria para encontrar tus medicamentos
|
Escanea el código de barras de tu tarjeta sanitaria para encontrar tus medicamentos
|
||||||
</Text>
|
</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[styles.button, shadows.scanButton]}
|
style={[styles.button, shadows.scanButton, isTablet && styles.buttonTablet]}
|
||||||
activeOpacity={0.85}
|
activeOpacity={0.85}
|
||||||
onPress={() => router.push('/scanner')}
|
onPress={() => router.push('/scanner')}
|
||||||
>
|
>
|
||||||
<Ionicons name="scan" size={24} color="#ffffff" />
|
<Ionicons name="scan" size={isTablet ? 28 : 24} color="#ffffff" />
|
||||||
<Text style={styles.buttonText}>Iniciar escaneo</Text>
|
<Text style={[styles.buttonText, isTablet && styles.buttonTextTablet]}>Iniciar escaneo</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
@@ -42,6 +46,9 @@ const styles = StyleSheet.create({
|
|||||||
paddingHorizontal: spacing.xl,
|
paddingHorizontal: spacing.xl,
|
||||||
gap: spacing.md,
|
gap: spacing.md,
|
||||||
},
|
},
|
||||||
|
contentTablet: {
|
||||||
|
gap: spacing.lg,
|
||||||
|
},
|
||||||
iconContainer: {
|
iconContainer: {
|
||||||
width: 100,
|
width: 100,
|
||||||
height: 100,
|
height: 100,
|
||||||
@@ -51,11 +58,19 @@ const styles = StyleSheet.create({
|
|||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
marginBottom: spacing.sm,
|
marginBottom: spacing.sm,
|
||||||
},
|
},
|
||||||
|
iconContainerTablet: {
|
||||||
|
width: 140,
|
||||||
|
height: 140,
|
||||||
|
borderRadius: 70,
|
||||||
|
},
|
||||||
title: {
|
title: {
|
||||||
fontSize: 22,
|
fontSize: 22,
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
color: colors.text,
|
color: colors.text,
|
||||||
},
|
},
|
||||||
|
titleTablet: {
|
||||||
|
fontSize: 28,
|
||||||
|
},
|
||||||
description: {
|
description: {
|
||||||
fontSize: 15,
|
fontSize: 15,
|
||||||
color: colors.textSecondary,
|
color: colors.textSecondary,
|
||||||
@@ -63,6 +78,11 @@ const styles = StyleSheet.create({
|
|||||||
lineHeight: 22,
|
lineHeight: 22,
|
||||||
maxWidth: 280,
|
maxWidth: 280,
|
||||||
},
|
},
|
||||||
|
descriptionTablet: {
|
||||||
|
fontSize: 17,
|
||||||
|
maxWidth: 420,
|
||||||
|
lineHeight: 26,
|
||||||
|
},
|
||||||
button: {
|
button: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
@@ -73,9 +93,16 @@ const styles = StyleSheet.create({
|
|||||||
paddingHorizontal: spacing.xl,
|
paddingHorizontal: spacing.xl,
|
||||||
marginTop: spacing.md,
|
marginTop: spacing.md,
|
||||||
},
|
},
|
||||||
|
buttonTablet: {
|
||||||
|
paddingVertical: spacing.lg,
|
||||||
|
paddingHorizontal: spacing.xl * 1.5,
|
||||||
|
},
|
||||||
buttonText: {
|
buttonText: {
|
||||||
fontSize: 17,
|
fontSize: 17,
|
||||||
fontWeight: '600',
|
fontWeight: '600',
|
||||||
color: '#ffffff',
|
color: '#ffffff',
|
||||||
},
|
},
|
||||||
|
buttonTextTablet: {
|
||||||
|
fontSize: 20,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { useWindowDimensions } from 'react-native';
|
||||||
|
|
||||||
|
const TABLET_MIN_WIDTH = 768;
|
||||||
|
|
||||||
|
export function useResponsive() {
|
||||||
|
const { width, height } = useWindowDimensions();
|
||||||
|
|
||||||
|
const isTablet = width >= TABLET_MIN_WIDTH;
|
||||||
|
const isLandscape = width > height;
|
||||||
|
|
||||||
|
// Scale factor for tablet: 1.0 on phone, ~1.2 on tablet
|
||||||
|
const scale = isTablet ? 1.2 : 1.0;
|
||||||
|
|
||||||
|
// Max content width to prevent stretching on large screens
|
||||||
|
const maxContentWidth = isTablet ? Math.min(600, width * 0.6) : width;
|
||||||
|
|
||||||
|
// Horizontal padding: more on tablets to center content
|
||||||
|
const horizontalPadding = isTablet ? 48 : 24;
|
||||||
|
|
||||||
|
return {
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
isTablet,
|
||||||
|
isLandscape,
|
||||||
|
scale,
|
||||||
|
maxContentWidth,
|
||||||
|
horizontalPadding,
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user