From 9d8e2828afa350338965a99994991a8fc477bd65 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sun, 14 Jul 2024 22:53:38 +0300 Subject: [PATCH] cleanup icons, update text --- applications/settings/about/about.c | 37 +++++++------------ assets/icons/About/Certification1_103x56.png | Bin 3038 -> 0 bytes assets/icons/About/Certification2_46x33.png | Bin 229 -> 0 bytes 3 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 assets/icons/About/Certification1_103x56.png delete mode 100644 assets/icons/About/Certification2_46x33.png diff --git a/applications/settings/about/about.c b/applications/settings/about/about.c index 1669e335a..9356901b9 100644 --- a/applications/settings/about/about.c +++ b/applications/settings/about/about.c @@ -74,11 +74,12 @@ static DialogMessageButton unleashed_info_screen(DialogsApp* dialogs, DialogMess const char* screen_header = "Unleashed Firmware\n"; - const char* screen_text = "Play with caution.\n" - "Not for illegal use!"; + const char* screen_text = "Is for experimental purposes only " + "and is not meant for any illegal use! " + "We do not condone any illegal activity."; dialog_message_set_header(message, screen_header, 0, 0, AlignLeft, AlignTop); - dialog_message_set_text(message, screen_text, 0, 26, AlignLeft, AlignTop); + dialog_message_set_text(message, screen_text, 0, 11, AlignLeft, AlignTop); result = dialog_message_show(dialogs, message); dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop); dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop); @@ -89,9 +90,9 @@ static DialogMessageButton unleashed_info_screen(DialogsApp* dialogs, DialogMess static DialogMessageButton unleashed_info_screen2(DialogsApp* dialogs, DialogMessage* message) { DialogMessageButton result; - const char* screen_text = "Custom plugins included\n" - "For updates & info visit\n" - "github.com/DarkFlippers"; + const char* screen_text = + "This firmware is free and\ndistributed under\nthe OpenSource license.\n" + "If you paid any money for it - you got scammed."; dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop); result = dialog_message_show(dialogs, message); @@ -100,24 +101,15 @@ static DialogMessageButton unleashed_info_screen2(DialogsApp* dialogs, DialogMes return result; } -static DialogMessageButton icon1_screen(DialogsApp* dialogs, DialogMessage* message) { +static DialogMessageButton unleashed_info_screen3(DialogsApp* dialogs, DialogMessage* message) { DialogMessageButton result; - dialog_message_set_icon(message, &I_Certification1_103x56, 13, 0); + const char* screen_text = "Community apps included in\nall builds except `c` build\n" + "For updates and more visit:\n" + "github.com/DarkFlippers"; + + dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop); result = dialog_message_show(dialogs, message); - dialog_message_set_icon(message, NULL, 0, 0); - - return result; -} - -static DialogMessageButton icon2_screen(DialogsApp* dialogs, DialogMessage* message) { - DialogMessageButton result; - - dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10); - dialog_message_set_text( - message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter); - result = dialog_message_show(dialogs, message); - dialog_message_set_icon(message, NULL, 0, 0); dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop); return result; @@ -197,11 +189,10 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage* const AboutDialogScreen about_screens[] = { unleashed_info_screen, unleashed_info_screen2, + unleashed_info_screen3, product_screen, compliance_screen, address_screen, - icon1_screen, - icon2_screen, hw_version_screen, fw_version_screen}; diff --git a/assets/icons/About/Certification1_103x56.png b/assets/icons/About/Certification1_103x56.png deleted file mode 100644 index 6e11bbbb222cc54a3e6883f81522af25fd847e52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3038 zcmb7GX;@QN8V;he)ul=cf&(#HL1^|pBvP^~ic)21m5K^h9>uM#%iJVvjyO-}N0xKmZ+XA>e&;)Pb6~)- z8MaQg7z}2H*iRUY{>Gypmh}|$8~!sT2ZNd30!ihFT;k7Bz-j`ZgyTShL9In`42J7% z&;p7i5W&WQ@sNgx8)`g-!$L|PE{rZANwfkm0rJb#fgzazQblHxf~~}PFSX?wIA{Ph zhyYlFI$5LV7%l=~M!&izkxVY&MZZAyO!K)B>;1&>(;TuhB0whA_tvf_jAx(jpM7 z!5U)%ad0Za!{JaII}#i;K;zLh`jPTcA&5qVNG6bo6V0^=FaqlnVC@*AcYMa+_Z$&O z^?^J__2 zw9!ncyI7+~0F441b%(~?eg1;`N*#nw4Ip_k77ReCWYZW-JWW9Z@k}a>hK~c73Ot|y z04ktTGC(TBbd<4Nl(?}JPzR-fN?#qU9y!3qUF9SN(&k(xcBi!?b0dJ0W0-d1YQELngk)kz>pV zD2&aFa^kOg;UqR@^cyCf*Fz$J&c|Uuu3vxW~ zz037lo4rGRElu<7w-Md$kxq5Bs+Ouzwwb#lKqWf`!Wo zcZ-ktRNbS~FYLai-`)EA?qP1}@ce4utIK_>9&PexRBf~TAM ze;~o#{=mKyJ+b7z9bFZ&-@8wRo^tH`q`JdqoBQEH2N#E#gnP0A=7z}aQY7f5{8(6l zoo&pn%!;O!i``bd0*-!a^XHjciyr#Fx$_e-G&sUn9-Zr1KydedL5{gPyER~?_@O<# z%*`L;8nD>$?6x9{jo|Y;&4RLu@^5~ATk0(i(0#H~7TPAqiL<#U_I-LFGb)b%^jHqf zQ}y=kbJ@y|GM8U>UK2PR>quM`+m+S25BOoox%r-jwC8MieMwo@y1ilTTfob8cDZyG zo0wFCXRX?F!;5}cbm|`-DM>hs)@5xhyURtfWyEI>|mxxkth$^N4M&8DZ; zH)na;4_Z1c%8dlSl*|(zw8}_usp|B6ExOXcjq2QyIeY4Tx7ktapvu*_%FwpAIT5Yd z?QS+@?my}|Q)`~gb=WBPoZCHglOA`siE!NO;9$KdOaEfKn;ai_ySJmDJ$8|Q;xu(P zR5{qfCid*TzN@hz*H&o_t_i|v{+84@?M+_5ZM*j288=VA?yuQiM?UGyjI626sgqDJ zM*};bEobdNQ$}ZeT%TIo?g1Wfin)Aiw_~0hD{J8M!|Nqevt*6Xap&`$++*MGkNBwJ zhw3Qwwm|o#u3?+2I^L@lK%xA+BFE=$v-H{!yX+ zQD}p#v#xgaz37EuJA&r=NPF`4lw6VzB&q+f>N(H*Sh^*lZ`Enb24;Cl#*^MJPUL=F zT7KNkPhz? zwDvxyt9OrWi{BtpY#ww9d2p)OZhiae2R)6662q2&8=ImA|L(M&*pWzjW!3FL70)|V z`k2M$KHiSEt_@Y&clzFF+-$jv8=k?mRX5!#%3PP7m)IGy_N+tVcT!GYWBQAyLH7H7 z3eH~;Cm*oAPz}wEDOgCZGCXdJcJWPYjPWDwzx5q(vj58TgV$z;$T8bmY-%S76Kh uKZdmO;a~c@3d^&-1;=T zdEV~dE9_2v2<2Pid?=n_o3MCO-A5)qmHYo@Jp3jwB`^7eym+fxoxz8QtS6Qam1Y|! zr_NbyeOvU-CA$l&z7_nH6v>?!`zVuf^AS(s0M|6%%_#=?UdNv8|9>xd*oX c{KsLyP+HH}pmOhIG0>F^p00i_>zopr08YJL$p8QV