diff --git a/app/components/Settings/BottomScreen/Menus/Clock/Alarm.vue b/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue similarity index 98% rename from app/components/Settings/BottomScreen/Menus/Clock/Alarm.vue rename to app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue index d819b97..60ade11 100644 --- a/app/components/Settings/BottomScreen/Menus/Clock/Alarm.vue +++ b/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue @@ -37,7 +37,7 @@ const handleCancel = () => { const handleReset = () => { confirmationModal.open({ - text: $t("settings.clock.alarm.resetConfirmation"), + text: $t("settings.clock.achievements.resetConfirmation"), onConfirm: () => { achievements.reset(); }, diff --git a/app/components/Settings/BottomScreen/Menus/Clock/Menu.vue b/app/components/Settings/BottomScreen/Menus/Clock/Menu.vue index c91ca2d..77bd5c3 100644 --- a/app/components/Settings/BottomScreen/Menus/Clock/Menu.vue +++ b/app/components/Settings/BottomScreen/Menus/Clock/Menu.vue @@ -43,7 +43,7 @@ onRender((ctx) => { 0, -96 + animation.stage2Offset + animation.stage1Offset, ); - assets.images.settings.topScreen.clock.alarm.draw( + assets.images.settings.topScreen.clock.achievements.draw( ctx, 0, -48 + animation.stage1Offset, diff --git a/app/components/Settings/BottomScreen/Menus/Menus.vue b/app/components/Settings/BottomScreen/Menus/Menus.vue index efec0a4..3580ce9 100644 --- a/app/components/Settings/BottomScreen/Menus/Menus.vue +++ b/app/components/Settings/BottomScreen/Menus/Menus.vue @@ -11,7 +11,7 @@ import UserUserName from "./User/UserName.vue"; import UserPersonalMessage from "./User/PersonalMessage.vue"; import ClockMenu from "./Clock/Menu.vue"; -import ClockAlarm from "./Clock/Alarm.vue"; +import ClockAchievements from "./Clock/Achievements.vue"; import ClockDate from "./Clock/Date.vue"; import ClockTime from "./Clock/Time.vue"; import TouchScreenMenu from "./TouchScreen/Menu.vue"; @@ -40,7 +40,7 @@ const { select, selected, selectorPosition } = useButtonNavigation({ optionsStartUp: [31, 23, 49, 49], clock: [79, 119, 49, 49], - clockAlarm: [79, 71, 49, 49], + clockAchievements: [79, 71, 49, 49], clockTime: [127, 71, 49, 49], clockDate: [79, 23, 49, 49], @@ -58,7 +58,7 @@ const { select, selected, selectorPosition } = useButtonNavigation({ settingsStore.openSubMenu(buttonName); } else { if (buttonName === "options") select("optionsLanguage"); - if (buttonName === "clock") select("clockAlarm"); + if (buttonName === "clock") select("clockAchievements"); if (buttonName === "user") select("userUserName"); if (buttonName === "touchScreen") throw new Error("Not implemented"); } @@ -86,21 +86,21 @@ const { select, selected, selectorPosition } = useButtonNavigation({ clock: { left: "options", right: "user", - up: "clockAlarm", + up: "clockAchievements", }, - clockAlarm: { + clockAchievements: { down: "clock", up: "clockDate", right: "clockTime", }, clockTime: { down: ["clock", false], - left: "clockAlarm", + left: "clockAchievements", up: ["clockDate", false], }, clockDate: { right: ["clockTime", false], - down: "clockAlarm", + down: "clockAchievements", }, user: { @@ -175,7 +175,7 @@ const viewComponents: Record = { optionsLanguage: OptionsLanguage, options2048: Options2048, - clockAlarm: ClockAlarm, + clockAchievements: ClockAchievements, clockDate: ClockDate, clockTime: ClockTime, diff --git a/app/components/Settings/TopScreen/Notifications.vue b/app/components/Settings/TopScreen/Notifications.vue index 8492b00..577ad66 100644 --- a/app/components/Settings/TopScreen/Notifications.vue +++ b/app/components/Settings/TopScreen/Notifications.vue @@ -40,7 +40,7 @@ const IMAGES_MAP: Record = { clock: assets.images.settings.topScreen.clock.clock, clockTime: assets.images.settings.topScreen.clock.time, clockDate: assets.images.settings.topScreen.clock.date, - clockAlarm: assets.images.settings.topScreen.clock.alarm, + clockAchievements: assets.images.settings.topScreen.clock.achievements, user: assets.images.settings.topScreen.user.user, userUserName: assets.images.settings.topScreen.user.userName, diff --git a/app/stores/settings.ts b/app/stores/settings.ts index 3f9dc00..630e712 100644 --- a/app/stores/settings.ts +++ b/app/stores/settings.ts @@ -4,7 +4,7 @@ export type SettingsButton = | "options2048" | "optionsStartUp" | "clock" - | "clockAlarm" + | "clockAchievements" | "clockTime" | "clockDate" | "user" diff --git a/app/utils/settings.ts b/app/utils/settings.ts index fea136d..4ddbee7 100644 --- a/app/utils/settings.ts +++ b/app/utils/settings.ts @@ -9,7 +9,7 @@ export const SETTINGS_SUB_MENUS = [ "optionsLanguage", "options2048", "optionsStartUp", - "clockAlarm", + "clockAchievements", "clockTime", "clockDate", "userBirthday", diff --git a/i18n/locales/en.json b/i18n/locales/en.json index 7ff1dc6..f47f29d 100644 --- a/i18n/locales/en.json +++ b/i18n/locales/en.json @@ -52,9 +52,9 @@ }, "clock": { "title": "Clock", - "description": "Change date, time, and alarm settings.", + "description": "Change date, time, and achievement\nsettings.", - "alarm": { + "achievements": { "title": "Achievements", "description": "Manage your achievements.", "resetButton": "Reset Achievements", diff --git a/public/nds/images/settings/top-screen/clock/achievements.webp b/public/nds/images/settings/top-screen/clock/achievements.webp new file mode 100644 index 0000000..d132808 Binary files /dev/null and b/public/nds/images/settings/top-screen/clock/achievements.webp differ diff --git a/public/nds/images/settings/top-screen/clock/alarm.webp b/public/nds/images/settings/top-screen/clock/alarm.webp deleted file mode 100644 index bb610fb..0000000 Binary files a/public/nds/images/settings/top-screen/clock/alarm.webp and /dev/null differ diff --git a/public/nds/images/settings/top-screen/clock/clock-active.webp b/public/nds/images/settings/top-screen/clock/clock-active.webp index 38ee59f..3b2814c 100644 Binary files a/public/nds/images/settings/top-screen/clock/clock-active.webp and b/public/nds/images/settings/top-screen/clock/clock-active.webp differ diff --git a/public/nds/images/settings/top-screen/clock/clock-disabled.png b/public/nds/images/settings/top-screen/clock/clock-disabled.png index f8bdb60..34f21f0 100644 Binary files a/public/nds/images/settings/top-screen/clock/clock-disabled.png and b/public/nds/images/settings/top-screen/clock/clock-disabled.png differ diff --git a/public/nds/images/settings/top-screen/clock/clock.webp b/public/nds/images/settings/top-screen/clock/clock.webp index 9359ac0..95c81b7 100644 Binary files a/public/nds/images/settings/top-screen/clock/clock.webp and b/public/nds/images/settings/top-screen/clock/clock.webp differ