19 Commits

Author SHA1 Message Date
1
996999453a feat(client): i18n copy + reco lang refresh + home polish 2026-02-02 20:11:09 +08:00
1
64b8352ad3 fix:并 2026-02-02 17:33:20 +08:00
1
4b739dd194 feat: 完善启动分发逻辑,优化小组件背景适配与点赞图标交互 2026-02-02 17:17:10 +08:00
吕新雨
d045237952 chore: 清理 Python 运行产物并忽略
- 从仓库移除 __pycache__/ 与 *.pyc 等运行产物,避免 git pull 覆盖未跟踪文件导致合并失败
- 在 .gitignore 增加 Python 运行产物忽略规则
2026-02-02 16:52:22 +08:00
1
228fd7fd84 feat: 首页支持风景图与纯色背景随滑动自动切换,优化点赞图标样式与交互 2026-02-02 16:50:38 +08:00
3587a24115 Merge pull request '新功能:个性化推荐算法' (#7) from damer into main
Reviewed-on: #7
2026-02-02 08:48:11 +00:00
吕新雨
6dc4e2b943 新功能:个性化推荐算法 2026-02-02 16:47:37 +08:00
吕新雨
936094211b Merge remote-tracking branch 'origin/main' 2026-02-02 11:27:00 +08:00
吕新雨
be38d817d5 Merge branch 'damer' 2026-02-02 11:23:53 +08:00
吕新雨
58d17fc39f fix:更新算法 2026-02-02 11:22:35 +08:00
Hao
502a6ac500 Merge pull request 'Hao' (#5) from Hao into main
Reviewed-on: #5
2026-02-02 02:51:14 +00:00
f49cbb7186 Merge pull request 'fix:文明' (#4) from damer into main
Reviewed-on: #4
2026-02-02 02:49:27 +00:00
吕新雨
814b96edb6 fix:文明 2026-02-02 10:47:24 +08:00
1
868c5cac40 feat: 更新 App 名称为 Hey Mama,优化 iOS 情绪小组件样式与背景铺满 2026-01-31 19:46:34 +08:00
1
e675cbbbfb feat: 完善个人中心与小组件功能,优化 Onboarding 交互与手势体验 2026-01-31 19:02:54 +08:00
Hao
c4c7d7d251 Merge pull request 'main' (#3) from main into Hao
Reviewed-on: #3
2026-01-30 10:16:42 +00:00
Hao
7e4074d457 Merge pull request 'Hao' (#2) from Hao into main
Reviewed-on: #2
2026-01-30 10:15:45 +00:00
1
a9ea31b235 fix: resolve Expo SDK 54 compatibility issues and React 19 JSX runtime errors 2026-01-30 18:09:56 +08:00
1
0c71494815 改页 2026-01-30 16:34:40 +08:00
182 changed files with 14164 additions and 769 deletions

View File

@@ -1,4 +1,5 @@
请开始完成编码 请开始完成编码
客户端请按照标准的RN架构目录写代码 客户端请按照标准的RN架构目录写代码
后端请按照标准的python FastAPI 架构目录写代码 后端请按照标准的python FastAPI 架构目录写代码
现在多语言仅支持 EN / TC 现在多语言仅支持 EN / TC
整个task.md执行完毕后需要在对应的overview.md标记并且说明变更的文件名

View File

@@ -9,6 +9,6 @@
- 输入/输出定义 - 输入/输出定义
- 验收标准(可验证) - 验收标准(可验证)
3. 拆分后输出一个 `modules/` 目录结构列表,并为每个模块生成对应 spec 内容。 3. 拆分后输出一个 `modules/` 目录结构列表,并为每个模块生成对应 spec 内容。
4. 保留大 spec.md 的高层背景/总览到 overview 部分。 4. 保留大 spec.md 的高层背景/总览到 overview 部分,并标明各个模块的实现顺序
5. 子模块之间按逻辑关系关联。 5. 子模块之间按逻辑关系关联。
6. 不生成 plan.md 或 tasks.md仅拆出子模块 spec。 6. 不生成 plan.md 或 tasks.md仅拆出子模块 spec。

View File

@@ -2,3 +2,4 @@
根据对应的plan.md 生成task.md 根据对应的plan.md 生成task.md
任务清单详细可执行 任务清单详细可执行
执行完要标记 执行完要标记
整个task.md执行完毕后需要在对应的overview.md标记

View File

@@ -0,0 +1 @@
使用测试工具完成集成测试,并给我一份简单的测试报告

View File

@@ -28,4 +28,5 @@ modules/ 可嵌套 modules/,每层都独立规范。
输出时根据这个结构生成内容时,请保持文件职责清晰。 输出时根据这个结构生成内容时,请保持文件职责清晰。
简短记录项目的该层每个spec的内容 每次编码完成后更新overview.md 简短记录项目的该层每个spec的内容 每次编码完成后更新overview.md
可以通过nvm 切换node版本 可以通过nvm 切换node版本
在对数据库操作中,禁止执行破坏性操作,如果必须请让我同意,并回复:允许操作数据库

4
.gitignore vendored
View File

@@ -4,6 +4,10 @@
.DS_Store .DS_Store
*.pem *.pem
# Python运行产物
__pycache__/
*.py[cod]
# Node / JS # Node / JS
node_modules/ node_modules/
npm-debug.* npm-debug.*

View File

@@ -3,6 +3,17 @@
本项目面向宝妈群体,提供情绪价值与正念练习支持。 本项目面向宝妈群体,提供情绪价值与正念练习支持。
客户端采用 React Native + Expo后端采用 Python + FastAPI数据库 MySQL任务调度 Celery推送/定时等功能完整支持。 客户端采用 React Native + Expo后端采用 Python + FastAPI数据库 MySQL任务调度 Celery推送/定时等功能完整支持。
# git提交
git add .
git commit -m '备注'
git push origin
获取最新分支
git pull
# 创建自己的分支
git checkout -b 姓名拼写
# 目录结构 # 目录结构
/mindfulness /mindfulness

View File

@@ -1,8 +1,7 @@
import { useEffect, useLayoutEffect, useMemo, useState } from 'react'; import { useEffect, useLayoutEffect, useMemo, useState, useCallback, useRef } from 'react';
import { StyleSheet, View } from 'react-native'; import { StyleSheet, View, Dimensions, Text, Pressable, PanResponder, Animated as RNAnimated, ImageBackground } from 'react-native';
import { Pressable } from 'react-native';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useNavigation } from 'expo-router'; import { useNavigation, useFocusEffect } from 'expo-router';
import Animated, { import Animated, {
Easing, Easing,
runOnJS, runOnJS,
@@ -19,20 +18,66 @@ import {
getUserProfile, getUserProfile,
setReaction, setReaction,
setThemeMode, setThemeMode,
getRecoFeedCache,
setRecoFeedCache,
getUserProfileScoring,
getRecoFeedHistory,
recordRecoFeedServed,
type ThemeMode, type ThemeMode,
} from '@/src/storage/appStorage'; } from '@/src/storage/appStorage';
import { fetchRecoFeed } from '@/src/services/recoApi';
import ProfileModal from '@/components/home/ProfileModal'; import ProfileModal from '@/components/home/ProfileModal';
import ThemeModal from '@/components/home/ThemeModal'; import ThemeModal from '@/components/home/ThemeModal';
import ThemeIcon from '@/assets/images/home/theme.svg'; import ThemeIcon from '@/assets/images/home/theme.svg';
import MyIcon from '@/assets/images/home/my.svg'; import MyIcon from '@/assets/images/home/my.svg';
import LikeOutlineIcon from '@/assets/images/home/like.svg';
import LikeFilledIcon from '@/assets/images/home/like_filled.svg'; import LikeFilledIcon from '@/assets/images/home/like_filled.svg';
import HateIcon from '@/assets/images/home/hate.svg'; import LikeIcon from '@/assets/images/icon/like_icon.svg';
const { height: SCREEN_HEIGHT } = Dimensions.get('window');
// 预定义风景图列表
const NATURE_IMAGES = [
require('@/assets/theme/nature/1.png'),
require('@/assets/theme/nature/2.png'),
require('@/assets/theme/nature/3.png'),
require('@/assets/theme/nature/4.png'),
require('@/assets/theme/nature/5.png'),
require('@/assets/theme/nature/6.png'),
require('@/assets/theme/nature/7.png'),
require('@/assets/theme/nature/8.png'),
require('@/assets/theme/nature/9.png'),
require('@/assets/theme/nature/10.png'),
require('@/assets/theme/nature/11.png'),
require('@/assets/theme/nature/12.png'),
require('@/assets/theme/nature/13.png'),
require('@/assets/theme/nature/14.png'),
require('@/assets/theme/nature/15.png'),
require('@/assets/theme/nature/17.png'),
require('@/assets/theme/nature/18.png'),
require('@/assets/theme/nature/19.png'),
require('@/assets/theme/nature/20.png'),
require('@/assets/theme/nature/22.png'),
];
// 预定义颜色列表
const THEME_COLORS = [
'#F7D9BF',
'#CBF2D8',
'#F5CDDE',
'#F2ECCB',
'#E2CBF2',
'#CBD9F2',
];
type FeedItem = { content_id: string; text: string };
export default function HomeScreen() { export default function HomeScreen() {
const { t } = useTranslation(); const { t, i18n } = useTranslation();
const isEnglish = i18n.language?.startsWith('en');
const recoLang: 'en' | 'tc' = i18n.language?.toLowerCase().startsWith('zh') ? 'tc' : 'en';
const navigation = useNavigation(); const navigation = useNavigation();
const [index, setIndex] = useState(0); const [index, setIndex] = useState(0);
const [themeMode, setThemeModeState] = useState<ThemeMode>('scenery'); const [themeMode, setThemeModeState] = useState<ThemeMode>('scenery');
@@ -41,29 +86,137 @@ export default function HomeScreen() {
const [profileName, setProfileName] = useState<string | undefined>(undefined); const [profileName, setProfileName] = useState<string | undefined>(undefined);
const [busy, setBusy] = useState(false); const [busy, setBusy] = useState(false);
const [likeFilled, setLikeFilled] = useState(false); const [likeFilled, setLikeFilled] = useState(false);
const [feedItems, setFeedItems] = useState<FeedItem[]>([]);
const [isFetching, setIsFetching] = useState(false);
const item = useMemo(() => MOCK_CONTENT[index % MOCK_CONTENT.length], [index]); // 解决语言切换时重复触发拉取/清空导致“文案不停跳动”的问题:
// 用 ref 持有最新状态,避免 useCallback 依赖 feedItems/isFetching 造成函数 identity 变化 → effect 重复执行
const feedItemsRef = useRef<FeedItem[]>([]);
const isFetchingRef = useRef(false);
useEffect(() => { useEffect(() => {
let cancelled = false; feedItemsRef.current = feedItems;
(async () => { }, [feedItems]);
const mode = await getThemeMode(); useEffect(() => {
const profile = await getUserProfile(); isFetchingRef.current = isFetching;
if (cancelled) return; }, [isFetching]);
setThemeModeState(mode);
setProfileName(profile.name);
})();
return () => {
cancelled = true;
};
}, []);
const backgroundColor = themeMode === 'color' ? '#F3D0E1' : '#F4D6C2'; // 动画相关 Shared Values
const translateY = useSharedValue(0);
const opacity = useSharedValue(1);
const likeScale = useSharedValue(1);
// 统一文案对象结构
const currentFeed = useMemo(() => {
if (feedItems.length > 0) {
return feedItems;
}
return MOCK_CONTENT.map(item => ({
content_id: item.id,
text: t(item.textKey)
}));
}, [feedItems, t]);
const item = useMemo(() => {
const data = currentFeed[index % currentFeed.length];
return {
id: String(data.content_id),
text: data.text
};
}, [currentFeed, index]);
// 异步拉取新文案
const fetchNewFeed = useCallback(async () => {
if (isFetchingRef.current) return;
isFetchingRef.current = true;
setIsFetching(true);
try {
const scoringProfile = await getUserProfileScoring();
if (!scoringProfile) return;
const history = await getRecoFeedHistory();
const { items, meta } = await fetchRecoFeed({
k: 30,
user_profile: scoringProfile,
already_recommended_ids: history.already_recommended_ids,
touched_or_viewed_ids: history.touched_or_viewed_ids,
});
if (items.length > 0) {
const wasEmpty = feedItemsRef.current.length === 0;
const newCache = {
saved_at: new Date().toISOString(),
lang: recoLang,
items: items.map((x) => ({ content_id: x.content_id, text: x.text })),
meta: meta as Record<string, unknown>,
};
await setRecoFeedCache(newCache);
await recordRecoFeedServed(items.map((x) => x.content_id));
setFeedItems(newCache.items.map((x) => ({ content_id: String(x.content_id), text: x.text })));
// 如果当前是 mock 数据,切换到新数据的第一条
if (wasEmpty) {
setIndex(0);
}
}
} catch (error) {
console.error('Failed to fetch new feed:', error);
} finally {
isFetchingRef.current = false;
setIsFetching(false);
}
}, [recoLang]);
// 每次进入页面或页面获得焦点时刷新个人信息和缓存文案
useFocusEffect(
useCallback(() => {
let cancelled = false;
(async () => {
const mode = await getThemeMode();
const profile = await getUserProfile();
const cache = await getRecoFeedCache();
if (cancelled) return;
setThemeModeState(mode);
setProfileName(profile.name);
// 语言切换时:旧语言缓存不复用,触发重新拉取
if (cache && cache.items.length > 0 && (cache.lang ?? 'en') === recoLang) {
setFeedItems(cache.items.map((x) => ({ content_id: String(x.content_id), text: x.text })));
} else {
// 语言不匹配或没有缓存:先清空回落到本地 mock会立即随语言切换再拉取对应语言的推荐文案
setFeedItems([]);
setIndex(0);
fetchNewFeed();
}
})();
return () => {
cancelled = true;
};
}, [fetchNewFeed, recoLang])
);
const backgroundColor = useMemo(() => {
if (themeMode === 'color') {
const colorIndex = Math.floor(index / 10) % THEME_COLORS.length;
return THEME_COLORS[colorIndex];
}
return '#F4D6C2'; // 风景模式下的默认底色(图片加载前显示)
}, [themeMode, index]);
// 计算当前应该显示的风景图索引(滑动 10 次切换一张)
const natureImageIndex = useMemo(() => {
return Math.floor(index / 10) % NATURE_IMAGES.length;
}, [index]);
const currentNatureImage = NATURE_IMAGES[natureImageIndex];
useLayoutEffect(() => { useLayoutEffect(() => {
navigation.setOptions({ navigation.setOptions({
headerShadowVisible: false, headerShadowVisible: false,
headerStyle: { backgroundColor }, // 为了让风景/颜色两种主题下“文案的视觉居中位置”一致,统一使用透明 Header
// 颜色主题下 Header 透明也不会影响观感(背景就是纯色)
headerStyle: { backgroundColor: 'transparent' },
headerTransparent: true,
headerRight: () => ( headerRight: () => (
<View style={styles.headerRight}> <View style={styles.headerRight}>
<CircleIconButton <CircleIconButton
@@ -81,62 +234,125 @@ export default function HomeScreen() {
</View> </View>
), ),
}); });
}, [backgroundColor, navigation, t]); }, [backgroundColor, themeMode, navigation, t]);
const likeScale = useSharedValue(1); const textAnimatedStyle = useAnimatedStyle(() => ({
const hateScale = useSharedValue(1); transform: [{ translateY: translateY.value }],
opacity: opacity.value,
}));
const likeAnimatedStyle = useAnimatedStyle(() => ({ const likeAnimatedStyle = useAnimatedStyle(() => ({
transform: [{ scale: likeScale.value }], transform: [{ scale: likeScale.value }],
})); }));
const hateAnimatedStyle = useAnimatedStyle(() => ({ // 切换到下一条文案的统一动画逻辑
transform: [{ scale: hateScale.value }], const triggerNextContent = useCallback(() => {
})); if (busy) return;
setBusy(true);
function playLikeAnimationAndThen(next: () => void) { // 1. 当前文案向上移动并消失
translateY.value = withTiming(-40, { duration: 300, easing: Easing.out(Easing.quad) });
opacity.value = withTiming(0, { duration: 300 }, (finished) => {
if (finished) {
// 2. 切换数据索引
runOnJS(setIndex)(index + 1);
runOnJS(setLikeFilled)(false);
// 检查是否需要拉取新文案(当接近当前列表末尾时,例如还剩 5 条)
if (index + 5 >= currentFeed.length && !isFetching) {
runOnJS(fetchNewFeed)();
}
// 3. 准备下一条文案:先瞬移到下方 40pt
translateY.value = 40;
// 4. 下一条文案向上移动到原位并显现
translateY.value = withTiming(0, { duration: 400, easing: Easing.out(Easing.back(1)) });
opacity.value = withTiming(1, { duration: 400 }, (finished) => {
if (finished) {
runOnJS(setBusy)(false);
}
});
}
});
}, [busy, index, currentFeed.length, isFetching, fetchNewFeed, translateY, opacity]);
const lastTapRef = useRef<number>(0);
// 使用 Ref 解决 PanResponder 闭包陷阱,确保手势回调能拿到最新的 state 和 function
const handlersRef = useRef({ onPressLike, triggerNextContent });
useEffect(() => {
handlersRef.current = { onPressLike, triggerNextContent };
}, [onPressLike, triggerNextContent]);
// 使用系统自带的 PanResponder 代替第三方手势库
const panResponder = useRef(
PanResponder.create({
onStartShouldSetPanResponder: () => true, // 允许开始捕获
onMoveShouldSetPanResponder: (_, gestureState) => {
// 只有当垂直滑动距离大于 20 时才接管位移手势
return Math.abs(gestureState.dy) > 20;
},
onPanResponderRelease: (_, gestureState) => {
const now = Date.now();
const DOUBLE_TAP_DELAY = 300;
// 1. 双击逻辑判定
if (now - lastTapRef.current < DOUBLE_TAP_DELAY) {
// 判定为双击
if (Math.abs(gestureState.dx) < 10 && Math.abs(gestureState.dy) < 10) {
runOnJS(handlersRef.current.onPressLike)();
lastTapRef.current = 0; // 重置
return;
}
}
lastTapRef.current = now;
// 2. 上滑逻辑判定
if (gestureState.dy < -50) { // 上滑超过 50pt
runOnJS(handlersRef.current.triggerNextContent)();
}
},
})
).current;
async function onPressLike() {
if (busy) return;
setLikeFilled(true); setLikeFilled(true);
// 1. 获取当前日期
const now = new Date();
const dateStr = `${now.getFullYear()}.${String(now.getMonth() + 1).padStart(2, '0')}.${String(now.getDate()).padStart(2, '0')}`;
// 2. 保存到收藏夹,包含当前背景信息
const favItem = {
favId: String(Date.now()), // 生成唯一 ID
id: item.id,
text: item.text,
date: dateStr,
themeMode: themeMode,
background: themeMode === 'scenery' ? String(natureImageIndex) : backgroundColor,
};
console.log('Home: Triggering addFavorite', JSON.stringify(favItem));
await addFavorite(favItem);
// 3. 记录到后端 Reaction喜欢
console.log('Home: Triggering setReaction', item.id);
await setReaction(item.id, 'like');
// 4. 爱心缩放动画
likeScale.value = withSequence( likeScale.value = withSequence(
withTiming(0.92, { duration: 90, easing: Easing.out(Easing.cubic) }), withTiming(0.8, { duration: 100 }),
withTiming(1.14, { duration: 120, easing: Easing.out(Easing.cubic) }), withTiming(1.2, { duration: 150 }),
withTiming(1, { duration: 140, easing: Easing.out(Easing.cubic) }, (finished) => { withTiming(1, { duration: 100 }, (finished) => {
if (finished) runOnJS(next)(); if (finished) {
console.log('Home: Like animation finished, triggering next content');
runOnJS(triggerNextContent)();
}
}) })
); );
} }
function playHateAnimationAndThen(next: () => void) {
hateScale.value = withSequence(
withTiming(0.92, { duration: 90, easing: Easing.out(Easing.cubic) }),
withTiming(1.06, { duration: 110, easing: Easing.out(Easing.cubic) }),
withTiming(1, { duration: 120, easing: Easing.out(Easing.cubic) }, (finished) => {
if (finished) runOnJS(next)();
})
);
}
function onPressLike() {
if (busy) return;
setBusy(true);
playLikeAnimationAndThen(async () => {
await setReaction(item.id, 'like');
await addFavorite(item.id);
setIndex((i) => i + 1);
setTimeout(() => setLikeFilled(false), 220);
setBusy(false);
});
}
function onPressHate() {
if (busy) return;
setBusy(true);
playHateAnimationAndThen(async () => {
await setReaction(item.id, 'dislike');
setIndex((i) => i + 1);
setBusy(false);
});
}
async function onSelectTheme(next: ThemeMode) { async function onSelectTheme(next: ThemeMode) {
setThemeModeState(next); setThemeModeState(next);
await setThemeMode(next); await setThemeMode(next);
@@ -144,40 +360,37 @@ export default function HomeScreen() {
} }
return ( return (
<View style={[styles.container, { backgroundColor }]}> <View style={[styles.container, { backgroundColor }]} {...panResponder.panHandlers}>
<View style={styles.card}> {themeMode === 'scenery' && (
<Animated.Text style={styles.text}>{item.text}</Animated.Text> <ImageBackground
</View> source={currentNatureImage}
style={StyleSheet.absoluteFill}
resizeMode="cover"
/>
)}
<Animated.View style={[styles.card, textAnimatedStyle, themeMode === 'scenery' && styles.sceneryCard]}>
<Text style={[styles.text, isEnglish && styles.textEnglish, themeMode === 'scenery' && styles.sceneryText]}>
{item.text}
</Text>
</Animated.View>
<View style={styles.actions}> <View style={styles.actions}>
<Animated.View style={[styles.reactionButton, hateAnimatedStyle]}>
<Pressable
onPress={onPressHate}
onPressIn={() => (hateScale.value = withTiming(0.92, { duration: 80 }))}
onPressOut={() => (hateScale.value = withTiming(1, { duration: 120 }))}
accessibilityRole="button"
accessibilityLabel={t('home.dislike')}
hitSlop={10}
style={styles.reactionInner}
>
<HateIcon width={30} height={30} />
</Pressable>
</Animated.View>
<Animated.View style={[styles.reactionButton, likeAnimatedStyle]}> <Animated.View style={[styles.reactionButton, likeAnimatedStyle]}>
<Pressable <Pressable
onPress={onPressLike} onPress={onPressLike}
onPressIn={() => (likeScale.value = withTiming(0.92, { duration: 80 }))}
onPressOut={() => (likeScale.value = withTiming(1, { duration: 120 }))}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel={t('home.like')} accessibilityLabel={t('home.like')}
hitSlop={10} hitSlop={20}
style={styles.reactionInner} style={styles.reactionInner}
> >
{likeFilled ? ( {likeFilled ? (
<LikeFilledIcon width={30} height={30} /> <LikeFilledIcon width={35} height={36} style={{ color: '#EA6969' }} />
) : ( ) : (
<LikeOutlineIcon width={30} height={30} /> <LikeIcon
width={35}
height={36}
style={{ color: themeMode === 'scenery' ? '#FFFFFF' : '#5E2A28' }}
/>
)} )}
</Pressable> </Pressable>
</Animated.View> </Animated.View>
@@ -220,7 +433,7 @@ const styles = StyleSheet.create({
flex: 1, flex: 1,
padding: 20, padding: 20,
justifyContent: 'center', justifyContent: 'center',
gap: 16, alignItems: 'center',
}, },
headerRight: { headerRight: {
flexDirection: 'row', flexDirection: 'row',
@@ -236,37 +449,53 @@ const styles = StyleSheet.create({
justifyContent: 'center', justifyContent: 'center',
}, },
card: { card: {
borderRadius: 16, position: 'absolute',
padding: 20, top: 0,
backgroundColor: 'rgba(255,255,255,0.65)', left: 0,
borderWidth: StyleSheet.hairlineWidth, right: 0,
borderColor: '#E5E7EB', bottom: 0,
justifyContent: 'center',
alignItems: 'center',
paddingHorizontal: 30,
zIndex: 5, // 降低层级,防止遮挡底部按钮
}, },
text: { text: {
fontSize: 20, fontSize: 22,
lineHeight: 28, lineHeight: 32,
color: '#5E2A28', color: '#5E2A28',
fontWeight: '700', fontWeight: '700',
textAlign: 'center',
},
textEnglish: {
fontFamily: 'STIXTwoText',
// 英文字体观感更细一点,避免过粗
fontWeight: '600',
},
sceneryCard: {
// 风景模式下稍微收窄文案宽度,增加呼吸感
paddingHorizontal: 50,
},
sceneryText: {
color: '#FFFFFF',
textShadowColor: 'rgba(0, 0, 0, 0.5)',
textShadowOffset: { width: 0, height: 1 },
textShadowRadius: 4,
}, },
actions: { actions: {
position: 'absolute',
bottom: SCREEN_HEIGHT * 0.16,
left: 0,
right: 0,
flexDirection: 'row', flexDirection: 'row',
gap: 12,
justifyContent: 'center', justifyContent: 'center',
zIndex: 20, // 提升层级,确保在最顶层可点击
}, },
reactionButton: { reactionButton: {
width: 58,
height: 58,
borderRadius: 29,
backgroundColor: 'rgba(255,255,255,0.75)',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}, },
reactionInner: { reactionInner: {
width: 58,
height: 58,
borderRadius: 29,
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}, },
}); });

View File

@@ -1,66 +1,178 @@
import { useState } from 'react'; import { useMemo, useState } from 'react';
import { useRouter } from 'expo-router'; import { useRouter } from 'expo-router';
import * as Notifications from 'expo-notifications';
import { useTranslation } from 'react-i18next';
import { OnboardingLayout } from '@/components/onboarding/OnboardingLayout'; import { OnboardingLayout } from '@/components/onboarding/OnboardingLayout';
import { NameInputStep } from '@/components/onboarding/NameInputStep'; import { NameInputStep } from '@/components/onboarding/NameInputStep';
import { IntentSelectionStep } from '@/components/onboarding/IntentSelectionStep'; import { SelectionStep } from '@/components/onboarding/SelectionStep';
import { setOnboardingCompleted, setUserProfile } from '@/src/storage/appStorage'; import { ReminderStep } from '@/components/onboarding/ReminderStep';
import { buildUserProfileFromQuestionnaire, mapOnboardingSelectionsToQuestionnaireAnswers } from '@/src/features/userProfileScoring';
import { fetchRecoFeed } from '@/src/services/recoApi';
import {
recordRecoFeedServed,
setOnboardingCompleted,
setUserProfile,
setDailyReminderSettings,
setUserProfileScoring,
setRecoFeedCache,
} from '@/src/storage/appStorage';
type Step =
| { id: 'name'; type: 'name' }
| { id: 'status' | 'emotion' | 'influence' | 'support'; type: 'selection'; optionIds: string[] }
| { id: 'reminder'; type: 'reminder' };
const STEPS: Step[] = [
{ id: 'name', type: 'name' },
{ id: 'status', type: 'selection', optionIds: ['pregnant', 'has_kids', 'no_fill'] },
{ id: 'emotion', type: 'selection', optionIds: ['happy', 'calm', 'stressed', 'low'] },
{ id: 'influence', type: 'selection', optionIds: ['family', 'work', 'relationship', 'friends', 'health'] },
{ id: 'support', type: 'selection', optionIds: ['emotional', 'parenting', 'self_worth', 'anxiety', 'balance'] },
{ id: 'reminder', type: 'reminder' },
];
export default function OnboardingScreen() { export default function OnboardingScreen() {
const router = useRouter(); const router = useRouter();
const [step, setStep] = useState(0); const { t, i18n } = useTranslation();
const [stepIndex, setStepIndex] = useState(0);
const [name, setName] = useState(''); const [name, setName] = useState('');
const [intents, setIntents] = useState<string[]>([]); const [selections, setSelections] = useState<Record<string, string[]>>({});
const [reminderTimes, setReminderTimes] = useState(3);
const currentStep = STEPS[stepIndex];
const currentTitle = useMemo(() => t(`onboardingSurvey.steps.${currentStep.id}.title`), [t, currentStep.id]);
const currentOptions = useMemo(() => {
if (currentStep.type !== 'selection') return [];
return currentStep.optionIds.map((optId) => ({
id: optId,
label: t(`onboardingSurvey.steps.${currentStep.id}.options.${optId}`),
}));
}, [t, currentStep]);
async function onFinish() { async function onFinish() {
// Save whatever input we have // 请求推送权限
await setUserProfile({ name, intents }); const { status } = await Notifications.requestPermissionsAsync();
const pushEnabled = status === 'granted';
// 将 Onboarding 选择映射为标准问卷枚举(允许跳过)
const answers = mapOnboardingSelectionsToQuestionnaireAnswers(selections);
// 生成用户画像(供推荐/Push/Widget 复用)
const scoringProfile = buildUserProfileFromQuestionnaire(answers);
await setUserProfileScoring(scoringProfile);
// Onboarding 结束后预拉取一次 Feed 文案(失败不阻塞进入首页)
try {
const lang = i18n.language?.toLowerCase().startsWith('zh') ? 'tc' : 'en';
const { items, meta } = await fetchRecoFeed({
k: 30,
user_profile: {
profile_version: scoringProfile.profile_version,
profile_source: scoringProfile.profile_source,
profile_generated_at: scoringProfile.profile_generated_at,
profile_confidence: scoringProfile.profile_confidence,
profile_answered: scoringProfile.profile_answered,
stage: scoringProfile.stage,
emotion_score: scoringProfile.emotion_score,
context: scoringProfile.context,
need: scoringProfile.need,
},
});
await setRecoFeedCache({
saved_at: new Date().toISOString(),
lang,
items: items.map((x) => ({ content_id: x.content_id, text: x.text })),
meta: meta as Record<string, unknown>,
});
await recordRecoFeedServed(items.map((x) => x.content_id));
} catch {
// 网络失败时使用首页本地 mock 兜底
}
await setUserProfile({
name,
intents: Object.values(selections).flat()
});
await setDailyReminderSettings({
timesPerDay: reminderTimes,
pushEnabled: pushEnabled
});
await setOnboardingCompleted(true); await setOnboardingCompleted(true);
router.replace('/(onboarding)/push-prompt'); router.replace('/(app)/home');
} }
async function onNext() { const onNext = () => {
if (step === 0) { if (stepIndex < STEPS.length - 1) {
setStep(1); setStepIndex(stepIndex + 1);
} else { } else {
await onFinish(); onFinish();
} }
} };
async function onSkip() { const onBack = () => {
// Skip logic: move to next step regardless of input if (stepIndex > 0) {
if (step === 0) { setStepIndex(stepIndex - 1);
setStep(1);
} else {
await onFinish();
} }
} };
// Step 0: Next button requires input const onSkip = async () => {
// Step 1: Next button always enabled (can proceed with empty selection) // 跳过整个 Onboarding仍生成一个“全跳过”的最小画像保证下游可用
const nextEnabled = step === 0 ? name.trim().length > 0 : true; const scoringProfile = buildUserProfileFromQuestionnaire({});
await setUserProfileScoring(scoringProfile);
// 标记已完成,避免下次启动再次进入 Onboarding
await setOnboardingCompleted(true);
router.replace('/(app)/home');
};
// 题目为多选:点击切换选中状态
const handleToggleSelection = (id: string) => {
setSelections(prev => {
const currentIds = prev[currentStep.id] || [];
const nextIds = currentIds.includes(id)
? currentIds.filter(i => i !== id)
: [...currentIds, id];
return { ...prev, [currentStep.id]: nextIds };
});
};
const handleSkipStep = () => {
setSelections((prev) => ({ ...prev, [currentStep.id]: [] }));
onNext();
};
return ( return (
<OnboardingLayout <OnboardingLayout
title={currentTitle}
currentStep={stepIndex}
totalSteps={STEPS.length - 1}
onSkip={onSkip} onSkip={onSkip}
onNext={onNext} onBack={onBack}
nextEnabled={nextEnabled} showBackButton={stepIndex > 0}
> >
{step === 0 ? ( {currentStep.type === 'name' && (
<NameInputStep <NameInputStep
value={name} value={name}
onChangeText={setName} onChangeText={setName}
onSubmitEditing={name.trim().length > 0 ? onNext : undefined} onNext={onNext}
/> />
) : ( )}
<IntentSelectionStep
selectedIds={intents} {currentStep.type === 'selection' && (
onToggle={(id) => { <SelectionStep
setIntents(prev => options={currentOptions}
prev.includes(id) selectedIds={selections[currentStep.id] || []}
? prev.filter(i => i !== id) onToggle={handleToggleSelection}
: [...prev, id] onNext={onNext}
); />
}} )}
{currentStep.type === 'reminder' && (
<ReminderStep
value={reminderTimes}
onChange={setReminderTimes}
onFinish={onFinish}
/> />
)} )}
</OnboardingLayout> </OnboardingLayout>

View File

@@ -1,12 +1,15 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { View, Text, Image, StyleSheet, TouchableOpacity, Dimensions, Platform, Alert } from 'react-native'; import { View, Text, StyleSheet, TouchableOpacity, Dimensions, Platform, Alert, Image } from 'react-native';
import { LinearGradient } from 'expo-linear-gradient';
import { useRouter } from 'expo-router'; import { useRouter } from 'expo-router';
import * as WebBrowser from 'expo-web-browser'; import * as WebBrowser from 'expo-web-browser';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { setConsentAccepted, getConsentAccepted } from '../../src/storage/appStorage'; import { setConsentAccepted, getConsentAccepted } from '../../src/storage/appStorage';
// 导入 SVG 组件
import FlowersBg from '../../assets/images/index/flowers_endbg.svg';
import WelcomeBtn from '../../assets/images/index/welcome_btn.svg';
const { width, height } = Dimensions.get('window'); const { width, height } = Dimensions.get('window');
export default function SplashScreen() { export default function SplashScreen() {
@@ -22,18 +25,15 @@ export default function SplashScreen() {
const accepted = await getConsentAccepted(); const accepted = await getConsentAccepted();
setShowConsent(!accepted); setShowConsent(!accepted);
if (accepted) { if (accepted) {
// 如果已经同意过,直接跳转到首页分发 router.replace('/');
// 注意:这里需要与 app/index.tsx 配合,如果 app/index.tsx 已经判断了 consent=true 不会跳过来,
// 那么这里其实是防守。
// 但如果用户是通过 deep link 或其他方式强制进入 splash这个逻辑会把他们送走。
router.replace('/');
} }
}; };
const handleAgree = async () => { const handleAgree = async () => {
await setConsentAccepted(true); await setConsentAccepted(true);
setShowConsent(false); setShowConsent(false);
router.replace('/'); // 跳转到 onboarding 流程
router.replace('/(onboarding)/onboarding');
}; };
const openLink = async (url: string) => { const openLink = async (url: string) => {
@@ -44,31 +44,40 @@ export default function SplashScreen() {
} }
}; };
const bgDecorationTop = 363;
const bgDecorationHeight = height * 0.6;
const contentTop = bgDecorationTop + (bgDecorationHeight * 0.25);
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Image {/* 中间的背景装饰 SVG (现在放在上面,作为上层) */}
source={require('../../assets/images/index/index_flowers.png')} <View style={[styles.bgDecorationContainer, { top: bgDecorationTop }]}>
style={styles.image} <FlowersBg width={width + 10} height={bgDecorationHeight} />
resizeMode="contain" </View>
/>
<View style={styles.contentContainer}> {/* 顶部的花图片 (现在放在下面,作为下层) */}
<Text style={styles.title}>{t('consent.title')}</Text> <View style={styles.topImageContainer}>
<Text style={styles.subtitle}>{t('consent.subtitle')}</Text> <Image
source={require('../../assets/images/index/index_flowers.png')}
style={styles.topImage}
resizeMode="contain"
/>
</View>
{/* 文案内容 */}
<View style={[styles.contentContainer, { position: 'absolute', top: contentTop }]}>
<Text style={styles.titleText}>
You Are Perfect.{"\n"}
Everything{"\n"}
Will Be Better.
</Text>
</View> </View>
<SafeAreaView style={styles.bottomContainer} edges={['bottom']}> <SafeAreaView style={styles.bottomContainer} edges={['bottom']}>
{showConsent && ( {showConsent && (
<> <>
<TouchableOpacity onPress={handleAgree} activeOpacity={0.8}> <TouchableOpacity onPress={handleAgree} activeOpacity={0.8} style={styles.buttonWrapper}>
<LinearGradient <WelcomeBtn width={87} height={57} />
colors={['#F69F7B', '#F99CC0']}
start={{ x: 0, y: 0 }}
end={{ x: 1, y: 0 }}
style={styles.button}
>
<Text style={styles.buttonText}>{t('consent.agree')}</Text>
</LinearGradient>
</TouchableOpacity> </TouchableOpacity>
<View style={styles.linksContainer}> <View style={styles.linksContainer}>
@@ -90,74 +99,57 @@ export default function SplashScreen() {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { container: {
flex: 1, flex: 1,
backgroundColor: '#FFF9F0', // 假设的背景色,根据图片调整 backgroundColor: '#F5D3B5', // 匹配 Figma 背景色
alignItems: 'center', alignItems: 'center',
}, },
image: { topImageContainer: {
width: width * 0.8, marginTop: 60,
height: height * 0.5, zIndex: 1, // 降低层级
marginTop: height * 0.1, },
topImage: {
width: 308,
height: 354,
},
bgDecorationContainer: {
position: 'absolute',
left: -3,
zIndex: 2, // 提高层级,使其覆盖在图片之上
}, },
contentContainer: { contentContainer: {
alignItems: 'center', alignItems: 'center',
marginTop: 20, zIndex: 3,
paddingHorizontal: 30,
}, },
title: { titleText: {
fontSize: 24, fontSize: 30,
fontWeight: 'bold', lineHeight: 42,
color: '#4A3427', // 深褐 color: '#772F00', // 匹配 Figma 文字颜
marginBottom: 10,
textAlign: 'center', textAlign: 'center',
fontFamily: Platform.OS === 'ios' ? 'Georgia' : 'serif', // 尝试匹配衬线体 fontWeight: '600',
}, fontFamily: Platform.OS === 'ios' ? 'STIX Two Text' : 'serif',
subtitle: {
fontSize: 18,
fontWeight: 'bold',
color: '#4A3427', // 深褐色
textAlign: 'center',
lineHeight: 24,
fontFamily: Platform.OS === 'ios' ? 'Georgia' : 'serif',
}, },
bottomContainer: { bottomContainer: {
position: 'absolute', position: 'absolute',
bottom: 0, bottom: 60,
width: '100%', width: '100%',
alignItems: 'center', alignItems: 'center',
paddingBottom: 20, zIndex: 4,
}, },
button: { buttonWrapper: {
width: width * 0.8, marginBottom: 40,
paddingVertical: 16,
borderRadius: 30,
alignItems: 'center',
justifyContent: 'center',
marginBottom: 20,
shadowColor: '#F69F7B',
shadowOffset: { width: 0, height: 4 },
shadowOpacity: 0.3,
shadowRadius: 8,
elevation: 5,
},
buttonText: {
color: '#FFF',
fontSize: 18,
fontWeight: '600',
}, },
linksContainer: { linksContainer: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
marginBottom: 10,
}, },
linkText: { linkText: {
fontSize: 12, fontSize: 12,
color: '#999', color: 'rgba(119, 47, 0, 0.5)', // 使用半透明的文字颜色
textDecorationLine: 'underline', textDecorationLine: 'underline',
}, },
divider: { divider: {
width: 1, width: 1,
height: 12, height: 12,
backgroundColor: '#CCC', backgroundColor: 'rgba(119, 47, 0, 0.2)',
marginHorizontal: 15, marginHorizontal: 15,
}, },
}); });

View File

@@ -3,12 +3,22 @@ import { DarkTheme, DefaultTheme, ThemeProvider } from '@react-navigation/native
import { useFonts } from 'expo-font'; import { useFonts } from 'expo-font';
import { Stack } from 'expo-router'; import { Stack } from 'expo-router';
import * as SplashScreen from 'expo-splash-screen'; import * as SplashScreen from 'expo-splash-screen';
import * as Notifications from 'expo-notifications';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import 'react-native-reanimated'; import 'react-native-reanimated';
import { useColorScheme } from '@/components/useColorScheme'; import { useColorScheme } from '@/components/useColorScheme';
import { initI18n } from '@/src/i18n'; import { initI18n } from '@/src/i18n';
// 配置通知处理方式(即使不发送也建议配置,以确保权限接口正常)
Notifications.setNotificationHandler({
handleNotification: async () => ({
shouldShowAlert: true,
shouldPlaySound: false,
shouldSetBadge: false,
}),
});
export { export {
// Catch any errors thrown by the Layout component. // Catch any errors thrown by the Layout component.
ErrorBoundary, ErrorBoundary,
@@ -24,7 +34,7 @@ SplashScreen.preventAutoHideAsync();
export default function RootLayout() { export default function RootLayout() {
const [loaded, error] = useFonts({ const [loaded, error] = useFonts({
SpaceMono: require('../assets/fonts/SpaceMono-Regular.ttf'), STIXTwoText: require('../assets/fonts/STIXTwoText-VariableFont_wght.ttf'),
...FontAwesome.font, ...FontAwesome.font,
}); });
const [i18nReady, setI18nReady] = useState(false); const [i18nReady, setI18nReady] = useState(false);
@@ -38,7 +48,7 @@ export default function RootLayout() {
initI18n() initI18n()
.catch((e) => { .catch((e) => {
// i18n 初始化失败不应阻塞 App 启动,先打印错误再继续 // i18n 初始化失败不应阻塞 App 启动,先打印错误再继续
console.error('i18n 初始化失败', e); console.error('i18n init failed', e);
}) })
.finally(() => setI18nReady(true)); .finally(() => setI18nReady(true));
}, []); }, []);

View File

@@ -22,9 +22,17 @@ export default function Index() {
return; return;
} }
// 2. 检查 Onboarding // 2. 检查 Onboarding 是否已完成
const completed = await getOnboardingCompleted(); const completed = await getOnboardingCompleted();
router.replace(completed ? '/(app)/home' : '/(onboarding)/onboarding'); if (cancelled) return;
if (completed) {
// 如果已经完成过流程,直接进 Home
router.replace('/(app)/home');
} else {
// 如果是首次进入(或未完成流程),进入 Onboarding
router.replace('/(onboarding)/onboarding');
}
})(); })();
return () => { return () => {
cancelled = true; cancelled = true;
@@ -41,4 +49,3 @@ export default function Index() {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { flex: 1, alignItems: 'center', justifyContent: 'center' }, container: { flex: 1, alignItems: 'center', justifyContent: 'center' },
}); });

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -0,0 +1,3 @@
<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.52529 12.1958C8.05105 12.1958 7.62296 11.8613 7.62737 11.3871C7.63044 11.0573 7.68303 10.7472 7.78512 10.4569C7.98347 9.93995 8.27273 9.47781 8.65289 9.0705C9.04959 8.64752 9.47934 8.26371 9.94215 7.91906C10.4215 7.55875 10.876 7.20627 11.3058 6.86162C11.7355 6.51697 12.0909 6.16449 12.3719 5.80418C12.6529 5.4282 12.7934 5.02089 12.7934 4.58225C12.7934 4.03394 12.6529 3.5483 12.3719 3.12533C12.0909 2.70235 11.6777 2.37337 11.1322 2.13838C10.5868 1.88773 9.8843 1.7624 9.02479 1.7624C8.18182 1.7624 7.36364 1.94256 6.57025 2.30287C6.01404 2.54963 5.47478 2.89275 4.95246 3.33224C4.59297 3.63473 4.06302 3.65873 3.7099 3.34884C3.32525 3.01128 3.30306 2.41578 3.69475 2.08642C4.33235 1.55029 5.01812 1.10547 5.75207 0.751958C6.76033 0.250653 7.93388 0 9.27273 0C10.4463 0 11.4545 0.180157 12.2975 0.54047C13.157 0.900783 13.8182 1.40992 14.281 2.06789C14.7603 2.71018 15 3.48564 15 4.39426C15 4.98956 14.8595 5.51436 14.5785 5.96867C14.2975 6.42298 13.9339 6.83812 13.4876 7.2141C13.0579 7.59008 12.6033 7.95822 12.124 8.31854C11.6446 8.66318 11.1983 9.0235 10.7851 9.39948C10.3884 9.77546 10.0826 10.1906 9.86777 10.6449C9.81955 10.7554 9.78061 10.8695 9.75095 10.9874C9.59709 11.5988 9.15576 12.1958 8.52529 12.1958ZM8.77686 18C8.33058 18 7.95041 17.859 7.63636 17.577C7.32231 17.295 7.16529 16.9191 7.16529 16.4491C7.16529 15.9791 7.32231 15.6031 7.63636 15.3211C7.95041 15.0235 8.33058 14.8747 8.77686 14.8747C9.20661 14.8747 9.57851 15.0235 9.89256 15.3211C10.2066 15.6031 10.3636 15.9791 10.3636 16.4491C10.3636 16.9191 10.2066 17.295 9.89256 17.577C9.57851 17.859 9.20661 18 8.77686 18Z" fill="#404040"/>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -1,3 +1,3 @@
<svg width="32" height="27" viewBox="0 0 32 27" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="32" height="27" viewBox="0 0 32 27" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M23.0879 1C24.9887 1 26.7592 1.93575 28.0762 3.42188C29.3956 4.91097 30.2001 6.88999 30.2002 8.84082C30.2002 13.2337 27.1054 17.3696 23.5225 20.499C21.7556 22.0422 19.9254 23.2909 18.4199 24.1494C17.6667 24.5789 17.0062 24.904 16.4863 25.1182C16.2262 25.2253 16.0121 25.3001 15.8467 25.3467C15.6728 25.3956 15.5993 25.4002 15.5996 25.4004C15.5928 25.3997 15.5178 25.3932 15.3525 25.3467C15.1871 25.3001 14.973 25.2253 14.7129 25.1182C14.193 24.904 13.5333 24.5788 12.7803 24.1494C11.2748 23.2909 9.44467 22.0423 7.67773 20.499C4.0947 17.3696 1 13.2338 1 8.84082C1.00008 6.89007 1.80381 4.91108 3.12207 3.42188C4.43787 1.93557 6.20587 1.00033 8.10059 1C9.51294 1.00117 10.8927 1.41742 12.0635 2.19434C12.7589 2.65582 13.3618 3.2322 13.8486 3.89355C14.2951 4.50017 15.0032 4.73135 15.5996 4.73145C16.1961 4.73144 16.905 4.5003 17.3516 3.89355C17.8376 3.23336 18.4389 2.65737 19.1328 2.19629C20.3012 1.4199 21.6779 1.00339 23.0879 1Z" stroke="#5E2A28" stroke-width="2"/> <path d="M23.0879 1C24.9887 1 26.7592 1.93575 28.0762 3.42188C29.3956 4.91097 30.2001 6.88999 30.2002 8.84082C30.2002 13.2337 27.1054 17.3696 23.5225 20.499C21.7556 22.0422 19.9254 23.2909 18.4199 24.1494C17.6667 24.5789 17.0062 24.904 16.4863 25.1182C16.2262 25.2253 16.0121 25.3001 15.8467 25.3467C15.6728 25.3956 15.5993 25.4002 15.5996 25.4004C15.5928 25.3997 15.5178 25.3932 15.3525 25.3467C15.1871 25.3001 14.973 25.2253 14.7129 25.1182C14.193 24.904 13.5333 24.5788 12.7803 24.1494C11.2748 23.2909 9.44467 22.0423 7.67773 20.499C4.0947 17.3696 1 13.2338 1 8.84082C1.00008 6.89007 1.80381 4.91108 3.12207 3.42188C4.43787 1.93557 6.20587 1.00033 8.10059 1C9.51294 1.00117 10.8927 1.41742 12.0635 2.19434C12.7589 2.65582 13.3618 3.2322 13.8486 3.89355C14.2951 4.50017 15.0032 4.73135 15.5996 4.73145C16.1961 4.73144 16.905 4.5003 17.3516 3.89355C17.8376 3.23336 18.4389 2.65737 19.1328 2.19629C20.3012 1.4199 21.6779 1.00339 23.0879 1Z" stroke="currentColor" stroke-width="2"/>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -1,4 +1,4 @@
<svg width="32" height="27" viewBox="0 0 32 27" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="32" height="27" viewBox="0 0 32 27" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M23.0879 1C24.9887 1 26.7592 1.93575 28.0762 3.42188C29.3956 4.91097 30.2001 6.88999 30.2002 8.84082C30.2002 13.2337 27.1054 17.3696 23.5225 20.499C21.7556 22.0422 19.9254 23.2909 18.4199 24.1494C17.6667 24.5789 17.0062 24.904 16.4863 25.1182C16.2262 25.2253 16.0121 25.3001 15.8467 25.3467C15.6728 25.3956 15.5993 25.4002 15.5996 25.4004C15.5928 25.3997 15.5178 25.3932 15.3525 25.3467C15.1871 25.3001 14.973 25.2253 14.7129 25.1182C14.193 24.904 13.5333 24.5788 12.7803 24.1494C11.2748 23.2909 9.44467 22.0423 7.67773 20.499C4.0947 17.3696 1 13.2338 1 8.84082C1.00008 6.89007 1.80381 4.91108 3.12207 3.42188C4.43787 1.93557 6.20587 1.00033 8.10059 1C9.51294 1.00117 10.8927 1.41742 12.0635 2.19434C12.7589 2.65582 13.3618 3.2322 13.8486 3.89355C14.2951 4.50017 15.0032 4.73135 15.5996 4.73145C16.1961 4.73144 16.905 4.5003 17.3516 3.89355C17.8376 3.23336 18.4389 2.65737 19.1328 2.19629C20.3012 1.4199 21.6779 1.00339 23.0879 1Z" fill="#5E2A28" stroke="#5E2A28" stroke-width="2"/> <path d="M23.0879 1C24.9887 1 26.7592 1.93575 28.0762 3.42188C29.3956 4.91097 30.2001 6.88999 30.2002 8.84082C30.2002 13.2337 27.1054 17.3696 23.5225 20.499C21.7556 22.0422 19.9254 23.2909 18.4199 24.1494C17.6667 24.5789 17.0062 24.904 16.4863 25.1182C16.2262 25.2253 16.0121 25.3001 15.8467 25.3467C15.6728 25.3956 15.5993 25.4002 15.5996 25.4004C15.5928 25.3997 15.5178 25.3932 15.3525 25.3467C15.1871 25.3001 14.973 25.2253 14.7129 25.1182C14.193 24.904 13.5333 24.5788 12.7803 24.1494C11.2748 23.2909 9.44467 22.0423 7.67773 20.499C4.0947 17.3696 1 13.2338 1 8.84082C1.00008 6.89007 1.80381 4.91108 3.12207 3.42188C4.43787 1.93557 6.20587 1.00033 8.10059 1C9.51294 1.00117 10.8927 1.41742 12.0635 2.19434C12.7589 2.65582 13.3618 3.2322 13.8486 3.89355C14.2951 4.50017 15.0032 4.73135 15.5996 4.73145C16.1961 4.73144 16.905 4.5003 17.3516 3.89355C17.8376 3.23336 18.4389 2.65737 19.1328 2.19629C20.3012 1.4199 21.6779 1.00339 23.0879 1Z" fill="currentColor" stroke="currentColor" stroke-width="2"/>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 22.7325C12.5691 22.7303 13.1259 22.5663 13.6053 22.2595C14.0847 21.9527 14.467 21.5159 14.7075 21H9.29246C9.53293 21.5159 9.91518 21.9527 10.3946 22.2595C10.874 22.5663 11.4308 22.7303 12 22.7325ZM21.75 16.7325C20.1075 14.835 19.8 12.9825 19.8 10.7325C19.7892 8.98974 19.1911 7.30149 18.1024 5.94058C17.0137 4.57967 15.4979 3.62559 13.8 3.23252C13.8039 3.16258 13.8039 3.09247 13.8 3.02252C13.8 2.52524 13.6024 2.04833 13.2508 1.6967C12.8992 1.34507 12.4222 1.14752 11.925 1.14752C11.4277 1.14752 10.9508 1.34507 10.5991 1.6967C10.2475 2.04833 10.05 2.52524 10.05 3.02252C10.046 3.09247 10.046 3.16258 10.05 3.23252C8.35205 3.62559 6.83626 4.57967 5.74753 5.94058C4.6588 7.30149 4.06073 8.98974 4.04996 10.7325C4.2115 12.9108 3.51125 15.0654 2.09996 16.7325C1.41746 17.6625 1.83746 19.5 3.31496 19.5H20.685C22.1625 19.5 22.59 17.6625 21.75 16.725V16.7325ZM15.75 13.5H13.5V15.75C13.5 16.1478 13.3419 16.5294 13.0606 16.8107C12.7793 17.092 12.3978 17.25 12 17.25C11.6021 17.25 11.2206 17.092 10.9393 16.8107C10.658 16.5294 10.5 16.1478 10.5 15.75V13.5H8.24996C7.85214 13.5 7.4706 13.342 7.1893 13.0607C6.908 12.7794 6.74996 12.3978 6.74996 12C6.74996 11.6022 6.908 11.2207 7.1893 10.9394C7.4706 10.6581 7.85214 10.5 8.24996 10.5H10.5V8.25002C10.5 7.8522 10.658 7.47067 10.9393 7.18936C11.2206 6.90806 11.6021 6.75002 12 6.75002C12.3978 6.75002 12.7793 6.90806 13.0606 7.18936C13.3419 7.47067 13.5 7.8522 13.5 8.25002V10.5H15.75C16.1478 10.5 16.5293 10.6581 16.8106 10.9394C17.0919 11.2207 17.25 11.6022 17.25 12C17.25 12.3978 17.0919 12.7794 16.8106 13.0607C16.5293 13.342 16.1478 13.5 15.75 13.5Z" fill="#F59250"/>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.535 7.5H15.4575C15.681 7.50404 15.8971 7.4196 16.0586 7.26508C16.2201 7.11056 16.3141 6.89847 16.32 6.675V4.9125C16.3102 4.35536 16.1907 3.80561 15.9682 3.29472C15.7457 2.78384 15.4246 2.32185 15.0234 1.93521C14.6221 1.54857 14.1485 1.24487 13.6297 1.0415C13.1109 0.838125 12.5571 0.73907 12 0.750004C10.8773 0.725863 9.79101 1.14831 8.9796 1.92456C8.1682 2.70081 7.69808 3.76738 7.6725 4.89V6.675C7.6784 6.89847 7.77235 7.11056 7.93389 7.26508C8.09544 7.4196 8.31149 7.50404 8.535 7.5ZM12 3C12.2967 3 12.5867 3.08798 12.8334 3.2528C13.08 3.41762 13.2723 3.65189 13.3858 3.92598C13.4994 4.20007 13.5291 4.50167 13.4712 4.79264C13.4133 5.08361 13.2704 5.35089 13.0607 5.56066C12.8509 5.77044 12.5836 5.9133 12.2926 5.97118C12.0017 6.02906 11.7001 5.99935 11.426 5.88582C11.1519 5.77229 10.9176 5.58003 10.7528 5.33336C10.588 5.08669 10.5 4.79668 10.5 4.5C10.5 4.10218 10.658 3.72065 10.9393 3.43934C11.2206 3.15804 11.6022 3 12 3ZM18.96 3.75H17.73C17.7929 4.08894 17.8255 4.43279 17.8275 4.7775V6.615C17.8295 6.92687 17.7699 7.23605 17.6521 7.52484C17.5344 7.81362 17.3608 8.07633 17.1413 8.2979C16.9218 8.51946 16.6608 8.69554 16.3731 8.81602C16.0855 8.9365 15.7769 8.99902 15.465 9H8.535C8.22313 8.99902 7.91453 8.9365 7.62687 8.81602C7.33921 8.69554 7.07816 8.51946 6.85869 8.2979C6.63921 8.07633 6.46562 7.81362 6.34787 7.52484C6.23012 7.23605 6.17052 6.92687 6.1725 6.615V4.7775C6.17451 4.43279 6.20713 4.08894 6.27 3.75H5.04C4.30065 3.75198 3.59216 4.04656 3.06936 4.56936C2.54656 5.09216 2.25198 5.80066 2.25 6.54V20.46C2.25198 21.1993 2.54656 21.9078 3.06936 22.4306C3.59216 22.9534 4.30065 23.248 5.04 23.25H18.96C19.6993 23.248 20.4078 22.9534 20.9306 22.4306C21.4534 21.9078 21.748 21.1993 21.75 20.46V6.54C21.748 5.80066 21.4534 5.09216 20.9306 4.56936C20.4078 4.04656 19.6993 3.75198 18.96 3.75ZM18.345 15.5775L16.095 19.3275C15.995 19.4947 15.8532 19.6331 15.6836 19.7291C15.514 19.8251 15.3224 19.8754 15.1275 19.875H14.9625C14.743 19.8416 14.5383 19.7441 14.3741 19.5946C14.21 19.4451 14.0937 19.2504 14.04 19.035L13.29 15.9825L11.6475 19.26C11.5538 19.4462 11.4102 19.6028 11.2328 19.7121C11.0553 19.8215 10.851 19.8794 10.6425 19.8794C10.434 19.8794 10.2297 19.8215 10.0522 19.7121C9.87476 19.6028 9.73118 19.4462 9.6375 19.26L8.25 16.5L7.8225 17.1375C7.6574 17.3861 7.4003 17.559 7.10774 17.6181C6.81518 17.6772 6.51114 17.6176 6.2625 17.4525C6.01386 17.2874 5.84099 17.0303 5.78191 16.7377C5.72284 16.4452 5.7824 16.1411 5.9475 15.8925L7.4475 13.6425C7.55672 13.4785 7.70712 13.346 7.88364 13.2583C8.06016 13.1707 8.2566 13.131 8.45331 13.1431C8.65001 13.1553 8.84008 13.2189 9.00446 13.3276C9.16885 13.4363 9.3018 13.5863 9.39 13.7625L10.635 16.2525L12.63 12.2625C12.7326 12.0561 12.8961 11.8862 13.0984 11.7757C13.3008 11.6653 13.5321 11.6197 13.7612 11.645C13.9903 11.6704 14.2061 11.7655 14.3794 11.9175C14.5527 12.0696 14.675 12.2711 14.73 12.495L15.57 15.8625L16.425 14.4375C16.5857 14.198 16.8322 14.0294 17.1137 13.9664C17.3952 13.9035 17.6901 13.9511 17.9375 14.0993C18.1849 14.2476 18.3659 14.4852 18.4431 14.763C18.5203 15.0409 18.4879 15.3379 18.3525 15.5925L18.345 15.5775Z" fill="#88D081"/>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -0,0 +1,4 @@
<svg width="47" height="47" viewBox="0 0 47 47" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="23.5" cy="23.5" r="23.5" fill="#F5D3B5"/>
<path d="M23.5 14.1562C23.9799 14.1563 24.3689 14.5455 24.3691 15.0254V22.6309H31.9746C32.4544 22.6311 32.8437 23.0202 32.8438 23.5C32.8438 23.9799 32.4545 24.3689 31.9746 24.3691H24.3691V31.9746C24.3689 32.4545 23.9799 32.8438 23.5 32.8438C23.0201 32.8437 22.6311 32.4544 22.6309 31.9746V24.3691H15.0254C14.5455 24.3689 14.1562 23.9799 14.1562 23.5C14.1563 23.0202 14.5456 22.6311 15.0254 22.6309H22.6309V15.0254C22.6311 14.5456 23.0201 14.1563 23.5 14.1562Z" fill="#8F521B"/>
</svg>

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

View File

@@ -0,0 +1,5 @@
<svg width="87" height="57" viewBox="0 0 87 57" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 28.5C0 12.7599 12.7599 0 28.5 0H58.5C74.2401 0 87 12.7599 87 28.5C87 44.2401 74.2401 57 58.5 57H28.5C12.7599 57 0 44.2401 0 28.5Z" fill="#F2DDCA"/>
<path d="M32 29L54 29" stroke="white" stroke-width="3" stroke-linecap="round"/>
<path d="M49 22L55.2929 28.2929C55.6834 28.6834 55.6834 29.3166 55.2929 29.7071L49 36" stroke="white" stroke-width="3" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 487 B

View File

@@ -0,0 +1,11 @@
<svg width="87" height="57" viewBox="0 0 87 57" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 28.5C0 12.7599 12.7599 0 28.5 0H58.5C74.2401 0 87 12.7599 87 28.5C87 44.2401 74.2401 57 58.5 57H28.5C12.7599 57 0 44.2401 0 28.5Z" fill="url(#paint0_linear_32_2902)"/>
<path d="M32 29L54 29" stroke="white" stroke-width="3" stroke-linecap="round"/>
<path d="M49 22L55.2929 28.2929C55.6834 28.6834 55.6834 29.3166 55.2929 29.7071L49 36" stroke="white" stroke-width="3" stroke-linecap="round"/>
<defs>
<linearGradient id="paint0_linear_32_2902" x1="0" y1="28.5" x2="87" y2="28.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#F69F7B"/>
<stop offset="1" stop-color="#F99CC0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 719 B

View File

@@ -0,0 +1,3 @@
<svg width="3" height="27" viewBox="0 0 3 27" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.5 1.5L1.5 25.5" stroke="#F89DB4" stroke-width="3" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 188 B

View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.49467 13.5033C8.78067 16.7229 9.77067 19.726 11.428 21.4441L11.9707 22L12.5133 21.4441C14.2073 19.7044 15.19 16.7013 15.4467 13.5033C14.3027 13.5827 13.122 13.626 11.9413 13.626C10.7607 13.626 9.63867 13.5899 8.49467 13.5033ZM15.5933 10.9694C15.5053 7.22276 14.486 3.5483 12.5427 1.58474L12 1L11.4573 1.55586C9.514 3.55552 8.524 7.22276 8.40667 10.9405C10.7955 11.1313 13.1957 11.141 15.586 10.9694H15.5933ZM22.4427 9.52561L22.7873 9.35957C22.4041 7.50584 21.5342 5.78328 20.2643 4.36346C18.9944 2.94363 17.3687 1.87607 15.5493 1.2671C17.1553 3.72155 18.0133 7.16501 18.1307 10.6518C19.614 10.4828 21.0657 10.1086 22.4427 9.54005V9.52561ZM18.0867 13.2362C17.9566 16.2416 17.0777 19.1695 15.5273 21.7618C17.6163 21.0689 19.4457 19.7741 20.7781 18.0454C22.1106 16.3167 22.8847 14.2337 23 12.0667C21.415 12.6465 19.7657 13.0391 18.0867 13.2362ZM1 12.0667C1.11534 14.2337 1.88942 16.3167 3.22187 18.0454C4.55432 19.7741 6.38366 21.0689 8.47267 21.7618C6.92232 19.1695 6.0434 16.2416 5.91333 13.2362C4.23432 13.0391 2.58501 12.6465 1 12.0667ZM5.84 10.6879C5.97933 7.17944 6.86667 3.72877 8.45067 1.2671C6.6331 1.87484 5.00872 2.94021 3.73896 4.35734C2.46919 5.77447 1.59825 7.49403 1.21267 9.34513L1.55733 9.51117C2.93096 10.102 4.38274 10.4982 5.86933 10.6879H5.84Z" fill="#EEB054"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1,3 @@
<svg width="35" height="36" viewBox="0 0 35 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25.0879 6C26.9887 6 28.7592 6.93575 30.0762 8.42188C31.3956 9.91097 32.2001 11.89 32.2002 13.8408C32.2002 18.2337 29.1054 22.3696 25.5225 25.499C23.7556 27.0422 21.9254 28.2909 20.4199 29.1494C19.6667 29.5789 19.0062 29.904 18.4863 30.1182C18.2262 30.2253 18.0121 30.3001 17.8467 30.3467C17.6728 30.3956 17.5993 30.4002 17.5996 30.4004C17.5928 30.3997 17.5178 30.3932 17.3525 30.3467C17.1871 30.3001 16.973 30.2253 16.7129 30.1182C16.193 29.904 15.5333 29.5788 14.7803 29.1494C13.2748 28.2909 11.4447 27.0423 9.67773 25.499C6.0947 22.3696 3 18.2338 3 13.8408C3.00008 11.8901 3.80381 9.91108 5.12207 8.42188C6.43787 6.93557 8.20587 6.00033 10.1006 6C11.5129 6.00117 12.8927 6.41742 14.0635 7.19434C14.7589 7.65582 15.3618 8.2322 15.8486 8.89355C16.2951 9.50017 17.0032 9.73135 17.5996 9.73145C18.1961 9.73144 18.905 9.5003 19.3516 8.89355C19.8376 8.23336 20.4389 7.65737 21.1328 7.19629C22.3012 6.4199 23.6779 6.00339 25.0879 6Z" stroke="currentColor" stroke-width="2"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,3 @@
<svg width="37" height="33" viewBox="0 0 37 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M27.38 0C25.4752 0.00420958 23.6144 0.597538 22.0335 1.70479C21.0003 2.42849 20.117 3.35044 19.4272 4.41503C19.0322 5.02468 17.9678 5.02469 17.5728 4.41504C16.8819 3.34867 15.9968 2.42544 14.9614 1.70122C13.3781 0.593805 11.5146 0.00166536 9.60767 0C4.30433 0 0 5.51285 0 11.0514C0 23.1565 16.0333 33 18.5 33C20.9667 33 37 23.1565 37 11.0514C37 5.51285 32.6957 0 27.38 0Z" fill="#FE3C3C" fill-opacity="0.76"/>
</svg>

After

Width:  |  Height:  |  Size: 522 B

View File

@@ -0,0 +1,3 @@
<svg width="6" height="10" viewBox="0 0 6 10" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 1L4.29289 4.29289C4.68342 4.68342 4.68342 5.31658 4.29289 5.70711L1 9" stroke="#C7B4A1" stroke-width="2" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 243 B

View File

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21.48 5.6925L21.27 4.035L12 0.75L2.73003 4.035L2.52003 5.685C2.44503 6.24 0.915026 19.2525 11.0775 22.935L12 23.25L12.915 22.92C23.0475 19.275 21.555 6.2475 21.48 5.6925ZM17.85 9.1425L12.8925 17.0925L12.825 17.1975C12.5406 17.6509 12.0883 17.9733 11.5669 18.0941C11.0455 18.215 10.4974 18.1245 10.0425 17.8425C9.83101 17.7097 9.64547 17.5394 9.49503 17.34L6.29253 13.0725C6.01107 12.791 5.85294 12.4093 5.85294 12.0112C5.85294 11.6132 6.01107 11.2315 6.29253 10.95C6.57399 10.6685 6.95573 10.5104 7.35378 10.5104C7.75182 10.5104 8.13357 10.6685 8.41503 10.95L10.7625 12.75L15.45 7.3875C15.6936 7.0877 16.0435 6.89345 16.4268 6.84521C16.8101 6.79696 17.1972 6.89845 17.5075 7.12853C17.8178 7.3586 18.0274 7.69953 18.0926 8.08029C18.1578 8.46105 18.0736 8.85228 17.8575 9.1725L17.85 9.1425Z" fill="#879CE7"/>
</svg>

After

Width:  |  Height:  |  Size: 920 B

View File

@@ -0,0 +1,4 @@
<svg width="47" height="47" viewBox="0 0 47 47" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="23.5" cy="23.5" r="23.5" fill="#F5D3B5"/>
<path d="M31.9746 22.6309C32.4544 22.6311 32.8437 23.0202 32.8438 23.5C32.8438 23.9799 32.4545 24.3689 31.9746 24.3691H15.0254C14.5455 24.3689 14.1562 23.9799 14.1562 23.5C14.1563 23.0202 14.5456 22.6311 15.0254 22.6309H31.9746Z" fill="#8F521B"/>
</svg>

After

Width:  |  Height:  |  Size: 404 B

View File

@@ -0,0 +1,3 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.34273 11.3513C8.03868 11.81 7.74043 12.2721 7.4301 12.7472C7.33503 12.6924 7.25878 12.6515 7.1859 12.6053C6.46053 12.148 5.7395 11.684 5.00979 11.2335C4.19176 10.7281 3.36408 10.2386 2.42298 9.9833C1.52725 9.74047 0.938938 9.90444 0.473698 10.5824C0.296096 10.8411 0.157103 11.1426 0.0721628 11.4446C-0.0759998 11.9701 -0.00843386 12.4745 0.391171 12.8943C2.3197 14.9191 4.2656 16.9271 6.37607 18.7687L6.41256 18.8006C6.69623 19.0482 6.98003 19.296 7.2776 19.526C7.88183 19.9939 8.57921 20.0718 9.30747 19.9468C9.84414 19.8545 10.3417 19.6592 10.7481 19.2799C11.2181 18.8408 11.5632 18.323 11.7915 17.7186C12.1829 16.6809 12.5477 15.6298 13.0072 14.622C14.4999 11.3489 16.2624 8.22294 18.2995 5.25424C21.1869 1.88662 20.2691 -2.14591 16.5163 1.34116C13.3774 4.3416 10.7346 7.74499 8.34273 11.3513Z" fill="#20BD40"/>
</svg>

After

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

View File

@@ -0,0 +1,6 @@
<svg width="39" height="39" viewBox="0 0 39 39" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.28564 2.592C3.28564 1.16048 4.44612 0 5.87764 0H16.5581C17.9896 0 19.1501 1.16048 19.1501 2.592V13.2725C19.1501 14.704 17.9896 15.8645 16.5581 15.8645H5.87764C4.44612 15.8645 3.28564 14.704 3.28564 13.2725V2.592Z" fill="#A360F5"/>
<path d="M22.811 2.592C22.811 1.16048 23.9715 0 25.403 0H36.0835C37.515 0 38.6755 1.16048 38.6755 2.592V13.2725C38.6755 14.704 37.515 15.8645 36.0835 15.8645H25.403C23.9715 15.8645 22.811 14.704 22.811 13.2725V2.592Z" fill="#FB84D3"/>
<path d="M1.83282 29.2908C0.820581 28.2786 0.820582 26.6374 1.83282 25.6252L9.38505 18.073C10.3973 17.0607 12.0385 17.0607 13.0507 18.073L20.6029 25.6252C21.6152 26.6374 21.6152 28.2786 20.6029 29.2908L13.0507 36.8431C12.0384 37.8553 10.3973 37.8553 9.38505 36.8431L1.83282 29.2908Z" fill="#FB84D3"/>
<path d="M22.811 22.1182C22.811 20.6867 23.9715 19.5262 25.403 19.5262H36.0835C37.515 19.5262 38.6755 20.6867 38.6755 22.1182V32.7986C38.6755 34.2302 37.515 35.3906 36.0835 35.3906H25.403C23.9715 35.3906 22.811 34.2302 22.811 32.7986V22.1182Z" fill="#FCB473"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,3 @@
<svg width="375" height="449" viewBox="0 0 375 449" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M187.5 64.2824C257.79 -1.71779 343.473 -4.39648 378 2.69061V456.404H-3V2.69061C31.5272 -4.39653 117.21 -1.71782 187.5 64.2824Z" fill="#FFF4EA"/>
</svg>

After

Width:  |  Height:  |  Size: 301 B

View File

@@ -0,0 +1,11 @@
<svg width="87" height="57" viewBox="0 0 87 57" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 28.5C0 12.7599 12.7599 0 28.5 0H58.5C74.2401 0 87 12.7599 87 28.5C87 44.2401 74.2401 57 58.5 57H28.5C12.7599 57 0 44.2401 0 28.5Z" fill="url(#paint0_linear_32_2902)"/>
<path d="M32 29L54 29" stroke="white" stroke-width="3" stroke-linecap="round"/>
<path d="M49 22L55.2929 28.2929C55.6834 28.6834 55.6834 29.3166 55.2929 29.7071L49 36" stroke="white" stroke-width="3" stroke-linecap="round"/>
<defs>
<linearGradient id="paint0_linear_32_2902" x1="0" y1="28.5" x2="87" y2="28.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#F69F7B"/>
<stop offset="1" stop-color="#F99CC0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 629 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 458 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 721 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 415 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

View File

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import SheetModal from '@/components/ui/SheetModal'; import SheetModal from '@/components/ui/SheetModal';
import { MOCK_CONTENT } from '@/src/constants/mockContent'; import { MOCK_CONTENT } from '@/src/constants/mockContent';
import { getFavorites } from '@/src/storage/appStorage'; import { getFavorites, getRecoFeedCache, type FavoriteItem } from '@/src/storage/appStorage';
type Props = { type Props = {
visible: boolean; visible: boolean;
@@ -13,25 +13,50 @@ type Props = {
export default function FavoritesModal({ visible, onClose }: Props) { export default function FavoritesModal({ visible, onClose }: Props) {
const { t } = useTranslation(); const { t } = useTranslation();
const [ids, setIds] = useState<string[]>([]); const [items, setItems] = useState<(FavoriteItem & { text: string })[]>([]);
// 每次打开时刷新一次,确保展示最新“喜欢” // 每次打开时刷新一次,确保展示最新“喜欢”
useEffect(() => { useEffect(() => {
if (!visible) return; if (!visible) return;
let cancelled = false; let cancelled = false;
(async () => { (async () => {
const list = await getFavorites(); const [favList, cache] = await Promise.all([
if (!cancelled) setIds(list); getFavorites(),
getRecoFeedCache()
]);
console.log('FavoritesModal: Loaded favList', favList.length, 'items');
console.log('FavoritesModal: Loaded cache items', cache?.items?.length || 0);
if (cancelled) return;
// 建立文案查找表
const textMap = new Map<string, string>();
// 1. 放入 Mock 数据
MOCK_CONTENT.forEach(c => textMap.set(String(c.id), t(c.textKey)));
// 2. 放入缓存数据
if (cache?.items) {
cache.items.forEach(c => textMap.set(String(c.content_id), c.text));
}
// 3. 组装最终展示列表
const enriched = favList.map(fav => {
const favIdStr = String(fav.id);
const text = fav.text || textMap.get(favIdStr);
console.log(`FavoritesModal: Matching fav.id=${favIdStr}, found text=${!!text}, textValue=${text?.substring(0, 10)}...`);
return {
...fav,
text: text || t('favorites.unknownText')
};
});
setItems(enriched);
})(); })();
return () => { return () => {
cancelled = true; cancelled = true;
}; };
}, [visible]); }, [visible, t]);
const items = useMemo(() => {
const map = new Map(MOCK_CONTENT.map((c) => [c.id, c]));
return ids.map((id) => map.get(id)).filter(Boolean) as { id: string; text: string }[];
}, [ids]);
return ( return (
<SheetModal visible={visible} title={t('profile.favorites')} onClose={onClose}> <SheetModal visible={visible} title={t('profile.favorites')} onClose={onClose}>
@@ -41,7 +66,7 @@ export default function FavoritesModal({ visible, onClose }: Props) {
) : ( ) : (
<FlatList <FlatList
data={items} data={items}
keyExtractor={(it) => it.id} keyExtractor={(it) => it.favId}
contentContainerStyle={styles.list} contentContainerStyle={styles.list}
renderItem={({ item }) => ( renderItem={({ item }) => (
<View style={styles.row}> <View style={styles.row}>

View File

@@ -1,5 +1,5 @@
import React, { useEffect, useMemo, useState } from 'react'; import React, { useEffect, useMemo, useState, useRef, useCallback } from 'react';
import { Alert, FlatList, Image, Pressable, StyleSheet, Text, View } from 'react-native'; import { Alert, FlatList, Image, Pressable, StyleSheet, Text, View, Platform, Dimensions } from 'react-native';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { LinearGradient } from 'expo-linear-gradient'; import { LinearGradient } from 'expo-linear-gradient';
import { Switch } from 'react-native'; import { Switch } from 'react-native';
@@ -11,6 +11,7 @@ import Animated, {
SlideInRight, SlideInRight,
SlideOutLeft, SlideOutLeft,
SlideOutRight, SlideOutRight,
Layout,
} from 'react-native-reanimated'; } from 'react-native-reanimated';
import SheetModal from '@/components/ui/SheetModal'; import SheetModal from '@/components/ui/SheetModal';
@@ -20,16 +21,26 @@ import {
getDailyReminderSettings, getDailyReminderSettings,
getFavorites, getFavorites,
setDailyReminderSettings, setDailyReminderSettings,
removeFavorite,
getRecoFeedCache,
getUserProfile,
type DailyReminderSettings, type DailyReminderSettings,
type FavoriteItem,
} from '@/src/storage/appStorage'; } from '@/src/storage/appStorage';
import AvatarIcon from '@/assets/images/home/Profile/Default_avatar.png'; import AvatarIcon from '@/assets/images/home/Profile/Default_avatar.svg';
import MyLikeIcon from '@/assets/images/home/Profile/mylike.svg'; import MyLikeIcon from '@/assets/images/icon/mylike_icon.svg';
import SmallComponentIcon from '@/assets/images/home/Profile/small_component.svg'; import SmallComponentIcon from '@/assets/images/icon/weight_icon.svg';
import RemindIcon from '@/assets/images/home/Profile/remind.svg'; import RemindIcon from '@/assets/images/icon/Push_icon.svg';
import PrivacyIcon from '@/assets/images/home/Profile/privacy Policy.svg'; import PrivacyIcon from '@/assets/images/icon/privacy_icon.svg';
import TermsIcon from '@/assets/images/home/Profile/terms_of_use.svg'; import TermsIcon from '@/assets/images/icon/Terms_icon.svg';
import LanguageIcon from '@/assets/images/home/Profile/language.svg'; import LanguageIcon from '@/assets/images/icon/language_icon.svg';
import SelectedIcon from '@/assets/images/icon/selected_icon.svg';
import QuestionIcon from '@/assets/images/home/Profile/widget/question_icon.svg';
import * as Notifications from 'expo-notifications';
import { changeLanguage } from '@/src/i18n';
const { width } = Dimensions.get('window');
type Props = { type Props = {
visible: boolean; visible: boolean;
@@ -37,24 +48,61 @@ type Props = {
onClose: () => void; onClose: () => void;
}; };
type Page = 'root' | 'favorites' | 'dailyReminder' | 'widget'; type Page = 'root' | 'favorites' | 'dailyReminder' | 'widget' | 'language' | 'widgetHowTo';
type NavDirection = 'forward' | 'back'; type NavDirection = 'forward' | 'back';
export default function ProfileModal({ visible, name, onClose }: Props) { const NATURE_IMAGES = [
require('@/assets/theme/nature/1.png'),
require('@/assets/theme/nature/2.png'),
require('@/assets/theme/nature/3.png'),
require('@/assets/theme/nature/4.png'),
require('@/assets/theme/nature/5.png'),
require('@/assets/theme/nature/6.png'),
require('@/assets/theme/nature/7.png'),
require('@/assets/theme/nature/8.png'),
require('@/assets/theme/nature/9.png'),
require('@/assets/theme/nature/10.png'),
require('@/assets/theme/nature/11.png'),
require('@/assets/theme/nature/12.png'),
require('@/assets/theme/nature/13.png'),
require('@/assets/theme/nature/14.png'),
require('@/assets/theme/nature/15.png'),
require('@/assets/theme/nature/17.png'),
require('@/assets/theme/nature/18.png'),
require('@/assets/theme/nature/19.png'),
require('@/assets/theme/nature/20.png'),
require('@/assets/theme/nature/22.png'),
];
export default function ProfileModal({ visible, name: propName, onClose }: Props) {
const { t } = useTranslation(); const { t } = useTranslation();
const [page, setPage] = useState<Page>('root'); const [page, setPage] = useState<Page>('root');
const [navDirection, setNavDirection] = useState<NavDirection>('forward'); const [navDirection, setNavDirection] = useState<NavDirection>('forward');
const [currentName, setCurrentName] = useState(propName);
const isRoot = page === 'root'; const isRoot = page === 'root';
// 关闭弹窗时重置为首页,避免下次打开停留在二级页 // 当弹窗打开时,尝试从存储中获取最新的昵称,确保与 onboarding 同步
useEffect(() => { useEffect(() => {
if (!visible) { if (visible) {
getUserProfile().then(profile => {
if (profile.name) {
setCurrentName(profile.name);
}
});
} else {
setNavDirection('back'); setNavDirection('back');
setPage('root'); setPage('root');
} }
}, [visible]); }, [visible]);
// 同步外部 propName 的变化
useEffect(() => {
if (propName) {
setCurrentName(propName);
}
}, [propName]);
function go(next: Page, direction: NavDirection) { function go(next: Page, direction: NavDirection) {
setNavDirection(direction); setNavDirection(direction);
setPage(next); setPage(next);
@@ -79,6 +127,8 @@ export default function ProfileModal({ visible, name, onClose }: Props) {
if (page === 'favorites') return t('profile.favorites'); if (page === 'favorites') return t('profile.favorites');
if (page === 'dailyReminder') return t('dailyReminder.title'); if (page === 'dailyReminder') return t('dailyReminder.title');
if (page === 'widget') return t('profile.widget'); if (page === 'widget') return t('profile.widget');
if (page === 'language') return t('profile.language');
if (page === 'widgetHowTo') return t('widget.howToTitle');
return t('profile.title'); return t('profile.title');
}, [page, t]); }, [page, t]);
@@ -107,42 +157,46 @@ export default function ProfileModal({ visible, name, onClose }: Props) {
}, [navDirection]); }, [navDirection]);
return ( return (
<SheetModal visible={visible} title={title} onClose={handleSheetClose}> <SheetModal
{!isRoot && ( visible={visible}
<Pressable title={title}
onPress={() => go('root', 'back')} onClose={handleSheetClose}
hitSlop={8} leftIcon={!isRoot ? require('@/assets/images/icon/back_icon.png') : undefined}
accessibilityRole="button" >
accessibilityLabel={t('common.back')} <View style={[styles.pageWrap, !isRoot && { flex: 1 }]}>
style={styles.backRow} <Animated.View
key={page}
entering={transition.entering}
exiting={transition.exiting}
style={!isRoot ? { flex: 1 } : undefined}
> >
<Text style={styles.backText}> {t('common.back')}</Text> <Animated.View
</Pressable> entering={transition.fadeIn}
)} exiting={transition.fadeOut}
style={!isRoot ? { flex: 1 } : undefined}
<Animated.View >
key={page}
entering={transition.entering}
exiting={transition.exiting}
style={styles.pageWrap}
>
<Animated.View entering={transition.fadeIn} exiting={transition.fadeOut}>
{page === 'root' ? ( {page === 'root' ? (
<RootPage <RootPage
name={name} name={currentName}
onOpenFavorites={() => go('favorites', 'forward')} onOpenFavorites={() => go('favorites', 'forward')}
onOpenWidget={() => go('widget', 'forward')} onOpenWidget={() => go('widget', 'forward')}
onOpenDailyReminder={() => go('dailyReminder', 'forward')} onOpenDailyReminder={() => go('dailyReminder', 'forward')}
onOpenLanguage={() => go('language', 'forward')}
/> />
) : page === 'favorites' ? ( ) : page === 'favorites' ? (
<FavoritesPage visible={visible} /> <FavoritesPage visible={visible} page={page} />
) : page === 'dailyReminder' ? ( ) : page === 'dailyReminder' ? (
<DailyReminderPage visible={visible} onDone={() => go('root', 'back')} /> <DailyReminderPage visible={visible} onDone={() => go('root', 'back')} />
) : page === 'language' ? (
<LanguagePage />
) : page === 'widgetHowTo' ? (
<WidgetHowToPage />
) : ( ) : (
<WidgetPage /> <WidgetPage onOpenHowTo={() => go('widgetHowTo', 'forward')} />
)} )}
</Animated.View>
</Animated.View> </Animated.View>
</Animated.View> </View>
</SheetModal> </SheetModal>
); );
} }
@@ -156,17 +210,19 @@ function RootPage({
onOpenFavorites, onOpenFavorites,
onOpenWidget, onOpenWidget,
onOpenDailyReminder, onOpenDailyReminder,
onOpenLanguage,
}: { }: {
name?: string; name?: string;
onOpenFavorites: () => void; onOpenFavorites: () => void;
onOpenWidget: () => void; onOpenWidget: () => void;
onOpenDailyReminder: () => void; onOpenDailyReminder: () => void;
onOpenLanguage: () => void;
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<> <>
<View style={styles.header}> <View style={styles.header}>
<Image source={AvatarIcon} style={styles.avatarImage} resizeMode="contain" /> <AvatarIcon width={234} height={183} />
<Text style={styles.name}>{name || 'Hali'}</Text> <Text style={styles.name}>{name || 'Hali'}</Text>
</View> </View>
@@ -198,48 +254,104 @@ function RootPage({
<ListItem <ListItem
icon={<LanguageIcon width={22} height={22} />} icon={<LanguageIcon width={22} height={22} />}
title={t('profile.language')} title={t('profile.language')}
onPress={() => toastTodo(t)} onPress={onOpenLanguage}
/> />
</View> </View>
</> </>
); );
} }
function FavoritesPage({ visible }: { visible: boolean }) { function FavoritesPage({ visible, page }: { visible: boolean; page: Page }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [ids, setIds] = useState<string[]>([]); const [favorites, setFavorites] = useState<(FavoriteItem & { text: string })[]>([]);
// 每次进入该页刷新一次,确保展示最新“喜欢”
useEffect(() => { useEffect(() => {
if (!visible) return; if (!visible) return;
let cancelled = false; refreshFavorites();
(async () => { }, [visible, page]); // 当页面切换回 favorites 时也刷新一次
const list = await getFavorites();
if (!cancelled) setIds(list);
})();
return () => {
cancelled = true;
};
}, [visible]);
const items = useMemo(() => { async function refreshFavorites() {
const map = new Map(MOCK_CONTENT.map((c) => [c.id, c])); const storedFavs = await getFavorites();
return ids.map((id) => map.get(id)).filter(Boolean) as { id: string; text: string }[]; const textMap = new Map<string, string>();
}, [ids]);
// 1) Mock 文案
MOCK_CONTENT.forEach((c) => textMap.set(String(c.id), t(c.textKey)));
// 2) 后端推荐缓存文案(避免收藏后 cache 覆盖就丢文案)
const cache = await getRecoFeedCache();
cache?.items?.forEach((c) => textMap.set(String(c.content_id), c.text));
// 3) 组装:优先使用收藏时写入的 text其次从 map 回填
const list = storedFavs.map((fav) => ({
...fav,
text: fav.text || textMap.get(String(fav.id)) || t('favorites.unknownText'),
}));
setFavorites(list);
}
async function handleRemove(favId: string) {
// 1. 调用存储层移除收藏
await removeFavorite(favId);
// 2. 更新本地状态
setFavorites(prev => prev.filter(item => item.favId !== favId));
}
return ( return (
<View style={styles.favContainer}> <View style={styles.favContainer}>
{items.length === 0 ? ( {favorites.length === 0 ? (
<Text style={styles.favEmpty}>{t('favorites.empty')}</Text> <Text style={styles.favEmpty}>{t('favorites.empty')}</Text>
) : ( ) : (
<FlatList <FlatList
data={items} data={favorites}
keyExtractor={(it) => it.id} keyExtractor={(it) => it.favId}
contentContainerStyle={styles.favList} contentContainerStyle={styles.favList}
showsVerticalScrollIndicator={false}
renderItem={({ item }) => ( renderItem={({ item }) => (
<View style={styles.favRow}> <Animated.View
<Text style={styles.favText}>{item.text}</Text> entering={FadeIn.duration(300)}
</View> exiting={FadeOut.duration(200)}
layout={Layout.duration(300).easing(Easing.out(Easing.quad))}
style={styles.favCard}
>
<View style={styles.favLeft}>
<Text style={styles.favDate}>{item.date}</Text>
</View>
<View style={styles.favRight}>
<View style={[
styles.favThumb,
item.themeMode === 'scenery' ? {} : { backgroundColor: item.background }
]}>
{item.themeMode === 'scenery' ? (
<View style={StyleSheet.absoluteFill}>
<Image
source={NATURE_IMAGES[parseInt(item.background)]}
style={{
width: width * 0.6,
height: 800, // 假设原图较高,设置一个较大的高度
position: 'absolute',
bottom: 0, // 关键:将图片底部对齐容器底部
}}
resizeMode="cover"
/>
</View>
) : null}
<Text style={[
styles.favThumbText,
item.themeMode === 'scenery' && { color: '#FFFFFF', textShadowColor: 'rgba(0,0,0,0.5)', textShadowOffset: {width:0, height:1}, textShadowRadius: 3 }
]} numberOfLines={4}>
{item.text}
</Text>
<Pressable
onPress={() => handleRemove(item.favId)}
style={styles.favRemoveBtn}
hitSlop={10}
>
<MyLikeIcon width={37 * 0.7} height={33 * 0.7} />
</Pressable>
</View>
</View>
</Animated.View>
)} )}
/> />
)} )}
@@ -252,16 +364,23 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [timesPerDay, setTimesPerDay] = useState(3); const [timesPerDay, setTimesPerDay] = useState(3);
const [pushEnabled, setPushEnabled] = useState(false); const [pushEnabled, setPushEnabled] = useState(false);
const [hasSystemPermission, setHasSystemPermission] = useState<boolean | null>(null);
useEffect(() => { useEffect(() => {
let cancelled = false; let cancelled = false;
if (!visible) return; if (!visible) return;
setLoading(true); setLoading(true);
(async () => { (async () => {
// 1. 获取本地存储设置
const s = await getDailyReminderSettings(); const s = await getDailyReminderSettings();
// 【测试模式】:强制模拟无权限状态
const granted = false;
if (cancelled) return; if (cancelled) return;
setTimesPerDay(s.timesPerDay); setTimesPerDay(s.timesPerDay);
setPushEnabled(s.pushEnabled); setPushEnabled(granted);
setHasSystemPermission(granted);
setLoading(false); setLoading(false);
})(); })();
return () => { return () => {
@@ -269,6 +388,40 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
}; };
}, [visible]); }, [visible]);
const handleTogglePush = async (value: boolean) => {
if (value) {
// 获取当前权限状态
const settings = await Notifications.getPermissionsAsync();
// 如果已经拒绝,弹窗提示
if (settings.status === 'denied') {
Alert.alert(
t('common.notice'),
t('permissions.notificationsDenied')
);
setPushEnabled(false);
return;
}
// 尝试申请权限
const { status } = await Notifications.requestPermissionsAsync();
// 调试:打印状态
console.log('Push Permission Status:', status);
if (status === 'granted') {
setPushEnabled(true);
setHasSystemPermission(true);
} else {
setPushEnabled(false);
setHasSystemPermission(false);
Alert.alert(t('common.notice'), t('dailyReminder.permissionDenied'));
}
} else {
setPushEnabled(false);
}
};
function clamp(next: number) { function clamp(next: number) {
return Math.min(10, Math.max(1, next)); return Math.min(10, Math.max(1, next));
} }
@@ -311,15 +464,24 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
</Pressable> </Pressable>
</View> </View>
<View style={styles.remindRow}> {!hasSystemPermission && (
<View style={styles.rowLeft}> <View style={styles.remindRow}>
<View style={styles.rowIcon}> <View style={styles.rowLeft}>
<RemindIcon width={18} height={18} /> <View style={styles.rowIcon}>
<RemindIcon width={18} height={18} />
</View>
<Text style={styles.rowText}>{t('dailyReminder.pushLabel')}</Text>
</View>
<View style={styles.rowRight}>
<Switch
value={pushEnabled}
onValueChange={handleTogglePush}
trackColor={{ false: '#D1D1D6', true: '#4CD964' }}
ios_backgroundColor="#D1D1D6"
/>
</View> </View>
<Text style={styles.rowText}>{t('dailyReminder.pushLabel')}</Text>
</View> </View>
<Switch value={pushEnabled} onValueChange={setPushEnabled} /> )}
</View>
<Pressable onPress={onOk} disabled={loading} style={styles.okPressable}> <Pressable onPress={onOk} disabled={loading} style={styles.okPressable}>
<LinearGradient <LinearGradient
@@ -335,34 +497,150 @@ function DailyReminderPage({ visible, onDone }: { visible: boolean; onDone: () =
); );
} }
function WidgetPage() { function WidgetPage({ onOpenHowTo }: { onOpenHowTo: () => void }) {
const { t } = useTranslation(); const { t, i18n } = useTranslation();
const currentLang = i18n.language;
// 根据语言选择图片
const widget1 = currentLang === 'en'
? require('@/assets/images/home/Profile/widget/Widget1_en.png')
: require('@/assets/images/home/Profile/widget/Widget1_tw.png');
const widget2 = currentLang === 'en'
? require('@/assets/images/home/Profile/widget/Widget2_en.png')
: require('@/assets/images/home/Profile/widget/Widget2_tw.png');
return ( return (
<View style={styles.widgetContent}> <View style={styles.widgetContent}>
<View style={styles.widgetRow}> <Pressable style={styles.questionBtn} onPress={onOpenHowTo}>
<View style={styles.widgetCard}> <QuestionIcon width={19} height={19} />
<View style={[styles.widgetPreviewInner, styles.widgetPreviewLock]}> </Pressable>
<Text style={styles.widgetPreviewDate} numberOfLines={1}>
{t('widget.previewDate')}
</Text>
<Text style={styles.widgetPreviewTime} numberOfLines={1}>
13:45
</Text>
</View>
<Text style={styles.widgetCardLabel}>{t('widget.lockScreen')}</Text>
</View>
<View style={styles.widgetCard}> <View style={styles.widgetScroll}>
<View style={[styles.widgetPreviewInner, styles.widgetPreviewHome]}> <Pressable style={styles.widgetItem} onPress={onOpenHowTo}>
<Text style={styles.widgetPreviewQuote} numberOfLines={3}> <Image source={widget1} style={styles.widgetImg1} resizeMode="contain" />
{t('widget.previewQuote')} <Text style={styles.widgetLabel}>{t('widget.lockScreen')}</Text>
</Text> </Pressable>
</View>
<Text style={styles.widgetCardLabel}>{t('widget.homeScreen')}</Text> <Pressable style={styles.widgetItem} onPress={onOpenHowTo}>
</View> <Image source={widget2} style={styles.widgetImg2} resizeMode="contain" />
<Text style={styles.widgetLabel}>{t('widget.homeScreen')}</Text>
</Pressable>
</View> </View>
</View>
);
}
<Text style={styles.widgetDesc}>{t('settings.widgetDesc')}</Text> function WidgetHowToPage() {
const { t, i18n } = useTranslation();
const currentLang = i18n.language;
const flatListRef = useRef<FlatList>(null);
const [activeIndex, setActiveIndex] = useState(0);
const [isManual, setIsManual] = useState(false);
const timerRef = useRef<NodeJS.Timeout | null>(null);
const images = currentLang === 'en' ? [
{ id: '1', src: require('@/assets/images/home/Profile/widget/Widget_description1_en.png'), desc: t('widget.howToDesc1') },
{ id: '2', src: require('@/assets/images/home/Profile/widget/Widget_description2_en.png'), desc: t('widget.howToDesc2') },
] : [
{ id: '1', src: require('@/assets/images/home/Profile/widget/Widget_description1_tw.png'), desc: t('widget.howToDesc1') },
{ id: '2', src: require('@/assets/images/home/Profile/widget/Widget_description2_tw.png'), desc: t('widget.howToDesc2') },
];
const startAutoPlay = useCallback(() => {
if (timerRef.current) clearInterval(timerRef.current);
timerRef.current = setInterval(() => {
if (!isManual) {
const nextIndex = (activeIndex + 1) % images.length;
flatListRef.current?.scrollToIndex({ index: nextIndex, animated: true });
setActiveIndex(nextIndex);
}
}, 3000);
}, [activeIndex, isManual, images.length]);
useEffect(() => {
startAutoPlay();
return () => {
if (timerRef.current) clearInterval(timerRef.current);
};
}, [startAutoPlay]);
const onScroll = (event: any) => {
const x = event.nativeEvent.contentOffset.x;
const index = Math.round(x / (width - 32));
if (index !== activeIndex) {
setActiveIndex(index);
}
};
const onScrollBeginDrag = () => {
setIsManual(true);
if (timerRef.current) clearInterval(timerRef.current);
};
return (
<View style={styles.howToPage}>
<FlatList
ref={flatListRef}
data={images}
keyExtractor={(item) => item.id}
horizontal
pagingEnabled
showsHorizontalScrollIndicator={false}
onScroll={onScroll}
onScrollBeginDrag={onScrollBeginDrag}
scrollEventThrottle={16}
renderItem={({ item }) => (
<View style={styles.howToSlide}>
<Image source={item.src} style={styles.howToImg} resizeMode="contain" />
<Text style={styles.howToDesc}>{item.desc}</Text>
</View>
)}
/>
<View style={styles.pagination}>
{images.map((_, i) => (
<View
key={i}
style={[
styles.dot,
i === activeIndex ? styles.dotActive : styles.dotInactive
]}
/>
))}
</View>
</View>
);
}
function LanguagePage() {
const { t, i18n } = useTranslation();
const currentLang = i18n.language;
const languages = [
{ id: 'zh-TW', label: t('language.zhTW') },
{ id: 'en', label: t('language.en') },
];
return (
<View style={styles.langPage}>
<View style={styles.langList}>
{languages.map((lang, index) => (
<Pressable
key={lang.id}
style={[
styles.langItem,
index < languages.length - 1 && styles.langItemBorder
]}
onPress={() => changeLanguage(lang.id as any)}
>
<Text style={styles.langText}>{lang.label}</Text>
{currentLang === lang.id && (
<SelectedIcon width={20} height={20} />
)}
</Pressable>
))}
</View>
</View> </View>
); );
} }
@@ -442,26 +720,31 @@ const styles = StyleSheet.create({
}, },
quickCard: { quickCard: {
flex: 1, flex: 1,
borderRadius: 16, borderRadius: 20,
padding: 14, padding: 14,
backgroundColor: 'rgba(244,214,194,0.65)', backgroundColor: 'rgba(244,214,194,0.65)',
height: 142,
justifyContent: 'space-between',
}, },
quickTitle: { quickTitle: {
color: '#5E2A28', color: '#482A0D',
fontSize: 14, fontSize: 15,
fontWeight: '700', fontWeight: '500',
marginBottom: 10, },
quickIconWrap: {
alignItems: 'flex-end',
justifyContent: 'flex-end',
flex: 1
}, },
quickIconWrap: { alignItems: 'center', justifyContent: 'center', flex: 1 },
list: { list: {
borderRadius: 16, borderRadius: 20,
backgroundColor: 'rgba(255,255,255,0.75)', backgroundColor: 'rgba(255,255,255,0.75)',
overflow: 'hidden', overflow: 'hidden',
marginBottom: 8, marginBottom: 8,
}, },
item: { item: {
height: 52, height: 52,
paddingHorizontal: 14, paddingHorizontal: 18,
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
@@ -471,55 +754,83 @@ const styles = StyleSheet.create({
itemLeft: { itemLeft: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
gap: 10, gap: 12,
}, },
itemIcon: { itemIcon: {
width: 28, width: 24,
height: 28, height: 24,
borderRadius: 10,
backgroundColor: 'rgba(244,214,194,0.55)',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}, },
itemText: { itemText: {
color: '#5E2A28', color: '#522B09',
fontSize: 15, fontSize: 15,
fontWeight: '600', fontWeight: '500',
}, },
chevron: { chevron: {
color: 'rgba(94,42,40,0.45)', color: '#C7B4A1',
fontSize: 20, fontSize: 20,
marginTop: -2, marginTop: -2,
}, },
favContainer: { favContainer: {
borderRadius: 16, flex: 1,
backgroundColor: 'rgba(255,255,255,0.75)', minHeight: 500, // 确保容器有足够高度
overflow: 'hidden',
marginBottom: 8,
}, },
favEmpty: { favEmpty: {
color: 'rgba(94,42,40,0.55)', color: 'rgba(94,42,40,0.55)',
fontSize: 15, fontSize: 15,
textAlign: 'center', textAlign: 'center',
paddingVertical: 26, paddingVertical: 100,
paddingHorizontal: 14,
}, },
favList: { favList: {
paddingBottom: 10, paddingHorizontal: 20,
paddingBottom: 80,
}, },
favRow: { favCard: {
paddingHorizontal: 14, flexDirection: 'row',
paddingVertical: 14, alignItems: 'center',
borderBottomWidth: StyleSheet.hairlineWidth, marginBottom: 24,
borderBottomColor: 'rgba(94,42,40,0.10)',
backgroundColor: 'rgba(255,255,255,0.15)',
}, },
favText: { favLeft: {
color: '#5E2A28', width: 90,
},
favDate: {
fontSize: 14,
color: '#772F00',
fontFamily: Platform.OS === 'ios' ? 'STIX Two Text' : 'serif',
fontWeight: '600',
},
favRight: {
flex: 1,
},
favThumb: {
backgroundColor: '#FFF4EA',
borderRadius: 16,
padding: 20,
width: width * 0.6,
height: 161,
justifyContent: 'center',
position: 'relative',
borderWidth: 1,
borderColor: 'rgba(119, 47, 0, 0.05)',
overflow: 'hidden',
},
favThumbText: {
fontSize: 15, fontSize: 15,
lineHeight: 22, lineHeight: 22,
fontWeight: '600', color: '#5E2A28',
fontWeight: '500',
textAlign: 'center',
},
favRemoveBtn: {
position: 'absolute',
top: 15,
right: 15,
width: 37,
height: 33,
alignItems: 'center',
justifyContent: 'center',
}, },
counter: { counter: {
@@ -563,15 +874,22 @@ const styles = StyleSheet.create({
}, },
remindRow: { remindRow: {
height: 54, height: 54,
borderRadius: 16, borderRadius: 20,
backgroundColor: 'rgba(255,255,255,0.75)', backgroundColor: 'rgba(255,255,255,0.75)',
paddingHorizontal: 14, paddingHorizontal: 14,
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
marginBottom: 18, marginBottom: 18,
width: width - 40, // 屏幕宽度减去左右各 20pt
alignSelf: 'center',
}, },
rowLeft: { flexDirection: 'row', alignItems: 'center', gap: 10 }, rowLeft: { flexDirection: 'row', alignItems: 'center', gap: 10 },
rowRight: {
height: '100%',
justifyContent: 'center',
alignItems: 'center',
},
rowIcon: { rowIcon: {
width: 28, width: 28,
height: 28, height: 28,
@@ -587,6 +905,7 @@ const styles = StyleSheet.create({
}, },
okPressable: { okPressable: {
marginBottom: 6, marginBottom: 6,
marginTop: 40, // 增加顶部间距以撑开高度
}, },
okBtn: { okBtn: {
height: 52, height: 52,
@@ -602,61 +921,104 @@ const styles = StyleSheet.create({
}, },
widgetContent: { widgetContent: {
paddingBottom: 18,
gap: 14,
},
widgetRow: {
flexDirection: 'row',
gap: 12,
},
widgetCard: {
flex: 1, flex: 1,
borderRadius: 16, paddingTop: 10,
overflow: 'hidden',
backgroundColor: 'rgba(255,255,255,0.75)',
borderWidth: StyleSheet.hairlineWidth,
borderColor: 'rgba(94,42,40,0.12)',
}, },
widgetPreviewInner: { questionBtn: {
height: 120, position: 'absolute',
padding: 12, right: 20,
justifyContent: 'center', top: -34, // 放在标题栏右侧
zIndex: 10,
}, },
widgetPreviewLock: { widgetScroll: {
backgroundColor: 'rgba(244,214,194,0.65)', alignItems: 'center',
gap: 30,
paddingBottom: 40,
}, },
widgetPreviewHome: { widgetItem: {
backgroundColor: 'rgba(243,208,225,0.55)', alignItems: 'center',
width: '100%',
}, },
widgetPreviewDate: { widgetImg1: {
color: 'rgba(94,42,40,0.70)', width: width * 0.9,
fontSize: 12, height: (width * 0.9) * (156 / 311),
fontWeight: '600',
marginBottom: 6,
}, },
widgetPreviewTime: { widgetImg2: {
color: '#ffffff', width: width * 0.9,
fontSize: 44, height: (width * 0.9) * (175 / 311),
fontWeight: '800',
letterSpacing: 1,
}, },
widgetPreviewQuote: { widgetLabel: {
color: '#5E2A28', marginTop: 12,
fontSize: 14, fontSize: 15,
lineHeight: 20, color: 'rgba(94, 42, 40, 0.45)',
fontWeight: '700', fontWeight: '500',
}, },
widgetCardLabel: { howToPage: {
paddingVertical: 10, flex: 1,
alignItems: 'center',
paddingTop: 20,
},
howToSlide: {
width: width - 32, // 减去 SheetModal 的 paddingHorizontal: 16 * 2
alignItems: 'center',
},
howToImg: {
width: width * 0.9,
height: (width * 0.9) * (234 / 326),
marginBottom: 40,
},
howToDesc: {
fontSize: 15,
lineHeight: 25,
color: '#522B09',
textAlign: 'center', textAlign: 'center',
color: '#5E2A28', fontWeight: '500',
fontSize: 13, paddingHorizontal: 20,
fontWeight: '700',
}, },
widgetDesc: { pagination: {
color: 'rgba(94,42,40,0.75)', flexDirection: 'row',
fontSize: 13, position: 'absolute',
lineHeight: 18, top: (width * 0.9) * (234 / 326) + 35, // 根据新的图片高度动态计算
gap: 8,
},
dot: {
width: 8,
height: 8,
borderRadius: 4,
},
dotActive: {
backgroundColor: '#EEB054',
},
dotInactive: {
backgroundColor: 'rgba(238, 176, 84, 0.3)',
},
langPage: {
paddingHorizontal: 20,
paddingTop: 10,
},
langList: {
backgroundColor: '#FFFFFF',
borderRadius: 20,
overflow: 'hidden',
width: width - 40, // 屏幕宽度减去左右各 20pt
alignSelf: 'center',
},
langItem: {
height: 62,
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
paddingHorizontal: 24,
},
langItemBorder: {
borderBottomWidth: StyleSheet.hairlineWidth,
borderBottomColor: 'rgba(94,42,40,0.1)',
},
langText: {
fontSize: 15,
color: '#522B09',
fontWeight: '500',
textTransform: 'capitalize',
}, },
}); });

View File

@@ -16,7 +16,7 @@ type Props = {
export default function ThemeModal({ visible, mode, onSelect, onClose }: Props) { export default function ThemeModal({ visible, mode, onSelect, onClose }: Props) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<SheetModal visible={visible} title={t('theme.title')} onClose={onClose}> <SheetModal visible={visible} title={t('theme.title')} onClose={onClose} height={350}>
<View style={styles.row}> <View style={styles.row}>
<ThemeCard <ThemeCard
title={t('theme.scenery')} title={t('theme.scenery')}
@@ -24,7 +24,7 @@ export default function ThemeModal({ visible, mode, onSelect, onClose }: Props)
onPress={() => onSelect('scenery')} onPress={() => onSelect('scenery')}
> >
<Image <Image
source={require('../../assets/images/index/index_flowers.png')} source={require('../../assets/images/theme/theme_landscape.png')}
resizeMode="cover" resizeMode="cover"
style={styles.previewImage} style={styles.previewImage}
/> />
@@ -35,7 +35,11 @@ export default function ThemeModal({ visible, mode, onSelect, onClose }: Props)
selected={mode === 'color'} selected={mode === 'color'}
onPress={() => onSelect('color')} onPress={() => onSelect('color')}
> >
<View style={styles.colorPreview} /> <Image
source={require('../../assets/images/theme/theme_color.png')}
resizeMode="cover"
style={styles.previewImage}
/>
</ThemeCard> </ThemeCard>
</View> </View>
</SheetModal> </SheetModal>
@@ -56,11 +60,20 @@ function ThemeCard({
return ( return (
<Pressable <Pressable
onPress={onPress} onPress={onPress}
style={[styles.card, selected ? styles.cardSelected : styles.cardUnselected]} style={styles.cardContainer}
hitSlop={6} hitSlop={6}
> >
<View style={styles.preview}>{children}</View> <View style={[styles.previewWrapper, selected && styles.selectedWrapper]}>
<Text style={styles.cardTitle}>{title}</Text> <View style={styles.previewInner}>
{children}
{/* 文案展示在图片中心 */}
<View style={styles.textOverlay}>
<Text style={[styles.overlayTitle, selected && styles.selectedOverlayTitle]}>
{title}
</Text>
</View>
</View>
</View>
</Pressable> </Pressable>
); );
} }
@@ -68,43 +81,57 @@ function ThemeCard({
const styles = StyleSheet.create({ const styles = StyleSheet.create({
row: { row: {
flexDirection: 'row', flexDirection: 'row',
gap: 14, gap: 30,
paddingBottom: 18, paddingHorizontal: 10,
paddingBottom: 50,
paddingTop: 20,
justifyContent: 'center',
}, },
card: { cardContainer: {
flex: 1, alignItems: 'center',
borderRadius: 18, width: 143,
padding: 10,
backgroundColor: 'rgba(255,255,255,0.55)',
}, },
cardSelected: { previewWrapper: {
borderWidth: 2, width: 138,
borderColor: '#F99CC0', height: 203,
borderRadius: 26,
padding: 6.5,
justifyContent: 'center',
alignItems: 'center',
}, },
cardUnselected: { selectedWrapper: {
borderWidth: StyleSheet.hairlineWidth, borderWidth: 4,
borderColor: 'rgba(94,42,40,0.18)', borderColor: '#E7837A',
borderRadius: 26,
}, },
preview: { previewInner: {
height: 96, width: '100%',
borderRadius: 14, height: '100%',
borderRadius: 21,
overflow: 'hidden', overflow: 'hidden',
backgroundColor: '#fff', backgroundColor: '#F5F5F5',
marginBottom: 10, position: 'relative',
}, },
previewImage: { previewImage: {
width: '100%', width: '100%',
height: '100%', height: '100%',
}, },
colorPreview: { textOverlay: {
flex: 1, ...StyleSheet.absoluteFillObject,
backgroundColor: '#F3D0E1', justifyContent: 'center',
alignItems: 'center',
backgroundColor: 'rgba(0,0,0,0.05)', // 轻微遮罩增加文字可读性
}, },
cardTitle: { overlayTitle: {
color: '#5E2A28', color: '#FFFFFF',
fontSize: 14, fontSize: 15,
fontWeight: '700', fontWeight: '700',
textAlign: 'center', textAlign: 'center',
textShadowColor: 'rgba(0, 0, 0, 0.3)',
textShadowOffset: { width: 0, height: 1 },
textShadowRadius: 3,
},
selectedOverlayTitle: {
color: '#FFFFFF',
}, },
}); });

View File

@@ -1,13 +1,14 @@
import React from 'react'; import React from 'react';
import { View, StyleSheet, TouchableOpacity } from 'react-native'; import { View, StyleSheet, TouchableOpacity } from 'react-native';
import { useTranslation } from 'react-i18next';
import { SerifText } from './SerifText'; import { SerifText } from './SerifText';
import { OnboardingColors } from '@/constants/OnboardingTheme'; import { OnboardingColors } from '@/constants/OnboardingTheme';
export const INTENTS = [ export const INTENTS = [
{ id: 'love', label: '爱情', icon: '❤️' }, { id: 'love', labelKey: 'intent.love', icon: '❤️' },
{ id: 'life', label: '生活', icon: '⛅' }, { id: 'life', labelKey: 'intent.life', icon: '⛅' },
{ id: 'travel', label: '旅游', icon: '🌴' }, { id: 'travel', labelKey: 'intent.travel', icon: '🌴' },
{ id: 'work', label: '职场', icon: '💼' }, { id: 'work', labelKey: 'intent.work', icon: '💼' },
]; ];
interface IntentSelectionStepProps { interface IntentSelectionStepProps {
@@ -16,9 +17,10 @@ interface IntentSelectionStepProps {
} }
export function IntentSelectionStep({ selectedIds, onToggle }: IntentSelectionStepProps) { export function IntentSelectionStep({ selectedIds, onToggle }: IntentSelectionStepProps) {
const { t } = useTranslation();
return ( return (
<View style={styles.container}> <View style={styles.container}>
<SerifText style={styles.title}></SerifText> <SerifText style={styles.title}>{t('intent.title')}</SerifText>
<View style={styles.grid}> <View style={styles.grid}>
{INTENTS.map((intent) => { {INTENTS.map((intent) => {
@@ -35,7 +37,7 @@ export function IntentSelectionStep({ selectedIds, onToggle }: IntentSelectionSt
> >
<SerifText style={styles.icon}>{intent.icon}</SerifText> <SerifText style={styles.icon}>{intent.icon}</SerifText>
<SerifText style={[styles.label, isSelected && styles.labelSelected]}> <SerifText style={[styles.label, isSelected && styles.labelSelected]}>
{intent.label} {t(intent.labelKey)}
</SerifText> </SerifText>
</TouchableOpacity> </TouchableOpacity>
); );

View File

@@ -1,32 +1,82 @@
import React from 'react'; import React, { useEffect, useRef, useState } from 'react';
import { View, StyleSheet, TextInput, Platform } from 'react-native'; import { View, StyleSheet, TextInput, Platform, Animated, TouchableOpacity, Dimensions, Text } from 'react-native';
import { SerifText } from './SerifText';
import { OnboardingColors } from '@/constants/OnboardingTheme'; import { OnboardingColors } from '@/constants/OnboardingTheme';
import BtnNotClicked from '@/assets/images/icon/btn_Notclicked.svg';
import BtnClicked from '@/assets/images/icon/btn_clicked.svg';
import EnterLightIcon from '@/assets/images/icon/enter_Light_icon.svg';
const { height } = Dimensions.get('window');
interface NameInputStepProps { interface NameInputStepProps {
value: string; value: string;
onChangeText: (text: string) => void; onChangeText: (text: string) => void;
onSubmitEditing?: () => void; onNext: () => void;
} }
export function NameInputStep({ value, onChangeText, onSubmitEditing }: NameInputStepProps) { export function NameInputStep({ value, onChangeText, onNext }: NameInputStepProps) {
const [isFocused, setIsFocused] = useState(false);
const blinkAnim = useRef(new Animated.Value(1)).current;
const hasInput = value.trim().length > 0;
useEffect(() => {
const animation = Animated.loop(
Animated.sequence([
Animated.timing(blinkAnim, { toValue: 0, duration: 500, useNativeDriver: true }),
Animated.timing(blinkAnim, { toValue: 1, duration: 500, useNativeDriver: true }),
])
);
if (isFocused) {
animation.start();
} else {
animation.stop();
blinkAnim.setValue(0);
}
return () => animation.stop();
}, [blinkAnim, isFocused]);
return ( return (
<View style={styles.container}> <View style={styles.container}>
<SerifText style={styles.title}></SerifText> <View style={styles.inputCard}>
<View style={styles.inputWrapper}>
<View style={styles.inputContainer}> {/* 显示层:文案 + 跟随的光标 */}
<TextInput <View style={styles.displayLayer}>
style={styles.input} <Text
value={value} style={[
onChangeText={onChangeText} styles.displayText,
placeholder="Hao" (!isFocused && !hasInput) && { color: OnboardingColors.textSecondary }
placeholderTextColor={OnboardingColors.textSecondary} ]}
selectionColor={OnboardingColors.cursor} >
autoFocus {hasInput ? value : (isFocused ? "" : "Mama")}
onSubmitEditing={onSubmitEditing} </Text>
returnKeyType="done" {isFocused && (
textAlign="center" <Animated.View style={[styles.cursorWrapper, { opacity: blinkAnim, marginLeft: 2 }]}>
/> <EnterLightIcon width={3} height={27} />
</Animated.View>
)}
</View>
{/* 交互层:隐藏的输入框 */}
<TextInput
style={styles.hiddenInput}
value={value}
onChangeText={onChangeText}
onFocus={() => setIsFocused(true)}
onBlur={() => setIsFocused(false)}
caretHidden={true}
autoCorrect={false}
spellCheck={false}
/>
</View>
</View>
<View style={styles.footer}>
<TouchableOpacity
onPress={onNext}
disabled={!hasInput}
activeOpacity={0.8}
>
{hasInput ? <BtnClicked width={87} height={57} /> : <BtnNotClicked width={87} height={57} />}
</TouchableOpacity>
</View> </View>
</View> </View>
); );
@@ -34,31 +84,53 @@ export function NameInputStep({ value, onChangeText, onSubmitEditing }: NameInpu
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { container: {
flex: 1,
alignItems: 'center', alignItems: 'center',
width: '100%', paddingTop: 20,
}, },
title: { inputCard: {
fontSize: 24, width: 335,
marginBottom: 40, height: 75,
textAlign: 'center',
},
inputContainer: {
width: '100%',
backgroundColor: OnboardingColors.cardBackground, backgroundColor: OnboardingColors.cardBackground,
borderRadius: 20, borderRadius: 20,
paddingVertical: 20, justifyContent: 'center',
paddingHorizontal: 24, alignItems: 'center',
shadowColor: '#000', shadowColor: '#000',
shadowOffset: { width: 0, height: 2 }, shadowOffset: { width: 0, height: 2 },
shadowOpacity: 0.05, shadowOpacity: 0.05,
shadowRadius: 10, shadowRadius: 10,
elevation: 2, elevation: 2,
}, },
input: { inputWrapper: {
fontSize: 24, width: '100%',
fontFamily: Platform.select({ ios: 'Georgia', android: 'serif', default: 'serif' }), height: '100%',
justifyContent: 'center',
alignItems: 'center',
},
displayLayer: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
},
displayText: {
fontSize: 22,
fontFamily: Platform.select({ ios: 'STIX Two Text', android: 'serif', default: 'serif' }),
fontWeight: '600',
color: OnboardingColors.textPrimary, color: OnboardingColors.textPrimary,
textAlign: 'center', textAlign: 'center',
padding: 0, // remove default padding
}, },
hiddenInput: {
...StyleSheet.absoluteFillObject,
color: 'transparent', // 文字透明,只负责输入逻辑
fontSize: 22,
textAlign: 'center',
},
cursorWrapper: {
// 默认居中显示时,光标在左侧
},
footer: {
position: 'absolute',
bottom: height * 0.12,
alignItems: 'center',
}
}); });

View File

@@ -1,45 +1,61 @@
import React from 'react'; import React from 'react';
import { View, StyleSheet, SafeAreaView, TouchableOpacity, StatusBar } from 'react-native'; import { View, StyleSheet, SafeAreaView, TouchableOpacity, StatusBar, Text, Image, Platform } from 'react-native';
import { OnboardingColors } from '@/constants/OnboardingTheme'; import { OnboardingColors } from '@/constants/OnboardingTheme';
import { SerifText } from './SerifText';
import { NextButton } from './NextButton';
interface OnboardingLayoutProps { interface OnboardingLayoutProps {
children: React.ReactNode; children: React.ReactNode;
onSkip?: () => void; title?: string;
onNext?: () => void; currentStep: number;
nextEnabled?: boolean; totalSteps: number;
showNextButton?: boolean; onSkip: () => void;
onBack?: () => void;
showBackButton?: boolean;
} }
export function OnboardingLayout({ export function OnboardingLayout({
children, children,
title,
currentStep,
totalSteps,
onSkip, onSkip,
onNext, onBack,
nextEnabled = true, showBackButton = false
showNextButton = true
}: OnboardingLayoutProps) { }: OnboardingLayoutProps) {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<StatusBar barStyle="dark-content" /> <StatusBar barStyle="dark-content" />
<SafeAreaView style={styles.safeArea}> <SafeAreaView style={styles.safeArea}>
{/* Header: Back & Skip */}
<View style={styles.header}> <View style={styles.header}>
<View style={styles.spacer} /> <View style={styles.headerLeft}>
{onSkip && ( {showBackButton && onBack && (
<TouchableOpacity onPress={onSkip} style={styles.skipButton}> <TouchableOpacity onPress={onBack} style={styles.iconButton}>
<SerifText style={styles.skipText}>Skip {'->'}</SerifText> <Image
</TouchableOpacity> source={require('@/assets/images/icon/back_icon.png')}
)} style={styles.backIcon}
</View> />
</TouchableOpacity>
<View style={styles.content}> )}
{children} </View>
<TouchableOpacity onPress={onSkip} style={styles.skipButton}>
<Text style={styles.skipText}>skip</Text>
<Image
source={require('@/assets/images/icon/skip_icon.png')}
style={styles.skipIcon}
/>
</TouchableOpacity>
</View> </View>
<View style={styles.footer}> {/* Title & Progress Row */}
{showNextButton && onNext && ( <View style={styles.titleRow}>
<NextButton onPress={onNext} disabled={!nextEnabled} /> <Text style={styles.questionTitle}>{title}</Text>
)} <Text style={styles.progressText}>({currentStep}/{totalSteps})</Text>
</View>
{/* Content */}
<View style={styles.content}>
{children}
</View> </View>
</SafeAreaView> </SafeAreaView>
</View> </View>
@@ -58,27 +74,60 @@ const styles = StyleSheet.create({
flexDirection: 'row', flexDirection: 'row',
justifyContent: 'space-between', justifyContent: 'space-between',
alignItems: 'center', alignItems: 'center',
paddingHorizontal: 24, paddingHorizontal: 20,
paddingVertical: 12, height: 44,
}, },
spacer: { headerLeft: {
width: 60, // Balance the skip button width approximately width: 44,
height: 44,
justifyContent: 'center',
},
iconButton: {
padding: 8,
},
backIcon: {
width: 19,
height: 19,
resizeMode: 'contain',
}, },
skipButton: { skipButton: {
flexDirection: 'row',
alignItems: 'center',
padding: 8, padding: 8,
}, },
skipText: { skipText: {
fontSize: 16, fontSize: 13,
color: OnboardingColors.textPrimary, color: OnboardingColors.textMuted,
fontFamily: Platform.OS === 'ios' ? 'STIX Two Text' : 'serif',
marginRight: 4,
},
skipIcon: {
width: 10,
height: 4,
resizeMode: 'contain',
},
titleRow: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'flex-end',
paddingHorizontal: 20,
marginTop: 20,
marginBottom: 20,
},
questionTitle: {
fontSize: 22,
color: OnboardingColors.questionTitle,
fontFamily: Platform.OS === 'ios' ? 'PingFang TC' : 'sans-serif',
flex: 1,
},
progressText: {
fontSize: 18,
color: OnboardingColors.textProgress,
fontFamily: Platform.OS === 'ios' ? 'PingFang TC' : 'sans-serif',
marginLeft: 10,
}, },
content: { content: {
flex: 1, flex: 1,
justifyContent: 'center', paddingHorizontal: 20,
paddingHorizontal: 24,
},
footer: {
alignItems: 'center',
paddingBottom: 40,
minHeight: 100, // Reserve space for button
}, },
}); });

View File

@@ -0,0 +1,89 @@
import React from 'react';
import { View, StyleSheet, TouchableOpacity, Text, Platform, Dimensions } from 'react-native';
import { OnboardingColors } from '@/constants/OnboardingTheme';
import AddIcon from '@/assets/images/icon/add_icon.svg';
import ReduceIcon from '@/assets/images/icon/reduce_icon.svg';
import BtnClicked from '@/assets/images/icon/btn_clicked.svg';
const { height } = Dimensions.get('window');
interface ReminderStepProps {
value: number;
onChange: (value: number) => void;
onFinish: () => void;
}
export function ReminderStep({ value, onChange, onFinish }: ReminderStepProps) {
const handleReduce = () => {
if (value > 1) onChange(value - 1);
};
const handleAdd = () => {
if (value < 5) onChange(value + 1);
};
return (
<View style={styles.container}>
<View style={styles.counterContainer}>
<TouchableOpacity onPress={handleReduce} activeOpacity={0.7}>
<ReduceIcon width={47} height={47} />
</TouchableOpacity>
<View style={styles.numberWrapper}>
<Text style={styles.numberText}>{value}</Text>
<Text style={styles.unitText}></Text>
</View>
<TouchableOpacity onPress={handleAdd} activeOpacity={0.7}>
<AddIcon width={47} height={47} />
</TouchableOpacity>
</View>
<View style={styles.footer}>
<TouchableOpacity onPress={onFinish} activeOpacity={0.8}>
<BtnClicked width={87} height={57} />
</TouchableOpacity>
</View>
</View>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
alignItems: 'center',
paddingTop: 20,
},
counterContainer: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
width: '100%',
marginTop: 40,
},
numberWrapper: {
flexDirection: 'row',
alignItems: 'flex-end',
marginHorizontal: 40,
},
numberText: {
fontSize: 107,
fontFamily: Platform.OS === 'ios' ? 'STIX Two Text' : 'serif',
fontWeight: '600',
color: OnboardingColors.textPrimary,
lineHeight: 120,
},
unitText: {
fontSize: 17,
fontFamily: Platform.OS === 'ios' ? 'STIX Two Text' : 'serif',
fontWeight: '600',
color: OnboardingColors.textPrimary,
marginBottom: 20,
marginLeft: 4,
},
footer: {
position: 'absolute',
bottom: height * 0.12,
alignItems: 'center',
}
});

View File

@@ -0,0 +1,115 @@
import React from 'react';
import { View, StyleSheet, TouchableOpacity, ScrollView, Dimensions } from 'react-native';
import { OnboardingColors } from '@/constants/OnboardingTheme';
import { SerifText } from './SerifText';
import SelectedIcon from '@/assets/images/icon/selected_icon.svg';
import BtnNotClicked from '@/assets/images/icon/btn_Notclicked.svg';
import BtnClicked from '@/assets/images/icon/btn_clicked.svg';
const { height } = Dimensions.get('window');
interface Option {
id: string;
label: string;
}
interface SelectionStepProps {
options: Option[];
selectedIds: string[];
onToggle: (id: string) => void;
onNext: () => void;
onSkip?: () => void;
}
export function SelectionStep({ options, selectedIds, onToggle, onNext, onSkip }: SelectionStepProps) {
const hasSelection = selectedIds.length > 0;
return (
<View style={styles.container}>
<ScrollView showsVerticalScrollIndicator={false} contentContainerStyle={styles.optionsList}>
{options.map((option) => {
const isSelected = selectedIds.includes(option.id);
return (
<TouchableOpacity
key={option.id}
style={styles.optionCard}
onPress={() => onToggle(option.id)}
activeOpacity={0.7}
>
<SerifText style={styles.optionText}>{option.label}</SerifText>
{isSelected && (
<View style={styles.iconWrapper}>
<SelectedIcon width={20} height={20} />
</View>
)}
</TouchableOpacity>
);
})}
</ScrollView>
{/* 底部按钮:距离底部 12% 高度 */}
<View style={styles.footer}>
<TouchableOpacity onPress={onNext} disabled={!hasSelection} activeOpacity={0.8}>
{hasSelection ? <BtnClicked width={87} height={57} /> : <BtnNotClicked width={87} height={57} />}
</TouchableOpacity>
</View>
</View>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
paddingTop: 20,
},
optionsList: {
paddingBottom: 150, // 为底部按钮留出空间
},
optionCard: {
width: '100%',
height: 75,
backgroundColor: OnboardingColors.cardBackground,
borderRadius: 20,
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
paddingHorizontal: 24,
marginBottom: 12,
shadowColor: '#000',
shadowOffset: { width: 0, height: 2 },
shadowOpacity: 0.05,
shadowRadius: 10,
elevation: 2,
},
optionText: {
fontSize: 18,
color: OnboardingColors.textPrimary,
fontWeight: '500',
flex: 1,
},
iconWrapper: {
marginLeft: 10,
},
footer: {
position: 'absolute',
bottom: height * 0.12,
left: 0,
right: 0,
alignItems: 'center',
},
footerRow: {
flexDirection: 'row',
alignItems: 'center',
gap: 16,
},
skipBtn: {
paddingVertical: 10,
paddingHorizontal: 14,
borderRadius: 12,
backgroundColor: 'rgba(0,0,0,0.04)',
},
skipText: {
fontSize: 16,
color: OnboardingColors.textMuted,
},
});

View File

@@ -1,5 +1,6 @@
import React, { useEffect, useMemo, useState } from 'react'; import React, { useEffect, useMemo, useState, useRef } from 'react';
import { Modal, Pressable, StyleSheet, Text, View } from 'react-native'; import { Modal, Pressable, StyleSheet, Text, View, PanResponder, Animated as RNAnimated, Dimensions, Image, ImageSourcePropType } from 'react-native';
import { useTranslation } from 'react-i18next';
import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { useSafeAreaInsets } from 'react-native-safe-area-context';
import Animated, { import Animated, {
Easing, Easing,
@@ -9,26 +10,36 @@ import Animated, {
withTiming, withTiming,
} from 'react-native-reanimated'; } from 'react-native-reanimated';
const { height: SCREEN_HEIGHT } = Dimensions.get('window');
const FIXED_TOP_GAP = 100; // 统一距离顶部的高度
type Props = { type Props = {
visible: boolean; visible: boolean;
title?: string; title?: string;
onClose: () => void; onClose: () => void;
children: React.ReactNode; children: React.ReactNode;
leftIcon?: ImageSourcePropType; // 新增:支持自定义左侧图标
height?: number; // 新增:支持自定义高度
}; };
/** /**
* 通用底部上拉弹窗Sheet * 通用底部上拉弹窗Sheet
* - 内容区背景色固定:#FAF3EC * - 内容区背景色固定:#FAF3EC
* - 关闭方式:点 X本期不要求点遮罩关闭 * - 高度固定:默认距离顶部固定间距,也支持传入指定高度
*/ */
export default function SheetModal({ visible, title, onClose, children }: Props) { export default function SheetModal({ visible, title, onClose, children, leftIcon, height: customHeight }: Props) {
const { t } = useTranslation();
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
const [mounted, setMounted] = useState(false); const [mounted, setMounted] = useState(false);
const progress = useSharedValue(0); // 0: 关闭, 1: 打开 const progress = useSharedValue(0); // 0: 关闭, 1: 打开
const dragY = useSharedValue(0); // 拖拽位移
const sheetHeight = customHeight || (SCREEN_HEIGHT - FIXED_TOP_GAP);
useEffect(() => { useEffect(() => {
if (visible) { if (visible) {
setMounted(true); setMounted(true);
dragY.value = 0;
progress.value = withTiming(1, { duration: 260, easing: Easing.out(Easing.cubic) }); progress.value = withTiming(1, { duration: 260, easing: Easing.out(Easing.cubic) });
return; return;
} }
@@ -40,46 +51,88 @@ export default function SheetModal({ visible, title, onClose, children }: Props)
if (finished) runOnJS(setMounted)(false); if (finished) runOnJS(setMounted)(false);
} }
); );
}, [visible, mounted, progress]); }, [visible, mounted, progress, dragY]);
// 使用 PanResponder 处理下滑手势
const panResponder = useRef(
PanResponder.create({
onStartShouldSetPanResponder: () => false,
onMoveShouldSetPanResponder: () => false, // 暂时屏蔽下拉关闭手势,解决滑动冲突
onPanResponderMove: (_, gestureState) => {
if (gestureState.dy > 0) {
dragY.value = gestureState.dy;
}
},
onPanResponderRelease: (_, gestureState) => {
if (gestureState.dy > 80 || gestureState.vy > 0.5) {
runOnJS(onClose)();
} else {
dragY.value = withTiming(0, {
duration: 300,
easing: Easing.out(Easing.back(1))
});
}
},
onPanResponderTerminate: () => {
dragY.value = withTiming(0, { duration: 200 });
},
})
).current;
const overlayStyle = useAnimatedStyle(() => { const overlayStyle = useAnimatedStyle(() => {
return { opacity: 0.4 * progress.value }; return { opacity: 0.4 * progress.value };
}); });
const sheetStyle = useAnimatedStyle(() => { const sheetStyle = useAnimatedStyle(() => {
const translateY = (1 - progress.value) * 380; const baseTranslateY = (1 - progress.value) * sheetHeight; // 基础位移
return { transform: [{ translateY }] }; return {
transform: [{ translateY: baseTranslateY + dragY.value }]
};
}); });
const containerPaddingBottom = useMemo(() => Math.max(insets.bottom, 12), [insets.bottom]); const containerPaddingBottom = useMemo(() => Math.max(insets.bottom, 80), [insets.bottom]); // 增加底部间距至 80约占 350 高度的 22%,确保内容不被截断并留出足够呼吸感
// 注意Modal 的 visible 必须为 true 才会渲染,因此用 mounted 保持退场动画 // 注意Modal 的 visible 必须为 true 才会渲染,因此用 mounted 保持退场动画
return ( return (
<Modal transparent visible={mounted} animationType="none" onRequestClose={onClose}> <Modal transparent visible={mounted} animationType="none" onRequestClose={onClose}>
<View style={styles.root}> <View style={styles.root}>
<Animated.View style={[styles.overlay, overlayStyle]} /> <Pressable
style={StyleSheet.absoluteFill}
onPress={onClose}
>
<Animated.View style={[styles.overlay, overlayStyle]} />
</Pressable>
<Animated.View <Animated.View
{...panResponder.panHandlers}
style={[ style={[
styles.sheet, styles.sheet,
sheetStyle, sheetStyle,
{ {
height: sheetHeight,
paddingBottom: containerPaddingBottom, paddingBottom: containerPaddingBottom,
}, },
]} ]}
> >
<View style={styles.handleContainer}>
<View style={styles.handle} />
</View>
<View style={styles.header}> <View style={styles.header}>
<Text style={styles.title} numberOfLines={1}> <Text style={styles.title} numberOfLines={1}>
{title ?? ''} {title ?? ''}
</Text> </Text>
<Pressable <Pressable
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel="关闭" accessibilityLabel={leftIcon ? t('common.back') : t('common.close')}
onPress={onClose} onPress={onClose}
hitSlop={10} hitSlop={10}
style={styles.close} style={styles.close}
> >
<Text style={styles.closeText}>×</Text> {leftIcon ? (
<Image source={leftIcon} style={styles.backIcon} />
) : (
<Text style={styles.closeText}>×</Text>
)}
</Pressable> </Pressable>
</View> </View>
@@ -103,9 +156,19 @@ const styles = StyleSheet.create({
backgroundColor: '#FAF3EC', backgroundColor: '#FAF3EC',
borderTopLeftRadius: 24, borderTopLeftRadius: 24,
borderTopRightRadius: 24, borderTopRightRadius: 24,
paddingTop: 14, paddingTop: 8,
paddingHorizontal: 16, paddingHorizontal: 16,
}, },
handleContainer: {
alignItems: 'center',
paddingVertical: 8,
},
handle: {
width: 40,
height: 5,
borderRadius: 2.5,
backgroundColor: 'rgba(94,42,40,0.15)',
},
header: { header: {
height: 44, height: 44,
justifyContent: 'center', justifyContent: 'center',
@@ -131,8 +194,13 @@ const styles = StyleSheet.create({
lineHeight: 28, lineHeight: 28,
fontWeight: '400', fontWeight: '400',
}, },
backIcon: {
width: 20,
height: 20,
resizeMode: 'contain',
},
body: { body: {
paddingTop: 10, paddingTop: 10,
flex: 1,
}, },
}); });

View File

@@ -1,9 +1,14 @@
export const OnboardingColors = { export const OnboardingColors = {
background: '#FFF4EA', background: '#FFF4EA',
textPrimary: '#4A3B32', textPrimary: '#772F00',
textSecondary: '#8C8C8C', textSecondary: '#DED2CA', // 默认 Mama 字体颜色
textMuted: '#A27854', // Skip 按钮颜色
textProgress: '#D4B08E', // (0/5) 颜色
questionTitle: '#B8504D', // 问题标题颜色
buttonNotClicked: '#F2DDCA',
buttonStart: '#F69F7B', buttonStart: '#F69F7B',
buttonEnd: '#F99CC0', buttonEnd: '#F99CC0',
cardBackground: '#FFFFFF', cardBackground: '#FFFFFF',
cursor: '#F99CC0', cardSelected: '#FFD8E2', // 选中后的背景色
cursor: '#F89DB4',
}; };

View File

@@ -3,6 +3,9 @@ PODS:
- ExpoModulesCore - ExpoModulesCore
- EXConstants (18.0.13): - EXConstants (18.0.13):
- ExpoModulesCore - ExpoModulesCore
- EXJSONUtils (0.15.0)
- EXManifests (1.0.10):
- ExpoModulesCore
- EXNotifications (0.32.16): - EXNotifications (0.32.16):
- ExpoModulesCore - ExpoModulesCore
- Expo (54.0.32): - Expo (54.0.32):
@@ -30,6 +33,177 @@ PODS:
- ReactCommon/turbomodule/core - ReactCommon/turbomodule/core
- ReactNativeDependencies - ReactNativeDependencies
- Yoga - Yoga
- expo-dev-client (6.0.20):
- EXManifests
- expo-dev-launcher
- expo-dev-menu
- expo-dev-menu-interface
- EXUpdatesInterface
- expo-dev-launcher (6.0.20):
- EXManifests
- expo-dev-launcher/Main (= 6.0.20)
- expo-dev-menu
- expo-dev-menu-interface
- ExpoModulesCore
- EXUpdatesInterface
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-jsinspector
- React-NativeModulesApple
- React-RCTAppDelegate
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactAppDependencyProvider
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- expo-dev-launcher/Main (6.0.20):
- EXManifests
- expo-dev-launcher/Unsafe
- expo-dev-menu
- expo-dev-menu-interface
- ExpoModulesCore
- EXUpdatesInterface
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-jsinspector
- React-NativeModulesApple
- React-RCTAppDelegate
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactAppDependencyProvider
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- expo-dev-launcher/Unsafe (6.0.20):
- EXManifests
- expo-dev-menu
- expo-dev-menu-interface
- ExpoModulesCore
- EXUpdatesInterface
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-jsinspector
- React-NativeModulesApple
- React-RCTAppDelegate
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactAppDependencyProvider
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- expo-dev-menu (7.0.18):
- expo-dev-menu/Main (= 7.0.18)
- expo-dev-menu/ReactNativeCompatibles (= 7.0.18)
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- expo-dev-menu-interface (2.0.0)
- expo-dev-menu/Main (7.0.18):
- EXManifests
- expo-dev-menu-interface
- ExpoModulesCore
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-jsinspector
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- expo-dev-menu/ReactNativeCompatibles (7.0.18):
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- ExpoAsset (12.0.12): - ExpoAsset (12.0.12):
- ExpoModulesCore - ExpoModulesCore
- ExpoFileSystem (19.0.21): - ExpoFileSystem (19.0.21):
@@ -74,6 +248,8 @@ PODS:
- ExpoModulesCore - ExpoModulesCore
- ExpoWebBrowser (15.0.10): - ExpoWebBrowser (15.0.10):
- ExpoModulesCore - ExpoModulesCore
- EXUpdatesInterface (2.0.0):
- ExpoModulesCore
- FBLazyVector (0.81.5) - FBLazyVector (0.81.5)
- hermes-engine (0.81.5): - hermes-engine (0.81.5):
- hermes-engine/Pre-built (= 0.81.5) - hermes-engine/Pre-built (= 0.81.5)
@@ -1798,6 +1974,28 @@ PODS:
- ReactCommon/turbomodule/core - ReactCommon/turbomodule/core
- ReactNativeDependencies - ReactNativeDependencies
- Yoga - Yoga
- RNGestureHandler (2.30.0):
- hermes-engine
- RCTRequired
- RCTTypeSafety
- React-Core
- React-Core-prebuilt
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- ReactNativeDependencies
- Yoga
- RNReanimated (4.1.6): - RNReanimated (4.1.6):
- hermes-engine - hermes-engine
- RCTRequired - RCTRequired
@@ -2040,19 +2238,26 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- "EXApplication (from `../node_modules/.pnpm/expo-application@7.0.8_expo@54.0.32/node_modules/expo-application/ios`)" - "EXApplication (from `../node_modules/.pnpm/expo-application@7.0.8_expo@54.0.32/node_modules/expo-application/ios`)"
- "EXConstants (from `../node_modules/.pnpm/expo-constants@18.0.13_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-constants/ios`)" - "EXConstants (from `../node_modules/.pnpm/expo-constants@18.0.13_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-constants/ios`)"
- "EXNotifications (from `../node_modules/.pnpm/expo-notifications@0.32.16_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@1_nvlvke5tn7wk5pigfsu7j4ieeq/node_modules/expo-notifications/ios`)" - "EXJSONUtils (from `../node_modules/.pnpm/expo-json-utils@0.15.0/node_modules/expo-json-utils/ios`)"
- "Expo (from `../node_modules/.pnpm/expo@54.0.32_@babel+core@7.28.6_@expo+metro-runtime@6.1.2_expo-router@6.0.22_react-native@0.8_7rhpxisdkrzvrgzbu7ct455kta/node_modules/expo`)" - "EXManifests (from `../node_modules/.pnpm/expo-manifests@1.0.10_expo@54.0.32/node_modules/expo-manifests/ios`)"
- "EXNotifications (from `../node_modules/.pnpm/expo-notifications@0.32.16_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+r_758952db70529f49bda448def1c13c49/node_modules/expo-notifications/ios`)"
- "Expo (from `../node_modules/.pnpm/expo@54.0.32_@babel+core@7.28.6_@expo+metro-runtime@6.1.2_expo-router@6.0.22_react-nati_18ad48ba284ee86e6eb1cb0f939697b0/node_modules/expo`)"
- "expo-dev-client (from `../node_modules/.pnpm/expo-dev-client@6.0.20_expo@54.0.32/node_modules/expo-dev-client/ios`)"
- "expo-dev-launcher (from `../node_modules/.pnpm/expo-dev-launcher@6.0.20_expo@54.0.32/node_modules/expo-dev-launcher`)"
- "expo-dev-menu (from `../node_modules/.pnpm/expo-dev-menu@7.0.18_expo@54.0.32/node_modules/expo-dev-menu`)"
- "expo-dev-menu-interface (from `../node_modules/.pnpm/expo-dev-menu-interface@2.0.0_expo@54.0.32/node_modules/expo-dev-menu-interface/ios`)"
- "ExpoAsset (from `../node_modules/.pnpm/expo-asset@12.0.12_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-asset/ios`)" - "ExpoAsset (from `../node_modules/.pnpm/expo-asset@12.0.12_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-asset/ios`)"
- "ExpoFileSystem (from `../node_modules/.pnpm/expo-file-system@19.0.21_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-file-system/ios`)" - "ExpoFileSystem (from `../node_modules/.pnpm/expo-file-system@19.0.21_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-file-system/ios`)"
- "ExpoFont (from `../node_modules/.pnpm/expo-font@14.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-font/ios`)" - "ExpoFont (from `../node_modules/.pnpm/expo-font@14.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-font/ios`)"
- "ExpoHead (from `../node_modules/.pnpm/expo-router@6.0.22_@expo+metro-runtime@6.1.2_@types+react@19.1.17_expo-constants@18.0.13_expo_rjurfbyy5kjn57nkkfxix5iqea/node_modules/expo-router/ios`)" - "ExpoHead (from `../node_modules/.pnpm/expo-router@6.0.22_@expo+metro-runtime@6.1.2_@types+react@19.1.17_expo-constants@18.0.1_bd9aa16746ed7110429f931eb008e6d2/node_modules/expo-router/ios`)"
- "ExpoKeepAwake (from `../node_modules/.pnpm/expo-keep-awake@15.0.8_expo@54.0.32_react@19.1.0/node_modules/expo-keep-awake/ios`)" - "ExpoKeepAwake (from `../node_modules/.pnpm/expo-keep-awake@15.0.8_expo@54.0.32_react@19.1.0/node_modules/expo-keep-awake/ios`)"
- "ExpoLinearGradient (from `../node_modules/.pnpm/expo-linear-gradient@15.0.8_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@_e6k2hjkd5k4lph2ersbp3gfshy/node_modules/expo-linear-gradient/ios`)" - "ExpoLinearGradient (from `../node_modules/.pnpm/expo-linear-gradient@15.0.8_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+_53aef72480df9baa4504f4743d9c64bb/node_modules/expo-linear-gradient/ios`)"
- "ExpoLinking (from `../node_modules/.pnpm/expo-linking@8.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-linking/ios`)" - "ExpoLinking (from `../node_modules/.pnpm/expo-linking@8.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-linking/ios`)"
- "ExpoLocalization (from `../node_modules/.pnpm/expo-localization@17.0.8_expo@54.0.32_react@19.1.0/node_modules/expo-localization/ios`)" - "ExpoLocalization (from `../node_modules/.pnpm/expo-localization@17.0.8_expo@54.0.32_react@19.1.0/node_modules/expo-localization/ios`)"
- "ExpoModulesCore (from `../node_modules/.pnpm/expo-modules-core@3.0.29_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-modules-core`)" - "ExpoModulesCore (from `../node_modules/.pnpm/expo-modules-core@3.0.29_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-modules-core`)"
- "ExpoSplashScreen (from `../node_modules/.pnpm/expo-splash-screen@31.0.13_expo@54.0.32/node_modules/expo-splash-screen/ios`)" - "ExpoSplashScreen (from `../node_modules/.pnpm/expo-splash-screen@31.0.13_expo@54.0.32/node_modules/expo-splash-screen/ios`)"
- "ExpoWebBrowser (from `../node_modules/.pnpm/expo-web-browser@15.0.10_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-web-browser/ios`)" - "ExpoWebBrowser (from `../node_modules/.pnpm/expo-web-browser@15.0.10_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-web-browser/ios`)"
- "EXUpdatesInterface (from `../node_modules/.pnpm/expo-updates-interface@2.0.0_expo@54.0.32/node_modules/expo-updates-interface/ios`)"
- "FBLazyVector (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/Libraries/FBLazyVector`)" - "FBLazyVector (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/Libraries/FBLazyVector`)"
- "hermes-engine (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)" - "hermes-engine (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)"
- "RCTDeprecation (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)" - "RCTDeprecation (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)"
@@ -2089,7 +2294,7 @@ DEPENDENCIES:
- "React-logger (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/logger`)" - "React-logger (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/logger`)"
- "React-Mapbuffer (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon`)" - "React-Mapbuffer (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon`)"
- "React-microtasksnativemodule (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)" - "React-microtasksnativemodule (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)"
- "react-native-safe-area-context (from `../node_modules/.pnpm/react-native-safe-area-context@5.6.2_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1_azuxgonsvxb2yngtegtuvyxcpi/node_modules/react-native-safe-area-context`)" - "react-native-safe-area-context (from `../node_modules/.pnpm/react-native-safe-area-context@5.6.2_react-native@0.81.5_@babel+core@7.28.6_@types+reac_14122a3aa345cfabcc022a0f638ef16d/node_modules/react-native-safe-area-context`)"
- "React-NativeModulesApple (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)" - "React-NativeModulesApple (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)"
- "React-oscompat (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/oscompat`)" - "React-oscompat (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/oscompat`)"
- "React-perflogger (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/reactperflogger`)" - "React-perflogger (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/reactperflogger`)"
@@ -2121,11 +2326,12 @@ DEPENDENCIES:
- ReactCodegen (from `build/generated/ios`) - ReactCodegen (from `build/generated/ios`)
- "ReactCommon/turbomodule/core (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon`)" - "ReactCommon/turbomodule/core (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon`)"
- "ReactNativeDependencies (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec`)" - "ReactNativeDependencies (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec`)"
- "RNCAsyncStorage (from `../node_modules/.pnpm/@react-native-async-storage+async-storage@2.2.0_react-native@0.81.5_@babel+core@7.28.6_@types_fp4qq3a7mejmut52v6jrlvxlzi/node_modules/@react-native-async-storage/async-storage`)" - "RNCAsyncStorage (from `../node_modules/.pnpm/@react-native-async-storage+async-storage@2.2.0_react-native@0.81.5_@babel+core@7.28.6__ce3c4972004f3d6791573ec5b64bee38/node_modules/@react-native-async-storage/async-storage`)"
- "RNReanimated (from `../node_modules/.pnpm/react-native-reanimated@4.1.6_@babel+core@7.28.6_react-native-worklets@0.5.1_@babel+core@7.28_ky3sbxf6i7nkyacc2hzg3xcz4q/node_modules/react-native-reanimated`)" - "RNGestureHandler (from `../node_modules/.pnpm/react-native-gesture-handler@2.30.0_react-native@0.81.5_@babel+core@7.28.6_@types+react_39cf7da47c9c8531caaa923ee740e293/node_modules/react-native-gesture-handler`)"
- "RNReanimated (from `../node_modules/.pnpm/react-native-reanimated@4.1.6_@babel+core@7.28.6_react-native-worklets@0.5.1_@babel+cor_c7c888bd389fb93c9cfe2d3c1c8b0777/node_modules/react-native-reanimated`)"
- "RNScreens (from `../node_modules/.pnpm/react-native-screens@4.16.0_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-screens`)" - "RNScreens (from `../node_modules/.pnpm/react-native-screens@4.16.0_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-screens`)"
- "RNSVG (from `../node_modules/.pnpm/react-native-svg@15.12.1_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-svg`)" - "RNSVG (from `../node_modules/.pnpm/react-native-svg@15.12.1_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-svg`)"
- "RNWorklets (from `../node_modules/.pnpm/react-native-worklets@0.5.1_@babel+core@7.28.6_react-native@0.81.5_@babel+core@7.28.6_@types+_5atwepuw3zy3crkgvetf35tkve/node_modules/react-native-worklets`)" - "RNWorklets (from `../node_modules/.pnpm/react-native-worklets@0.5.1_@babel+core@7.28.6_react-native@0.81.5_@babel+core@7.28.6_@_40f69326ce21d3f9f6d74d3965fd9adf/node_modules/react-native-worklets`)"
- "Yoga (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/yoga`)" - "Yoga (from `../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/yoga`)"
EXTERNAL SOURCES: EXTERNAL SOURCES:
@@ -2133,10 +2339,22 @@ EXTERNAL SOURCES:
:path: "../node_modules/.pnpm/expo-application@7.0.8_expo@54.0.32/node_modules/expo-application/ios" :path: "../node_modules/.pnpm/expo-application@7.0.8_expo@54.0.32/node_modules/expo-application/ios"
EXConstants: EXConstants:
:path: "../node_modules/.pnpm/expo-constants@18.0.13_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-constants/ios" :path: "../node_modules/.pnpm/expo-constants@18.0.13_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-constants/ios"
EXJSONUtils:
:path: "../node_modules/.pnpm/expo-json-utils@0.15.0/node_modules/expo-json-utils/ios"
EXManifests:
:path: "../node_modules/.pnpm/expo-manifests@1.0.10_expo@54.0.32/node_modules/expo-manifests/ios"
EXNotifications: EXNotifications:
:path: "../node_modules/.pnpm/expo-notifications@0.32.16_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@1_nvlvke5tn7wk5pigfsu7j4ieeq/node_modules/expo-notifications/ios" :path: "../node_modules/.pnpm/expo-notifications@0.32.16_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+r_758952db70529f49bda448def1c13c49/node_modules/expo-notifications/ios"
Expo: Expo:
:path: "../node_modules/.pnpm/expo@54.0.32_@babel+core@7.28.6_@expo+metro-runtime@6.1.2_expo-router@6.0.22_react-native@0.8_7rhpxisdkrzvrgzbu7ct455kta/node_modules/expo" :path: "../node_modules/.pnpm/expo@54.0.32_@babel+core@7.28.6_@expo+metro-runtime@6.1.2_expo-router@6.0.22_react-nati_18ad48ba284ee86e6eb1cb0f939697b0/node_modules/expo"
expo-dev-client:
:path: "../node_modules/.pnpm/expo-dev-client@6.0.20_expo@54.0.32/node_modules/expo-dev-client/ios"
expo-dev-launcher:
:path: "../node_modules/.pnpm/expo-dev-launcher@6.0.20_expo@54.0.32/node_modules/expo-dev-launcher"
expo-dev-menu:
:path: "../node_modules/.pnpm/expo-dev-menu@7.0.18_expo@54.0.32/node_modules/expo-dev-menu"
expo-dev-menu-interface:
:path: "../node_modules/.pnpm/expo-dev-menu-interface@2.0.0_expo@54.0.32/node_modules/expo-dev-menu-interface/ios"
ExpoAsset: ExpoAsset:
:path: "../node_modules/.pnpm/expo-asset@12.0.12_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-asset/ios" :path: "../node_modules/.pnpm/expo-asset@12.0.12_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-asset/ios"
ExpoFileSystem: ExpoFileSystem:
@@ -2144,11 +2362,11 @@ EXTERNAL SOURCES:
ExpoFont: ExpoFont:
:path: "../node_modules/.pnpm/expo-font@14.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-font/ios" :path: "../node_modules/.pnpm/expo-font@14.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-font/ios"
ExpoHead: ExpoHead:
:path: "../node_modules/.pnpm/expo-router@6.0.22_@expo+metro-runtime@6.1.2_@types+react@19.1.17_expo-constants@18.0.13_expo_rjurfbyy5kjn57nkkfxix5iqea/node_modules/expo-router/ios" :path: "../node_modules/.pnpm/expo-router@6.0.22_@expo+metro-runtime@6.1.2_@types+react@19.1.17_expo-constants@18.0.1_bd9aa16746ed7110429f931eb008e6d2/node_modules/expo-router/ios"
ExpoKeepAwake: ExpoKeepAwake:
:path: "../node_modules/.pnpm/expo-keep-awake@15.0.8_expo@54.0.32_react@19.1.0/node_modules/expo-keep-awake/ios" :path: "../node_modules/.pnpm/expo-keep-awake@15.0.8_expo@54.0.32_react@19.1.0/node_modules/expo-keep-awake/ios"
ExpoLinearGradient: ExpoLinearGradient:
:path: "../node_modules/.pnpm/expo-linear-gradient@15.0.8_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@_e6k2hjkd5k4lph2ersbp3gfshy/node_modules/expo-linear-gradient/ios" :path: "../node_modules/.pnpm/expo-linear-gradient@15.0.8_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+_53aef72480df9baa4504f4743d9c64bb/node_modules/expo-linear-gradient/ios"
ExpoLinking: ExpoLinking:
:path: "../node_modules/.pnpm/expo-linking@8.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-linking/ios" :path: "../node_modules/.pnpm/expo-linking@8.0.11_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/expo-linking/ios"
ExpoLocalization: ExpoLocalization:
@@ -2159,6 +2377,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/.pnpm/expo-splash-screen@31.0.13_expo@54.0.32/node_modules/expo-splash-screen/ios" :path: "../node_modules/.pnpm/expo-splash-screen@31.0.13_expo@54.0.32/node_modules/expo-splash-screen/ios"
ExpoWebBrowser: ExpoWebBrowser:
:path: "../node_modules/.pnpm/expo-web-browser@15.0.10_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-web-browser/ios" :path: "../node_modules/.pnpm/expo-web-browser@15.0.10_expo@54.0.32_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0_/node_modules/expo-web-browser/ios"
EXUpdatesInterface:
:path: "../node_modules/.pnpm/expo-updates-interface@2.0.0_expo@54.0.32/node_modules/expo-updates-interface/ios"
FBLazyVector: FBLazyVector:
:path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/Libraries/FBLazyVector" :path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/Libraries/FBLazyVector"
hermes-engine: hermes-engine:
@@ -2231,7 +2451,7 @@ EXTERNAL SOURCES:
React-microtasksnativemodule: React-microtasksnativemodule:
:path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/microtasks" :path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
react-native-safe-area-context: react-native-safe-area-context:
:path: "../node_modules/.pnpm/react-native-safe-area-context@5.6.2_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1_azuxgonsvxb2yngtegtuvyxcpi/node_modules/react-native-safe-area-context" :path: "../node_modules/.pnpm/react-native-safe-area-context@5.6.2_react-native@0.81.5_@babel+core@7.28.6_@types+reac_14122a3aa345cfabcc022a0f638ef16d/node_modules/react-native-safe-area-context"
React-NativeModulesApple: React-NativeModulesApple:
:path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios" :path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
React-oscompat: React-oscompat:
@@ -2295,34 +2515,43 @@ EXTERNAL SOURCES:
ReactNativeDependencies: ReactNativeDependencies:
:podspec: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec" :podspec: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/third-party-podspecs/ReactNativeDependencies.podspec"
RNCAsyncStorage: RNCAsyncStorage:
:path: "../node_modules/.pnpm/@react-native-async-storage+async-storage@2.2.0_react-native@0.81.5_@babel+core@7.28.6_@types_fp4qq3a7mejmut52v6jrlvxlzi/node_modules/@react-native-async-storage/async-storage" :path: "../node_modules/.pnpm/@react-native-async-storage+async-storage@2.2.0_react-native@0.81.5_@babel+core@7.28.6__ce3c4972004f3d6791573ec5b64bee38/node_modules/@react-native-async-storage/async-storage"
RNGestureHandler:
:path: "../node_modules/.pnpm/react-native-gesture-handler@2.30.0_react-native@0.81.5_@babel+core@7.28.6_@types+react_39cf7da47c9c8531caaa923ee740e293/node_modules/react-native-gesture-handler"
RNReanimated: RNReanimated:
:path: "../node_modules/.pnpm/react-native-reanimated@4.1.6_@babel+core@7.28.6_react-native-worklets@0.5.1_@babel+core@7.28_ky3sbxf6i7nkyacc2hzg3xcz4q/node_modules/react-native-reanimated" :path: "../node_modules/.pnpm/react-native-reanimated@4.1.6_@babel+core@7.28.6_react-native-worklets@0.5.1_@babel+cor_c7c888bd389fb93c9cfe2d3c1c8b0777/node_modules/react-native-reanimated"
RNScreens: RNScreens:
:path: "../node_modules/.pnpm/react-native-screens@4.16.0_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-screens" :path: "../node_modules/.pnpm/react-native-screens@4.16.0_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-screens"
RNSVG: RNSVG:
:path: "../node_modules/.pnpm/react-native-svg@15.12.1_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-svg" :path: "../node_modules/.pnpm/react-native-svg@15.12.1_react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0__react@19.1.0/node_modules/react-native-svg"
RNWorklets: RNWorklets:
:path: "../node_modules/.pnpm/react-native-worklets@0.5.1_@babel+core@7.28.6_react-native@0.81.5_@babel+core@7.28.6_@types+_5atwepuw3zy3crkgvetf35tkve/node_modules/react-native-worklets" :path: "../node_modules/.pnpm/react-native-worklets@0.5.1_@babel+core@7.28.6_react-native@0.81.5_@babel+core@7.28.6_@_40f69326ce21d3f9f6d74d3965fd9adf/node_modules/react-native-worklets"
Yoga: Yoga:
:path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/yoga" :path: "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.28.6_@types+react@19.1.17_react@19.1.0/node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS: SPEC CHECKSUMS:
EXApplication: 13420f8139864183f8a04fd6099077bdf8cfb186 EXApplication: 1e98d4b1dccdf30627f92917f4b2c5a53c330e5f
EXConstants: 3feb66fd1d94202fc1f0946d74e029d8b224b60e EXConstants: fce59a631a06c4151602843667f7cfe35f81e271
EXNotifications: 2a3feb7af6194828d9aafda72f63a9a03866230a EXJSONUtils: 1d3e4590438c3ee593684186007028a14b3686cd
Expo: b8d64eb9a496ebe8c71e3dae7eeb7f394b146b80 EXManifests: a8d97683e5c7a3b026ffbd58559c64dc655b747b
ExpoAsset: d999f3bbd998a750f3b74cb913229848901b926b EXNotifications: 9eec98712cc814ceff916d876cb53859003b0597
ExpoFileSystem: aefcd337b94b874f88752ebefc52813b84992fad Expo: 4e503a041c59c4e34c8be262a135848ad5cd3710
ExpoFont: c625dbd97ed57e9089b172b2a7bb99003d074664 expo-dev-client: 425ee077d6754a98cfe3a2e2410d29b440b24c9d
ExpoHead: b691a2ed7ab02ed820b6c6468941832d34969c29 expo-dev-launcher: a4f4cdef064ab1fb8621e5b8c7c457cd6e9568c3
ExpoKeepAwake: 44bf6715bc1d2ddb17afe19d927cd039cda123f0 expo-dev-menu: 05b18812110c175814c6af0d09dd658abcc5e00d
ExpoLinearGradient: 814a21fc4056c3cf606e4f19e31e47074c5b5a86 expo-dev-menu-interface: 600df12ea01efecdd822daaf13cc0ac091775533
ExpoLinking: ebf543fd411d56375cb4eee07f6ab4e31c7ad959 ExpoAsset: f867e55ceb428aab99e1e8c082b5aee7c159ea18
ExpoLocalization: 6ac6f326210f0a3141ef6f58ab8f8f4ed003b485 ExpoFileSystem: 858a44267a3e6e9057e0888ad7c7cfbf55d52063
ExpoModulesCore: 77496909fd3c800f97f7f2007dd26aeac4bb3798 ExpoFont: f543ce20a228dd702813668b1a07b46f51878d47
ExpoSplashScreen: 72fbc6dd9d6404dd9d0725a56c9ac1383bc0b14f ExpoHead: 4425246bc93411f0fe7f6945f95f698e91db8780
ExpoWebBrowser: 88b116cd378d9609c776c0903fe4070fca461588 ExpoKeepAwake: 55f75eca6499bb9e4231ebad6f3e9cb8f99c0296
ExpoLinearGradient: 809102bdb979f590083af49f7fa4805cd931bd58
ExpoLinking: 8f0aaf69aa56f832913030503b6263dc6f647f37
ExpoLocalization: d9168d5300a5b03e5e78b986124d11fb6ec3ebbd
ExpoModulesCore: f3da4f1ab5a8375d0beafab763739dbee8446583
ExpoSplashScreen: bc3cffefca2716e5f22350ca109badd7e50ec14d
ExpoWebBrowser: 17b064c621789e41d4816c95c93f429b84971f52
EXUpdatesInterface: 5adf50cb41e079c861da6d9b4b954c3db9a50734
FBLazyVector: e95a291ad2dadb88e42b06e0c5fb8262de53ec12 FBLazyVector: e95a291ad2dadb88e42b06e0c5fb8262de53ec12
hermes-engine: 9f4dfe93326146a1c99eb535b1cb0b857a3cd172 hermes-engine: 9f4dfe93326146a1c99eb535b1cb0b857a3cd172
RCTDeprecation: 943572d4be82d480a48f4884f670135ae30bf990 RCTDeprecation: 943572d4be82d480a48f4884f670135ae30bf990
@@ -2330,71 +2559,72 @@ SPEC CHECKSUMS:
RCTTypeSafety: 16a4144ca3f959583ab019b57d5633df10b5e97c RCTTypeSafety: 16a4144ca3f959583ab019b57d5633df10b5e97c
React: 914f8695f9bf38e6418228c2ffb70021e559f92f React: 914f8695f9bf38e6418228c2ffb70021e559f92f
React-callinvoker: 1c0808402aee0c6d4a0d8e7220ce6547af9fba71 React-callinvoker: 1c0808402aee0c6d4a0d8e7220ce6547af9fba71
React-Core: 4ae98f9e8135b8ddbd7c98730afb6fdae883db90 React-Core: c61410ef0ca6055e204a963992e363227e0fd1c5
React-Core-prebuilt: 8f4cca589c14e8cf8fc6db4587ef1c2056b5c151 React-Core-prebuilt: 02f0ad625ddd47463c009c2d0c5dd35c0d982599
React-CoreModules: e878a90bb19b8f3851818af997dbae3b3b0a27ac React-CoreModules: 1f6d1744b5f9f2ec684a4bb5ced25370f87e5382
React-cxxreact: 28af9844f6dc87be1385ab521fbfb3746f19563c React-cxxreact: 3af79478e8187b63ffc22b794cd42d3fc1f1f2da
React-debug: 6328c2228e268846161f10082e80dc69eac2e90a React-debug: 6328c2228e268846161f10082e80dc69eac2e90a
React-defaultsnativemodule: afc9d809ec75780f39464a6949c07987fbea488c React-defaultsnativemodule: d635ef36d755321e5d6fc065bd166b2c5a0e9833
React-domnativemodule: 91a233260411d41f27f67aa1358b7f9f0bfd101d React-domnativemodule: dd28f6d96cd21236e020be2eff6fe0b7d4ec3b66
React-Fabric: 21f349b5e93f305a3c38c885902683a9c79cf983 React-Fabric: 2e32c3fdbb1fbcf5fde54607e3abe453c6652ce2
React-FabricComponents: 47ac634cc9ecc64b30a9997192f510eebe4177e4 React-FabricComponents: 5ed0cdb81f6b91656cb4d3be432feaa28a58071a
React-FabricImage: 21873acd6d4a51a0b97c133141051c7acb11cc86 React-FabricImage: 2bc714f818cb24e454f5d3961864373271b2faf8
React-featureflags: 653f469f0c3c9dc271d610373e3b6e66a9fd847d React-featureflags: 847642f41fa71ad4eec5e0351badebcad4fe6171
React-featureflagsnativemodule: c91a8a3880e0f4838286402241ead47db43aed28 React-featureflagsnativemodule: c868a544b2c626fa337bcbd364b1befe749f0d3f
React-graphics: b4bdb0f635b8048c652a5d2b73eb8b1ddd950f24 React-graphics: 192ec701def5b3f2a07db2814dfba5a44986cff6
React-hermes: fcfad3b917400f49026f3232561e039c9d1c34bf React-hermes: e875778b496c86d07ab2ccaa36a9505d248a254b
React-idlecallbacksnativemodule: 8cb83207e39f8179ac1d344b6177c6ab3ccebcdc React-idlecallbacksnativemodule: 4d57965cdf82c14ee3b337189836cd8491632b76
React-ImageManager: 396128004783fc510e629124dce682d38d1088e7 React-ImageManager: bd0b99e370b13de82c9cd15f0f08144ff3de079e
React-jserrorhandler: b58b788d788cdbf8bda7db74a88ebfcffc8a0795 React-jserrorhandler: a2fdef4cbcfdcdf3fa9f5d1f7190f7fd4535248d
React-jsi: d2c3f8555175371c02da6dfe7ed1b64b55a9d6c0 React-jsi: 89d43d1e7d4d0663f8ba67e0b39eb4e4672c27de
React-jsiexecutor: ba537434eb45ee018b590ed7d29ee233fddb8669 React-jsiexecutor: abe4874aaab90dfee5dec480680220b2f8af07e3
React-jsinspector: f21b6654baf96cb9f71748844a32468a5f73ad51 React-jsinspector: a0b3e051aef842b0b2be2353790ae2b2a5a65a8f
React-jsinspectorcdp: 3f8be4830694c3c1c39442e50f8db877966d43f0 React-jsinspectorcdp: 6346013b2247c6263fbf5199adf4a8751e53bd89
React-jsinspectornetwork: 70e41469565712ad60e11d9c8b8f999b9f7f61eb React-jsinspectornetwork: 26281aa50d49fc1ec93abf981d934698fa95714f
React-jsinspectortracing: eccf9bfa4ec7f130d514f215cfb2222dc3c0e270 React-jsinspectortracing: 55eedf6d57540507570259a778663b90060bbd6e
React-jsitooling: b376a695f5a507627f7934748533b24eed1751ca React-jsitooling: 0e001113fa56d8498aa8ac28437ac0d36348e51a
React-jsitracing: 5c8c3273dda2d95191cc0612fb5e71c4d9018d2a React-jsitracing: b713793eb8a5bbc4d86a84e9d9e5023c0f58cbaf
React-logger: c3e2f8a2e284341205f61eef3d4677ab5a309dfd React-logger: 50fdb9a8236da90c0b1072da5c32ee03aeb5bf28
React-Mapbuffer: 603c18db65844bb81dbe62fee8fcc976eaeb7108 React-Mapbuffer: 9050ee10c19f4f7fca8963d0211b2854d624973e
React-microtasksnativemodule: d77e0c426fce34c23227394c96ca1033b30c813c React-microtasksnativemodule: f775db9e991c6f3b8ccbc02bfcde22770f96e23b
react-native-safe-area-context: 53f796cb6c814661bbe99fbdfd0585d07b996cdd react-native-safe-area-context: 37e680fc4cace3c0030ee46e8987d24f5d3bdab2
React-NativeModulesApple: 1664340b8750d64e0ef3907c5e53d9481f74bcbd React-NativeModulesApple: 8969913947d5b576de4ed371a939455a8daf28aa
React-oscompat: ce47230ed20185e91de62d8c6d139ae61763d09c React-oscompat: ce47230ed20185e91de62d8c6d139ae61763d09c
React-perflogger: b1af3cfb3f095f819b2814910000392a8e17ba9f React-perflogger: 02b010e665772c7dcb859d85d44c1bfc5ac7c0e4
React-performancetimeline: f9ec65b77bcadbc7bd8b47a6f4b4b697da7b1490 React-performancetimeline: 130db956b5a83aa4fb41ddf5ae68da89f3fb1526
React-RCTActionSheet: 0b14875b3963e9124a5a29a45bd1b22df8803916 React-RCTActionSheet: 0b14875b3963e9124a5a29a45bd1b22df8803916
React-RCTAnimation: 60f6eca214a62b9673f64db6df3830cee902b5af React-RCTAnimation: a7b90fd2af7bb9c084428867445a1481a8cb112e
React-RCTAppDelegate: 37734b39bac108af30a0fd9d3e1149ec68b82c28 React-RCTAppDelegate: 3262bedd01263f140ec62b7989f4355f57cec016
React-RCTBlob: 83fbcbd57755caf021787324aac2fe9b028cc264 React-RCTBlob: c17531368702f1ebed5d0ada75a7cf5915072a53
React-RCTFabric: a05cb1df484008db3753c8b4a71e4c6d9f1e43a6 React-RCTFabric: 6409edd8cfdc3133b6cc75636d3b858fdb1d11ea
React-RCTFBReactNativeSpec: d58d7ae9447020bbbac651e3b0674422aba18266 React-RCTFBReactNativeSpec: c004b27b4fa3bd85878ad2cf53de3bbec85da797
React-RCTImage: 47aba3be7c6c64f956b7918ab933769602406aac React-RCTImage: c68078a120d0123f4f07a5ac77bea3bb10242f32
React-RCTLinking: 2dbaa4df2e4523f68baa07936bd8efdfa34d5f31 React-RCTLinking: cf8f9391fe7fe471f96da3a5f0435235eca18c5b
React-RCTNetwork: 1fca7455f9dedf7de2b95bec438da06680f3b000 React-RCTNetwork: ca31f7c879355760c2d9832a06ee35f517938a20
React-RCTRuntime: 17819dd1dfc8613efaf4cbb9d8686baae4a83e5b React-RCTRuntime: a6cf4a1e42754fc87f493e538f2ac6b820e45418
React-RCTSettings: 01bf91c856862354d3d2f642ccb82f3697a4284a React-RCTSettings: e0e140b2ff4bf86d34e9637f6316848fc00be035
React-RCTText: cb576a3797dcb64933613c522296a07eaafc0461 React-RCTText: 75915bace6f7877c03a840cc7b6c622fb62bfa6b
React-RCTVibration: 560af8c086741f3525b8456a482cdbe27f9d098e React-RCTVibration: 25f26b85e5e432bb3c256f8b384f9269e9529f25
React-rendererconsistency: 2dac03f448ff337235fd5820b10f81633328870d React-rendererconsistency: 2dac03f448ff337235fd5820b10f81633328870d
React-renderercss: c5c6b7a15948dd28facca39a18ac269073718490 React-renderercss: 477da167bb96b5ac86d30c5d295412fb853f5453
React-rendererdebug: 3c9d5e1634273f5a24d84cc5669f290ce0bdc812 React-rendererdebug: 2a1798c6f3ef5f22d466df24c33653edbabb5b89
React-RuntimeApple: 887637d1e12ea8262df7d32bc100467df2302613 React-RuntimeApple: 28cf4d8eb18432f6a21abbed7d801ab7f6b6f0b4
React-RuntimeCore: 91f779835dc4f8f84777fe5dd24f1a22f96454e4 React-RuntimeCore: 41bf0fd56a00de5660f222415af49879fa49c4f0
React-runtimeexecutor: 8bb6b738f37b0ada4a6269e6f8ab1133dea0285c React-runtimeexecutor: 1afb774dde3011348e8334be69d2f57a359ea43e
React-RuntimeHermes: 4cb93de9fa8b1cc753d200dbe61a01b9ec5f5562 React-RuntimeHermes: f3b158ea40e8212b1a723a68b4315e7a495c5fc6
React-runtimescheduler: 83dc28f530bfbd2fce84ed13aa7feebdc24e5af7 React-runtimescheduler: 3e1e2bec7300bae512533107d8e54c6e5c63fe0f
React-timing: 03c7217455d2bff459b27a3811be25796b600f47 React-timing: 6fa9883de2e41791e5dc4ec404e5e37f3f50e801
React-utils: 6d46795ae0444ec8a5d9a5f201157b286bf5250a React-utils: 6e2035b53d087927768649a11a26c4e092448e34
ReactAppDependencyProvider: c277c5b231881ad4f00cd59e3aa0671b99d7ebee ReactAppDependencyProvider: 1bcd3527ac0390a1c898c114f81ff954be35ed79
ReactCodegen: 88a1f4643f15841573f833b895bfa2a0c6cb4e7f ReactCodegen: fffa79906f5866f6a5ab5d98480b375191190271
ReactCommon: e6e232202a447d353e5531f2be82f50f47cbaa9a ReactCommon: 08810150b1206cc44aecf5f6ae19af32f29151a8
ReactNativeDependencies: 71ce9c28beb282aa720ea7b46980fff9669f428a ReactNativeDependencies: 71ce9c28beb282aa720ea7b46980fff9669f428a
RNCAsyncStorage: e85a99325df9eb0191a6ee2b2a842644c7eb29f4 RNCAsyncStorage: 3a4f5e2777dae1688b781a487923a08569e27fe4
RNReanimated: 10415bc8396eaeac0d7b2c9a1538eae7e607ec9c RNGestureHandler: e0d0bce5599f6120b7adf90c38d2805e2935795f
RNScreens: dd61bc3a3e6f6901ad833efa411917d44827cf51 RNReanimated: 9c6a550b41de91cf374e60afd79db93a362f1126
RNSVG: 2825ee146e0f6a16221e852299943e4cceef4528 RNScreens: d8d6f1792f6e7ac12b0190d33d8d390efc0c1845
RNWorklets: 9ccdc8112b17af6eee2c85a233891cb80db150ad RNSVG: 31d6639663c249b7d5abc9728dde2041eb2a3c34
RNWorklets: 1b50cb7595142f95e70518196ba247ad7f46a52e
Yoga: 5934998fbeaef7845dbf698f698518695ab4cd1a Yoga: 5934998fbeaef7845dbf698f698518695ab4cd1a
PODFILE CHECKSUM: dfe3cc75dee014a0abd367bc9e1bdbab0ba64ee3 PODFILE CHECKSUM: dfe3cc75dee014a0abd367bc9e1bdbab0ba64ee3

View File

@@ -374,6 +374,8 @@
"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/EXDevMenu.bundle",
); );
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputPaths = ( outputPaths = (
@@ -387,6 +389,8 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevLauncher.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevMenu.bundle",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;

View File

@@ -7,7 +7,7 @@
"android": "expo run:android", "android": "expo run:android",
"ios": "expo run:ios", "ios": "expo run:ios",
"web": "expo start --web", "web": "expo start --web",
"postinstall": "node ./scripts/postinstall-fix-metro.js" "test": "vitest run"
}, },
"dependencies": { "dependencies": {
"@expo/vector-icons": "^15.0.3", "@expo/vector-icons": "^15.0.3",
@@ -15,6 +15,7 @@
"@react-navigation/native": "^7.1.8", "@react-navigation/native": "^7.1.8",
"expo": "~54.0.32", "expo": "~54.0.32",
"expo-constants": "~18.0.13", "expo-constants": "~18.0.13",
"expo-dev-client": "^6.0.20",
"expo-font": "~14.0.11", "expo-font": "~14.0.11",
"expo-linear-gradient": "^15.0.8", "expo-linear-gradient": "^15.0.8",
"expo-linking": "~8.0.11", "expo-linking": "~8.0.11",
@@ -25,11 +26,11 @@
"expo-status-bar": "~3.0.9", "expo-status-bar": "~3.0.9",
"expo-web-browser": "~15.0.10", "expo-web-browser": "~15.0.10",
"i18next": "^25.8.0", "i18next": "^25.8.0",
"pnpm": "^10.28.2",
"react": "19.1.0", "react": "19.1.0",
"react-dom": "19.1.0", "react-dom": "19.1.0",
"react-i18next": "^16.5.4", "react-i18next": "^16.5.4",
"react-native": "0.81.5", "react-native": "0.81.5",
"react-native-gesture-handler": "^2.30.0",
"react-native-reanimated": "~4.1.1", "react-native-reanimated": "~4.1.1",
"react-native-safe-area-context": "~5.6.0", "react-native-safe-area-context": "~5.6.0",
"react-native-screens": "~4.16.0", "react-native-screens": "~4.16.0",
@@ -41,7 +42,8 @@
"devDependencies": { "devDependencies": {
"@types/react": "~19.1.0", "@types/react": "~19.1.0",
"react-test-renderer": "19.1.0", "react-test-renderer": "19.1.0",
"typescript": "~5.9.2" "typescript": "~5.9.2",
"vitest": "^4.0.18"
}, },
"private": true "private": true
} }

1090
client/pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -20,14 +20,31 @@ function getOptionalEnv(name: string, fallback: string): string {
return process.env[name] ?? fallback; return process.env[name] ?? fallback;
} }
export const APP_ENV = (getOptionalEnv('EXPO_PUBLIC_ENV', 'dev') as AppEnv) ?? 'dev'; export type AppRuntimeEnv = 'local' | 'dev' | 'prod';
export const API_BASE_URL = getRequiredEnv('EXPO_PUBLIC_API_BASE_URL'); export const APP_ENV = (getOptionalEnv('EXPO_PUBLIC_ENV', 'local') as AppRuntimeEnv) ?? 'local';
function getApiBaseUrl(env: AppRuntimeEnv): string {
// 向后兼容:若直接提供了 EXPO_PUBLIC_API_BASE_URL则优先使用不再强制要求 *_DEV/_PROD
const direct = process.env.EXPO_PUBLIC_API_BASE_URL;
if (direct && String(direct).trim()) return String(direct).trim();
// 约定local/dev/prod 三套域名分别配置,便于后续直接切环境而不改代码
if (env === 'local') {
return getOptionalEnv('EXPO_PUBLIC_API_BASE_URL_LOCAL', 'http://localhost:8000');
}
if (env === 'dev') {
return getOptionalEnv('EXPO_PUBLIC_API_BASE_URL_DEV', getOptionalEnv('EXPO_PUBLIC_API_BASE_URL_LOCAL', 'http://localhost:8000'));
}
return getOptionalEnv('EXPO_PUBLIC_API_BASE_URL_PROD', getOptionalEnv('EXPO_PUBLIC_API_BASE_URL_LOCAL', 'http://localhost:8000'));
}
export const API_BASE_URL = getApiBaseUrl(APP_ENV);
/** /**
* 默认语言策略: * 默认语言策略:
* - auto优先设备语言支持列表内时否则回退 zh-CN * - auto优先设备语言支持列表内时否则回退 en
* - zh-CN/en/es/pt/zh-TW固定默认语言仍允许用户在设置中手动切换并持久化 * - en/zh-TW固定默认语言仍允许用户在设置中手动切换并持久化
*/ */
export const DEFAULT_LANGUAGE = getOptionalEnv('EXPO_PUBLIC_DEFAULT_LANGUAGE', 'auto'); export const DEFAULT_LANGUAGE = getOptionalEnv('EXPO_PUBLIC_DEFAULT_LANGUAGE', 'auto');

View File

@@ -1,16 +1,16 @@
export type MockContentItem = { export type MockContentItem = {
id: string; id: string;
text: string; textKey: string;
}; };
/** /**
* 本地 mock 内容(后续接后端时可替换) * 本地 mock 内容(后续接后端时可替换)
*/ */
export const MOCK_CONTENT: MockContentItem[] = [ export const MOCK_CONTENT: MockContentItem[] = [
{ id: 'c1', text: '你已经很努力了,今天也值得被温柔对待。' }, { id: 'c1', textKey: 'mock.c1' },
{ id: 'c2', text: '深呼吸三次,把注意力带回当下。' }, { id: 'c2', textKey: 'mock.c2' },
{ id: 'c3', text: '允许自己慢一点,情绪会像云一样飘过。' }, { id: 'c3', textKey: 'mock.c3' },
{ id: 'c4', text: '你不需要完美,你已经足够好。' }, { id: 'c4', textKey: 'mock.c4' },
{ id: 'c5', text: '把手放在心口,对自己说一句:辛苦了。' } { id: 'c5', textKey: 'mock.c5' }
]; ];

View File

@@ -0,0 +1,51 @@
import { describe, expect, it } from 'vitest';
import { buildUserProfileFromQuestionnaire } from '../index';
import { mapOnboardingSelectionsToQuestionnaireAnswers } from '../onboardingMapping';
describe('Onboarding → UserProfileScoring 集成', () => {
it('完整作答Onboarding 选择能正确映射并生成画像', () => {
const selections = {
status: ['pregnant'],
emotion: ['calm'],
influence: ['work'],
support: ['balance'],
};
const answers = mapOnboardingSelectionsToQuestionnaireAnswers(selections);
expect(answers).toEqual({
mom_stage: 'expecting',
emotion: 'calm',
context: 'work',
need: 'rest_balance',
});
const p = buildUserProfileFromQuestionnaire(answers, {
generatedAt: '2026-01-30T00:00:00Z',
now: '2026-01-30T00:00:00Z',
});
expect(p.stage).toEqual({ expecting: 1, parenting: 0, unknown: 0 });
expect(p.emotion_score).toBe(0.8);
expect(p.context).toEqual({ work: 1 });
expect(p.need).toEqual({ rest_balance: 1 });
expect(p.profile_answered).toEqual({ stage: true, emotion: true, context: true, need: true });
});
it('全部跳过仍能生成最小可计算画像unknown=1', () => {
const answers = mapOnboardingSelectionsToQuestionnaireAnswers({});
expect(answers).toEqual({ mom_stage: null, emotion: null, context: null, need: null });
const p = buildUserProfileFromQuestionnaire(answers, {
generatedAt: '2026-01-30T00:00:00Z',
now: '2026-01-30T00:00:00Z',
});
expect(p.stage).toEqual({ unknown: 1 });
expect(p.emotion_score).toBeNull();
expect(p.context).toEqual({});
expect(p.need).toEqual({});
expect(p.profile_answered).toEqual({ stage: false, emotion: false, context: false, need: false });
});
});

View File

@@ -0,0 +1,70 @@
import { describe, expect, it } from 'vitest';
import {
buildUserProfileFromQuestionnaire,
computeProfileConfidence,
computeTimeConfidence,
normalizeAnswers,
} from '../index';
describe('userProfileScoring V1.2', () => {
it('normalizeAnswers: 非法值按跳过处理', () => {
// @ts-expect-error: 模拟非法输入
const out = normalizeAnswers({ mom_stage: 'xxx', emotion: 'yyy', context: 'zzz', need: 'ooo' });
expect(out).toEqual({ mom_stage: undefined, emotion: undefined, context: undefined, need: undefined });
});
it('computeTimeConfidence: 分段衰减', () => {
const gen = new Date('2026-01-01T00:00:00Z');
// 07 天1.0
expect(computeTimeConfidence(gen, new Date('2026-01-05T00:00:00Z'))).toBe(1.0);
// 30 天以上0.5
expect(computeTimeConfidence(gen, new Date('2026-02-15T00:00:00Z'))).toBe(0.5);
});
it('computeProfileConfidence: 完整度因子 + clamp', () => {
const confTime = 1.0;
// 全部跳过completion=0 → completionFactor=0.5 → 0.5
expect(
computeProfileConfidence(confTime, { stage: false, emotion: false, context: false, need: false })
).toBe(0.5);
// 全部作答completion=1 → completionFactor=1 → 1
expect(computeProfileConfidence(confTime, { stage: true, emotion: true, context: true, need: true })).toBe(1.0);
});
it('buildUserProfileFromQuestionnaire: 全部跳过输出最小可计算画像', () => {
const p = buildUserProfileFromQuestionnaire({}, { generatedAt: '2026-01-30T00:00:00Z', now: '2026-01-30T00:00:00Z' });
expect(p.profile_version).toBe('v1.2');
expect(p.profile_source).toBe('questionnaire');
expect(p.profile_answered).toEqual({ stage: false, emotion: false, context: false, need: false });
expect(p.stage).toEqual({ unknown: 1 });
expect(p.emotion_score).toBeNull();
expect(p.context).toEqual({});
expect(p.need).toEqual({});
// conf_time=1completionFactor=0.5
expect(p.profile_confidence).toBe(0.5);
// unknown 会命中 unsafe_for_stage_unknown并带跨维度谓词
expect(p.hard_rules.forbidden_risk_flags).toContain('unsafe_for_stage_unknown');
expect(p.hard_rules.forbidden_content_predicates.some((x) => x.id === 'unknown_block_parenting_pressure_personalized')).toBe(
true
);
});
it('buildUserProfileFromQuestionnaire: emotion<=0.2 命中 unsafe_for_emotion_low', () => {
const p = buildUserProfileFromQuestionnaire(
{ mom_stage: 'expecting', emotion: 'overwhelmed', context: 'health', need: 'anxiety_relief' },
{ generatedAt: '2026-01-30T00:00:00Z', now: '2026-01-30T00:00:00Z' }
);
expect(p.emotion_score).toBe(0.2);
expect(p.hard_rules.forbidden_risk_flags).toContain('unsafe_for_emotion_low');
});
});

View File

@@ -0,0 +1,19 @@
export type {
BuildUserProfileOptions,
QuestionnaireAnswersV1_2,
UserProfileV1_2,
UserProfileV1_2_Extended,
} from './types';
export type { OnboardingSelections } from './onboardingMapping';
export {
buildUserProfileFromQuestionnaire,
computeProfileAnswered,
computeProfileConfidence,
computeTimeConfidence,
normalizeAnswers,
} from './scoring';
export { mapOnboardingSelectionsToQuestionnaireAnswers } from './onboardingMapping';

View File

@@ -0,0 +1,61 @@
import type { QuestionnaireAnswersV1_2 } from './types';
/**
* Onboarding UI 的选项 ID → 标准问卷枚举(可跳过)
*
* 说明:
* - UI 侧每题目前是单选,但数据结构是 string[];这里取第 1 个作为答案
* - 不存在错误处理:未知/非法值统一按“跳过”处理(返回 null
*/
export type OnboardingSelections = Record<string, string[] | undefined>;
export function mapOnboardingSelectionsToQuestionnaireAnswers(
selections: OnboardingSelections
): QuestionnaireAnswersV1_2 {
return {
mom_stage: mapMomStage(selections.status?.[0]),
emotion: mapEmotion(selections.emotion?.[0]),
context: mapContext(selections.influence?.[0]),
need: mapNeed(selections.support?.[0]),
};
}
function mapMomStage(raw: string | undefined): QuestionnaireAnswersV1_2['mom_stage'] {
// 跳过null显式跳过
if (!raw) return null;
// UI id → 标准枚举
if (raw === 'pregnant') return 'expecting';
if (raw === 'has_kids') return 'parenting';
if (raw === 'no_fill') return 'unknown';
// 其他非法值:按跳过处理
return null;
}
function mapEmotion(raw: string | undefined): QuestionnaireAnswersV1_2['emotion'] {
if (!raw) return null;
// UI 当前选项happy/calm/stressed/low
if (raw === 'happy') return 'joyful';
if (raw === 'calm') return 'calm';
if (raw === 'stressed') return 'overwhelmed';
if (raw === 'low') return 'low';
return null;
}
function mapContext(raw: string | undefined): QuestionnaireAnswersV1_2['context'] {
if (!raw) return null;
// UI id 已与标准枚举一致family/work/relationship/friends/health
if (raw === 'family' || raw === 'work' || raw === 'relationship' || raw === 'friends' || raw === 'health') return raw;
return null;
}
function mapNeed(raw: string | undefined): QuestionnaireAnswersV1_2['need'] {
if (!raw) return null;
// UI id → 标准枚举
if (raw === 'emotional') return 'emotional_support';
if (raw === 'parenting') return 'parenting_pressure';
if (raw === 'self_worth') return 'self_worth';
if (raw === 'anxiety') return 'anxiety_relief';
if (raw === 'balance') return 'rest_balance';
return null;
}

View File

@@ -0,0 +1,233 @@
/**
* 用户画像打分User Profile ScoringV1.2
*
* 规则来源:
* - `spec_kit/User Profile Scoring/spec.md`
* - `设计说明文档/客戶端問卷打分規則.md`V1.2
*/
import type {
BuildUserProfileOptions,
ContextAnswer,
EmotionAnswer,
HardRules,
MomStageAnswer,
NeedAnswer,
ProfileAnswered,
QuestionnaireAnswersV1_2,
SparseOneHot,
UserProfileV1_2_Extended,
UserStageOneHot,
} from './types';
const MS_PER_DAY = 24 * 60 * 60 * 1000;
function clamp(value: number, min: number, max: number): number {
if (!Number.isFinite(value)) return min;
return Math.min(max, Math.max(min, value));
}
function toDate(value: Date | string | undefined): Date | null {
if (!value) return null;
if (value instanceof Date) return Number.isFinite(value.getTime()) ? value : null;
const d = new Date(value);
return Number.isFinite(d.getTime()) ? d : null;
}
function isMomStageAnswer(v: unknown): v is MomStageAnswer {
return v === 'expecting' || v === 'parenting' || v === 'unknown';
}
function isEmotionAnswer(v: unknown): v is EmotionAnswer {
return (
v === 'low' ||
v === 'overwhelmed' ||
v === 'tired' ||
v === 'neutral' ||
v === 'calm' ||
v === 'joyful'
);
}
function isContextAnswer(v: unknown): v is ContextAnswer {
return v === 'family' || v === 'work' || v === 'relationship' || v === 'friends' || v === 'health';
}
function isNeedAnswer(v: unknown): v is NeedAnswer {
return (
v === 'emotional_support' ||
v === 'parenting_pressure' ||
v === 'self_worth' ||
v === 'anxiety_relief' ||
v === 'rest_balance'
);
}
/**
* 归一化答案:非法值按“跳过”处理(归一化为 undefined
* - `null` 保留,表示显式跳过/无值
*/
export function normalizeAnswers(raw: QuestionnaireAnswersV1_2): QuestionnaireAnswersV1_2 {
const mom_stage =
raw.mom_stage === null ? null : isMomStageAnswer(raw.mom_stage) ? raw.mom_stage : undefined;
const emotion = raw.emotion === null ? null : isEmotionAnswer(raw.emotion) ? raw.emotion : undefined;
const context = raw.context === null ? null : isContextAnswer(raw.context) ? raw.context : undefined;
const need = raw.need === null ? null : isNeedAnswer(raw.need) ? raw.need : undefined;
return { mom_stage, emotion, context, need };
}
export function computeProfileAnswered(normalized: QuestionnaireAnswersV1_2): ProfileAnswered {
return {
stage: normalized.mom_stage !== undefined && normalized.mom_stage !== null,
emotion: normalized.emotion !== undefined && normalized.emotion !== null,
context: normalized.context !== undefined && normalized.context !== null,
need: normalized.need !== undefined && normalized.need !== null,
};
}
/**
* 时间衰减置信度conf_time
* - 07 天1.0
* - 730 天:线性衰减到 0.7(含第 30 天)
* - 30 天以上0.5
*/
export function computeTimeConfidence(generatedAt: Date, now: Date): number {
const deltaMs = now.getTime() - generatedAt.getTime();
if (!Number.isFinite(deltaMs) || deltaMs <= 0) return 1.0;
const days = deltaMs / MS_PER_DAY;
if (days <= 7) return 1.0;
if (days <= 30) {
const t = (days - 7) / (30 - 7); // 0..1
return 1.0 - 0.3 * t; // 1 -> 0.7
}
return 0.5;
}
/**
* V1.2profile_confidenceconf_U
* conf = clamp(conf_time * (0.5 + 0.5 * completion), 0.2, 1.0)
*/
export function computeProfileConfidence(confTime: number, answered: ProfileAnswered): number {
const answeredCount =
(answered.stage ? 1 : 0) + (answered.emotion ? 1 : 0) + (answered.context ? 1 : 0) + (answered.need ? 1 : 0);
const completion = answeredCount / 4;
const completionFactor = 0.5 + 0.5 * completion;
return clamp(confTime * completionFactor, 0.2, 1.0);
}
function buildStageOneHot(momStage: MomStageAnswer | null | undefined): UserStageOneHot {
// V1.2mom_stage 跳过按安全策略输出 unknown=1
if (momStage === null || momStage === undefined) {
return { unknown: 1 };
}
return {
expecting: momStage === 'expecting' ? 1 : 0,
parenting: momStage === 'parenting' ? 1 : 0,
unknown: momStage === 'unknown' ? 1 : 0,
};
}
function mapEmotionScore(emotion: EmotionAnswer | null | undefined): number | null {
if (emotion === null || emotion === undefined) return null;
switch (emotion) {
case 'low':
return 0.0;
case 'overwhelmed':
return 0.2;
case 'tired':
return 0.4;
case 'neutral':
return 0.6;
case 'calm':
return 0.8;
case 'joyful':
return 1.0;
}
}
function buildSparseOneHot(value: string | null | undefined): SparseOneHot {
if (value === null || value === undefined) return {};
return { [value]: 1 };
}
function computeRuleHitsAndHardRules(profile: {
stage: UserStageOneHot;
emotion_score: number | null;
}): { rule_hits: string[]; hard_rules: HardRules } {
const rule_hits: string[] = [];
const forbidden_risk_flags: string[] = [];
const stageUnknown = profile.stage.unknown === 1;
const stageParenting = profile.stage.parenting === 1;
if (stageUnknown) {
rule_hits.push('unsafe_for_stage_unknown');
forbidden_risk_flags.push('unsafe_for_stage_unknown');
}
if (stageParenting) {
rule_hits.push('unsafe_for_stage_parenting');
forbidden_risk_flags.push('unsafe_for_stage_parenting');
}
if (profile.emotion_score !== null && profile.emotion_score <= 0.2) {
rule_hits.push('unsafe_for_emotion_low');
forbidden_risk_flags.push('unsafe_for_emotion_low');
}
const forbidden_content_predicates = [];
if (stageUnknown) {
forbidden_content_predicates.push({
id: 'unknown_block_parenting_pressure_personalized',
when_user: { stage_unknown: true },
forbid_content: { need: 'parenting_pressure', personalization_power: 1 },
});
}
return {
rule_hits,
hard_rules: {
forbidden_risk_flags,
forbidden_content_predicates,
},
};
}
export function buildUserProfileFromQuestionnaire(
rawAnswers: QuestionnaireAnswersV1_2,
options: BuildUserProfileOptions = {}
): UserProfileV1_2_Extended {
const normalized = normalizeAnswers(rawAnswers);
const profile_answered = computeProfileAnswered(normalized);
const now = toDate(options.now) ?? new Date();
const generatedAt = toDate(options.generatedAt) ?? now;
const confTime = computeTimeConfidence(generatedAt, now);
const profile_confidence = computeProfileConfidence(confTime, profile_answered);
const stage = buildStageOneHot(normalized.mom_stage);
const emotion_score = mapEmotionScore(normalized.emotion);
const context = buildSparseOneHot(normalized.context);
const need = buildSparseOneHot(normalized.need);
const { rule_hits, hard_rules } = computeRuleHitsAndHardRules({ stage, emotion_score });
return {
profile_version: 'v1.2',
profile_source: 'questionnaire',
profile_generated_at: generatedAt.toISOString(),
profile_confidence,
profile_answered,
stage,
emotion_score,
context,
need,
rule_hits,
hard_rules,
};
}

View File

@@ -0,0 +1,95 @@
/**
* 用户画像打分User Profile ScoringV1.2 类型定义
*
* 说明:
* - 本模块用于:问卷答案(可跳过)→ 用户画像(可计算、可观测、可版本化)
* - 字段与规则以 `spec_kit/User Profile Scoring/spec.md`V1.2)为准
*/
export type MomStageAnswer = 'expecting' | 'parenting' | 'unknown';
export type EmotionAnswer = 'low' | 'overwhelmed' | 'tired' | 'neutral' | 'calm' | 'joyful';
export type ContextAnswer = 'family' | 'work' | 'relationship' | 'friends' | 'health';
export type NeedAnswer =
| 'emotional_support'
| 'parenting_pressure'
| 'self_worth'
| 'anxiety_relief'
| 'rest_balance';
/**
* V1.2:每题可跳过
* - `undefined`:字段缺失(可能是“没传”)
* - `null`:显式跳过/无值(例如 UI 明确传 null
*/
export type QuestionnaireAnswersV1_2 = {
mom_stage?: MomStageAnswer | null;
emotion?: EmotionAnswer | null;
context?: ContextAnswer | null;
need?: NeedAnswer | null;
};
export type ProfileAnswered = {
stage: boolean;
emotion: boolean;
context: boolean;
need: boolean;
};
export type UserStageOneHot = {
expecting?: 0 | 1;
parenting?: 0 | 1;
unknown: 0 | 1;
};
export type SparseOneHot = Record<string, 1>;
export type UserProfileV1_2 = {
profile_version: 'v1.2';
profile_source: 'questionnaire';
profile_generated_at: string; // ISO8601
profile_confidence: number; // 01
profile_answered: ProfileAnswered;
stage: UserStageOneHot;
emotion_score: number | null;
context: SparseOneHot;
need: SparseOneHot;
};
export type ForbiddenContentPredicate = {
/**
* 谓词 ID用于可观测与回归测试
*/
id: string;
/**
* 触发条件(用户侧)
* 说明:这里刻意保持为 object便于未来接入规则引擎时做 schema 对齐。
*/
when_user: Record<string, unknown>;
/**
* 禁推条件(内容侧)
* 说明:本模块不判断内容的 `personalization_power`,只输出可执行条件。
*/
forbid_content: Record<string, unknown>;
};
export type HardRules = {
forbidden_risk_flags: string[];
forbidden_content_predicates: ForbiddenContentPredicate[];
};
export type UserProfileV1_2_Extended = UserProfileV1_2 & {
rule_hits: string[];
hard_rules: HardRules;
};
export type BuildUserProfileOptions = {
/**
* 画像生成时间;不传则使用当前时间
*/
generatedAt?: Date | string;
/**
* 当前时间(用于计算 time decay不传则使用当前时间
*/
now?: Date | string;
};

View File

@@ -0,0 +1,22 @@
## 应用文案总表(请在此文件对应的 JSON 中修改)
**单一文案源文件**`client/src/i18n/locales/all.json`
- **English**`all.json``en`
- **繁体中文**`all.json``zh-TW`
> 说明:项目运行时只读取 `all.json`;请不要再改 `locales/en.json`、`locales/zh-TW.json`(它们已不再作为运行时数据源)。
### 快速索引(高频文案)
- **Home**`home.*`
- **Push 提示**`push.*`
- **主题**`theme.*`
- **我的/Profile**`profile.*`
- **收藏**`favorites.*`
- **设置**`settings.*`
- **Onboarding问卷**`onboardingSurvey.steps.*`
- **Onboarding兴趣**`intent.*`
- **Mock 文案**`mock.*`

View File

@@ -3,31 +3,23 @@ import * as Localization from 'expo-localization';
import i18n from 'i18next'; import i18n from 'i18next';
import { initReactI18next } from 'react-i18next'; import { initReactI18next } from 'react-i18next';
import en from './locales/en.json'; // 用 require 避免 TS 的 json module 配置差异导致无法编译
import es from './locales/es.json'; // eslint-disable-next-line @typescript-eslint/no-var-requires
import pt from './locales/pt.json'; const all = require('./locales/all.json') as { en: Record<string, unknown>; 'zh-TW': Record<string, unknown> };
import zhCN from './locales/zh-CN.json';
import zhTW from './locales/zh-TW.json';
/** /**
* 语言码约定: * 语言码约定:
* - 简体中文zh-CN
* - 繁体中文zh-TW * - 繁体中文zh-TW
* - 英语en * - 英语en
* - 西班牙语es
* - 葡萄牙语pt
*/ */
export type AppLanguage = 'zh-CN' | 'zh-TW' | 'en' | 'es' | 'pt'; export type AppLanguage = 'zh-TW' | 'en';
export const SUPPORTED_LANGUAGES: readonly AppLanguage[] = [ export const SUPPORTED_LANGUAGES: readonly AppLanguage[] = [
'zh-CN',
'zh-TW', 'zh-TW',
'en', 'en',
'es',
'pt',
] as const; ] as const;
const DEFAULT_FALLBACK_LANGUAGE: AppLanguage = 'zh-CN'; const DEFAULT_FALLBACK_LANGUAGE: AppLanguage = 'en';
const STORAGE_KEY_LANGUAGE = 'settings.language'; const STORAGE_KEY_LANGUAGE = 'settings.language';
function isSupportedLanguage(lang: string): lang is AppLanguage { function isSupportedLanguage(lang: string): lang is AppLanguage {
@@ -37,19 +29,13 @@ function isSupportedLanguage(lang: string): lang is AppLanguage {
function normalizeDeviceLanguageTagToAppLanguage(languageTag: string): AppLanguage { function normalizeDeviceLanguageTagToAppLanguage(languageTag: string): AppLanguage {
const tag = languageTag.toLowerCase(); const tag = languageTag.toLowerCase();
// 中文:优先区分繁简 // 中文:当前仅支持繁体中文zh-TW
if (tag.startsWith('zh')) { if (tag.startsWith('zh')) {
// 常见繁体标记zh-TW / zh-HK / zh-Hant return 'zh-TW';
if (tag.includes('tw') || tag.includes('hk') || tag.includes('hant')) {
return 'zh-TW';
}
return 'zh-CN';
} }
// 其他语言:按前缀匹配 // 其他语言:按前缀匹配(当前仅支持英文)
if (tag.startsWith('en')) return 'en'; if (tag.startsWith('en')) return 'en';
if (tag.startsWith('es')) return 'es';
if (tag.startsWith('pt')) return 'pt';
return DEFAULT_FALLBACK_LANGUAGE; return DEFAULT_FALLBACK_LANGUAGE;
} }
@@ -87,7 +73,7 @@ export async function clearLanguagePreference(): Promise<void> {
* 语言选择优先级: * 语言选择优先级:
* 1) 用户设置(若存在) * 1) 用户设置(若存在)
* 2) 设备语言(在支持列表内时生效;否则会被 normalize 到默认回退) * 2) 设备语言(在支持列表内时生效;否则会被 normalize 到默认回退)
* 3) 默认回退(zh-CN * 3) 默认回退(en
*/ */
export async function initI18n(): Promise<void> { export async function initI18n(): Promise<void> {
if (i18n.isInitialized) return; if (i18n.isInitialized) return;
@@ -98,11 +84,8 @@ export async function initI18n(): Promise<void> {
await i18n.use(initReactI18next).init({ await i18n.use(initReactI18next).init({
resources: { resources: {
'zh-CN': { translation: zhCN }, 'zh-TW': { translation: all['zh-TW'] as any },
'zh-TW': { translation: zhTW }, en: { translation: all.en as any },
en: { translation: en },
es: { translation: es },
pt: { translation: pt },
}, },
lng: initialLang, lng: initialLang,
fallbackLng: DEFAULT_FALLBACK_LANGUAGE, fallbackLng: DEFAULT_FALLBACK_LANGUAGE,

View File

@@ -0,0 +1,314 @@
{
"en": {
"common": {
"ok": "OK",
"cancel": "Cancel",
"error": "Error",
"openLinkError": "Cannot open link",
"back": "Back",
"close": "Close"
},
"onboarding": {
"title": "Welcome",
"progress": "{{current}}/{{total}}",
"next": "Next",
"skip": "Skip",
"skipAll": "Skip onboarding",
"q1Title": "How are you feeling lately?",
"q1Desc": "No right or wrong. You can skip and adjust later.",
"q2Title": "What kind of support do you want?",
"q2Desc": "For example: gentle reminders, mindfulness, emotional support.",
"q3Title": "When do you need comfort the most?",
"q3Desc": "Morning, afternoon, late night, or specific moments.",
"q4Title": "A gentle sentence for yourself",
"q4Desc": "You can skip. Well stay with you along the way."
},
"onboardingSurvey": {
"steps": {
"name": { "title": "What should I call you?" },
"status": {
"title": "Your current stage?",
"options": {
"pregnant": "Pregnant / preparing for motherhood",
"has_kids": "Already have kids",
"no_fill": "Prefer not to say"
}
},
"emotion": {
"title": "How are you feeling right now?",
"options": {
"happy": "Happy / satisfied",
"calm": "Calm / grounded",
"stressed": "Stressed / overwhelmed",
"low": "Down / low mood"
}
},
"influence": {
"title": "What has been affecting you lately?",
"options": {
"family": "Family & kids",
"work": "Work or study",
"relationship": "Intimate relationship",
"friends": "Friends & social life",
"health": "Mental & physical health"
}
},
"support": {
"title": "What support do you need most?",
"options": {
"emotional": "Emotional support",
"parenting": "Parenting stress",
"self_worth": "Self-worth",
"anxiety": "Anxiety relief",
"balance": "Rest & balance"
}
},
"reminder": { "title": "How many reminders do you want per day?" }
}
},
"intent": {
"title": "What kind of help do you want?",
"love": "Love",
"life": "Life",
"travel": "Travel",
"work": "Career"
},
"push": {
"title": "Notifications",
"cardTitle": "Turn on gentle reminders",
"cardDesc": "Well send a short mindful phrase when you may need it. You can change this anytime in Settings.",
"enable": "Enable",
"later": "Later",
"loading": "Working…",
"errorTitle": "Notice",
"errorDesc": "Its okay if enabling fails. You can keep using the app."
},
"home": {
"title": "Mindfulness",
"like": "Like",
"dislike": "Dislike",
"favorites": "Favorites",
"settings": "Settings",
"theme": "Theme",
"profile": "Me"
},
"theme": {
"title": "Theme",
"scenery": "Scenery",
"color": "Color"
},
"profile": {
"title": "Me",
"favorites": "My Likes",
"widget": "Widget",
"dailyReminder": "Daily Reminder",
"privacy": "Privacy Policy",
"terms": "Terms of Use",
"language": "Language",
"todoTitle": "Notice",
"todoDesc": "This feature is a placeholder for this iteration."
},
"dailyReminder": {
"title": "Daily Reminder",
"timesUnit": "times",
"pushLabel": "Push Reminder",
"ok": "Ok",
"minus": "Decrease",
"plus": "Increase"
},
"widget": {
"lockScreen": "Lock Screen Widget",
"homeScreen": "Home Screen Widget",
"previewDate": "Thu, Jan 29",
"previewQuote": "Im proud of who I am, even while becoming who I want to be."
},
"favorites": {
"title": "Favorites",
"empty": "No favorites yet.",
"unknownText": "This quote is no longer available."
},
"settings": {
"title": "Settings",
"language": "Language",
"version": "Version",
"widgetTitle": "iOS Widget",
"widgetDesc": "Put gentle reminders on your home screen: long-press → tap “+” → search “Mindfulness” → add a size you like."
},
"consent": {
"title": "You Are Perfect.",
"subtitle": "Everything Will Be Better.",
"agree": "Agree & Continue",
"privacy": "Privacy Policy",
"terms": "Terms of Use"
},
"permissions": {
"notificationsDenied": "Notifications are denied. Please enable them in Settings."
},
"language": {
"zhTW": "繁體中文",
"en": "English"
},
"mock": {
"c1": "Youve been trying your best. You deserve kindness today.",
"c2": "Take three deep breaths and return to the present moment.",
"c3": "Its okay to slow down. Emotions pass like clouds.",
"c4": "You dont need to be perfect. You are enough.",
"c5": "Place a hand on your heart and say: You did well today."
}
},
"zh-TW": {
"common": {
"ok": "確定",
"cancel": "取消",
"back": "返回",
"close": "關閉"
},
"onboarding": {
"title": "歡迎",
"progress": "{{current}}/{{total}}",
"next": "下一步",
"skip": "跳過",
"skipAll": "跳過整個引導",
"q1Title": "你最近的感受更接近哪一種?",
"q1Desc": "沒有對錯,你可以跳過,之後也能慢慢調整。",
"q2Title": "你更希望獲得哪種支持?",
"q2Desc": "例如:溫柔提醒、正念練習、情緒陪伴。",
"q3Title": "你通常在什麼時候最需要被安慰?",
"q3Desc": "例如:清晨、午后、深夜,或某些特定時刻。",
"q4Title": "給自己一句溫柔的話",
"q4Desc": "你可以直接跳過,我們會在之後繼續陪你。"
},
"onboardingSurvey": {
"steps": {
"name": { "title": "我可以怎麼稱呼你?" },
"status": {
"title": "媽媽的狀態?",
"options": {
"pregnant": "懷孕中/準備成為媽媽",
"has_kids": "已經有孩子",
"no_fill": "不想填寫"
}
},
"emotion": {
"title": "當下情緒狀態?",
"options": {
"happy": "愉悅、滿足",
"calm": "平靜、安穩",
"stressed": "被壓得有點喘不過氣",
"low": "情緒低落"
}
},
"influence": {
"title": "是什麼影響了你最近的感受?",
"options": {
"family": "家庭與孩子",
"work": "工作或學習",
"relationship": "親密關係",
"friends": "朋友與人際",
"health": "身心健康"
}
},
"support": {
"title": "最需要什麼支持?",
"options": {
"emotional": "情緒支持",
"parenting": "育兒壓力",
"self_worth": "自我價值",
"anxiety": "焦慮舒緩",
"balance": "休息與平衡"
}
},
"reminder": { "title": "你需要每天幾次提醒?" }
}
},
"intent": {
"title": "你希望得到什麼幫助?",
"love": "愛情",
"life": "生活",
"travel": "旅遊",
"work": "職場"
},
"push": {
"title": "通知",
"cardTitle": "開啟溫柔提醒",
"cardDesc": "我們會在你需要的時候,送上一句正念短句或溫柔提醒(可隨時在設定中調整)。",
"enable": "立即開啟",
"later": "稍後",
"loading": "處理中…",
"errorTitle": "提示",
"errorDesc": "開啟失敗也沒關係,你仍然可以繼續使用應用。"
},
"home": {
"title": "正念",
"like": "喜歡",
"dislike": "不喜歡",
"favorites": "收藏",
"settings": "設定",
"theme": "主題",
"profile": "我的"
},
"theme": {
"title": "主題",
"scenery": "風景",
"color": "顏色"
},
"profile": {
"title": "我的",
"favorites": "我的喜歡",
"widget": "小工具",
"dailyReminder": "每日提醒",
"privacy": "隱私政策",
"terms": "使用條款",
"language": "語言",
"todoTitle": "提示",
"todoDesc": "此功能本期先占位,後續迭代補齊。"
},
"dailyReminder": {
"title": "每日提醒",
"timesUnit": "次",
"pushLabel": "推送提醒",
"ok": "確定",
"minus": "減少次數",
"plus": "增加次數"
},
"widget": {
"lockScreen": "鎖屏小工具",
"homeScreen": "桌面小工具",
"previewDate": "1月29日週四 · 已至臘月十一",
"previewQuote": "我也對現在的自己感到滿意,即使我仍在努力成為想成為的人。"
},
"favorites": {
"title": "收藏夾",
"empty": "這裡還沒有收藏內容。",
"unknownText": "這條文案暫時無法顯示。"
},
"settings": {
"title": "設定",
"language": "語言",
"version": "版本",
"widgetTitle": "iOS 小工具",
"widgetDesc": "把溫柔提醒放到桌面上:長按主畫面 → 點「+」 → 搜尋「正念」 → 添加你喜歡的尺寸。"
},
"consent": {
"agree": "同意並繼續",
"privacy": "隱私協議",
"terms": "用戶使用協議"
},
"permissions": {
"notificationsDenied": "系統權限已被拒絕,請前往手機設定開啟通知。"
},
"language": {
"zhTW": "繁體中文",
"en": "English"
},
"mock": {
"c1": "你已經很努力了,今天也值得被溫柔對待。",
"c2": "深呼吸三次,把注意力帶回當下。",
"c3": "允許自己慢一點,情緒會像雲一樣飄過。",
"c4": "你不需要完美,你已經足夠好。",
"c5": "把手放在心口,對自己說一句:辛苦了。"
}
}
}

View File

@@ -3,6 +3,7 @@
"ok": "确定", "ok": "确定",
"cancel": "取消", "cancel": "取消",
"error": "错误", "error": "错误",
"notice": "提示",
"openLinkError": "无法打开链接", "openLinkError": "无法打开链接",
"back": "返回" "back": "返回"
}, },

View File

@@ -0,0 +1,64 @@
import i18n from 'i18next';
import { API_BASE_URL } from '@/src/constants/env';
import type { UserProfileV1_2 } from '@/src/features/userProfileScoring';
export type RecommendedItem = {
content_id: number;
text: string;
final_score: number;
fallback_level_final: number;
explanations?: Record<string, unknown> | null;
};
export type RecoMeta = Record<string, unknown>;
export type RecoEngineResult = {
items: RecommendedItem[];
meta: RecoMeta;
};
export type RecoRequest = {
k?: number;
user_profile: UserProfileV1_2;
already_recommended_ids?: Array<string | number>;
touched_or_viewed_ids?: Array<string | number>;
now?: string; // ISO8601可选
};
function withTimeout(ms: number): AbortController {
const controller = new AbortController();
setTimeout(() => controller.abort(), ms);
return controller;
}
export async function fetchRecoFeed(req: RecoRequest): Promise<RecoEngineResult> {
const controller = withTimeout(12_000);
const url = `${API_BASE_URL}/v1/reco/feed`;
const acceptLanguage = i18n.language?.toLowerCase().startsWith('zh') ? 'tc' : 'en';
const res = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
// 让后端做 locale 选择(目前后端只区分 en/tc
'Accept-Language': acceptLanguage,
},
body: JSON.stringify({
k: req.k,
user_profile: req.user_profile,
already_recommended_ids: req.already_recommended_ids ?? [],
touched_or_viewed_ids: req.touched_or_viewed_ids ?? [],
now: req.now,
}),
signal: controller.signal,
});
if (!res.ok) {
const text = await res.text().catch(() => '');
throw new Error(`推荐接口请求失败:${res.status} ${res.statusText} ${text}`.trim());
}
return (await res.json()) as RecoEngineResult;
}

View File

@@ -1,4 +1,5 @@
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import type { UserProfileV1_2_Extended } from '@/src/features/userProfileScoring';
/** /**
* 本地存储 key 统一管理,避免 UI 里散落硬编码 * 本地存储 key 统一管理,避免 UI 里散落硬编码
@@ -9,6 +10,9 @@ const KEY_CONTENT_REACTIONS = 'content.reactions';
const KEY_FAVORITES_ITEMS = 'favorites.items'; const KEY_FAVORITES_ITEMS = 'favorites.items';
const KEY_CONSENT_ACCEPTED = 'consent.accepted'; const KEY_CONSENT_ACCEPTED = 'consent.accepted';
const KEY_USER_PROFILE = 'user.profile'; const KEY_USER_PROFILE = 'user.profile';
const KEY_USER_PROFILE_SCORING = 'user.profileScoring';
const KEY_RECO_FEED_CACHE = 'reco.feedCache';
const KEY_RECO_FEED_HISTORY = 'reco.feedHistory';
const KEY_UI_THEME_MODE = 'ui.theme.mode'; const KEY_UI_THEME_MODE = 'ui.theme.mode';
const KEY_DAILY_REMINDER_SETTINGS = 'dailyReminder.settings'; const KEY_DAILY_REMINDER_SETTINGS = 'dailyReminder.settings';
@@ -20,11 +24,48 @@ export type UserProfile = {
name?: string; name?: string;
intents?: string[]; intents?: string[];
}; };
/**
* 用户画像(问卷打分输出)
* 说明:用于推荐/Push/Widget 统一复用;结构以 `src/features/userProfileScoring` 输出为准。
*/
export type UserProfileScoring = UserProfileV1_2_Extended;
export type DailyReminderSettings = { export type DailyReminderSettings = {
timesPerDay: number; timesPerDay: number;
pushEnabled: boolean; pushEnabled: boolean;
}; };
export type RecoFeedCacheItem = {
content_id: number;
text: string;
};
export type RecoFeedCache = {
saved_at: string; // ISO8601
/**
* 缓存文案的语言(后端目前只区分 en / tc
* - en: English
* - tc: 繁体中文
*/
lang?: 'en' | 'tc';
items: RecoFeedCacheItem[];
meta?: Record<string, unknown>;
};
/**
* Feed 链路可观测输入(用于下一次请求携带给后端)
*
* - already_recommended_ids本设备已下发过的内容避免重复下发
* - touched_or_viewed_ids本设备用户已看过/划过的内容(用于频控/去重/降重复)
*
* 说明:后端不需要“实时知道”,只要在下一次拉取时带上即可。
*/
export type RecoFeedHistory = {
updated_at: string; // ISO8601
already_recommended_ids: number[];
touched_or_viewed_ids: number[];
};
async function getJson<T>(key: string, fallback: T): Promise<T> { async function getJson<T>(key: string, fallback: T): Promise<T> {
const raw = await AsyncStorage.getItem(key); const raw = await AsyncStorage.getItem(key);
@@ -69,14 +110,34 @@ export async function setReaction(contentId: string, reaction: Reaction): Promis
await setJson(KEY_CONTENT_REACTIONS, next); await setJson(KEY_CONTENT_REACTIONS, next);
} }
export async function getFavorites(): Promise<string[]> { export type FavoriteItem = {
return await getJson<string[]>(KEY_FAVORITES_ITEMS, []); favId: string; // 唯一标识,支持重复点赞同一文案
id: string;
/**
* 收藏时的文案快照(强烈建议写入,避免后续 cache 覆盖导致无法还原文案)
*/
text?: string;
date: string;
themeMode: ThemeMode;
background: string; // 颜色值或图片路径
};
export async function getFavorites(): Promise<FavoriteItem[]> {
return await getJson<FavoriteItem[]>(KEY_FAVORITES_ITEMS, []);
} }
export async function addFavorite(contentId: string): Promise<void> { export async function addFavorite(item: FavoriteItem): Promise<void> {
const list = await getFavorites(); const list = await getFavorites();
if (list.includes(contentId)) return; // 允许重复点赞,不再根据 id 去重
await setJson(KEY_FAVORITES_ITEMS, [...list, contentId]); const newList = [item, ...list];
console.log('Adding to favorites:', JSON.stringify(item));
await setJson(KEY_FAVORITES_ITEMS, newList);
}
export async function removeFavorite(favId: string): Promise<void> {
const list = await getFavorites();
const next = list.filter(item => item.favId !== favId);
await setJson(KEY_FAVORITES_ITEMS, next);
} }
export async function getConsentAccepted(): Promise<boolean> { export async function getConsentAccepted(): Promise<boolean> {
@@ -107,6 +168,103 @@ export async function setUserProfile(profile: UserProfile): Promise<void> {
await setJson(KEY_USER_PROFILE, { ...current, ...profile }); await setJson(KEY_USER_PROFILE, { ...current, ...profile });
} }
export async function getUserProfileScoring(): Promise<UserProfileScoring | null> {
const raw = await AsyncStorage.getItem(KEY_USER_PROFILE_SCORING);
if (!raw) return null;
try {
return JSON.parse(raw) as UserProfileScoring;
} catch {
return null;
}
}
export async function setUserProfileScoring(profile: UserProfileScoring): Promise<void> {
await setJson(KEY_USER_PROFILE_SCORING, profile);
}
export async function getRecoFeedCache(): Promise<RecoFeedCache | null> {
const raw = await AsyncStorage.getItem(KEY_RECO_FEED_CACHE);
if (!raw) return null;
try {
return JSON.parse(raw) as RecoFeedCache;
} catch {
return null;
}
}
export async function setRecoFeedCache(cache: RecoFeedCache): Promise<void> {
await setJson(KEY_RECO_FEED_CACHE, cache);
}
export async function getRecoFeedHistory(): Promise<RecoFeedHistory> {
const raw = await AsyncStorage.getItem(KEY_RECO_FEED_HISTORY);
if (!raw) {
return {
updated_at: new Date().toISOString(),
already_recommended_ids: [],
touched_or_viewed_ids: [],
};
}
try {
const parsed = JSON.parse(raw) as Partial<RecoFeedHistory>;
return {
updated_at: typeof parsed.updated_at === 'string' ? parsed.updated_at : new Date().toISOString(),
already_recommended_ids: Array.isArray(parsed.already_recommended_ids)
? parsed.already_recommended_ids.filter((x) => Number.isFinite(x)).map((x) => Number(x))
: [],
touched_or_viewed_ids: Array.isArray(parsed.touched_or_viewed_ids)
? parsed.touched_or_viewed_ids.filter((x) => Number.isFinite(x)).map((x) => Number(x))
: [],
};
} catch {
return {
updated_at: new Date().toISOString(),
already_recommended_ids: [],
touched_or_viewed_ids: [],
};
}
}
export async function setRecoFeedHistory(history: RecoFeedHistory): Promise<void> {
await setJson(KEY_RECO_FEED_HISTORY, history);
}
function uniqKeepLatest(list: number[], max: number): number[] {
const seen = new Set<number>();
const out: number[] = [];
for (let i = list.length - 1; i >= 0; i -= 1) {
const v = list[i];
if (!Number.isFinite(v)) continue;
if (seen.has(v)) continue;
seen.add(v);
out.push(v);
if (out.length >= max) break;
}
return out.reverse();
}
export async function recordRecoFeedServed(contentIds: number[]): Promise<void> {
if (!contentIds?.length) return;
const h = await getRecoFeedHistory();
const next = {
...h,
updated_at: new Date().toISOString(),
already_recommended_ids: uniqKeepLatest([...h.already_recommended_ids, ...contentIds], 500),
};
await setRecoFeedHistory(next);
}
export async function recordRecoFeedTouched(contentId: number): Promise<void> {
if (!Number.isFinite(contentId)) return;
const h = await getRecoFeedHistory();
const next = {
...h,
updated_at: new Date().toISOString(),
touched_or_viewed_ids: uniqKeepLatest([...h.touched_or_viewed_ids, contentId], 500),
};
await setRecoFeedHistory(next);
}
export async function getDailyReminderSettings(): Promise<DailyReminderSettings> { export async function getDailyReminderSettings(): Promise<DailyReminderSettings> {
const s = await getJson<DailyReminderSettings>(KEY_DAILY_REMINDER_SETTINGS, { const s = await getJson<DailyReminderSettings>(KEY_DAILY_REMINDER_SETTINGS, {
timesPerDay: 3, timesPerDay: 3,

20
server/.env.dev Normal file
View File

@@ -0,0 +1,20 @@
# 运行环境dev 或 prod
APP_ENV=dev
# Web 服务
APP_NAME=mindfulness-server
APP_HOST=0.0.0.0
APP_PORT=8000
# 数据库dev 指向 mindfulness_devprod 指向 mindfulness
DATABASE_URL=mysql+aiomysql://damer:damer@43.163.242.87:3306/mindfulness_dev?charset=utf8mb4
# Redis使用 ACL 用户;并确保应用侧 key 带 dev:/pro: 前缀)
REDIS_URL=redis://dev_damer:damer@43.163.242.87:6379/0
# Celery默认不启用结果存储避免 Redis 内存压力)
CELERY_BROKER_URL=redis://dev_damer:damer@43.163.242.87:6379/0
# CELERY_RESULT_BACKEND=redis://<REDIS_USER>:<REDIS_PASSWORD>@<REDIS_HOST>:6379/0
# 推送Expo
# EXPO_ACCESS_TOKEN=

20
server/.env.prod Normal file
View File

@@ -0,0 +1,20 @@
# 运行环境dev 或 prod
APP_ENV=prod
# Web 服务
APP_NAME=mindfulness-server
APP_HOST=0.0.0.0
APP_PORT=8000
# 数据库dev 指向 mindfulness_devprod 指向 mindfulness
DATABASE_URL=mysql+aiomysql://damer:damer@43.163.242.87:3306/mindfulness?charset=utf8mb4
# Redis使用 ACL 用户;并确保应用侧 key 带 dev:/pro: 前缀)
REDIS_URL=redis://prod_damer:damer@43.163.242.87:6379/0
# Celery默认不启用结果存储避免 Redis 内存压力)
CELERY_BROKER_URL=redis://prod_damer:damer@43.163.242.87:6379/0
# CELERY_RESULT_BACKEND=redis://<REDIS_USER>:<REDIS_PASSWORD>@<REDIS_HOST>:6379/0
# 推送Expo
# EXPO_ACCESS_TOKEN=

BIN
server/.test.db Normal file

Binary file not shown.

39
server/alembic.ini Normal file
View File

@@ -0,0 +1,39 @@
[alembic]
script_location = alembic
# 注意:实际连接串由 alembic/env.py 从环境变量 DATABASE_URL 注入
sqlalchemy.url = driver://user:pass@localhost/dbname
[loggers]
keys = root,sqlalchemy,alembic
[handlers]
keys = console
[formatters]
keys = generic
[logger_root]
level = WARN
handlers = console
qualname =
[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine
[logger_alembic]
level = INFO
handlers =
qualname = alembic
[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic
[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s

40
server/alembic/README.md Normal file
View File

@@ -0,0 +1,40 @@
# Alembic数据库迁移
## 1. 前置
-`server/` 下准备 `.env.dev`(或系统环境变量),至少包含:
- `DATABASE_URL=mysql+aiomysql://...`
> 注意:本仓库推荐使用 Python 虚拟环境venv。示例以 `server/.venv` 为准。
---
## 2. 安装依赖(一次性)
在仓库根目录:
```bash
python3 -m venv server/.venv
source server/.venv/bin/activate
pip install -r server/requirements.txt
```
---
## 3. 常用命令
`server/` 目录运行:
```bash
source .venv/bin/activate
alembic -c alembic.ini history
alembic -c alembic.ini upgrade head
```
---
## 4. 说明
- 连接串由 `alembic/env.py` 从环境变量 `DATABASE_URL`(或 `app/core/config.py`)读取。
- 初始迁移版本为:`0001_init_content_tables`(创建推荐系统最小内容表与画像表)。

137
server/alembic/env.py Normal file
View File

@@ -0,0 +1,137 @@
from __future__ import annotations
import asyncio
import os
import sys
from logging.config import fileConfig
from pathlib import Path
from alembic import context
from sqlalchemy import pool
from sqlalchemy.engine import Connection
from sqlalchemy.ext.asyncio import async_engine_from_config
# 让 alembic 在 `server/` 下运行时也能 import app.*
SERVER_DIR = Path(__file__).resolve().parents[1] # .../server/alembic -> .../server
sys.path.append(str(SERVER_DIR))
from app.db.base import Base # noqa: E402
import app.db.models # noqa: F401,E402 # 确保模型被导入metadata 完整
# Alembic Config 对象
config = context.config
# 配置日志
if config.config_file_name is not None:
fileConfig(config.config_file_name)
# 目标 metadataautogenerate 依赖)
target_metadata = Base.metadata
def _read_env_kv(env_path: Path) -> dict[str, str]:
"""
读取 .env 文件中的 KEY=VALUE。
说明:
- 迁移阶段只需要 DATABASE_URL不应因为 Redis/Celery 等配置缺失而失败
- 这里不依赖 pydantic-settings 的 Settings 校验,避免“缺字段导致迁移不可用”
"""
data: dict[str, str] = {}
if not env_path.exists():
return data
for raw in env_path.read_text(encoding="utf-8").splitlines():
line = raw.strip()
if not line or line.startswith("#"):
continue
if "=" not in line:
continue
k, v = line.split("=", 1)
k = k.strip()
v = v.strip().strip('"').strip("'")
if k:
data[k] = v
return data
def _get_database_url() -> str:
"""
获取数据库连接串。
约定:
- 优先读取环境变量 `DATABASE_URL`
- 若未设置,则按 `APP_ENV`(默认 dev读取 `server/.env.dev` 或 `server/.env.prod`
注意:迁移阶段仅依赖 DATABASE_URL不应强制要求 REDIS_URL / CELERY_BROKER_URL 等配置存在。
"""
# 允许在 alembic 命令时临时覆盖
env_url = os.getenv("DATABASE_URL")
if env_url:
return env_url
app_env = (os.getenv("APP_ENV") or "dev").strip() or "dev"
env_file = SERVER_DIR / (".env.prod" if app_env == "prod" else ".env.dev")
kv = _read_env_kv(env_file)
url = kv.get("DATABASE_URL")
if url:
return url
raise RuntimeError(
"缺少 DATABASE_URL请设置环境变量 DATABASE_URL或在 server/.env.dev或 .env.prod中配置 DATABASE_URL。"
)
def run_migrations_offline() -> None:
"""离线模式:生成 SQL 脚本,不连接数据库。"""
url = _get_database_url()
context.configure(
url=url,
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
compare_type=True,
)
with context.begin_transaction():
context.run_migrations()
def do_run_migrations(connection: Connection) -> None:
"""在线模式:在已有连接上执行迁移。"""
context.configure(
connection=connection,
target_metadata=target_metadata,
compare_type=True,
)
with context.begin_transaction():
context.run_migrations()
async def run_migrations_online() -> None:
"""在线模式:使用异步引擎执行迁移。"""
url = _get_database_url()
config.set_main_option("sqlalchemy.url", url)
connectable = async_engine_from_config(
config.get_section(config.config_ini_section) or {},
prefix="sqlalchemy.",
poolclass=pool.NullPool,
)
async with connectable.connect() as connection:
await connection.run_sync(do_run_migrations)
await connectable.dispose()
if context.is_offline_mode():
run_migrations_offline()
else:
asyncio.run(run_migrations_online())

Some files were not shown because too many files have changed in this diff Show More