From 452569bce8c61bc1c48496b56014b8eeba7da5a7 Mon Sep 17 00:00:00 2001 From: Pihkaal Date: Fri, 30 Jan 2026 22:17:48 +0100 Subject: [PATCH] feat(settings/clock): rename alarm -> achievements and update icons --- .../Clock/{Alarm.vue => Achievements.vue} | 2 +- .../BottomScreen/Menus/Clock/Menu.vue | 2 +- .../Settings/BottomScreen/Menus/Menus.vue | 16 ++++++++-------- .../Settings/TopScreen/Notifications.vue | 2 +- app/stores/settings.ts | 2 +- app/utils/settings.ts | 2 +- i18n/locales/en.json | 4 ++-- .../top-screen/clock/achievements.webp | Bin 0 -> 370 bytes .../settings/top-screen/clock/alarm.webp | Bin 438 -> 0 bytes .../top-screen/clock/clock-active.webp | Bin 322 -> 340 bytes .../top-screen/clock/clock-disabled.png | Bin 6342 -> 8379 bytes .../settings/top-screen/clock/clock.webp | Bin 336 -> 352 bytes 12 files changed, 15 insertions(+), 15 deletions(-) rename app/components/Settings/BottomScreen/Menus/Clock/{Alarm.vue => Achievements.vue} (98%) create mode 100644 public/nds/images/settings/top-screen/clock/achievements.webp delete mode 100644 public/nds/images/settings/top-screen/clock/alarm.webp 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 0000000000000000000000000000000000000000..d1328081e2420bde747020c94137ee23193d4915 GIT binary patch literal 370 zcmV-&0ge7rNk&F$0RRA3MM6+kP&iCo0RR9mEC34t*Ptkp)M#*n1x(?aSHAZh5sKQj zfl@|$jX$h=Qxr*RG!oE_GF+g95K=Ot>8sMq;VROs^V^IP$MME@PRZRAKYph+9Fr~Sj>yFGaBzw^3I7Z-e; zn~Oh9f$VKD-cm5mtRNDy0fB}mgXtTaMc{p8Wly#sKiDkL&d_>JMBF4msS4jGRRvU1 zmVl6|MpYHOkF4y;t}38GRZy-|l%T5WV-)dyVEiN~iMnEYZs-{EeKKqT#|U)SiGF?o z16#l`GT}KtHAp#4F+Iy9Y*3nz^mj{jQpb9L-&?vhNKZeO5+##t~ud3heYo*9!M%GVEFHVi;w$`L>H^WbxAc QFfU$0yylMk|F7>30GST3TmS$7 literal 0 HcmV?d00001 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 bb610fbb33d2c01e96a67a57f24d96b5b44d2e90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmV;n0ZIN+Nk&Gl0RRA3MM6+kP&iDX0RR9mEC34t7ojMUq-ItED$sx_eDmX(Gk8$c zNQ%_$0vG)7FAMfm3`vrd2*W*OW3k^wxOeCO2M%@bd?w@>9?=Mp#PA<9@bT3|yZH&0 z`9DWO1U3U=0tB#R+ilw@fjj92$EFn{YWrU$`2f&0zY+a+;I?ff$$&6dFz(DAf4Dt1 zzs)1_>U{O`5G%f=eTe^IbxlKaa}`}fP2*~Yoky97Xl|}zpd1;o1tD|QpK?4A1Y014 zD%&-(Hi>|_(SA|3y9HTmBU-3UWU++yi;@*KFgo;D0UH1-P^p#Y+_Zvoz14!H%iYhy^M=R(Ufvurf6+ITCE1$cyS5^%wv_F`ioV^>IF5d5vUbH74 z>9sY^cEzUDYN$g-TYSRKf6V*?C?nH*g?huirH4Ojw>fM gmpt8RUw8WnIwO}y>0CHp9wp>ac{mUM|9xz30BY36TmS$7 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 38ee59f0d80540a90f7ef16d104f5572453110ab..3b2814c1ea4283d02cf7c317835481e0bd5e0967 100644 GIT binary patch literal 340 zcmV-a0jvH}Nk&FY0RRA3MM6+kP&iCL0RR9mEC34tU!W!c0Y?9_oa+_BXaF+)f6f~k zk*%m{+kgp_@JHD3%s;^-O|>1felmEl|=ZWY)+O}Qs~KBT=}Z3)Mu`zzkemYm literal 322 zcmV-I0lofGNk&FG0RRA3MM6+kP&iC30RR9mEC34tbvTi2w{G^omBPT%!YrZC&@iwp ze$rF_)EaptBW)uM&cCszV-L@Uk+zX@l{EVB;P>Bw+cu6Q1KPgpT>Zo4{>6FVmHBw~ zb^BgoNp0;V{?9rT5f7Y>NZdl7jRFa^cUS|B5TY!DBNPQwrNOF#>40j{0)!lJwY?h? z&Lo__3}36e U;zbIecW!SJGjP0lf8TuX&CKow^5Vwg{KWXFap&Ab zdtr7dl^5}A9(6A1oc?}1Rg$%(`I+R$w+qiwW#s;JXWF?>ua5n>+er1+y@jQYb5GAZ zx4z-rPHI~3Irr$YbDJy9U47%+$$LPm$xYb2=$H%10>?hB>C>OEH;(N$}m zAh7$MV^i>B>lh@Z50=Kf1kX8dc?se*lIQKo5YzRP`K9IB*$-=f20fhY7 zQ3NxVf?#=#pi3Y0qJex=Z!(u)a$W?g{btV*R0WiacyQec22_!?U4OIRRhTl@w}Y32 zjzJ}FXl;xSAF%JS)l>G%@>w>yPeEWL%U}zPHccV}&bw`}>n9+A@+5L_;ewlohZTPS z;$zj4nw;4R&641>=Sf*bA7duS06Djq!cV)5?E{vM(3}LclsN+dlcAQmzzmcDnCr)? zW=dV=na54;u$&_?Z*hVKj~l@#nG_>~J=QIV0XEMu0IIM>evmN&1|78l`&Lxxr&U#L zZ|T~Atty6Pt8M>=MbN_WXM;|>>3Hk^7pdQ>hqBX$lJuVA!DCWJwpy(+VFSg4KFBJO zCYx@zo4taEaRQSgv2OPa-6@$`kHCk=quVRe`{oll`W9p5cjGtV!%kQ?8A zp0o_AGS_5?rN7XMbmm#IkhBK3K%|Xdewuu&E;02yNE%zG7t;XLWt?^Mb@4?yaV@!T z&uJ7Tiz(7Ava|&|&7fh(qRwi6XiZO=H&h0rGq|w;wEQxbk34ix4jvo&V}3r^h4i|QHr!A!m44jijc8&&HeExvw%K#)MX)MaH_^ckw#~&Gg*~HY<~3d zh+UwLc>g!zL7mT-qIeuV>6qjLj{WuX^>Rv~f&T??x4vHa@bdSAci_~XTb%tkv-12O Dxz=L4 literal 6342 zcmd5;ziX615Z#l6ToMAY@)U~$!Ad2h6hST~Bv&M8uuuevSl9-lA~p$PW0l6jBCVYW zww7X}|AAdPqlKgliG^?TK4#};_xo{oA94$~nVo&}X7=rmFK=$IEze9{m~zg|bXOMF z@%O6#HP1NL__Dq90E5QX`tm~K$G0on7>qsXtahCHv^)Lx(KyEK$1Cfr&b_?s+|Fy~ zj^WxlaPHZhbH6v7yZ+9(bDMjg@7%z|_a+->TYr8wPEJmM(rpZbg99W9&AZTMXJ=^~9v)%=VN9<_9UUD> z4^6B z#n2#~=BFLDn99bWj00@cH|7|_9H(VY(_kv0y+A`9#$|@(s+S`SWpbF+TCjb|FmZCL zGS$R8n32n3&Vyk$vz`T;U_cmhjW`;x<6c5&^qfbc5yn$P1AS==D-sIEfJnGXS^Q1| zjly`<;{Yi>o`MHaNFP>2wB{;~*Q9}k-s+JF7F~j#u4vbA1HuMX%o)RmxuRLfk@SVDN@0ZLP7L^59I@D%a6gvVUMBoSaZmT4_cFRkwone25|yAYk6MD)bH z)YVf3aZC$@9>%pKC>S6UG{i|m_k!%HLcCmp3}F;hVYL8SGHVK*-vGj-1tL^w8@NT+$$t+7O^)^Xw#5t{zErsk2T!3X&lW4g@cY z-Zcry(?I(Ltc}Ed;W5@A*vO4WgS~<25`mO*lQzl8K-$E#kEVML)S9(N+6Ne^iJ!cS39R|qs#W(kcqU|nb+Zon5W_l2 zO>UbuCu#4P2R8dhkvsexc_8|WP=)ZLL9!#v*~m#v%d*`9aL-8X0XHE5d@@#NKtTdz y3haDIA)A)u-a`R{ZgM8vWSo6Je>WLFdkR$wx}V}8g%iINPKVr*N?-ba&`k^@Hla}f literal 336 zcmV-W0k8g2Nk&FU0RRA3MM6+kP&iCG0RR9mEC34tbwG_INs^?-iLol22rJI0aOy2Q zII!WtL)(+}>`yao%4&?XjWqve4jw!UFXJT)8fGJ@dZ)6#RalIp?Y{%JZ5&Akw0+mP z`iHN-JLezw%+s@U=lor4;puW0e`ftbQcp{bTj<$Hh}_=F1{xuOQddZh6p5X%D@7V` zZCZekDz|+lBWQ%guT52E|2bb}6}c+jpHP`Vhad_4tQ=yoiUq4f01;P1+-4XeNw|~k z5$&HdAae!+a3|X%+TVyXNL0X0sG${`{Q|%W#MO$v_U$b}foT6!H?njz;M)rY;{AOk zq0Km&n}mMh+sr6~D~YFz!lb_Y60&rRX(o(d|7iV2MXSvlbit0Dca!w*m3CzI{a%}v iX43m^bruHaIf5*yZ`^*HwOUB4WE(#