thêm giao diện map và cập nhật nativewind

This commit is contained in:
Tran Anh Tuan
2025-10-30 17:55:25 +07:00
parent d717a360b7
commit f9ca9542c4
31 changed files with 1068 additions and 65 deletions

View File

@@ -1,31 +1,34 @@
import { StyleSheet, Text, type TextProps } from 'react-native';
import { StyleSheet, Text, type TextProps } from "react-native";
import { useThemeColor } from '@/hooks/use-theme-color';
import { useThemeColor } from "@/hooks/use-theme-color";
export type ThemedTextProps = TextProps & {
lightColor?: string;
darkColor?: string;
type?: 'default' | 'title' | 'defaultSemiBold' | 'subtitle' | 'link';
type?: "default" | "title" | "defaultSemiBold" | "subtitle" | "link";
className?: string;
};
export function ThemedText({
style,
className = "",
lightColor,
darkColor,
type = 'default',
type = "default",
...rest
}: ThemedTextProps) {
const color = useThemeColor({ light: lightColor, dark: darkColor }, 'text');
const color = useThemeColor({ light: lightColor, dark: darkColor }, "text");
return (
<Text
className={className}
style={[
{ color },
type === 'default' ? styles.default : undefined,
type === 'title' ? styles.title : undefined,
type === 'defaultSemiBold' ? styles.defaultSemiBold : undefined,
type === 'subtitle' ? styles.subtitle : undefined,
type === 'link' ? styles.link : undefined,
type === "default" ? styles.default : undefined,
type === "title" ? styles.title : undefined,
type === "defaultSemiBold" ? styles.defaultSemiBold : undefined,
type === "subtitle" ? styles.subtitle : undefined,
type === "link" ? styles.link : undefined,
style,
]}
{...rest}
@@ -41,20 +44,20 @@ const styles = StyleSheet.create({
defaultSemiBold: {
fontSize: 16,
lineHeight: 24,
fontWeight: '600',
fontWeight: "600",
},
title: {
fontSize: 32,
fontWeight: 'bold',
fontWeight: "bold",
lineHeight: 32,
},
subtitle: {
fontSize: 20,
fontWeight: 'bold',
fontWeight: "bold",
},
link: {
lineHeight: 30,
fontSize: 16,
color: '#0a7ea4',
color: "#0a7ea4",
},
});

View File

@@ -1,14 +1,30 @@
import { View, type ViewProps } from 'react-native';
import { View, type ViewProps } from "react-native";
import { useThemeColor } from '@/hooks/use-theme-color';
import { useThemeColor } from "@/hooks/use-theme-color";
export type ThemedViewProps = ViewProps & {
lightColor?: string;
darkColor?: string;
className?: string;
};
export function ThemedView({ style, lightColor, darkColor, ...otherProps }: ThemedViewProps) {
const backgroundColor = useThemeColor({ light: lightColor, dark: darkColor }, 'background');
export function ThemedView({
style,
className = "",
lightColor,
darkColor,
...otherProps
}: ThemedViewProps) {
const backgroundColor = useThemeColor(
{ light: lightColor, dark: darkColor },
"background"
);
return <View style={[{ backgroundColor }, style]} {...otherProps} />;
return (
<View
className={className}
style={[{ backgroundColor }, style]}
{...otherProps}
/>
);
}