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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -59,11 +55,17 @@ export const SoundscapeCard = ({
>
<ImageBackground
source={item.imageUrl}
className="w-full h-[100px] border-[3px] border-white justify-end p-2 bg-white"
className={`w-full h-[100px] border-[3px] justify-end p-2 ${
isSelected ? "border-highlight" : "border-transparent"
}`}
imageStyle={{ borderRadius: 20, resizeMode: "cover" }}
style={{ borderRadius: 20, overflow: "hidden" }}
>
<Text className="text-white font-baloo text-[11px] text-center leading-tight shadow-sm shadow-black">
<Text
className={`font-baloo text-[11px] text-center leading-tight ${
isSelected ? "text-highlight shadow-transparent" : "text-white shadow-black"
}`}
>
{t(`soundscape.${item.type}`)}
</Text>
</ImageBackground>
Expand Down
32 changes: 16 additions & 16 deletions blotztask-mobile/src/feature/pomodoro/utils/pomodoro-setting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions blotztask-mobile/src/i18n/locales/en/pomodoro.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
10 changes: 5 additions & 5 deletions blotztask-mobile/src/i18n/locales/zh/pomodoro.json
Original file line number Diff line number Diff line change
Expand Up @@ -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声音"
}
}
24 changes: 12 additions & 12 deletions blotztask-mobile/src/shared/constants/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert package lock json. copy and paste package lock json from main to revert

Expand Down
Loading