From 20ee8023c11b3178c71104326f2840155cfb84b2 Mon Sep 17 00:00:00 2001 From: Kayos Date: Mon, 25 May 2026 11:58:43 -0700 Subject: [PATCH] vc=30: minibar above nav buttons + simpler icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two follow-ups on vc=29 (the cutout fix is bundled in too — vc=29 never shipped standalone): Minibar Was rendering UNDER the system nav buttons / gesture pill because StrawActivity uses enableEdgeToEdge() and the minibar was aligned BottomCenter with no inset awareness. Added navigationBarsPadding() to the MinibarOverlay Column so it lifts above the system bar in both gesture-nav and 3-button-nav modes. Icon v1 had two overlapping shapes (tilted lime parallelogram + white play triangle) that fought each other and read as visual noise at launcher size. Replaced with a single bold white play triangle on the deep-green (#166534) background — one strong silhouette, reads at any size, says "video app" without ceremony. PNG fallbacks re-rendered at all five mipmap densities. --- buildSrc/src/main/kotlin/ProjectConfig.kt | 4 ++-- .../straw/feature/player/MinibarOverlay.kt | 7 +++++- .../res/drawable/ic_launcher_foreground.xml | 20 ++++++------------ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 987 -> 603 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 987 -> 603 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 740 -> 479 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 740 -> 479 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 1355 -> 759 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 1355 -> 759 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1809 -> 973 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 1809 -> 973 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 2477 -> 1200 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 2477 -> 1200 bytes 13 files changed, 14 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/kotlin/ProjectConfig.kt b/buildSrc/src/main/kotlin/ProjectConfig.kt index 83175d02a..021a8e0ff 100644 --- a/buildSrc/src/main/kotlin/ProjectConfig.kt +++ b/buildSrc/src/main/kotlin/ProjectConfig.kt @@ -55,6 +55,6 @@ const val NEWPIPE_APPLICATION_ID_NEW = "net.newpipe.app" // vc=19 / 0.1.0-AE — rust pipeline cutover. Extraction via // strawcore-core (Sulkta-Coop/strawcore) via the UniFFI wrapper; no // NewPipeExtractor in the runtime path. -const val STRAW_VERSION_CODE = 29 -const val STRAW_VERSION_NAME = "0.1.0-AO" +const val STRAW_VERSION_CODE = 30 +const val STRAW_VERSION_NAME = "0.1.0-AP" const val STRAW_APPLICATION_ID = "com.sulkta.straw" diff --git a/strawApp/src/main/kotlin/com/sulkta/straw/feature/player/MinibarOverlay.kt b/strawApp/src/main/kotlin/com/sulkta/straw/feature/player/MinibarOverlay.kt index dea622a58..b9dbdcda6 100644 --- a/strawApp/src/main/kotlin/com/sulkta/straw/feature/player/MinibarOverlay.kt +++ b/strawApp/src/main/kotlin/com/sulkta/straw/feature/player/MinibarOverlay.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -79,7 +80,11 @@ fun MinibarOverlay( onDispose { controller.removeListener(listener) } } - Column(modifier = modifier.fillMaxWidth()) { + // navigationBarsPadding shifts the whole minibar up by the system + // nav-bar height so the bar sits ABOVE the gesture pill / 3-button + // nav, not behind them. enableEdgeToEdge in StrawActivity means + // anything aligned BottomCenter lands under those buttons otherwise. + Column(modifier = modifier.fillMaxWidth().navigationBarsPadding()) { HorizontalDivider() Surface( color = MaterialTheme.colorScheme.surfaceVariant, diff --git a/strawApp/src/main/res/drawable/ic_launcher_foreground.xml b/strawApp/src/main/res/drawable/ic_launcher_foreground.xml index 9bb57a385..7dac7e8a3 100644 --- a/strawApp/src/main/res/drawable/ic_launcher_foreground.xml +++ b/strawApp/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,25 +1,17 @@ - - - + android:pathData="M 38,30 L 38,78 L 82,54 Z" /> diff --git a/strawApp/src/main/res/mipmap-hdpi/ic_launcher.png b/strawApp/src/main/res/mipmap-hdpi/ic_launcher.png index c8f3906f9b9faa3c8659b6a600e32c9e5be5082d..c14f88f15a69484dd10899f061a8dd70d63367c5 100644 GIT binary patch delta 561 zcmV-10?z&02ipXYHGcvSNklz4Mi+GHZ~*6Sy@<3v9KCh z$pQ=8A!4RxGf^HXuf;6P6h`vMBhfUT3kw#*Mo}Y=JfalCjKwWk;L4nH|9f=4{XPHx z-R}S0ySS3Ep*-O~q7%IVELe;hEJh6$qXvsngT<)9V$@(UYJad8HCT)qkYe4nt#y{_ zM4cvX7UU*O2BX_%U+?f*&6R*-{|5ZsEzT(%X>?7t4wmJWfDivYSdWdRv|^>rGt%hF z&(1|!;%5-ggCt2-bLD2&q}yiCN;lvw^d;yAU7w_{vs7<6rdq1%Q}oH$%YC3y!7|e_ z+H0D3oHMFrQ-9So=NOD`n|-6xr$RObymN|71uA4y*vk|`k}I^6)_pWY-&qP1|*wW6qAWFo7xqNlO)j__?AFu&oSM9aCY>!%e5$W ze178a_pcrV;~AnYvGcpDo`ung;Otv88s{jjh}}Ou41X+nhS$8$kr$AG;>9Ab5#QFl zYj)`7@eXjTNU>NfHn+d#^bed~hrx#n6AOg)x~KaN&yJDi3lIZ|o+7G>g>Nr=7so)N zr-({o;L%eAT?{FDiXe)iMo$qeG3@9m0xzac^b~;<3*TNejd%EWm!mQC=qV!cKf%Oc zF>0_FH7Zz)8Z1T)7NZ7>QG>;(!D7^4F>1U6qFTbtHM%BP00000NkvXXu0mjf%$5t4 delta 948 zcmV;l155nd1ltFYHGcz;Nkl`@tm>94A z2i`nr;vcY!2X7uc7|+J|a`j~NvWv#VOmADv;@DfVkvU;ZkkSEV8!v@=Xwp@nwXwga zrKX=->BIBwCwb`e@(U<@?<(;>Vl(;yaAAp=4NJ^ySYl?w5`QxrmYCVF8<-uxbDgW! zOR0Q0^{c_wU^_QV%o_{3#{vXF_^DBXAZm2=XgA01(`<&}TW#(A8zvS?Oh_-Cq$fgB zk!uuJYgYCPh1E3sgVxf&F~2dJ!yb%}^}Jte2#w$WH-b}9n?rW6wCc^$ zPEKQlF=FIwOn>2SaUmunX;0Bx z3?USnKCjTAu$BP{(p$_o8FqM_a(DSwo7p@B3DR4POenoJO1pXPqz)3KtC)RgFmNfX z(11?Dj6*_avC#B5vdJbk*jnX#0V+#ZF>*%fwZW_(@PBO{DhrobbhvZKxue6buutJD z#SMVzO9YqL!&?iB_g~$J&x@asiE)MYY=${4RskOX<4~NZX5TD474&TObHnkdLgQjG z4V#XA+al<#{@i|xzJ5F1>)EE=jQ9MF3EP&H+~)e{PdIX=U=a&Vcb)=BcVcuh&GQ(Ry?+8P=8XkiA&+?3vAN`V zo?g#_hjs%mCYCCD?w8qpx=}s>5A6n6Oe|HtWIoVbrMm&(S?^z-1hzY|RN2$2Rd1Gd z@_(?2asZ3zP^wf3q?kUXN|iv0g%U9xN|h=B6GI4fPhV1?N|h=B6Z1`m2fTWeDpdj| zrd+B#+RZ_gDpdj|cARC{Oi^yFq~~ix0BnNJE$`))_iO`p??fm-jrysxkqKL>R0;6P zqut=jseCz=ClE0->i1t5@lB3Y(?!5ir7cR3_1_kgVTqXyOU!IoVrIhz4Mi+GHZ~*6Sy@<3v9KCh z$pQ=8A!4RxGf^HXuf;6P6h`vMBhfUT3kw#*Mo}Y=JfalCjKwWk;L4nH|9f=4{XPHx z-R}S0ySS3Ep*-O~q7%IVELe;hEJh6$qXvsngT<)9V$@(UYJad8HCT)qkYe4nt#y{_ zM4cvX7UU*O2BX_%U+?f*&6R*-{|5ZsEzT(%X>?7t4wmJWfDivYSdWdRv|^>rGt%hF z&(1|!;%5-ggCt2-bLD2&q}yiCN;lvw^d;yAU7w_{vs7<6rdq1%Q}oH$%YC3y!7|e_ z+H0D3oHMFrQ-9So=NOD`n|-6xr$RObymN|71uA4y*vk|`k}I^6)_pWY-&qP1|*wW6qAWFo7xqNlO)j__?AFu&oSM9aCY>!%e5$W ze178a_pcrV;~AnYvGcpDo`ung;Otv88s{jjh}}Ou41X+nhS$8$kr$AG;>9Ab5#QFl zYj)`7@eXjTNU>NfHn+d#^bed~hrx#n6AOg)x~KaN&yJDi3lIZ|o+7G>g>Nr=7so)N zr-({o;L%eAT?{FDiXe)iMo$qeG3@9m0xzac^b~;<3*TNejd%EWm!mQC=qV!cKf%Oc zF>0_FH7Zz)8Z1T)7NZ7>QG>;(!D7^4F>1U6qFTbtHM%BP00000NkvXXu0mjf%$5t4 delta 948 zcmV;l155nd1ltFYHGcz;Nkl`@tm>94A z2i`nr;vcY!2X7uc7|+J|a`j~NvWv#VOmADv;@DfVkvU;ZkkSEV8!v@=Xwp@nwXwga zrKX=->BIBwCwb`e@(U<@?<(;>Vl(;yaAAp=4NJ^ySYl?w5`QxrmYCVF8<-uxbDgW! zOR0Q0^{c_wU^_QV%o_{3#{vXF_^DBXAZm2=XgA01(`<&}TW#(A8zvS?Oh_-Cq$fgB zk!uuJYgYCPh1E3sgVxf&F~2dJ!yb%}^}Jte2#w$WH-b}9n?rW6wCc^$ zPEKQlF=FIwOn>2SaUmunX;0Bx z3?USnKCjTAu$BP{(p$_o8FqM_a(DSwo7p@B3DR4POenoJO1pXPqz)3KtC)RgFmNfX z(11?Dj6*_avC#B5vdJbk*jnX#0V+#ZF>*%fwZW_(@PBO{DhrobbhvZKxue6buutJD z#SMVzO9YqL!&?iB_g~$J&x@asiE)MYY=${4RskOX<4~NZX5TD474&TObHnkdLgQjG z4V#XA+al<#{@i|xzJ5F1>)EE=jQ9MF3EP&H+~)e{PdIX=U=a&Vcb)=BcVcuh&GQ(Ry?+8P=8XkiA&+?3vAN`V zo?g#_hjs%mCYCCD?w8qpx=}s>5A6n6Oe|HtWIoVbrMm&(S?^z-1hzY|RN2$2Rd1Gd z@_(?2asZ3zP^wf3q?kUXN|iv0g%U9xN|h=B6GI4fPhV1?N|h=B6Z1`m2fTWeDpdj| zrd+B#+RZ_gDpdj|cARC{Oi^yFq~~ix0BnNJE$`))_iO`p??fm-jrysxkqKL>R0;6P zqut=jseCz=ClE0->i1t5@lB3Y(?!5ir7cR3_1_kgVTqXyOU!IoVrIhXaZHGct=NklI*1S$br2yi>L5a3 z)Io&6(07mkH=nVEnLIEz`)FHEJczAAs+s%74uwlt?$2j^7!pDsym3xC^Jyd zT30-Mb>UPk8P!4IAPBJ2G}~LdWOjPHjIiXOa1a9n0}~^YpMSB-k;YXuK{3817tbIg8`8F!!T;@Ot1Kbm;o2 z`qdMzJ-JQ17Jphf=)!|*jcX?zyLpyWjnsG0lef=1H_cpqV%z`!|H;r!O$WXI`f=*c z#WVLT|Mlk=*@jTZLEnGg|I=h#=Ohgbcjt=P&04<{qA_PVqLQoQH#kHAVw|%mafr1bH#7_DTqsdZ_^?Y;}6?x3gp4v<0K zNI+T=1d2>|-vK5F^SYh>eo2u@QT4;BJ|JK8*zy2Si0>+D0u6*92oaWo_#(*Tz||e$f@YilX)oYIK6Q5UTe$i z4-zA8d8MqLPmHmN=*+b{Q)81|-Vc9bY|q|d{^9Gzg|+2+gY7v8flbj0vUyw`>jzBn z@!Kb}@1829Xaza_xTI3zE3+S-Jy@PsN6`c_+pTu5yPfia{BR?8a=fd>ExO=ZJ8OptR3cMP6dt8BLy>13WQ zA87}vIT$^iheHU<15|(z6H0{qk|I}QONqQbp#HN%X1i5Vq_)!nuWXoy2I@S_Z^3zA zKn1AqHC^1vaJ4^2UnNUd^9(GI;%`}z%oNECf;1wI;l93cA3iov*itjh|0{^`KebE@ hkX#IqTnvz0eglne{&i><2#o*$002ovPDHLkV1jZSOK1Q9 diff --git a/strawApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/strawApp/src/main/res/mipmap-mdpi/ic_launcher_round.png index fcfab8700211002e656f1e323500fa314802beda..7885352b044bac81fa38aa09f9785e8d96cde23e 100644 GIT binary patch delta 436 zcmV;l0Zabm1>XaZHGct=NklI*1S$br2yi>L5a3 z)Io&6(07mkH=nVEnLIEz`)FHEJczAAs+s%74uwlt?$2j^7!pDsym3xC^Jyd zT30-Mb>UPk8P!4IAPBJ2G}~LdWOjPHjIiXOa1a9n0}~^YpMSB-k;YXuK{3817tbIg8`8F!!T;@Ot1Kbm;o2 z`qdMzJ-JQ17Jphf=)!|*jcX?zyLpyWjnsG0lef=1H_cpqV%z`!|H;r!O$WXI`f=*c z#WVLT|Mlk=*@jTZLEnGg|I=h#=Ohgbcjt=P&04<{qA_PVqLQoQH#kHAVw|%mafr1bH#7_DTqsdZ_^?Y;}6?x3gp4v<0K zNI+T=1d2>|-vK5F^SYh>eo2u@QT4;BJ|JK8*zy2Si0>+D0u6*92oaWo_#(*Tz||e$f@YilX)oYIK6Q5UTe$i z4-zA8d8MqLPmHmN=*+b{Q)81|-Vc9bY|q|d{^9Gzg|+2+gY7v8flbj0vUyw`>jzBn z@!Kb}@1829Xaza_xTI3zE3+S-Jy@PsN6`c_+pTu5yPfia{BR?8a=fd>ExO=ZJ8OptR3cMP6dt8BLy>13WQ zA87}vIT$^iheHU<15|(z6H0{qk|I}QONqQbp#HN%X1i5Vq_)!nuWXoy2I@S_Z^3zA zKn1AqHC^1vaJ4^2UnNUd^9(GI;%`}z%oNECf;1wI;l93cA3iov*itjh|0{^`KebE@ hkX#IqTnvz0eglne{&i><2#o*$002ovPDHLkV1jZSOK1Q9 diff --git a/strawApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/strawApp/src/main/res/mipmap-xhdpi/ic_launcher.png index 717e67c8cf3c1db79d750e434ede4f7e94fcde80..d5571af16ee797b9dfd6fe31b26d5b1e2b76de79 100644 GIT binary patch literal 759 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1SE5RJ;(=AY)RhkE)4%caKYZ?lNlJ8)_A%& zhE&XXd*`6{xO36gf14te$1e}4T~eY1Ls-YunHl2`6*F|U7j?90=Qi+}Tb-uo*rXSZbY%xRC7 z{`q_F_RKGGKVSbpb-Qb;d`|7f_!FgHmj?IlyZ12v$DE(Kr61pIJGb*-d$`|Mwb#-% z`%cRL_%C;5gKpuz$8TmIbhkZzUSp2s|HhtUZ>`z=;sY#-qnISQ(*42}oUfkAU$>hXHH`#OC3>uX9&lpZ)3 zb8o)R<=h=_XT4V_Wx>y*<$s0CpWE#b-60yG@LHLbRrth34@X9pBCDVYuN;_^Szq$1 z7za%_<}eA! z6zLOD5%GBI;b_YA|B3EYkGzmmOXXj$gXt5i^&y)c+6bfGL^5)78&qol`;+0A4OV`v3p{ delta 1319 zcmaJ>Yc$gf0RPL#Ot&fIG>^GQ9wRMn7Cq*#S*DOj_qya2#)P=!5%XsrL&c(X#W-Vm z%x3PQyqZMhq?0ToltWQNIF<6qa(%n!+zSs&7|0k1ILPEUx9+G2w>EI;bLokk8JJy6wJmR4{wtl58jn)TH>quh5LM`2 z2M^2mjT^QNlcG;r&nDKLYq%{C&Vkot)lby^-k;HV`37YPBK}4`n8NBP6P@%RPXY`3 zXvszyLQT@)81hncUTSWMj&VC@I?j8QMeUR(`ItzR^D+za`^P9u#KNy!Ar=0utC<^) zDe$BwTz~h$pwi&A_6+cWJcju?Z z^xxz4A!I0Vxx0=#^{LfD-pjWXg}P);WtF;vf2yBQC;`ALuMxw&i&>7KYoo==7np14 zl~r!TNS;kk6}Nx$)>O=t7iQsZ4bjhA%Xl!jJRqk=;Oj;q^l;GTI$vC1v6$U9aXB@` zOH5m^q$vzYzXy>wH+Kl(dpH+ow1qO7z*{iuB~<_dSar?dclwFrgt?X0m;$aa)I8F3 zhX6+Z{CJk_CVG^-)GZzjeJ*J{6r6K2_GimONu$ii zxFaQ}*H?7z)uB0AFZ&X$%{bRv;3;kT$is?Fcj2L^;Ui~chRcMl{r*DP#B6+pYjCNYSvDk zbhjvTd}%orqb3#Pb)LIr%sPza@n<=AJR+xl>=;*^3GiQ!`=*qAJICG^ zX>F$}vt+0B^VgXRzQg-buqg0URj?mE-(P8l7hLjEXP97@aCR4fs|qeTr#+0)U*M?% z_6O{8;OD`cGfnc>XgqSG>}w_$Q-{+3@nGY};<%(U0%(xynykPeikP)LOdJwdOIJ@} z=15Pml`TPiKJglRof*2<3xXUd$jqU`XU*UjvD<~az)148!^p|s39GB$ll2g-MEWRx zaYzExO36gf14te$1e}4T~eY1Ls-YunHl2`6*F|U7j?90=Qi+}Tb-uo*rXSZbY%xRC7 z{`q_F_RKGGKVSbpb-Qb;d`|7f_!FgHmj?IlyZ12v$DE(Kr61pIJGb*-d$`|Mwb#-% z`%cRL_%C;5gKpuz$8TmIbhkZzUSp2s|HhtUZ>`z=;sY#-qnISQ(*42}oUfkAU$>hXHH`#OC3>uX9&lpZ)3 zb8o)R<=h=_XT4V_Wx>y*<$s0CpWE#b-60yG@LHLbRrth34@X9pBCDVYuN;_^Szq$1 z7za%_<}eA! z6zLOD5%GBI;b_YA|B3EYkGzmmOXXj$gXt5i^&y)c+6bfGL^5)78&qol`;+0A4OV`v3p{ delta 1319 zcmaJ>Yc$gf0RPL#Ot&fIG>^GQ9wRMn7Cq*#S*DOj_qya2#)P=!5%XsrL&c(X#W-Vm z%x3PQyqZMhq?0ToltWQNIF<6qa(%n!+zSs&7|0k1ILPEUx9+G2w>EI;bLokk8JJy6wJmR4{wtl58jn)TH>quh5LM`2 z2M^2mjT^QNlcG;r&nDKLYq%{C&Vkot)lby^-k;HV`37YPBK}4`n8NBP6P@%RPXY`3 zXvszyLQT@)81hncUTSWMj&VC@I?j8QMeUR(`ItzR^D+za`^P9u#KNy!Ar=0utC<^) zDe$BwTz~h$pwi&A_6+cWJcju?Z z^xxz4A!I0Vxx0=#^{LfD-pjWXg}P);WtF;vf2yBQC;`ALuMxw&i&>7KYoo==7np14 zl~r!TNS;kk6}Nx$)>O=t7iQsZ4bjhA%Xl!jJRqk=;Oj;q^l;GTI$vC1v6$U9aXB@` zOH5m^q$vzYzXy>wH+Kl(dpH+ow1qO7z*{iuB~<_dSar?dclwFrgt?X0m;$aa)I8F3 zhX6+Z{CJk_CVG^-)GZzjeJ*J{6r6K2_GimONu$ii zxFaQ}*H?7z)uB0AFZ&X$%{bRv;3;kT$is?Fcj2L^;Ui~chRcMl{r*DP#B6+pYjCNYSvDk zbhjvTd}%orqb3#Pb)LIr%sPza@n<=AJR+xl>=;*^3GiQ!`=*qAJICG^ zX>F$}vt+0B^VgXRzQg-buqg0URj?mE-(P8l7hLjEXP97@aCR4fs|qeTr#+0)U*M?% z_6O{8;OD`cGfnc>XgqSG>}w_$Q-{+3@nGY};<%(U0%(xynykPeikP)LOdJwdOIJ@} z=15Pml`TPiKJglRof*2<3xXUd$jqU`XU*UjvD<~az)148!^p|s39GB$ll2g-MEWRx zaYzE<|{ zLn`LHy}jT2YM{)qkMBd*y9KCBoZuMfY(I@-id(eI9G2Nr)e2WGyt+t3e}_k4l%rUq z3)eEmsV$1FGg_USd7lZXXoO5jQn;y`YtgKD?WNb9;(O0+*4IC%+4p^~&1v7MreSJ_ z0w4ThIN95DP(z}JcEs|7S$#6utMl*eTYBZI;=PY15rv7n7Ou)$^Yq`!S;Dg~sjfT! zv19qcp4{2n=h@bMN?o>p;i`2T4!jQj%=STh%JgYlubSK2-w%!seEUo6JHx@Azt-Q& z%(i};x38??yW{okJ6br?LS(J1N|vqOyt4FsU+lX4LS``?&q*O#q0xbVA35dEF`guT z#zWlIN_pkM9**=B4tdF|Jv@pt1W)$xsLv4m)5D`1A@r+<$6&_C-#t2>;=Aph@8>j| zk(l;m^_k{`v=ol}38I&JdX#1e9_#7RnBh2o;zd^P2gXLn64*-Ij!B<6aMt5MXC=d| ziCo*b43$N5bkCux#Y@(`X|qOLJYX?r!D!-EpVo%rfl8qpFJTPWMnk%Kd*7q zia2-YoCoV|j&|dqgJ$PW0+r5Cy3XE^TAxyVOl~XRogaTn_450*Zn&*kv&N>zcFxQ9 z75_8U&iiXeoO4qOkCV*UddgVcX6lc%4@wRY21jnkZcU&+Q!$ee8KDBwIXY#wIVrF`9YjX zN0tj_h*lficUus;=inci#xO&+&y_4uuHt7t10@0tj&N-0Qj*AEiDH%GF=txa#LFhz z7{%s9#|_Kjmp z6RY%0nf#a8^Jmn({w0uZa8L>8o`!_LUI*><&8`+qYi)SH>FzG6eerJULF>=m-0Si` vdaqiu@zPh`Nz8v2^1B^O5aFR6@l3qs-n7*JJ!USz{K??y>gTe~DWM4fA5*B* literal 1809 zcmb7Fc{m%`7FR@KYrW1`Dos_HMy;t1QktN)+7hLf1|!9nmYGS=;ZY5mSh`r+YG@*K z(T0qsG`6ZG!U!hHH`J1n7A@6@SfZpU;-xcx%s=ms_rCj``}^+i-gEA`_ndprwE&ct zwuYgGl9H0P_bK;41>XEBAZ0~=!8CbU0cz2{UhYaeU)%lms$vDf^LBSVlS&s0`2?`X z{?5eOcN3`n&ahWq@SXS$|bjxWS%7Qs*-fYFUj}Eu&s&UBkDe?q-4tof~oV=#B1g7{*jx*SB`v!8Z>|T}gFLBxFsdz-B zO|a@#U~x!1e1GAh?VTtNEp|7<%;&S=PHmLeq#$Pf)b!=-o5#ZzhI2CR<)y=` z|5|~YpHHg9IEVSG)AP-S)kM-X+GsbzeO8{Y*Z9(C1Q zY@GP5$cVT;(i_F$tl(S6;ligg7BN#h?sAV8DX9a9tu|v#p5=FX9NEfRilFOaB@r)& z(t=?QrQs*{<;Rs;MbB>6WkkIE`H??byx({?Z-JebN0eWKNzp-}DGlG~?3rvZ>BoUe z#H*eX`CzTc=gQ`XY73pxN>s6_LH(Vu2p>zN6=C~k=1O(Lm}q78hmJeQ6Ghk5O@m?c zzy4cNDAn__w^J9*C;9GGi@EfYF$xw`>4c^yKhowI45ieSC^yTJ-M$*)B;lSE-NtLn5rU6 z$H=&*ve1$zG!=jwkKr41`2fL`^I5iJ!{?lZ12u4<>@!*bkuu6Wm(&Qb(skovvZ&V| zV9&dtdIIW7r>mmP3}|QaS>zd?o`ah61zPH|;|4)T`$#ey$+F+M6-G1+aPdWCN1_~S z(ZWG)Zuqt_4g9!@5TNvj;_cGuVtM;AHY3yr4FkNJzz8m58x(P1k>6nAbZFRiJnI!= zQZw_%$F3Jh9(qs+uS39?8(CXv4l&F&x%<%UUn)_L#_^dN*A+K217bKeN`lLq_db|V zXcuB39j9tVID}=mh4x9ECqgDgt+_i|pqL_IXVSKr6vWT)A(!n#2qcJ9EY8%IDcZwc^Eppc8N`J$}yi`PZ%V2i`L& z64u6_S(^4bYfh;)w<^Uy9q-B5EnpVMRWDiq|N9MYpfPjXQx?4TP>R$|6y|-vR#}u>v^fg(p-wsljQcr z&I-j*7O+(xty?=qe_#(Gzei5B{ms&_{xA8~>j{;aePDVa02lpc`rw4Z!@${QLKp%# ntdd|P@;?86eEk2dOl$!s6W1};0Z$thHBQOf1LgkoB$o6aJD_A_ diff --git a/strawApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/strawApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 455be2a69ba7453ef56a9f1e6f1f46b9546bb285..f6d9d87c540a77a8dd0edecd4c7bde1558d351ef 100644 GIT binary patch literal 973 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q2}owBl)eX2Y)RhkE)4%caKYZ?lNlJ8n><|{ zLn`LHy}jT2YM{)qkMBd*y9KCBoZuMfY(I@-id(eI9G2Nr)e2WGyt+t3e}_k4l%rUq z3)eEmsV$1FGg_USd7lZXXoO5jQn;y`YtgKD?WNb9;(O0+*4IC%+4p^~&1v7MreSJ_ z0w4ThIN95DP(z}JcEs|7S$#6utMl*eTYBZI;=PY15rv7n7Ou)$^Yq`!S;Dg~sjfT! zv19qcp4{2n=h@bMN?o>p;i`2T4!jQj%=STh%JgYlubSK2-w%!seEUo6JHx@Azt-Q& z%(i};x38??yW{okJ6br?LS(J1N|vqOyt4FsU+lX4LS``?&q*O#q0xbVA35dEF`guT z#zWlIN_pkM9**=B4tdF|Jv@pt1W)$xsLv4m)5D`1A@r+<$6&_C-#t2>;=Aph@8>j| zk(l;m^_k{`v=ol}38I&JdX#1e9_#7RnBh2o;zd^P2gXLn64*-Ij!B<6aMt5MXC=d| ziCo*b43$N5bkCux#Y@(`X|qOLJYX?r!D!-EpVo%rfl8qpFJTPWMnk%Kd*7q zia2-YoCoV|j&|dqgJ$PW0+r5Cy3XE^TAxyVOl~XRogaTn_450*Zn&*kv&N>zcFxQ9 z75_8U&iiXeoO4qOkCV*UddgVcX6lc%4@wRY21jnkZcU&+Q!$ee8KDBwIXY#wIVrF`9YjX zN0tj_h*lficUus;=inci#xO&+&y_4uuHt7t10@0tj&N-0Qj*AEiDH%GF=txa#LFhz z7{%s9#|_Kjmp z6RY%0nf#a8^Jmn({w0uZa8L>8o`!_LUI*><&8`+qYi)SH>FzG6eerJULF>=m-0Si` vdaqiu@zPh`Nz8v2^1B^O5aFR6@l3qs-n7*JJ!USz{K??y>gTe~DWM4fA5*B* literal 1809 zcmb7Fc{m%`7FR@KYrW1`Dos_HMy;t1QktN)+7hLf1|!9nmYGS=;ZY5mSh`r+YG@*K z(T0qsG`6ZG!U!hHH`J1n7A@6@SfZpU;-xcx%s=ms_rCj``}^+i-gEA`_ndprwE&ct zwuYgGl9H0P_bK;41>XEBAZ0~=!8CbU0cz2{UhYaeU)%lms$vDf^LBSVlS&s0`2?`X z{?5eOcN3`n&ahWq@SXS$|bjxWS%7Qs*-fYFUj}Eu&s&UBkDe?q-4tof~oV=#B1g7{*jx*SB`v!8Z>|T}gFLBxFsdz-B zO|a@#U~x!1e1GAh?VTtNEp|7<%;&S=PHmLeq#$Pf)b!=-o5#ZzhI2CR<)y=` z|5|~YpHHg9IEVSG)AP-S)kM-X+GsbzeO8{Y*Z9(C1Q zY@GP5$cVT;(i_F$tl(S6;ligg7BN#h?sAV8DX9a9tu|v#p5=FX9NEfRilFOaB@r)& z(t=?QrQs*{<;Rs;MbB>6WkkIE`H??byx({?Z-JebN0eWKNzp-}DGlG~?3rvZ>BoUe z#H*eX`CzTc=gQ`XY73pxN>s6_LH(Vu2p>zN6=C~k=1O(Lm}q78hmJeQ6Ghk5O@m?c zzy4cNDAn__w^J9*C;9GGi@EfYF$xw`>4c^yKhowI45ieSC^yTJ-M$*)B;lSE-NtLn5rU6 z$H=&*ve1$zG!=jwkKr41`2fL`^I5iJ!{?lZ12u4<>@!*bkuu6Wm(&Qb(skovvZ&V| zV9&dtdIIW7r>mmP3}|QaS>zd?o`ah61zPH|;|4)T`$#ey$+F+M6-G1+aPdWCN1_~S z(ZWG)Zuqt_4g9!@5TNvj;_cGuVtM;AHY3yr4FkNJzz8m58x(P1k>6nAbZFRiJnI!= zQZw_%$F3Jh9(qs+uS39?8(CXv4l&F&x%<%UUn)_L#_^dN*A+K217bKeN`lLq_db|V zXcuB39j9tVID}=mh4x9ECqgDgt+_i|pqL_IXVSKr6vWT)A(!n#2qcJ9EY8%IDcZwc^Eppc8N`J$}yi`PZ%V2i`L& z64u6_S(^4bYfh;)w<^Uy9q-B5EnpVMRWDiq|N9MYpfPjXQx?4TP>R$|6y|-vR#}u>v^fg(p-wsljQcr z&I-j*7O+(xty?=qe_#(Gzei5B{ms&_{xA8~>j{;aePDVa02lpc`rw4Z!@${QLKp%# ntdd|P@;?86eEk2dOl$!s6W1};0Z$thHBQOf1LgkoB$o6aJD_A_ diff --git a/strawApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/strawApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png index edd54e2eb2689cbca5a3480edd8988a69be8cf5e..3004b5dfbfe0394ca3a9b20999c06747737891b2 100644 GIT binary patch literal 1200 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 diff --git a/strawApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/strawApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index edd54e2eb2689cbca5a3480edd8988a69be8cf5e..3004b5dfbfe0394ca3a9b20999c06747737891b2 100644 GIT binary patch literal 1200 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