From 5085a17bcb6fbe74fc8d874ef371aedc45d71d2f Mon Sep 17 00:00:00 2001 From: ushastoe Date: Sat, 29 Apr 2023 18:16:53 +0300 Subject: [PATCH 1/2] HID app refactor --- .../external/hid_app/assets/OutCircles.png | Bin 0 -> 2469 bytes .../hid_app/assets/Pause_icon_9x9.png | Bin 4559 -> 1743 bytes .../hid_app/assets/Pin_back_arrow_10x10.png | Bin 0 -> 4575 bytes .../hid_app/assets/Pressed_Button_19x19.png | Bin 0 -> 1790 bytes .../external/hid_app/assets/S_DOWN.png | Bin 0 -> 1893 bytes .../external/hid_app/assets/S_LEFT.png | Bin 0 -> 1906 bytes .../external/hid_app/assets/S_RIGHT.png | Bin 0 -> 1902 bytes applications/external/hid_app/assets/S_UP.png | Bin 0 -> 1886 bytes .../external/hid_app/assets/Voldwn_6x6.png | Bin 3593 -> 4556 bytes .../external/hid_app/assets/Volup_8x6.png | Bin 3595 -> 4564 bytes .../external/hid_app/views/hid_media.c | 51 +++++++++++------- .../external/hid_app/views/hid_mouse.c | 26 ++++----- .../external/hid_app/views/hid_tiktok.c | 42 ++++++++------- .../external/hid_app/views/hid_ytshorts.c | 33 +++++++----- 14 files changed, 86 insertions(+), 66 deletions(-) create mode 100644 applications/external/hid_app/assets/OutCircles.png create mode 100644 applications/external/hid_app/assets/Pin_back_arrow_10x10.png create mode 100644 applications/external/hid_app/assets/Pressed_Button_19x19.png create mode 100644 applications/external/hid_app/assets/S_DOWN.png create mode 100644 applications/external/hid_app/assets/S_LEFT.png create mode 100644 applications/external/hid_app/assets/S_RIGHT.png create mode 100644 applications/external/hid_app/assets/S_UP.png diff --git a/applications/external/hid_app/assets/OutCircles.png b/applications/external/hid_app/assets/OutCircles.png new file mode 100644 index 0000000000000000000000000000000000000000..f34d2687a6b1c03b312899572ce3dc6c2fb7af13 GIT binary patch literal 2469 zcmcIm32+lt7*6Xzu>~1H$_+b8NG&vlD9qT+?j~JHvLU;rX|*a) zs8AWFWu$-{au?(nK~W9`idGl|vC5${fH*Bh1Um@jC`WypCIu9bVaCjC_U-0--~YY; z|Ni$fJ3DJ+m-s&M8jYrlEz>d%+(&?m>=X;WSFikiIk-I?$b3cCXcD@sSBz%S;$9j} z94tDViqk%Z;Uu4yFbEgq-OM=4h)6K- zWP+4~o+?jba2!5C}jZa*i-+|E7;{iy z6)EVDByY4*+0lp)L1}R)d4lNYr9wGHRTP;ZSXf0c!Juj+f>8*eb6_|q8AH;k7|CE* z8`KVrz_SYb53tdJVQPs<-F;w*7u`jV1GU>3n_pH~KPT8MCK!m)iXzYOdW>dy%7xGb z>qc}2%7D0Vy&Dl&(q$kyo~ML1U0}XN;tJGEsPo%=%S#;KXwN1?=}3-rQ5-_hm>bbk zlpdj7f&rl@N=K8Fo7ItIc$I+d<)8>!hxOjes;c4vBgPqd4%3qeM;ToR##1z6Bv=kH zP;MjPa=Qo&*TK-;xMs;K1?>_KvJ3cmj&Vyt9}D~=`dE*E2K*k?&43-m%@k!&x}r#b zU9&$sYMoeIPzM2K=vL_XB%x{z5qxcQT#TTEV-3JHYj9xK&JoG zT%{}<_zv~u~Z-y?vX z6NR6AF^}is2iD==ef1=Dc<^FSb-!$L82V51-8FBt0Wv^qs@9YvH66}++N+x$?F_>R z%t%?xdYzffz;UZN!%C3DjTns^F{1&)N2G;gdPOiZJZd9B9~~`>yl0<}P6mgEI&43- zz(f1NC-_0lg5X%|-nVX+MiZN2vt&5(ryYHD@0NW~r=P~$X{{v9UJ zdf=towjG;u{Pm3o>7m!thi*)$?)>%1^j6&0!?R;?-?M*ATQTqFhTa`*eRl1AN>_F+ zhE1?-=v8JWvz89&vZ!0x1#O1|302ABk?#AKl-+v&06cZgsxSN1^eF#+&sfv;qQzz< znHt+~PII6`-P}qhXEHM1wzgA!O9eIXo#%5e*vfy~kz^Y@bkYaY2i7E=?e^JAxub8D zY%;Tz&XXNac|V*~J}I6jrZokYjNY=aS4wRoeQa>ogEO5MQ!h1V`p$gZ^~CKh>xtd5 ziNPUPW;o#UDI+&rABkip5^*tj!_hPEZV+wzbH&&U^pa=Hl>QTh^w6I>500v@z0_Ej zI;*;6!K&EmmZhtpthvp(HtYCi)@IEX=GT8wku$J(>#)K7L$}4$8z1$&IpgwL z^Lv}U*LpiIp%u#uD^84ESJqHrxtUw}4oI0O_OR;l3sWd-MV>MdBcL;m5JV#(iu|X&A6Jzl|RhB?A;}_+@tDm{t;n}&l*S8-} z{k)|9o7MrN&Yga44D{82+r#TRUranZF@JsMrmlJ7$o_ra>QpxYS-Y@$_3~vU-yU!( zNrz&$TG6XzdBw%I$a52GoBp~p@k)6u(;8R&$%fv@*_6ZTA1RwP%d%;B-t@l#cgkqJ literal 0 HcmV?d00001 diff --git a/applications/external/hid_app/assets/Pause_icon_9x9.png b/applications/external/hid_app/assets/Pause_icon_9x9.png index d72d712bbaa47429793bddbab0096de8d95045b4..fe16dc03e2629da128e37a7b9e1ccb11b4c92b78 100644 GIT binary patch delta 682 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 diff --git a/applications/external/hid_app/assets/Pin_back_arrow_10x10.png b/applications/external/hid_app/assets/Pin_back_arrow_10x10.png new file mode 100644 index 0000000000000000000000000000000000000000..e7510fd5dc0084fe0f9b6fdeabf969ed3cfd6466 GIT binary patch literal 4575 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 literal 0 HcmV?d00001 diff --git a/applications/external/hid_app/assets/S_LEFT.png b/applications/external/hid_app/assets/S_LEFT.png new file mode 100644 index 0000000000000000000000000000000000000000..13c9f51b4ee428f92a995efb2bb961c76f7dc247 GIT binary patch literal 1906 zcmcIlONbmr819IM7&n_k4$)j}ItL9}(^cI){bDD(voo{qKxSPwgINzks;jDJ+MVg@ zbocDcE(ks_5Qv}=1w|C`D7g3lbt6Pn#GHIU4iUUY52APw)Pq_*uU%!c?!|$getq@* zUw!}ARTmZ)9yoOH*g;8>4pryNOX7T39CshMMf|_-N$17s_Gtd$M3U|}k{$b`mtVP4 zlJ>tI)R)uc+9{Xtb`DeSv0Sem3A7|lP4^;9R#+-~tPz9-<>$*+6gi*;(Meia6;+0McO*{gYY|hISi(CoVU<-DrpHIc zq9#vy(&RVMHh%pNg_Mj7MxD6Tw}%pywOCtlCjyK5`XaX!Go13c&UtIpsl`!6Su=7- zzV}QJQr=BYWQv9ZSQ)3Rpop&N02)BE>kzt{;~M6DPz>ibKMx<$@wa<${2^3|q*|TNn^eqX7B_0uE+6z{I1FBGWP%>gy8Y%bavFC$jN_ z+)_>i$Jk95X^c=4+JJeM2Otq_n0g*Sp3XF%>b{S?5!-`tAU+-3+RmD(qJmMtnMsiW zu#GHXl;Hq}Il?upQOkxpAyn{e)h+QBk87L?cXdUk#PxaH#v(sK8#kC5g^euDf?dpF zK1f9C)`s85X?AXS)e7W(=v+*)tQQoLHJMRm_&C_Xy}jui&~}?lknYm_0W9Hu+Ql&| zHiXmv87}o^;uE~OyY#&^{(qD{w3Re**kEGiRF!NpYPQ4-nxg)@Ut9eiWu_?7oOLr9 z+Axb7V?$2v98n{$6Wuci&>ZLk(=bfnc+3KZVdNd%@Nr((2P#^@7S|}4)*Q5ra>>k> z^ddr)Qn8}xvo>^)4Q&gexoso+GZ_d{cURs=Zd+zYHi)%5yBzNt;%2<>uuxbQi(Td7 zPjpJ`NZo3=Sht_Kwp5(_Se|(F_rG4djxV4W9=iP5ryo?GID4)7?X6ww-I>XmcQzVt zyjuC@aqlB-v+B=0Vq7$@fBh_2x$WxtKi<1~wDacE&z(AY&r=(}{`vOizDvz3Uw!!7 zjg3$6OP^2Qb?(6TvzuQ|p7>(_rK0)bcj@y#9y|Qlk;=p`Hzt0_cExICq5RhD*(d)7 DzvyO% literal 0 HcmV?d00001 diff --git a/applications/external/hid_app/assets/S_RIGHT.png b/applications/external/hid_app/assets/S_RIGHT.png new file mode 100644 index 0000000000000000000000000000000000000000..e0ba2afd1aefe680ef730165fab4c73892d67709 GIT binary patch literal 1902 zcmcIlONbmr7;Z(DWOWf=APd1x=i(zZUHzEut|pT>J2UGJY_FTmglzN>tE;PLnw{=y zyL)$LS49Xx2@>%j9()`k7{r6%B>|PqMK5{~!3TIXiiqe%4CWwK&-Bc$vRU`yKtJcJ z@BixizpgsJxbWE2nFOH2JQ=4e4Ua;zU?vO+V_rR^Z9NWXn_RT2ZQBAqHb(1~lb z6U=QS^u)$Oi)^eATnKW zJf@A(!YA&S+{dx3lwdxm5zujVhlb%8oo0nl@C|6Vrpmm(lip0C70jLAjYC&i#x~*D|K+T452z7W6Je=XZfteTh>wAGZ zj@^vX3`c}E>lKNMDg}XOYo6gNu8Dw7u>}y-Ens<&0*n;uB7QbaI?%<(*BM#Ooyf-z zbL%m}ImT|Q@Q zO`utZ2~0yb05UKFL?dpQdJqv;k;JXKHP&T`!#wV;CW#)geU^ln=O+kpo62$2&eP1< z`7Gvwl(%lZ_&!e1r;EF8APz!jW0GgRB9Xkw)RT(W!4B^2P3Mrd*P)zrm*x*)Df6=) zPH45wo&L{o$u|?9;GhgX zu4z?8Y1FC>RhzLOQY>hhP?_B}axjyjAbEG?1LU@4c4PxzyYt)euE8J1`woq`WeML^ zl9S)|`Hqw}>(!QZ;fGhNlaC(US6}`0`Sz3d9=vqv*(aXsAvST>`Np}AU0+fkzWevX zFMjjx2d8h$e|_Lu$7-I9_J8`-$uB3azVgx^*ALwH-JchJdF>*)F8}n`=9z1ooA3Sn z*8Iec=!rusBo2rlA)$&3ESyk<+5_T%Km~3H4&2I#BEbc?mT}@_7qngWLL|q3Z{GLj zea|zmwHBT~bny5=Nszj6H1pW^gDJbyNoqz50#kA2eH?;ew+ z``!=Q%h|H`f=hU)V#+&A9fq+$OVY`iVT{QN%j6F022n-%{l@2t9MFogWO>kwYpfT{ zZzSx@#zLEHtPqDPGpFQ}Lst-lEW`3J>_@3PtSBR1S6t_hHANmlvXzQb%?rxQUQ4d= zgvpKy0f7+8Wk=P^Ix))rv$6pVLxZ-amw;}&&~T9{7e7UmOQ`QI*5`_1;;y3fvMhEr zZ7>+915@QmSJNHG(V(Fj1`r64u16Ujf+#&PVW_i|Bte`7Jd$%p+~KQPMG;cRa|q)p zZIl*13CFY{jx}9{`J5&|&)XduhEsH!HP%FxLhp{mX?s0p+9FH&YC>3JjYZjsNwK)c zGoJSNU9?SK|3e`q(}MA8(jVDFiN^XY6x^x6>LY!zTT2+uc+%#)Kj~C!Qc*ULs>@F< z1rg7?F@V)^#wv>Fnh78RhTVqHg(VlEXQ1gqIEH#62oz^{Z(vRXe|;}d&vTnm zn&F7BX1$^aQECuSmonSYZ3+P``wSQaQGj*IfNwe2LIe^UnIm0de4Ufk+=+brIJcA& z!7+8yrM_GA_CxQ5MaDO{%u8IoA4zUc!)G>f2 zB7l_;1|8kPfUpjR4)J{hV@2MoTjPD6c$^A%g<48npC=&}`3XYYWm+6{^E3-~F^l;i z6|Gw@zK=8PmEx)&$fMA?nB-ZnC?sz(qe}5O*ulNM=^WDzdQ6b+()=+j<$gB639EL6 z)BhPR?QY^zytcday*2)SlwR0MdN}Gbv2tokJ{c`vV#ZC;{@t&weorz}6=}}9nHDz8 z;_lRtQ#(f#Stc<%B2|V1eNaNE1e^{l1B8&}n8?SLX^vI&gDtK}Fw1k$M)g|Bs+mIx&3d(MU;gs@FOEt_4&2-N>CT<>@ZpDEx@=s3>-NW&_Pq!`m0nlRe|7D<#)WS; z&wuvB)nBWFcOL&GyZ+ZlS2RQU=ITZN=J4weZoGF4x*hA*ADj2z^TW9xXVMvR?izUR dLThDn|C>wR&!;bbcqQKfn~jC~C$lfV`Zrq^TDbrK literal 0 HcmV?d00001 diff --git a/applications/external/hid_app/assets/Voldwn_6x6.png b/applications/external/hid_app/assets/Voldwn_6x6.png index d7a82a2df8262667a9a03419f437ff9b350e645f..ce487b546812e471bfaf380f3849f954e6c757ac 100644 GIT binary patch delta 1123 zcmbtTO=uHA6rSKu+hki0wNyl8*;c9OW@mr0e>T!I2~D7>u|`F_bhERYEF{@=ciUPI zZ51ztg2;NX(z^#iD0-5DMNeYEgI+v|C&g1iyoeAdrm40HDjwdx+4sJA?|bvjEF4-5t8TqR10U(^UlF7U`J~B*Z z(@Bw4M3LsAEC88>6#&ZB%Jqp154FJC2(EJAgCLsVHCje0I0MP3! zKRz>v6MOTcg>=1M$IEk1U(I6I;bbm)07SYQ76Nyd4`9^&U@5#fphO|9LkLMpiLw%_ zbCP+2W@Qy}s=z-Sjf6rSm71q|etOCe)*^=kiRc48k0P&B8#$!M zsj}}oD#JLFZY65FB?jq?Q8B6*<}qxPWm;ILZ2PuXwu2{;-mcbF z`c0PSB_x})E@=v_7=lJCMHHhAN#+$))FoM$f=5JrUxP(1r=E7Ll2y|x!733uPa<74 zZMUlVamuP{C4+HlC5qe{RZZFz+r`uy^Zgvp;v3=Grd7d-Uv5UQLEMTryJalTx80dj zJTSwdM=Gmq{t+_^`gtd-S31k-yGQX*^LvlitB?m58 zHDphFCy%v?>t(H0GEkgiDCQsd|BW)O7Qf~HALKFjXmjKpba2S0?xN^Q_{8+SWro;(PWD#)E8nEcIY` G;`%p^?M_($ delta 269 zcmX@3+$m$x8Q|y6%O%Cdz`(%k>ERLtq}f22gBeI(7m}}HVBm7jbaoE#baqxKD9TUE z%t>WnsJOM!&xA|2!BSNas7$iNHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD z0|T?-ZW>Ty2*wnMhfPZdWL2OmPRHz3PuKo=K2Qa`i92328LD!W>&_QnJ0dj1BPl)UP|Nnu^ z&_kE&fRwDKi(^Q|t)v7XNMT@fb2DIEB9SN(BCv=>;Q#|;4TIpasE#Q>g$$mqelF{r G5}E+EnMbPt diff --git a/applications/external/hid_app/assets/Volup_8x6.png b/applications/external/hid_app/assets/Volup_8x6.png index 4b7ec66d65178e808c672576150f5773b04c31a4..ee9045f7fde3e4c5e7104bdee4919d7694e34d7c 100644 GIT binary patch delta 1123 zcmb7D&ubGw6rNz!Hc4BdLZuX0HXtp!*_qAe*Vw2@8k#^;W37sK>2zn3EF{@=ciUPI z{UKh8g2*1U(!W7077rpQ;;jb{ir`5P9z+lXZz9BrX{xP)_3(DyzWLsJ-^};sM*r); z*m7ZPq|@8y1psvBvcuzi?clb*eGmVB&fIAP+DgfM5`eW^zVBo&0N$LQP8aO)k(7|j zq$4OEiAYKi0gzo@i>cmA(n#zj&l0rkcpiYOM*vv74!}1aTKovWGz8$&Bmnp>0KMkw z<1<5iV_#u(B2%x|xqI&Ut9ib3nAwXq0KT4vdBDBZLmaj4u6S<_#Dh@MAcR6R9z;>3 zDbeCFL4k@Q!C|ih{#&tiq!(gduEHGjZOadU0+CG(6E@9>Gdv8Vy$a!cC(G5GfOO%EODt5Vv-tDOek!MYzm4RM8d!Yy+(~$ z`}kn1xK<{$5~B%G7Uf;@Ke(_9VOkyjO8@t%_<#C?eC(Q8JLt>5l#sWHu+-#FF@hLfwFgM=*^?A?|g0Tpl_ffrE)mPWyXf@ IrzWrc08aHw1^@s6 delta 274 zcmcbj+%03#8Q|y6%O%Cdz`(%k>ERLtq&a|?je{9Tp1iGpl7WHCIn&uWz|+}Tp`a)~ zEi)&TfuZ8oMn4lS-3CilL7+0p64!{5;QX|b^2DN42FH~Aq*MjZ+{ElzqZ8JJlaTW+4n z&B!>}h}U59Q(g&n7bi0d0|V#D`utLp@-$N^k%G diff --git a/applications/external/hid_app/views/hid_media.c b/applications/external/hid_app/views/hid_media.c index 468529d56..0028ac596 100644 --- a/applications/external/hid_app/views/hid_media.c +++ b/applications/external/hid_app/views/hid_media.c @@ -21,6 +21,7 @@ typedef struct { bool down_pressed; bool ok_pressed; bool connected; + bool back_pressed; HidTransport transport; } HidMediaModel; @@ -55,61 +56,72 @@ static void hid_media_draw_callback(Canvas* canvas, void* context) { canvas_set_font(canvas, FontSecondary); // Keypad circles - canvas_draw_icon(canvas, 76, 8, &I_Circles_47x47); + canvas_draw_icon(canvas, 58, 3, &I_OutCircles); // Up if(model->up_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 93, 9, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 6, &I_S_UP); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 96, 12, &I_Volup_8x6); + canvas_draw_icon(canvas, 79, 9, &I_Volup_8x6); canvas_set_color(canvas, ColorBlack); // Down if(model->down_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 93, 41, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 36, &I_S_DOWN); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 96, 45, &I_Voldwn_6x6); + canvas_draw_icon(canvas, 80, 41, &I_Voldwn_6x6); canvas_set_color(canvas, ColorBlack); // Left if(model->left_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 77, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 61, 13, &I_S_LEFT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - hid_media_draw_arrow(canvas, 82, 31, CanvasDirectionRightToLeft); - hid_media_draw_arrow(canvas, 86, 31, CanvasDirectionRightToLeft); + hid_media_draw_arrow(canvas, 65, 28, CanvasDirectionRightToLeft); + hid_media_draw_arrow(canvas, 70, 28, CanvasDirectionRightToLeft); canvas_set_color(canvas, ColorBlack); // Right if(model->right_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 109, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - hid_media_draw_arrow(canvas, 112, 31, CanvasDirectionLeftToRight); - hid_media_draw_arrow(canvas, 116, 31, CanvasDirectionLeftToRight); + hid_media_draw_arrow(canvas, 96, 28, CanvasDirectionLeftToRight); + hid_media_draw_arrow(canvas, 101, 28, CanvasDirectionLeftToRight); canvas_set_color(canvas, ColorBlack); // Ok if(model->ok_pressed) { - canvas_draw_icon(canvas, 93, 25, &I_Pressed_Button_13x13); + canvas_set_bitmap_mode(canvas, 1); + canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19); + canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - hid_media_draw_arrow(canvas, 96, 31, CanvasDirectionLeftToRight); - canvas_draw_line(canvas, 100, 29, 100, 33); - canvas_draw_line(canvas, 102, 29, 102, 33); + hid_media_draw_arrow(canvas, 80, 28, CanvasDirectionLeftToRight); + canvas_draw_line(canvas, 84, 26, 84, 30); + canvas_draw_line(canvas, 86, 26, 86, 30); canvas_set_color(canvas, ColorBlack); // Exit + if(model->back_pressed) { + canvas_set_bitmap_mode(canvas, 1); + canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19); + canvas_set_bitmap_mode(canvas, 0); + canvas_set_color(canvas, ColorWhite); + } + canvas_draw_icon(canvas, 111, 38, &I_Pin_back_arrow_10x10); + canvas_set_color(canvas, ColorBlack); + canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8); canvas_set_font(canvas, FontSecondary); elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit"); @@ -135,6 +147,8 @@ static void hid_media_process_press(HidMedia* hid_media, InputEvent* event) { } else if(event->key == InputKeyOk) { model->ok_pressed = true; hid_hal_consumer_key_press(hid_media->hid, HID_CONSUMER_PLAY_PAUSE); + } else if(event->key == InputKeyBack) { + model->back_pressed = true; } }, true); @@ -160,6 +174,8 @@ static void hid_media_process_release(HidMedia* hid_media, InputEvent* event) { } else if(event->key == InputKeyOk) { model->ok_pressed = false; hid_hal_consumer_key_release(hid_media->hid, HID_CONSUMER_PLAY_PAUSE); + } else if(event->key == InputKeyBack) { + model->back_pressed = false; } }, true); @@ -176,12 +192,7 @@ static bool hid_media_input_callback(InputEvent* event, void* context) { } else if(event->type == InputTypeRelease) { hid_media_process_release(hid_media, event); consumed = true; - } else if(event->type == InputTypeShort) { - if(event->key == InputKeyBack) { - hid_hal_consumer_key_release_all(hid_media->hid); - } } - return consumed; } diff --git a/applications/external/hid_app/views/hid_mouse.c b/applications/external/hid_app/views/hid_mouse.c index ca299c463..75df53dd1 100644 --- a/applications/external/hid_app/views/hid_mouse.c +++ b/applications/external/hid_app/views/hid_mouse.c @@ -49,66 +49,66 @@ static void hid_mouse_draw_callback(Canvas* canvas, void* context) { } // Keypad circles - canvas_draw_icon(canvas, 64, 8, &I_Circles_47x47); + canvas_draw_icon(canvas, 58, 3, &I_OutCircles); // Up if(model->up_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 81, 9, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 6, &I_S_UP); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 84, 10, &I_Pin_arrow_up_7x9); + canvas_draw_icon(canvas, 80, 8, &I_Pin_arrow_up_7x9); canvas_set_color(canvas, ColorBlack); // Down if(model->down_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 81, 41, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 36, &I_S_DOWN); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 84, 43, &I_Pin_arrow_down_7x9); + canvas_draw_icon(canvas, 80, 40, &I_Pin_arrow_down_7x9); canvas_set_color(canvas, ColorBlack); // Left if(model->left_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 65, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 61, 13, &I_S_LEFT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 67, 28, &I_Pin_arrow_left_9x7); + canvas_draw_icon(canvas, 63, 25, &I_Pin_arrow_left_9x7); canvas_set_color(canvas, ColorBlack); // Right if(model->right_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 97, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 99, 28, &I_Pin_arrow_right_9x7); + canvas_draw_icon(canvas, 95, 25, &I_Pin_arrow_right_9x7); canvas_set_color(canvas, ColorBlack); // Ok if(model->left_mouse_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 81, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 83, 27, &I_Left_mouse_icon_9x9); + canvas_draw_icon(canvas, 79, 24, &I_Left_mouse_icon_9x9); canvas_set_color(canvas, ColorBlack); // Back if(model->right_mouse_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 108, 48, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 110, 50, &I_Right_mouse_icon_9x9); + canvas_draw_icon(canvas, 112, 38, &I_Right_mouse_icon_9x9); canvas_set_color(canvas, ColorBlack); } diff --git a/applications/external/hid_app/views/hid_tiktok.c b/applications/external/hid_app/views/hid_tiktok.c index 9b15d812b..bfa0dbc89 100644 --- a/applications/external/hid_app/views/hid_tiktok.c +++ b/applications/external/hid_app/views/hid_tiktok.c @@ -41,64 +41,68 @@ static void hid_tiktok_draw_callback(Canvas* canvas, void* context) { canvas_set_font(canvas, FontSecondary); // Keypad circles - canvas_draw_icon(canvas, 66, 8, &I_Circles_47x47); + canvas_draw_icon(canvas, 58, 3, &I_OutCircles); // Pause if(model->back_mouse_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 106, 46, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 108, 48, &I_Pause_icon_9x9); + canvas_draw_icon(canvas, 113, 37, &I_Pause_icon_9x9); canvas_set_color(canvas, ColorBlack); // Up if(model->up_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 83, 9, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 6, &I_S_UP); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 86, 11, &I_Arr_up_7x9); + canvas_draw_icon(canvas, 80, 8, &I_Arr_up_7x9); canvas_set_color(canvas, ColorBlack); // Down if(model->down_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 83, 41, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 36, &I_S_DOWN); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 86, 44, &I_Arr_dwn_7x9); + canvas_draw_icon(canvas, 80, 40, &I_Arr_dwn_7x9); canvas_set_color(canvas, ColorBlack); // Left if(model->left_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 67, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 61, 13, &I_S_LEFT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 71, 29, &I_Voldwn_6x6); + canvas_draw_icon(canvas, 64, 25, &I_Voldwn_6x6); canvas_set_color(canvas, ColorBlack); // Right if(model->right_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 99, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 101, 29, &I_Volup_8x6); + canvas_draw_icon(canvas, 95, 25, &I_Volup_8x6); canvas_set_color(canvas, ColorBlack); // Ok if(model->ok_pressed) { - canvas_draw_icon(canvas, 81, 23, &I_Like_pressed_17x17); - } else { - canvas_draw_icon(canvas, 84, 27, &I_Like_def_11x9); + canvas_set_bitmap_mode(canvas, 1); + canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19); + canvas_set_bitmap_mode(canvas, 0); + canvas_set_color(canvas, ColorWhite); } + canvas_draw_icon(canvas, 78, 25, &I_Like_def_11x9); + canvas_set_color(canvas, ColorBlack); + // Exit canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8); canvas_set_font(canvas, FontSecondary); @@ -187,17 +191,17 @@ static bool hid_tiktok_input_callback(InputEvent* event, void* context) { consumed = true; } else if(event->key == InputKeyDown) { // Swipe to new video - hid_hal_mouse_scroll(hid_tiktok->hid, 19); + hid_hal_mouse_scroll(hid_tiktok->hid, -19); consumed = true; } else if(event->key == InputKeyUp) { // Swipe to previous video - hid_hal_mouse_scroll(hid_tiktok->hid, -19); + hid_hal_mouse_scroll(hid_tiktok->hid, 19); consumed = true; } else if(event->key == InputKeyBack) { // Pause - hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_RIGHT); - furi_delay_ms(25); - hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_RIGHT); + hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT); + furi_delay_ms(50); + hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT); consumed = true; } } else if(event->type == InputTypeLong) { diff --git a/applications/external/hid_app/views/hid_ytshorts.c b/applications/external/hid_app/views/hid_ytshorts.c index 44ad02ff0..9be2f853c 100644 --- a/applications/external/hid_app/views/hid_ytshorts.c +++ b/applications/external/hid_app/views/hid_ytshorts.c @@ -41,70 +41,75 @@ static void hid_ytshorts_draw_callback(Canvas* canvas, void* context) { canvas_set_font(canvas, FontSecondary); // Keypad circles - canvas_draw_icon(canvas, 66, 8, &I_Circles_47x47); + canvas_draw_icon(canvas, 58, 3, &I_OutCircles); // Pause if(model->back_mouse_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 106, 46, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 107, 33, &I_Pressed_Button_19x19); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 108, 48, &I_Pause_icon_9x9); + canvas_draw_icon(canvas, 113, 37, &I_Pause_icon_9x9); canvas_set_color(canvas, ColorBlack); // Up if(model->up_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 83, 9, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 6, &I_S_UP); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 86, 11, &I_Arr_up_7x9); + canvas_draw_icon(canvas, 80, 8, &I_Arr_up_7x9); canvas_set_color(canvas, ColorBlack); // Down if(model->down_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 83, 41, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 68, 36, &I_S_DOWN); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 86, 44, &I_Arr_dwn_7x9); + canvas_draw_icon(canvas, 80, 40, &I_Arr_dwn_7x9); canvas_set_color(canvas, ColorBlack); // Left if(model->left_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 67, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 61, 13, &I_S_LEFT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 71, 29, &I_Voldwn_6x6); + canvas_draw_icon(canvas, 64, 25, &I_Voldwn_6x6); canvas_set_color(canvas, ColorBlack); // Right if(model->right_pressed) { canvas_set_bitmap_mode(canvas, 1); - canvas_draw_icon(canvas, 99, 25, &I_Pressed_Button_13x13); + canvas_draw_icon(canvas, 91, 13, &I_S_RIGHT); canvas_set_bitmap_mode(canvas, 0); canvas_set_color(canvas, ColorWhite); } - canvas_draw_icon(canvas, 101, 29, &I_Volup_8x6); + canvas_draw_icon(canvas, 95, 25, &I_Volup_8x6); canvas_set_color(canvas, ColorBlack); // Ok if(model->ok_pressed) { - canvas_draw_icon(canvas, 81, 23, &I_Like_pressed_17x17); - } else { - canvas_draw_icon(canvas, 84, 27, &I_Like_def_11x9); + canvas_set_bitmap_mode(canvas, 1); + canvas_draw_icon(canvas, 74, 19, &I_Pressed_Button_19x19); + canvas_set_bitmap_mode(canvas, 0); + canvas_set_color(canvas, ColorWhite); } + canvas_draw_icon(canvas, 78, 25, &I_Like_def_11x9); + canvas_set_color(canvas, ColorBlack); + // Exit canvas_draw_icon(canvas, 0, 54, &I_Pin_back_arrow_10x8); canvas_set_font(canvas, FontSecondary); elements_multiline_text_aligned(canvas, 13, 62, AlignLeft, AlignBottom, "Hold to exit"); } + static void hid_ytshorts_reset_cursor(HidYTShorts* hid_ytshorts) { // Set cursor to the phone's left up corner // Delays to guarantee one packet per connection interval From 947dd1b75444696def1cd0f558d3dd05179e5301 Mon Sep 17 00:00:00 2001 From: ushastoe Date: Sat, 29 Apr 2023 18:20:54 +0300 Subject: [PATCH 2/2] Change UP&DOWN swipe --- applications/external/hid_app/views/hid_tiktok.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/external/hid_app/views/hid_tiktok.c b/applications/external/hid_app/views/hid_tiktok.c index bfa0dbc89..4dfbde4eb 100644 --- a/applications/external/hid_app/views/hid_tiktok.c +++ b/applications/external/hid_app/views/hid_tiktok.c @@ -190,13 +190,13 @@ static bool hid_tiktok_input_callback(InputEvent* event, void* context) { hid_hal_mouse_release(hid_tiktok->hid, HID_MOUSE_BTN_LEFT); consumed = true; } else if(event->key == InputKeyDown) { - // Swipe to new video - hid_hal_mouse_scroll(hid_tiktok->hid, -19); - consumed = true; - } else if(event->key == InputKeyUp) { // Swipe to previous video hid_hal_mouse_scroll(hid_tiktok->hid, 19); consumed = true; + } else if(event->key == InputKeyUp) { + // Swipe to new video + hid_hal_mouse_scroll(hid_tiktok->hid, -19); + consumed = true; } else if(event->key == InputKeyBack) { // Pause hid_hal_mouse_press(hid_tiktok->hid, HID_MOUSE_BTN_LEFT);