From ce51ed076cf55c98d8d69dfd28cedd4e9a60549a Mon Sep 17 00:00:00 2001 From: Mateusz Grzegorzek Date: Thu, 30 Sep 2021 17:37:32 +0200 Subject: [PATCH] [BH-925] Replace placeholder icons with final ones Replace placeholder icons with final ones. Replace old bad icons with a new good one. --- art/bell/alarm_snooze_W_M.png | Bin 281 -> 0 bytes ...ging_W_G.png => bell_alarm_ringing_W_G.png} | Bin art/bell/bell_alarm_ringing_W_M.png | Bin 808 -> 0 bytes art/bell/bell_alarm_snooze_W_M.png | Bin 697 -> 281 bytes image/assets/images/bell/alarm_snooze_W_M.vpi | Bin 773 -> 0 bytes ...ging_W_G.vpi => bell_alarm_ringing_W_G.vpi} | Bin .../images/bell/bell_alarm_ringing_W_M.vpi | Bin 973 -> 0 bytes .../images/bell/bell_alarm_snooze_W_M.vpi | Bin 1065 -> 773 bytes image/assets/lang/English.json | 2 +- .../apps-common/widgets/AlarmSetSpinner.cpp | 2 +- .../windows/BGSoundsPausedWindow.cpp | 2 +- .../windows/PowerNapSessionEndedWindow.cpp | 10 +++++----- 12 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 art/bell/alarm_snooze_W_M.png rename art/bell/{alarm_ringing_W_G.png => bell_alarm_ringing_W_G.png} (100%) delete mode 100644 art/bell/bell_alarm_ringing_W_M.png delete mode 100644 image/assets/images/bell/alarm_snooze_W_M.vpi rename image/assets/images/bell/{alarm_ringing_W_G.vpi => bell_alarm_ringing_W_G.vpi} (100%) delete mode 100644 image/assets/images/bell/bell_alarm_ringing_W_M.vpi diff --git a/art/bell/alarm_snooze_W_M.png b/art/bell/alarm_snooze_W_M.png deleted file mode 100644 index af93d4562ad4c60ed9261d6684ec83a39a3fcb43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%u?6^qxB}__|Nk$&IsYz@wbIkYF{I+wn`w?h4F(*{kN?}h z4UN`N3|Y=@QGUHpLvu%0tJszWtaBKGpR#PwQaoVJ^ydfnHmBUjW{p)7w^R#!+;iYz zX5;bAOmBo%Jbv?ePQt<9Ceia8(`wRYteO~h*2OeLd0wxH>9vWxS3imfXg#R^z|r_i z&&FT#z0;MQD|$8W2|W1`IpK+{W1_QT;Dl#qBQH$XX{_fIxhKF-*d?PaA+mSv_J;M* b4U7!^`Mf)1`0})Xj%M(5^>bP0l+XkKr)6!G diff --git a/art/bell/alarm_ringing_W_G.png b/art/bell/bell_alarm_ringing_W_G.png similarity index 100% rename from art/bell/alarm_ringing_W_G.png rename to art/bell/bell_alarm_ringing_W_G.png diff --git a/art/bell/bell_alarm_ringing_W_M.png b/art/bell/bell_alarm_ringing_W_M.png deleted file mode 100644 index 6b0b857e8b04b31b938fae97ac48524828937aca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmV+@1K0eCP)jPXf`MtIGw=WAjt%{6Eqvx8#JB3bOJjQxZJb!I22-z7$j`& z_uf4V5W2fhLKp#{D2k#e%2fG)I3%UbO1rV;b!op!D{!Wmj&(Ps?LFIcZ080ez@SP- z${)N=-q}jnhGF#$BJrcNEe-;t!gFZ2?_2Cj*j8qJcO5ysK*_rvNbJ5uaGpUw0wkY7=%yWje^9B(cOxd5Z)3$3hKDY9yWfHtdQ~*pI6#x@Q1;E5n0Wfh+6~G`q z*N6lyjD%bWJ+?F!{8jl_l8++7*pd$_!dR0JBEr~{A6$ebfc=?R4k3~iAqTy5prxiU zEQ1|`R)`*RD2k$75dQ)2FpB!iuE3xG0000eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM000J1OjJbx00960|E1ZV-2eapsYygZRCwC#mO&DLFbD(V|3B?jTPPt^ zrw2H9*KsH*xQc}qw4eo?08`}zuqq+IHv;_l3${XS<2HeMk$<#%5b?ag;c0=#vjXfA zsN?MOoM6FIf)&pQmV9QIs*zUBL^V_+o{cm$){za>@e~j$;D7K4f%+~yPbu$0)VZjQ zDc%s|_*szT9YJA3K~a$A%~{ZwEP;Os6y6X3af%!(7!0f0BBXdc_SOq;jdUp}hKR@*MEhe62ku4wZYUPymB`hgoKDj2{>u zGW`#yp?4?sM-d-Z`X%)Ok0IlUQ~`C_pA!wn3?2?gdfL|*Z%afBPoSq>j-&*RGp6}k z_iz*{`_hosaDNN|y*;l|0mlYo26N_XWzc|*&5*!pN?#5V0$n*CkMB~2NzJQQtHe+| ztt3gxzC=-EWESXH3jbFH%;$6TWwBUv35#$gI$D4R(#17Cm46t9n9a_ItyZh|n40Bs ziQR4o1yugOVUaGoJEfW}lIMA!>#c6ELR@K{dcA30R)0*NdjzmZge%OGQ8N4y*#>>@ z6Tu>bE1=E%dc7WUuMidy7?^=~PPu2Hc21}t(3jO2oWyVP|TDsDuHRoLE|Mje+ z+tNFiAts($Km)``nnS}kjiBC#$`vZ}s`3JL-qeO-y>~{A3j3W*Ub&+wl@6x9w1?R9 zC3eY_+gW8UZB2!=F%6`(X(;j3>>0#KP$T6i?l6`(7iuDLF4R<-L7YqEn|Q`hgxElw zAa=DHK?zj4f)dkJIo^l+ a-Xz|Gx=TINqf(08?yJ}{M&R06dzp8V#Ye)g9LOk)}(af&LyK8$4V~Dd5 z!uacTu3bY6Av0WQZN>1~2$zoVHj;akx;9*Btv$E;P;uy7&0Pg?=;G9WCAF3cUj2z4 z#5&>9)wyFCbE(usZc-QGdvOrGiPNf3AEoY0Ej(u}e3H5~$D}@Zls!br!m+TL=?|6( zkB;!lX2QgJvChs(-O|?}wY77Sn$E$AXzD)yLl)C`kyn~oZZ)S9QE#Kn=xa1uC((2N z7i(1Yt9ojz2j1jKtTx8Yy@_3KsuX({D=o%rI*V=Y{2Jc=~PPu2Hc21}t(3jO2oWyVP|TDsDuHRoLE|Mje+ z+tNFiAts($Km)``nnS}kjiBC#$`vZ}s`3JL-qeO-y>~{A3j3W*Ub&+wl@6x9w1?R9 zC3eY_+gW8UZB2!=F%6`(X(;j3>>0#KP$T6i?l6`(7iuDLF4R<-L7YqEn|Q`hgxElw zAa=DHK?zj4f)dkJIo^l+ a-Xz|Gx=TINqf(08?yJ}{M&T9B@!2)25k2_a*1Uz7BiW z{(Y7TOY8~P^v{<(+I~Xqj{dRItyOKDO1>Low|bs^S2feiFSJH`MO)k1L2poJT0!s7 j%G5$1P-|+SPpCQZM(WOQ@oMU=Pu5hwf92i$-`oBLmRTBp diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json index bffaa6b548b7d6821d4a683483d9ffcca14926ba..0896d6d2e325d17f9bd7f13608fa752adcb946f2 100644 --- a/image/assets/lang/English.json +++ b/image/assets/lang/English.json @@ -614,7 +614,7 @@ "app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "recurring during\nsnooze", "app_bell_settings_alarm_settings_snooze_chime_tone": "Snooze chime tone", "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze chime volume", - "app_bellmain_home_screen_bottom_desc": "Next alarm will ring", + "app_bellmain_home_screen_bottom_desc": "Next alarm will ring in", "app_bellmain_home_screen_bottom_desc_dp": "Deep press to activate", "app_bell_alarm_deactivated": "Alarm deactivated
", "app_bell_alarm_set_not_active": "Alarm set.
Deep press to activate.", diff --git a/module-apps/apps-common/widgets/AlarmSetSpinner.cpp b/module-apps/apps-common/widgets/AlarmSetSpinner.cpp index 6836b020a4ab70f978ed9ede7d61bae00af92543..5627bc8539643d06adf1c9749a76ec2c06449d20 100644 --- a/module-apps/apps-common/widgets/AlarmSetSpinner.cpp +++ b/module-apps/apps-common/widgets/AlarmSetSpinner.cpp @@ -102,7 +102,7 @@ namespace gui alarmImg->setImage("bell_alarm_deactivated_W_M"); break; case Status::RINGING: - alarmImg->setImage("bell_alarm_ringing_W_M"); + alarmImg->setImage("bell_alarm_ringing_W_G"); break; case Status::SNOOZE: alarmImg->setImage("bell_alarm_snooze_W_M"); diff --git a/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp b/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp index f348272be4df21b348b717bdd25fbf05525c5eb3..b7e8634041541e44455293acbd0b2439668ce504 100644 --- a/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp +++ b/products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp @@ -26,7 +26,7 @@ namespace gui auto body = new gui::VBox(this, 0, 0, style::window_width, style::window_height); body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); - new gui::Image(body, "pause"); + new gui::Image(body, "big_pause_W_G"); auto text = new gui::Text(body, 0, 0, body->getWidth(), bgSoundsStyle::pause::textH); text->setText(utils::translate("common_paused")); diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp index d00f68664d1a8397a5ff5b416823d7bc5fa82bc9..4bd311e58fc454c5404e2bca66b2eaff2d719a15 100644 --- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp +++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp @@ -14,7 +14,7 @@ namespace gui { PowerNapSessionEndedWindow::PowerNapSessionEndedWindow( app::ApplicationCommon *app, std::shared_ptr presenter) - : WindowWithTimer(app, gui::window::name::powernapSessionEnded), presenter{std::move(presenter)} + : WindowWithTimer(app, window::name::powernapSessionEnded), presenter{std::move(presenter)} { buildInterface(); } @@ -28,14 +28,14 @@ namespace gui void PowerNapSessionEndedWindow::buildLayout() { - auto body = new gui::VBox(this, 0, 0, style::window_width, style::window_height); + auto body = new VBox(this, 0, 0, style::window_width, style::window_height); body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center)); - new gui::Image(body, "tethering_notification_icon"); // TODO: ICON!!!! + new Image(body, "big_namaste_W_G"); - auto text = new gui::Text(body, 0, 0, body->getWidth(), powerNapStyle::sessionEnd::textH); + auto text = new Text(body, 0, 0, body->getWidth(), powerNapStyle::sessionEnd::textH); TextFormat format(FontManager::getInstance().getFont(powerNapStyle::descriptionFont)); - gui::text::RichTextParser parser; + text::RichTextParser parser; auto textParsed = parser.parse(utils::translate("app_bell_powernap_session_ended_message"), &format); text->setText(std::move(textParsed)); text->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));