From f25af1caadae9a38b6d89371257a4a2b956ca7d9 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Mon, 15 May 2023 16:48:05 +0300 Subject: [PATCH] Less trash in code --- build-logic/settings.gradle.kts | 1 + .../unitto/core/base/TopLevelDestinations.kt | 8 +++--- .../ic_launcher_icon_round.xml | 24 ------------------ .../mipmap-hdpi/ic_launcher_icon_round.png | Bin 4172 -> 0 bytes .../mipmap-mdpi/ic_launcher_icon_round.png | Bin 2569 -> 0 bytes .../mipmap-xhdpi/ic_launcher_icon_round.png | Bin 5927 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_icon_round.png | Bin 9767 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_icon_round.png | Bin 14472 -> 0 bytes .../ui/common/textfield/FormatterSymbols.kt | 4 +-- .../feature/converter/components/TopScreen.kt | 23 +++++++++++------ .../components/UnitSelectionButton.kt | 8 +++--- settings.gradle.kts | 1 + 12 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 core/base/src/main/res/mipmap-anydpi-v26/ic_launcher_icon_round.xml delete mode 100644 core/base/src/main/res/mipmap-hdpi/ic_launcher_icon_round.png delete mode 100644 core/base/src/main/res/mipmap-mdpi/ic_launcher_icon_round.png delete mode 100644 core/base/src/main/res/mipmap-xhdpi/ic_launcher_icon_round.png delete mode 100644 core/base/src/main/res/mipmap-xxhdpi/ic_launcher_icon_round.png delete mode 100644 core/base/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_round.png diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index b92e00da..9effadbc 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +@Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories { google() diff --git a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt index 5d4bff94..fe6b3bb8 100644 --- a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt +++ b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt @@ -34,10 +34,10 @@ sealed class TopLevelDestinations( name = R.string.calculator ) - object Epoch : TopLevelDestinations( - route = "epoch_route", - name = R.string.epoch_converter - ) +// object Epoch : TopLevelDestinations( +// route = "epoch_route", +// name = R.string.epoch_converter +// ) object Settings : TopLevelDestinations( route = "settings_graph", diff --git a/core/base/src/main/res/mipmap-anydpi-v26/ic_launcher_icon_round.xml b/core/base/src/main/res/mipmap-anydpi-v26/ic_launcher_icon_round.xml deleted file mode 100644 index cfabe93f..00000000 --- a/core/base/src/main/res/mipmap-anydpi-v26/ic_launcher_icon_round.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/base/src/main/res/mipmap-hdpi/ic_launcher_icon_round.png b/core/base/src/main/res/mipmap-hdpi/ic_launcher_icon_round.png deleted file mode 100644 index 58645901c0ce9cf25c5d1fc09b7631344734a248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4172 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 Wk3TSgf8#Fz00000mA{a|W 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 diff --git a/core/base/src/main/res/mipmap-xhdpi/ic_launcher_icon_round.png b/core/base/src/main/res/mipmap-xhdpi/ic_launcher_icon_round.png deleted file mode 100644 index ea63bc688ad029cd2c29aed72fe06b9bc0465445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5927 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 JPDHLkV1k!~YRmut diff --git a/core/base/src/main/res/mipmap-xxhdpi/ic_launcher_icon_round.png b/core/base/src/main/res/mipmap-xxhdpi/ic_launcher_icon_round.png deleted file mode 100644 index 2d86de894ec1d4d498dab1c8800548bc79bde0d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9767 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 Bq+S33 diff --git a/core/base/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_round.png b/core/base/src/main/res/mipmap-xxxhdpi/ic_launcher_icon_round.png deleted file mode 100644 index 16dc1a5e4e0c98c666b8d99ad204b49f25238caa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14472 zcmYkjWmsHI6RwK}3-0btf(CbYCqQs_cXtS`3GN=;oxxp$1c$+02Zv$L`|WF=>--p7 zGpoB-ukL!P?y8AaRhB_TCPIdSf^r3g5p(?lN8hRHoVA1 z@Yj-h812_Or;0%}kut~q*V*`?g(tbua%SpO!AyatiNjor%Zvykk8sjM&vjCg6pr^p z93`AgoIYN2;(gYu9lP$%Fy+;7tLut({@N*zO+ zZ(~<+e#|j;pME?`caZJYmRMTsePCc9J0|89>;ke5)ClQHB>U2SMf2npr~w}Nrtf!4 zcKK~)F24%D$FNqtot9!)yn5jtP)P;$tfjCQ65IDnAe{_)e!6*M9lkOS$%H`)T{#b$QcYEuR%5d$d+nIJzjf zu*~VuE|R|=BK|yz`!)I zpU^YJ-yPE|QgZmNUNlPDXT$Cf;P57uN9r=H^kqM#%;W00mFV{Nm_ zO0ij3&LEC)T=`VR)ihP>iEDz?^8JbCP29M4IfuK39!VKO({iQq+>#okz?b$Ie{N;m z=-YmGyy#k=ut@v&Xc#;}yGg6Mevw=r+t4#=ryY|bzmJVc=%(Sf$d>l^8bTLLvnko{ zMqSl=8O}uwHK_J1H`zC$>!j zzc&8GSEd7zs(F=4*S>tzNJ( zH1sUq8@*d@FAjX_{{zQTWMM`AQr;%)9*cgEnBaJ6C*IB%^8|BQK^~ZNf(uH1njW8? z_TSVq>Kv9sQMe73GjD%Ckj6 z*H>qJ6C^^~B7mzaM_E}3&2sZYjh;M%yeK@p?){g_&xi}CPTvLV5ya4b`1tTKdtPn% z=C&kmnlehFq#1`_tf(S7R&n?wbUXw~MNah>u}T3P*IVq)M5e%=_|ux~LbBCZ>;s-e~ICno||Jg=LmsagB!e24Jx9n%p>3GMrJIjZtW>FFLc zLIMA2R^~Y1c+G(=hsR{ zOUqsFTJjfn0a%lg*-;#6{p6bd_BB{NG~o5`_mL5>XY?=TUu77V93Q$`T;7d#5AF3Z zU-u6!iEM1v%a9W)HVP+P;9_Zqv|8%f>SE;reS~|zBI1{`>_1{QHlY*hwK=}P*II8> zwoCE#NJ+{3$lOmy-jPE5s_c-Y>_8&iJu54x`%0Hnc?}Mx3i`g>|AAdH%QZf0WAD2s z5!xMUPc876WFzt#N=GhdGjG<`gZMKfwLi)R;f zjJw&4%a21#?d4uecp38s{^N-oeR=!m?b%l~QZ=~ExkdibadY2H9^Z?CK*&yP7N67o zIngSDxxx+G0tw&BGX5l4}=k?<$ygz=fE2cwj*&;N_^x zX)+KV`zNDnn5bu<%eX7^L2oHEl%yq!$9&(aS+Cx)aNfg{b?-))l~^h0Eph%h3L$r_Ll2po8CXZUE!k1j)>0#Ovtx-v}x}kKxFR7O&u%M#shEPIar(+O|>R zBzO*=A}8kJ*Bs%IfqOM|%NM^K82O}3A1DoL29n0>N>iM@{Zafskbwzf%Xf)LD89Q} zt|yZdd3o4e&fkEc8k?W)J%UuFR%kR9N%kxEMtAm%t8JzRo2!*CzY=<&`fL7hzA=I5po$H(%2i?cMElf5g?I2 z9Pfw*&)+|X)DdZ5l_NpkOZ8bGDy?i4L!le z=UKBd&i8!+C6CW>oMx~0QpKvw5DLzX@g{rNsysi2E3coW8ixTDCQ|tmV za)LY0_|+IATAcKxRFvRq-7gud2pBJq08J(_L$Tj72Ji5*yO|-b`;#c<)4|xEr5-;m zBcPG4+0oF~U80XJsxg~ru%H;Wk-rA$6;rF__Yig+RFrtBGu-se&Jx9Hqa@dKFCTq)jGG}Xy&{W5iGJkJ4e^A!uB*adHLl5AwHkrAFSzSN?MHoI(h`KU;ap=Ot$G_vq;q1WgG|f@etzoinY?3;_ z${~4g5W51OxFjmy;CgxZEE13iH1aNm%;W$(3kf`ouG^Q%lPq@$-ccuLVSvN$< zS+*NDioyL*O;Ciz#N0Hrfp0gXM}tDCVTFukq@F(<9i{E)Wj?AmBsc(4SD%Bf@0-7J zbXx}qH$2!dTlwmrq34~iPpoA0_7|gCg!r{<2O08)_7fBN8G zM)$X6%_zvk5WN={70qDd>Qz#S7&4JMv&cttUgB8BZefCr4^LOgW)W6eUs}Kg$!tcx zGvqr9RD}Or(H~D|QDlt88-G-{Q4>&54YAZaZf3RQ@_YP&Mv%b5RWAlq#1$8R6rR72 zteXkn9K!`QxW39KdO@k9g6!VmF>{psxP7~eY3$chu{_oC8%5b*GEW?kVD?#pSuu!- zm&nlg$uQN6gGLibXR&a9oR?gPsH_}?#6<}dLh&|;%$`|I>e3uV#!WeU_$$B!i0>9| z(G~&g9sNQ?-7Fd&mw|LOtgh%)|qJp7);FVN_)z zKgdVj^UJq)cIQKMXL;zpv8M*ItNDImh*ZSDyhIBBUB{szNzZJkB#xz`rsgx4$^4mQ zWB1O;!&BUrnoQ1SK3@^+@S^Ih4(*Jiu>NCwd%(kD9ql-~uqYAa36J9J^Z|A^8&8oM z1e(viLs`7i)3a7-=wx&alDw0u1yhHTA0z*2S}AkVA+ex zy1sjaq{B6G=_5=`MkRK(`Ua+wR+7n>yZfQaSq1Gikj4(^BP4<%VS<{nuVw{& z+Q4z5u!LYDp{e$!rk+hJP;#okXrNbQx+Icg9;!@O3R$7_$Kv8*q)g(WCEv+gXtRWX z!_iyn%J-}qQrVrK?;HSt3~4v?uzB-xeqrBsyEI^y*t?vyYVrWOQL@aJv^zu=BcN1- zS|>QHMBZtw`K#4b2D?}Pd_jg-S(uBj=R?2B)ciL4E$sQ;tFPc5rLz-7l?Fg0qduEw zXm|O%#E0yW`I@H-1!Bh`M@9eFBDF3rw>0Eaa4f{7i_ggL$=$K;%LOKo3dr9bos{Pb z>sjli*}MwuzA-r$5n8<*!#qZ|77M$xkfHMamaGfoNdjnQtzxxMjB2pFm%^y@B{W2=?GEwvqa@5 z)^aeZrQc9$KP`Udzy~PLj`3di+JG^hU1(m4MTx`&$WwO4j`Dj?c~%J}Y30S`5;&fp zURu5t<*g-iraylQ=uwU884b& zi@@4iL@IKh=VZzt*7(XyqF3;+LR-aQcA!@#vH26uU+q}NMHB!=ib92{|L*3{Icb@q2pw$P~~ehw|jm>?fL{Csub zWUkV=wSWYuRfV-60)E;&+qt%@>pASAu0H>;nEd^&A;?9ahGI+`q5^+2uF_*R0R3_K zP$Eb_n(rot+wKMIWY{CSVR?TBLYV`WLc#^fDe;Gv>s0vvR%zEE0P95(oREXmV0_ozArxfBI5eaPnR?dO;LQ*wGN<{8 z3yj7d?Lmv`^14!XOj1dxR}XIbyWrJpl_g>#6$szRH~KXbXKrD40_9=;Hu`%{EjZLF zfI6=dK(8sfJl0*JxTZP~2bW8Mg@ehSIW^bxrXK8hv6jmiIEzQ-!J`2^F!9z9D$OY$ z=}Wg$6;Dd%frD0krR=1;lPS1f$tv+1&RkG)jQ_JtAQCPzEv@O{lug)9{kX+8PJzi_ z0KE6hN%{B(u;9lw?2rqvkcJHss_>(StUiAlgGv5eg(q$|I`{RRD_&amec zvcx7;p$c_z#i9Ga)k3#AX`{X$JQYpQG&JAyQ+oT=QiHv2l($F~r9?d;)|g78hYW~} zBl>wm+TUOC)*{`&lTrVH5yzIPFViUCUaKZF^!y%I2^xyVerm7Z3ZIzdW7V&yh1vrI{bXF^Wf1D z#nf>ta9la@?YV$irJyz+{>R8naf7>0_Y7IKUTsbvhc(Wt_%b?-eY)6mah;U~J7c{u z)lkU(_AkZ{hGzE(OVS?|l&*K&^vp@+=nYqwFYSsav_qq(%%gruz^9Qh^f+=$&-AYO z2NGqs^S&=ZqMH?aMQPr90w!c?UTdOy*4Pfk@x1f@3((C&6q8UnkoRSJCE&)F_V<4w z0G@V(;&&Q%xJ&~4kms7LR0v_>e`d_73NjRPFa)EKeCN)uPswcN9GAs_GlGQ6nAwf8 zmm9mBQhpo*+1D0gOySnB4uwk1@!YpUtZUsKL4TSra-Fww;q)!Od2e23$EHxTMS zC_o=hW%_h^&tZ~%U&ZN@I*3pYjwepN>-4;EN7sLlgPw|=&E&NDKka-EIzS0`zg-*#Z@%Crps?MC6yLAUTNkMy*Luf?+He{Cm zeqU2uPZmo^ihvxCR1eN}Jj6P(`DgxmQ}5L~iw_HB=%03y80wILbQ%x;9x( z6D(dZ2Csdlc9!#eC@jU5gXYa)e82u$JUbwEJBSuS(~HL4?@zcY7q}9NDO0CV-`7P! zcU6Yw+XDk{J{mXB0237GIUuU5FOWHpHBX)wuRYY+UaezBkeEnAFR5q|JoxA{PYO{Cs@MuXf}U3 zGDBgfaok1^xzBd>MBI$mpzW|Xpi4$OoYVv(Op-OHOQ74`xIP4nO`U84X$#3FDm-k> z3s`q+@bVglY93>MghD7#cnlV2?CTHni$7VQE*msSojiAGXu)E^4aNozT@4F(m4U-y zu2tVHfH3xpYDjybodOeRS?+<7{6*n9_x!){CB21nZ)^Ocz=rhw(wXzIqXM?K&oHO7 zPrm+-m!u<4H)fH2kXD5m`|=IFf$$INhG{w7@?>#-Tycp~giYS2rNVd-i8CfwXIDtL zOal!J>#Yvlk?7=8&>i?f@1TVxVDtC|N31543-*FE#A&aVCAabV)>^lSd3rXMIaGie>LGumlz@5Ph>98W6i*uF*3}&(7}nwm~Hp6|UPS zZ^b}j*kye05wOOe*tsrsJ5v%&`Y=p|&kP_T4CAc&*d)iG3-EaIYh(p=Mq#*0_=}4x zu1TN^4F&F;q7rj!+F-Qe1iSutf4SHFJc!=DdkySSD}xCi2I|DcVgHs|@kBiFuYI?o z|IiMBCfzEz8W`COZJJ*Rur6<~9JM{E=D9Qn zkkUdg*cTngI_rGnrWU;wFmXGa()rr{YQ?MH=4h}UYy8K#K@eZ|&9K$(--B2g5)K}6 zAO6(pT#Z*Gk26>VI6n4^GY<2{ES~QsawH30|4@~yF+`U1UkDnmiTaxe@HKq28zn=yY4`PiWWCU-Z=D#KK;@BD?6K99TmuO$|^g_)G>?4rQiuO{6G2!vmgW4I!81 zBeWF46^ic=s2xm_4S~k^%*nVpn@;oyQ4!3-{^i?7SWg9p6!=~8{B`b*xBiKC@52gV zgS*r|uGEU^e76PQO_Ei9jb##J-b3{Q9$>*deRwYOT3(U#44L-Vemi3a`dm z|0J=1p@_|{6G3*9VJeVLFI!L^}XEw)QkFy;bqe<0l==hy^VpT|IC zm_KR_or1$PDA7s~&IpU(mviv_kq$IFC=)6hK+_}>f_@^jRM#>ppa9c5aQkIaD6iPe z=2TrTFruzc?I1S8AGT&;imcV@tI_q&?CdXIV>sdo@OH1z5&^sEu_&*dYr1ur3Z<%+ zIZcIJD&4oCD~sghR6WF7a@10Cj2_C7ho4oVD~(2rJL=QuC)ydp(DP&@TYtx9Einyj z&I?And&y@1ilOxe8c9J1NRXd6xFR0fI9DYEyk7is>R*+PCn|&zmI>BOPNrChZZENz z#A~y(B1g+47u_14y?c57#&0@#rFggwD(I5V0n2^o3z`S-fCzIa-bP~|r-DJPa&gI($2>&~N)S{V_ zQ4ZqP;_LIrvzbVXzJu4U3vDWUziNW5j&To%pTWw~)OcHtiH!ySw4uX^c0p)*AgW7z z>XX>%4c1afD=5M2djNbdW*yK!7sxqW(cnlB!l$fi z^S*d3pIosbImNxzFY11kRYh`^zSFY!1Bd|*vp5NL1s*Nqu&$Zr3kz2F3qgi`D z&t?(1tVJ-X@o*u~1$MOIYI^13CWk`e@PoyW#OrBETaPEIif7XuySJ+G<6Rvp1_b-H zV;^f7cCMlmlFvGfq$24&+wpwvAT!tjL*+w_>I6mcRB!jx>RTq_PKm0O@Lg>!a0EGU4D#Cc?WI(^bamHd1B9B)pJXF->G>8d?u-Zy9FAg77RPRtBO=th= z5@8mj)G@*3`$5#zhtRf159;MyX02s^3|M=9E+K!W_ zx?o@PFHWILbUNXzr(X~v1_YDMP7Jn#Uc(Rx!5i%^HS^^vv-vv}<66u0Z>=9%YJtH& z&@1l8>B+e#C-{$_w9WpaU2x@{|C^B50T(obK9Tm8D5b$$=B>oX3T_qljXQV(5I-j0 zz{4nd{hx$WH(8w;xy6l6W)Z3OPo4DjrwTv7j}bCE)?uGe5!Wz29@oKbcqa(@?(16cIiI7ke${7(>SImFJ29Y^mMX2lKiouao(bjEh?d#jZL#`n zXk+~(Xy_!Sw#1!z`ONhbDmmSp9;gx`TvP{Yg-3F|VP>=`z1d65?G4TzQ12kA&C2=m zc&x&R76mbZdRbyh+1&5z;P)<`Ti5a_iUcZ_*-w}PC#V*~bv>m@PoYOcJyUcqZn#gx z|JzITKKaE&_pR_mwjiF_kJaURlfiZ1;V*5&=x2@E>+&|LX^N1$x~|L4AG?pI2b0*o znN7je$WW1Ai4Oj)=6Nm<|9p5#;RZ5q5xxS{t;iu|BrgHD@Stgoc^TiXP-q;eONX`Q zEdmbnK3QHH*VOab;7pM}IN4(V^xaScMRQezpZ7!J;@&frv&52cIL<;@QTLZ#Q?`tG z90vX=eKR)qUoBLCpf?maYvN>95BX;BqiAq%VIqhd9yShq_?*8AY2FuE*)ZUKDdQOW zTaYGW!Y2cU3BIG8u(Bl;WkcM4778Z!#ps`K)a|T<8F8`}nL=BCiO)-vjO$)gS{2m| zZEP@*8Bd5U@TvlXe1b`YGvDGdd)UA813ACXBF9upZSy80m}iN|c%849#*vHolIe%1 zI%6kf>7!P_sO}eK^!Y%L_wanhdetA#lU@8LenoI}F95=o9upO^E!6+_zZE!FR9 zaO)psG|DZxx$^Geu(hD0RI!MB zy}j;$i%E1h5`JCh=^y5uvhn%gEXe$^#uzyF!}AWdz}IfpQ}V6lz?0|_8nz3sd1~&W z0J+W{VY?uAyi{oiXMMcN$_2&sn0TQl#IAk$GBks}KV{y6q;BsA{eSjz!RQ9OV=({P6v%#o4bMGJ|5fz$C^zZ0TSUqccD^{Rl`IbY0G z-1E@b1J>#dZBJoyb2PlGiu0;460wy3_&RX%GK9Yi;kXz8!zT>srzkhcL+%QRX7L!{ zdcd)FRtI=PL|d*i%I{w}efuN@%`iMuKgY`f zw|O@izrSXyL7r~u7x(R1U*Hk8c+O1qX_BXP)Xn9J%A~(CHG9fk4UCbpVnN;%%tn>S zEO{CiEGUs^*X2KV=otI`IV6(kUH2)A!(xD`zXveTe>WqbLKfoa%4xk{jw3J#vsBk{ zNQASK6$1MT@Y(6h!&WYp!>;=<9>6Cf1)}bwH^8$|xpcb!bkU!rs^O_mxb6>UjYm=_ zC!pRN9d9-gpj<6~X-T2(+=^_hXAcOwG2iYh39QesxEE2CwtzYP_Y#I4p+E6M0trL8 z04_ROLD~QL;D~g`u*dhF_bukvb^#y2S8e9HqwG*EeJ#|6`UpX*SB3&Zx_ z>V0QKi!KVW%JukeaC7zP=B6Q4CkqevcS6k8PtiTmWwQ0Mqy_J4l@lKk&wftt-{3cA zDEhs51mD~+XdH@f9>whbPf4rJs56XHh6@C=`yO*;%!FrFgvH)w_LJ2-` z`*pu@OUY42jDALkqx3rCavh3d@en8unFn73SkwhjGM@+}gD3oS-lQS~{jYgm0+)eRMS+1OW_-Y4~y-Ox~y;iSY#>aW%O^zg6H>m={`r7~f7; zoA$d=8S`d(k1M)W8{YsJ)UE#iTgQj}IZ0~G%+YAn(>JpZ#Fv-TJwd=$a0SQf(GQQm z7-dHHk0karU2Bo0Pkuw{o9&{p!4B(yT!+Kb9}7FVR0daT2T{s83cbLz(1T~==}+Nw zx@wlCtI;@6r2adhi5`L?*Db*javn*?qnLL&+P3tGjH;^aAI;4dBZX0#!jcz$j6mlbY)0%fnOpy0$g3uh}G2YP}W-f zs=nxB<-DM5aPWQlH((0VmWq&Cayivrtk%8zar63bJeB_5^nOM&xIiYNJ0x}DDaIe) zgs6cv9iFnwhkIphiYlCv4=i9h>~8i7y-Jq&U-3%>zZ%b}tU+ayfe5rNMXF4Medp9A zqXlm0!X{41iA1B`)fV7$qy$~MtXHI-*z^;q&6{`V&|PZS2~SzE`UIWV7TE{(aQ@Fl zRUBmlb-YuV*Eiw3r(aWNCU8=GV~Hl@{jYl>Jp9TREIhe)v;;xI?)Xfq+GwjqmqyXt z-8^7UA2x`~yf((o5!Qn1P)b^g^S#r~|z`J<6$=INw- zMhF-)PKeh%umzfrUBXFGqr^)8qg5px<{0xcgUk19SxH(5w8&rTRz9 z)bYQ%SsY#%Z8)piNCCR2|D79yJkEs_GC3_3cLwhWfv|@#y$3XD!BQOBNXiCdKW95V z?BbHCqehS%H;`qT;p>uUx_-6kC{f~l;jQZV4k0e3BC3GEcY*Mlw$O+KXV(}5UX+|I zrR-(my^(nNTJ1VR>~<4ZxGwS;9sF*lG#J%1tcp0b6LiGUPa4OOewQ|$D)#50O6OPZ zzjhX3_qSUeIOQDmt~#r3!kl+wm}~pQRXu}bIfY=g+=E0N3%lQLCs$`Y_hMOvKXm;4 zr@o3Ci6bSPio2>k8}s+vs#cASji0Cp-Y}GRZd$vBauM;WQ(k~mVwT8NWvY#|%9V48 zhp&|CdLAYgTwLZ)YO!*Ng5S(PDdzH9T*b1sdPAcv)*8Ih@tU~8CNOk~R7>P}#&Sd~ zzCb0Qq7Zxh!s-V5W*?cE75^Q7^_(u8K$#+Q+u#1zc%Z;K|48?I_WgPDq-Erl`R%wa zW{L58tU1@y>EzcgMJBOq?wY*#Xx;kQ`N9GU1X|}}iC+kkehHZ1gt(lvTIs;1DhM?lEs5ArfATvAP)K z#8Y|IbL+6uPdHxe@}a&j}!#kw68Jc;9A5KYdAFF7UZoT#P-1Hy1?;-|@24X@HzdSp5JViMNaY`7^p}t;OzN zUT-n_iNed`x!%hPEui!`p#eGB(Bm-E%8=fEL@%7espD=&`cWlMFfiE?tD{K_(S-DV z{J^M{rJsP?UR8XdES|h*_P>A@CwLJbuS2s!L&{J8RxhR&&bC1@kIjT%nFpm1T;sHz z7qGWmIIGxSI+@{w?j*#`x>*~2WrcC}f9dyEoc?xRN`6XII zkcvM*m~HVGcJigZ)JqR^G(kL@PdV4-t(i zD+yEfM|BLw5^nqVXZSc?2M8m^CggLWrJe`BpSY*l;lUFmk!v8_lJhrfk32w1nmRfm z;fB*3!o*g&)0D7!GTBRlu>1IxnVP(DJO)tIL_t1PHjazu&#LIom5{Id8K2kXRL}X> z0m?ykH>>blvDN3X6i)u+3(!fjp8&+INKASbVJQ}-RJOSN4+ebuyO**(8#;$kaEl`Q zON(xP31(Q0O1cPvtiA0yi4ve39dFV@iO_RbFRMBf~RA2;08U@8%>0NcIq?Jj1&5v6!1jy%Sg8<|2~&y_8X zhv+jzRVjsq508Ih4*qU+`j~l*c^bnbq_)#Iv|ZGuRQ|V*=UNC&;WF z{rU|zM7NMKhRt^I=SoIK#Piud`pUUV!Q>rH%}<+Cm}r+s;#nmuGBT`V zzdFMH%l2|x#81@}_Y&{AS9oWm)(fo4DuF_@WTuJ$SeXTPQ_9^JkU-mp(|Ru029jLk zZ?{w`>gQI(75;`R78v!NUeO|$Dj?YhCtBT~%1Ta-IiAlgP=L$X7;rMM=(9v}qvej^ z7Nz-Viqt$dF8LdWm&`i`E}X+XDq>5eEG7!8;g35Gv zq*P%qagQy#DRfCPWkNL>cL3!iF?xQ>xOtQZ%Rz+O=k_TLQeX1sd)4#dt4}R#^LgdD z`jAQil2_3RmqB;x+(#E{nEBMHJM_u!fLvC}m}MiNGGn6$wV=rl_a<3wxNp?5p_WFtdZ#0bM2t zVsSTY7O1!vB45Vwh0(deB zPaZ-cb}qMYm?b_X%o3ZO9@!21+ohA}JyEE{T;%G*Lo8!-U$QHZh&`^!SHNDNl2th6 zj53)9q*7xwoVvL>?OFDG#{5JWanBrYOU4u!h}CQ=S4rGpk$!%LRCxsCL*llUp3^^7 zm)|c`OL*2Rrbq@d$Dnj6u+8_d04ZrHkYW68|Can2&pFM9#tQx?v=|!-ORSwdB@qNN zb*(C}wpfo>tU&-Cd$BZXVsuj<3yhrVWA=U*IiNZi~t#%EO2u%q_g{J_pYWQyJBw}7g#Ca zQ1FHBB>J#oK976B(>$0Z38~Q~+Gsqc7I8xNJ5b}STGYSG5m$o{u2$PJ<&YC+76aoF z;_I|yH&sF?m=lBv;cr7KK02HLfj#u7QgX2ghV@?a zMHR4+s8-y@6#e!Jvc>)28x{_yvwQa1w#yvyxE)+M9uo-I?F~P`0d%*DCcgtl1=y^H z1hRjO)gl_%FX&AXpZhYO*c5v-YXcPzHadsuN{0U+O0soNBb&3Ceu!gy(<3>^IJqq|IJaX zIviwr^!2nqNy{n1kw~2HcWMP{Bl1ZYb0BS)ul;L_Nq)ZaI9+@e7^*hxd2z@JeS*6@ zAQX(Xy0uR|cCD+i8Lh(HlJ`E9&xPEFIXM-*n&KYfB|fRxHr@U|pIM%asp_A?a;tGd z&4k!!e`e_$9MIgbu{$$SQd6@HnVWsYmxU(fQEDJ7RwQ@vg3%T|==uq#8`gdBX7^XS z!~Uy3Q6jBC@lX#hul-+kJr{IoeTA2(p2A^F#gH$?7@kEb3pZFD?43an*O`=zNnpBM z<$}R=pwkQ4Si5(@% z#m~_5Y|Mzn;-b<9Bnr~TKgX><%jw32)yu2l5VVBce^j2eNBQ}Df)t?(W_w+Kg_J2) zh7kdKFt=!X^d_`$eB2|h%WxoLP-8?WW~b4TA3&_J#Bfp#(%%1ME2%wuK)N+{8Grrt zWD_fGSBcSmSaqTh$^@69o=2yyVXG>y9D9?tOK+e^M@}cj^;p&XLE4t|#m!& ZQ0XtCcWJdM + calculatedTextFieldValue = calculatedTextFieldValue.copy(selection = newSelection) + }, formatterSymbols = formatterSymbols, textColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f), minRatio = 0.7f @@ -159,8 +161,7 @@ internal fun TopScreenPart( transitionSpec = { // Enter animation (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn() - // Exit animation - with fadeOut()) + togetherWith fadeOut()) .using(SizeTransform(clip = false)) } ) { value -> @@ -178,7 +179,9 @@ internal fun TopScreenPart( ExpressionTextField( modifier = Modifier.weight(2f), value = outputTextFieldValue, - onCursorChange = { outputTextFieldValue = outputTextFieldValue.copy(selection = it) }, + onCursorChange = { newSelection -> + outputTextFieldValue = outputTextFieldValue.copy(selection = newSelection) + }, formatterSymbols = formatterSymbols, readOnly = true, minRatio = 0.7f @@ -197,7 +200,9 @@ internal fun TopScreenPart( UnformattedTextField( modifier = Modifier.weight(2f), value = outputTextFieldValue, - onCursorChange = { outputTextFieldValue = outputTextFieldValue.copy(selection = it) }, + onCursorChange = { newSelection -> + outputTextFieldValue = outputTextFieldValue.copy(selection = newSelection) + }, minRatio = 0.7f, readOnly = true ) @@ -210,7 +215,9 @@ internal fun TopScreenPart( UnformattedTextField( modifier = Modifier.weight(2f), value = outputTextFieldValue, - onCursorChange = { outputTextFieldValue = outputTextFieldValue.copy(selection = it) }, + onCursorChange = { newSelection -> + outputTextFieldValue = outputTextFieldValue.copy(selection = newSelection) + }, minRatio = 0.7f, readOnly = true ) @@ -245,7 +252,7 @@ internal fun TopScreenPart( // Enter animation (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn() // Exit animation - with fadeOut()) + togetherWith fadeOut()) .using(SizeTransform(clip = false)) } ) { value -> diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt index 799eacfb..65a03503 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt @@ -82,11 +82,11 @@ internal fun UnitSelectionButton( targetState = label ?: 0, transitionSpec = { if (targetState > initialState) { - (slideInVertically { height -> height } + fadeIn()).togetherWith( - slideOutVertically { height -> -height } + fadeOut()) + (slideInVertically { height -> height } + fadeIn()) togetherWith + slideOutVertically { height -> -height } + fadeOut() } else { - (slideInVertically { height -> -height } + fadeIn()).togetherWith( - slideOutVertically { height -> height } + fadeOut()) + (slideInVertically { height -> -height } + fadeIn()) togetherWith + slideOutVertically { height -> height } + fadeOut() }.using( SizeTransform(clip = false) ) diff --git a/settings.gradle.kts b/settings.gradle.kts index 7e9e80f9..4f3cc9f0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,6 +7,7 @@ pluginManagement { } } +@Suppress("UnstableApiUsage") dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {