diff --git a/blotztask-mobile/assets/images-png/pomodoro-img-cafeNook.png b/blotztask-mobile/assets/images-png/pomodoro-img-cafeNook.png new file mode 100644 index 000000000..da4bf9710 Binary files /dev/null and b/blotztask-mobile/assets/images-png/pomodoro-img-cafeNook.png differ diff --git a/blotztask-mobile/assets/images-png/pomodoro-sound-choose.png b/blotztask-mobile/assets/images-png/pomodoro-img-choose.png similarity index 100% rename from blotztask-mobile/assets/images-png/pomodoro-sound-choose.png rename to blotztask-mobile/assets/images-png/pomodoro-img-choose.png diff --git a/blotztask-mobile/assets/images-png/pomodoro-img-nightGlow.png b/blotztask-mobile/assets/images-png/pomodoro-img-nightGlow.png new file mode 100644 index 000000000..2d6cbcbe6 Binary files /dev/null and b/blotztask-mobile/assets/images-png/pomodoro-img-nightGlow.png differ diff --git a/blotztask-mobile/assets/images-png/pomodoro-sound-noSound.png b/blotztask-mobile/assets/images-png/pomodoro-img-noSound.png similarity index 100% rename from blotztask-mobile/assets/images-png/pomodoro-sound-noSound.png rename to blotztask-mobile/assets/images-png/pomodoro-img-noSound.png diff --git a/blotztask-mobile/assets/images-png/pomodoro-img-pineFocus.png b/blotztask-mobile/assets/images-png/pomodoro-img-pineFocus.png new file mode 100644 index 000000000..448e4c40d Binary files /dev/null and b/blotztask-mobile/assets/images-png/pomodoro-img-pineFocus.png differ diff --git a/blotztask-mobile/assets/images-png/pomodoro-img-silentMind.png b/blotztask-mobile/assets/images-png/pomodoro-img-silentMind.png new file mode 100644 index 000000000..bd2b50b5e Binary files /dev/null and b/blotztask-mobile/assets/images-png/pomodoro-img-silentMind.png differ diff --git a/blotztask-mobile/assets/images-png/pomodoro-img-streamWhisper.png b/blotztask-mobile/assets/images-png/pomodoro-img-streamWhisper.png new file mode 100644 index 000000000..afdf4bee2 Binary files /dev/null and b/blotztask-mobile/assets/images-png/pomodoro-img-streamWhisper.png differ diff --git a/blotztask-mobile/assets/sounds/pomodoro-cafeVibe.mp3 b/blotztask-mobile/assets/sounds/pomodoro-cafeNook.mp3 similarity index 100% rename from blotztask-mobile/assets/sounds/pomodoro-cafeVibe.mp3 rename to blotztask-mobile/assets/sounds/pomodoro-cafeNook.mp3 diff --git a/blotztask-mobile/assets/sounds/pomodoro-taskFlow.mp3 b/blotztask-mobile/assets/sounds/pomodoro-nightGlow.mp3 similarity index 100% rename from blotztask-mobile/assets/sounds/pomodoro-taskFlow.mp3 rename to blotztask-mobile/assets/sounds/pomodoro-nightGlow.mp3 diff --git a/blotztask-mobile/assets/sounds/pomodoro-deepWork.mp3 b/blotztask-mobile/assets/sounds/pomodoro-pineFocus.mp3 similarity index 100% rename from blotztask-mobile/assets/sounds/pomodoro-deepWork.mp3 rename to blotztask-mobile/assets/sounds/pomodoro-pineFocus.mp3 diff --git a/blotztask-mobile/assets/sounds/pomodoro-calmMind.mp3 b/blotztask-mobile/assets/sounds/pomodoro-silentMind.mp3 similarity index 100% rename from blotztask-mobile/assets/sounds/pomodoro-calmMind.mp3 rename to blotztask-mobile/assets/sounds/pomodoro-silentMind.mp3 diff --git a/blotztask-mobile/assets/sounds/pomodoro-easyFocus.mp3 b/blotztask-mobile/assets/sounds/pomodoro-streamWhisper.mp3 similarity index 100% rename from blotztask-mobile/assets/sounds/pomodoro-easyFocus.mp3 rename to blotztask-mobile/assets/sounds/pomodoro-streamWhisper.mp3 diff --git a/blotztask-mobile/src/feature/pomodoro/components/pomodoro-mode-bottomsheet.tsx b/blotztask-mobile/src/feature/pomodoro/components/pomodoro-mode-bottomsheet.tsx index 6c61f5f50..d25302cc6 100644 --- a/blotztask-mobile/src/feature/pomodoro/components/pomodoro-mode-bottomsheet.tsx +++ b/blotztask-mobile/src/feature/pomodoro/components/pomodoro-mode-bottomsheet.tsx @@ -4,7 +4,7 @@ import Animated, { useSharedValue, useAnimatedScrollHandler } from "react-native import { MaterialIcons } from "@expo/vector-icons"; import { ASSETS } from "@/shared/constants/assets"; import { LinearGradient } from "expo-linear-gradient"; -import { SoundscapeCard } from "../../calendar/components/sound-scape"; +import { SoundscapeCard } from "./sound-scape"; import { useTranslation } from "react-i18next"; import { PomodoroSoundscapeType, diff --git a/blotztask-mobile/src/feature/calendar/components/sound-scape.tsx b/blotztask-mobile/src/feature/pomodoro/components/sound-scape.tsx similarity index 83% rename from blotztask-mobile/src/feature/calendar/components/sound-scape.tsx rename to blotztask-mobile/src/feature/pomodoro/components/sound-scape.tsx index 8d49a9c5d..febadf1a6 100644 --- a/blotztask-mobile/src/feature/calendar/components/sound-scape.tsx +++ b/blotztask-mobile/src/feature/pomodoro/components/sound-scape.tsx @@ -1,9 +1,5 @@ import { ImageBackground, Pressable, Text, View } from "react-native"; -import { - ITEM_WIDTH, - ITEM_GAP, - PomodoroSoundscapeType, -} from "../../pomodoro/utils/pomodoro-setting"; +import { ITEM_WIDTH, ITEM_GAP, PomodoroSoundscapeType } from "../utils/pomodoro-setting"; import { useTranslation } from "react-i18next"; import Animated, { interpolate, useAnimatedStyle } from "react-native-reanimated"; import type { SharedValue } from "react-native-reanimated"; @@ -59,11 +55,17 @@ export const SoundscapeCard = ({ > - + {t(`soundscape.${item.type}`)} diff --git a/blotztask-mobile/src/feature/pomodoro/utils/pomodoro-setting.ts b/blotztask-mobile/src/feature/pomodoro/utils/pomodoro-setting.ts index 327a5b79f..4d9d3af24 100644 --- a/blotztask-mobile/src/feature/pomodoro/utils/pomodoro-setting.ts +++ b/blotztask-mobile/src/feature/pomodoro/utils/pomodoro-setting.ts @@ -5,28 +5,28 @@ export const ITEM_GAP = 12; export const SNAP_INTERVAL = ITEM_WIDTH + ITEM_GAP; export const SOUNDSCAPES = { - easyFocus: { - imageUrl: ASSETS.pomodoroSoundEasyFocus, - music: ASSETS.pomodoroEasyFocus, + streamWhisper: { + imageUrl: ASSETS.pomodoroImgStreamWhisper, + music: ASSETS.pomodoroStreamWhisper, }, - deepWork: { - imageUrl: ASSETS.pomodoroSoundDeepWork, - music: ASSETS.pomodoroDeepWork, + pineFocus: { + imageUrl: ASSETS.pomodoroImgPineFocus, + music: ASSETS.pomodoroPineFocus, }, - taskFlow: { - imageUrl: ASSETS.pomodoroSoundTaskFlow, - music: ASSETS.pomodoroTaskFlow, + nightGlow: { + imageUrl: ASSETS.pomodoroImgNightGlow, + music: ASSETS.pomodoroNightGlow, }, - calmMind: { - imageUrl: ASSETS.pomodoroSoundCalmMind, - music: ASSETS.pomodoroCalmMind, + silentMind: { + imageUrl: ASSETS.pomodoroImgSilentMind, + music: ASSETS.pomodoroSilentMind, }, - cafeVibe: { - imageUrl: ASSETS.pomodoroSoundCafeVibe, - music: ASSETS.pomodoroCafeVibe, + cafeNook: { + imageUrl: ASSETS.pomodoroImgCafeNook, + music: ASSETS.pomodoroCafeNook, }, noSound: { - imageUrl: ASSETS.pomodoroSoundNoSound, + imageUrl: ASSETS.pomodoroImgNoSound, music: null, }, } as const; diff --git a/blotztask-mobile/src/i18n/locales/en/pomodoro.json b/blotztask-mobile/src/i18n/locales/en/pomodoro.json index 0d7e30474..f298f608f 100644 --- a/blotztask-mobile/src/i18n/locales/en/pomodoro.json +++ b/blotztask-mobile/src/i18n/locales/en/pomodoro.json @@ -39,11 +39,11 @@ "modeLockedWhileRunning": "Pomodoro settings can’t be changed while a Pomodoro is running." }, "soundscape": { - "easyFocus": "Easy\nFocus", - "deepWork": "Deep\nWork", - "taskFlow": "Task\nFlow", - "calmMind": "Calm\nMind", - "cafeVibe": "Cafe\nVibe", + "streamWhisper": "Stream\nWhisper", + "pineFocus": "Pine\nFocus", + "silentMind": "Silent\nMind", + "nightGlow": "Night\nGlow", + "cafeNook": "Cafe\nNook", "noSound": "No\nSound" } } diff --git a/blotztask-mobile/src/i18n/locales/zh/pomodoro.json b/blotztask-mobile/src/i18n/locales/zh/pomodoro.json index 973bb7bb5..b0ea3c8df 100644 --- a/blotztask-mobile/src/i18n/locales/zh/pomodoro.json +++ b/blotztask-mobile/src/i18n/locales/zh/pomodoro.json @@ -37,11 +37,11 @@ "modeLockedWhileRunning": "番茄钟进行中,无法修改番茄钟设置。" }, "soundscape": { - "easyFocus": "轻松\n专注", - "deepWork": "深度\n工作", - "taskFlow": "任务\n心流", - "calmMind": "平静\n氛围", - "cafeVibe": "咖啡馆\n白噪音", + "streamWhisper": "浅溪\n轻语", + "pineFocus": "松间\n沉心", + "nightGlow": "星夜\n低语", + "silentMind": "行云\n逐流", + "cafeNook": "咖啡馆\n暖阳", "noSound": "无\n声音" } } diff --git a/blotztask-mobile/src/shared/constants/assets.ts b/blotztask-mobile/src/shared/constants/assets.ts index 96de82d4f..2664211e5 100644 --- a/blotztask-mobile/src/shared/constants/assets.ts +++ b/blotztask-mobile/src/shared/constants/assets.ts @@ -46,13 +46,13 @@ export const PNGIMAGES = { onboardingNoteBackground: require("../../../assets/images-png/onboarding-note-background.png"), onboardingVoiceBackground: require("../../../assets/images-png/onboarding-voice-background.png"), xhsLogo: require("../../../assets/images-png/xhs.jpg"), - pomodoroSoundEasyFocus: require("../../../assets/images-png/pomodoro-sound-easyFocus.png"), - pomodoroSoundDeepWork: require("../../../assets/images-png/pomodoro-sound-deepWork.png"), - pomodoroSoundTaskFlow: require("../../../assets/images-png/pomodoro-sound-taskFlow.png"), - pomodoroSoundCalmMind: require("../../../assets/images-png/pomodoro-sound-calmMind.png"), - pomodoroSoundCafeVibe: require("../../../assets/images-png/pomodoro-sound-cafeVibe.png"), - pomodoroSoundChoose: require("../../../assets/images-png/pomodoro-sound-choose.png"), - pomodoroSoundNoSound: require("../../../assets/images-png/pomodoro-sound-noSound.png"), + pomodoroImgStreamWhisper: require("../../../assets/images-png/pomodoro-img-streamWhisper.png"), + pomodoroImgPineFocus: require("../../../assets/images-png/pomodoro-img-pineFocus.png"), + pomodoroImgNightGlow: require("../../../assets/images-png/pomodoro-img-nightGlow.png"), + pomodoroImgSilentMind: require("../../../assets/images-png/pomodoro-img-silentMind.png"), + pomodoroImgCafeNook: require("../../../assets/images-png/pomodoro-img-cafeNook.png"), + pomodoroImgChoose: require("../../../assets/images-png/pomodoro-img-choose.png"), + pomodoroImgNoSound: require("../../../assets/images-png/pomodoro-img-noSound.png"), } as const; export const SVGIMAGES = { @@ -66,11 +66,11 @@ export const SVGIMAGES = { export const SOUNDS = { buttonSpin: require("../../../assets/sounds/button-spin.mp3"), - pomodoroEasyFocus: require("../../../assets/sounds/pomodoro-easyFocus.mp3"), - pomodoroDeepWork: require("../../../assets/sounds/pomodoro-deepWork.mp3"), - pomodoroTaskFlow: require("../../../assets/sounds/pomodoro-taskFlow.mp3"), - pomodoroCalmMind: require("../../../assets/sounds/pomodoro-calmMind.mp3"), - pomodoroCafeVibe: require("../../../assets/sounds/pomodoro-cafeVibe.mp3"), + pomodoroStreamWhisper: require("../../../assets/sounds/pomodoro-streamWhisper.mp3"), + pomodoroPineFocus: require("../../../assets/sounds/pomodoro-pineFocus.mp3"), + pomodoroNightGlow: require("../../../assets/sounds/pomodoro-nightGlow.mp3"), + pomodoroSilentMind: require("../../../assets/sounds/pomodoro-silentMind.mp3"), + pomodoroCafeNook: require("../../../assets/sounds/pomodoro-cafeNook.mp3"), }; // Export all assets for convenience