From 41e2d188b96e06ab8a5525908da1cdd5ab09833d Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Sat, 23 Dec 2023 17:23:40 +0800 Subject: [PATCH] fix(momotalk): correct sort switch --- .../{SORT_OFF.png => SORT_ASCENDING.png} | Bin 5066 -> 4826 bytes .../{SORT_ON.png => SORT_DESCENDING.png} | Bin 4949 -> 4871 bytes tasks/momotalk/assets/assets_momotalk.py | 28 +++++++++--------- tasks/momotalk/ui.py | 6 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) rename assets/en/momotalk/{SORT_OFF.png => SORT_ASCENDING.png} (59%) rename assets/en/momotalk/{SORT_ON.png => SORT_DESCENDING.png} (60%) diff --git a/assets/en/momotalk/SORT_OFF.png b/assets/en/momotalk/SORT_ASCENDING.png similarity index 59% rename from assets/en/momotalk/SORT_OFF.png rename to assets/en/momotalk/SORT_ASCENDING.png index bd1203a47ea335f7ab5771bab3c154f56f9c641f..617998dcfb89cf24f13087f6298986dbf10db3fc 100644 GIT binary patch delta 753 zcmX@5eoJ+N1ryuhiB>aY5-n0p%uS7T6pRdvjP(tS^^J^m4J@oo&8&>gH@;J65;QUn zF*LU_GO#i=(FRHw7)(}Vmcb(G$?To~=@GVp(d65>zlVuec;JFFDoI z#a5{zw?Hp5GsTJ+^I`hSGg5&@f_$ZGXasZtiZ7Ue-k8p+A#b8*uAmW~nU|7ZUaSez znVgZBm!6tptE4~q3~QX9+zo+X1_tiEo-U3d6?5L+J(wkGD8Y8Ye&#{(Vnsa`$2%Pg zJM@0JS;KISXUU@+ZY|6o*Y zqq^%%fIV={NuOz^n`lG12u0Lm=C-OOMmUY-Y@T|MDd@j9hE04 zPwYH)`1$+&wfA*o1sHZM04bTb?{CG`<)6=f`Ej;=S|Y=O=yQ>b2V(SU*?*inSGQz^ zsomacGoJeOF4j!E44*eL^Dua8db2Y$?9({Fu%W|<=kfmkObq|zf!<$ z>DAY&?kZ}|oW+=+H*G#tBQQuOvQJ*XrY9c$gHz#z@A1C^r delta 1072 zcmV-01kd~0CCVp|I06OikvfAaA|QBea5_z8bYWy+bYYX>0v7`_Fj|vS14@%y1tzn@0~i96s0LYQYlmDL z000eyNkl|DO-*%ic8C9*Tc;zlQ3p%{ ze-@F3E&u=yT&;EJ5*AXQeaileIXA;p0|2Ad4qX5M@EYmaCl6f+0F0Yf3IG7WN)Uhn z003AC0x$po04qTN1^@tHB?!O(006860T=)PfR!Ks0{{T95(HoX0035k01NZU1xb%bP>h0{|9P2IxtZizcT{kXoq{s#A!f8NVDYAvt72>^JJC0GD3-z>*0N9w3e_4j-C-r(`2 z>Aqqb09b_93jp(_S|g&zq;>D*SAE~UqjaVl07ke<|e?Cr%tl zK>)yF1YiJ|@8XA-BckiC?Uu-2UH$a^^XCqvCIDao0x$r~*ERY+Rm)z)D|a;K5)rlZ zZ^2eT13*6lFaXS#`X%5fugRX z0LH`$XaML<00sa6U?m8^e*iEh%XOL?01lM^3;^Tv^fh1rpc4TY0LJIR*7ndP0KoVN zzyL5lP1eBypfl|g07m2a3h12ukRbqcCIAD#Xrz>L&NU(>9UK5U(>?)UWHz_9lL0UQ zbSD4|qGbZt7BOs2WXjz9xI4+1a%%Wv)Ybm$U#$Pv%da8CJHo7=XX qOr}kfbIz7v0kaVclLr{U82ksT_QSLnMAvKp0000&`L8{erj2^txP z7@Aud8CaQEXagk-3??fw%U}`pWcE_ANH#V#NJ&c5HAplv*EKOUNz_d;PBzg^G*2-x zv@lCaF)~Toyq#H!slF&B%_=8Tp}54gti&oYxg;|`&sM28u`D%32`ZSGS6q^qmz?V9 zVyjesgHlGk|Zv7^~2Hy~g+9`3;-6lNNI{t)1JlTe4d;_mad-*&UVhvZl{% z-7bCaXPNTmh1{7;^$mqft}!ws_`N z<@QBfE&6ul<#qqO?dO;nY7H6L8a&r}b$0aMuiwJQ#BdiZaCMThs~`K?W(J3Hp9V$- zh8ImtJPZsD;vxw^6L&3OU}j*rz{)DYz|f$laR4Y(QV+DHLG4q~&YZc748ImJFgr+V z-fU$|2wGXnzz`9=^;(C<(mNGjUOhj!>e?o$ZTCdB@^LFEZF_e7yBL34c+e(O<^vIP zY?%-2C_2}lAKTaAG4ay-!_Q4(++B{mJ9jqiA;SXozL|^(I)_;*HvE5i`rPU5f`vM+ zUV&aNE}k2||G8Ixa;R1k%RT$s{#W~U_xbq!vcI;JrZ7aL z*O@RiY?N7e;TO9E!?DN08SoGQGT>nIdhR~<$s5?@#oa%0*EUo*oM#o-0Fw1|^>bP0 Hl+XkKx=AVH delta 958 zcmZoyyQ((9f{FFbM5`Gxh9+i47M7Me3PuJ-#`*?k`bMU@Mg~>}hE}Gg8{erjO@7bB zCSqi4Wo#U!q)?GtVC9=yl9-ZMk~sMxlL#9`VsbFE*W_qcwatf_C733!V2iA0T-w9T zz`)Dz>EaktG3V{w{oQk1CD=ct-@9G#|J@w4MH2%L1A~JoO9D`6l>!6M{Q<0u5)2FtS{w&}LLrG;-Y_vdsL$H- zGv{`hbM)5O@|TBxEi5w@fcS z=k{K+=ZUZ>fqwW^`|+u{;6*;31DZ>Ff17RFZq~m{gCU^| z=>0FRXNd@Ew#hQjEtab)Fk#pr0TPsc+R?Gsq=37`^X#d_w(HAsZ(ls&z{Aj;e22B6 z&OHB~#if6;n^+mR(`i~-+!I#?roo+ zCGPSn3uitcbHqUm~0P|)(|R{r?iub(9TH$KT_ zz;Na;kdV>gtvT}U-IM!!ZN40+Upe>s{GY#TPij8et(`w7!g}9^cqWFa!l2NuN2>4;$`@3*vAwwap@eUT4~M$3>F6b q(F=%4Sm&X@AA_f>pUXO@geCyfc88k) diff --git a/tasks/momotalk/assets/assets_momotalk.py b/tasks/momotalk/assets/assets_momotalk.py index 6f4ca49..3f0de62 100644 --- a/tasks/momotalk/assets/assets_momotalk.py +++ b/tasks/momotalk/assets/assets_momotalk.py @@ -113,26 +113,26 @@ SKIP = ButtonWrapper( button=(1192, 103, 1229, 141), ), ) -SORT_OFF = ButtonWrapper( - name='SORT_OFF', +SORT_ASCENDING = ButtonWrapper( + name='SORT_ASCENDING', jp=None, en=Button( - file='./assets/en/momotalk/SORT_OFF.png', - area=(591, 158, 662, 199), - search=(571, 138, 682, 219), - color=(235, 237, 238), - button=(591, 158, 662, 199), + file='./assets/en/momotalk/SORT_ASCENDING.png', + area=(631, 166, 648, 188), + search=(611, 146, 668, 208), + color=(221, 228, 233), + button=(631, 166, 648, 188), ), ) -SORT_ON = ButtonWrapper( - name='SORT_ON', +SORT_DESCENDING = ButtonWrapper( + name='SORT_DESCENDING', jp=None, en=Button( - file='./assets/en/momotalk/SORT_ON.png', - area=(594, 159, 658, 196), - search=(574, 139, 678, 216), - color=(233, 235, 236), - button=(594, 159, 658, 196), + file='./assets/en/momotalk/SORT_DESCENDING.png', + area=(631, 166, 648, 189), + search=(611, 146, 668, 209), + color=(221, 228, 234), + button=(631, 166, 648, 189), ), ) STORY = ButtonWrapper( diff --git a/tasks/momotalk/ui.py b/tasks/momotalk/ui.py index 4f82ff7..a41d080 100644 --- a/tasks/momotalk/ui.py +++ b/tasks/momotalk/ui.py @@ -19,8 +19,8 @@ SWITCH_UNREAD.add_state("on", UNREAD_ON) SWITCH_UNREAD.add_state("off", UNREAD_OFF) SWITCH_SORT = Switch("Sort_switch") -SWITCH_SORT.add_state("on", SORT_ON) -SWITCH_SORT.add_state("off", SORT_OFF) +SWITCH_SORT.add_state("ascending", SORT_ASCENDING) +SWITCH_SORT.add_state("descending", SORT_DESCENDING) """Required for template matching as reply and story button can be found in different locations""" @@ -145,7 +145,7 @@ class MomoTalkUI(UI): """ if self.match_color(FIRST_UNREAD, threshold=80) and self.select_then_disappear(FIRST_UNREAD, SELECT_STUDENT, force_select=True): return True - logger.warn("No students available for interaction") + logger.warning("No students available for interaction") return False def chat(self):