From 34fc7b7f3041799c24a1f752c7aeed7f3c87340e Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Wed, 20 May 2020 20:45:18 -0400 Subject: [PATCH] launch: fixed mark conversions and added files --- .../app/landscape/img/{Tile.png => Chat.png} | Bin pkg/arvo/app/landscape/img/Dojo.png | Bin 0 -> 2261 bytes pkg/arvo/app/landscape/img/Links.png | Bin 0 -> 3407 bytes pkg/arvo/app/landscape/img/Publish.png | Bin 0 -> 3838 bytes pkg/arvo/app/launch.hoon | 10 ++++++---- pkg/arvo/lib/launch-store.hoon | 4 ++-- pkg/arvo/mar/launch/action.hoon | 4 +--- pkg/arvo/mar/launch/update.hoon | 1 - 8 files changed, 9 insertions(+), 10 deletions(-) rename pkg/arvo/app/landscape/img/{Tile.png => Chat.png} (100%) create mode 100644 pkg/arvo/app/landscape/img/Dojo.png create mode 100644 pkg/arvo/app/landscape/img/Links.png create mode 100644 pkg/arvo/app/landscape/img/Publish.png diff --git a/pkg/arvo/app/landscape/img/Tile.png b/pkg/arvo/app/landscape/img/Chat.png similarity index 100% rename from pkg/arvo/app/landscape/img/Tile.png rename to pkg/arvo/app/landscape/img/Chat.png diff --git a/pkg/arvo/app/landscape/img/Dojo.png b/pkg/arvo/app/landscape/img/Dojo.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b651bc5c43ae491cf93dea4ead1aa93d92cc0d GIT binary patch literal 2261 zcmbVOeK^zo8sAu19KvG=&$OONRworsWyPl1=!MwmAuoC4CBh>kR#qc<$-+}w$!5=_ zC~t+PX>oGsMXk+CUS{Zp{pf6!@G!CSn{!>~oa;LOJ%4hKpZjy)-~0Ey?(3U- z*o&mEYoQB)K=eI52)-aTf~yU_8vNGKJ;y;<^Q%Wd5(Kj4fM!7}_Fk(3H=#+sBsWN{ z$Z8TaU{Ux(cnIWvf!_D9RS*a~#*=`jq(T)kM)Lbki;k~}7;Yxu_XSvgwch3nCUvq+ z3Gro+pWe`rhIm2#$z1;-7{7{d$$*sGZm49JnU4S7Q}Cz9%!cj zSigm%UGuJJcdc}|o~m3GN`M5fhSZey5Bg&uC$;77WQ7s?V#+lzJG5t8~ z^QuBF-zJtS0V`u4b*LpD+Mq(seV{Wr?ctdzaX_`OV2LXq1dh(GsfVKmFxuW zL0XL}?&bDl{%d81^5t1cRcHbK0}ER~HZaM@wIj6jkH8&+P~u;+{;a|DjOKk?Hi|~y znV__{dY@9dW=DCI%*>`@>2|<$Z~GfhQmhucfB6*I`Zv;S+&&D-Q!Q0Scnw!gfghZHntQ1K$EB^KUIhw)e9onV`P??}lzWt& zlQ^~PT8Jb7?szeJ62S&949^PVtj8d-PE`S0U>3nID|iit(WPWBjq?NHkssAmi|Mi3 z|G%I=9tg%$2d^f%N1?YQTf%WDRw^ke?@V z<94AERwD4o&0yj=?~oNZ#Q9%1FtTEK+E74I#g+XU(IM+%jcB7irb<(yDGWxE!y)Hp%`&x{f;_^upP?n$BkO^a>oBN>EK=>+$k`8c^dh1zcf zJkH5eI%~1l`bdNYI60m|wcf{Nd4oXu4;-RU`6zLh4Mrd}0>+IIG6j5QM{b@n2|hCo zMt_6PJOIH3MhhUgpSIQ#TJd--){KzVJ`!do&OWme=)`m7wiv-zLm(|TFFpuHbK&tU ztr?sG&_&|PQ5b50{6ZIMT)H_`z)quY(k-I(oD!Ws1M&bJ|c(ERtqiam(_)A&luUNkMP=tDN!G!sku#sw z29#AZuYLrwm0s2{&?9}>C;hB%e}-x@w6t1l#S^cyF8$d#{C|VIGbJ%k$J6y9p|^Fo zlJ8xR*_*CZYiWZv}tIYn9pAv>nJlZ*TuV?KVM`BcdwJ1ziS~{;xT9}TdS5*m&fj@5Dk%c%_lF2(@uIgV zaP5V!CeMQ{2f!P2H$_&iV!l`i?|*Bs#__j*k1_q=4;OLax-k=NXJq#A;mL6%n8g(z z^>nIr;>pY)AwRt~BP*b>{N(qoowq}lkJ|eQONk@%Okuxa>rJDlWwX<>1sC7G*@h`m*LyQ0b literal 0 HcmV?d00001 diff --git a/pkg/arvo/app/landscape/img/Links.png b/pkg/arvo/app/landscape/img/Links.png new file mode 100644 index 0000000000000000000000000000000000000000..d83bb877c9158f23e988467908b804035d865271 GIT binary patch literal 3407 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 b&)3nSEe^CCVn_`Cxe9QwIeV(w3Pboer+Y$# literal 0 HcmV?d00001 diff --git a/pkg/arvo/app/launch.hoon b/pkg/arvo/app/launch.hoon index 9f38aef336..931cb3121a 100644 --- a/pkg/arvo/app/launch.hoon +++ b/pkg/arvo/app/launch.hoon @@ -31,17 +31,18 @@ %_ new-state tiles %- ~(gas by *tiles:store) - %+ turn `(list term)`[%chat %publish %link %dojo %weather %clock ~] + %+ turn `(list term)`[%chat %publish %links %weather %clock %dojo ~] |= =term :- term ^- tile:store ?+ term [[%custom ~] %.y] %chat [[%basic 'Chat' '/~landscape/img/Chat.png' '/~chat'] %.y] - %links [[%basic 'Links' '/~landscape/img/Links.png' '/~link'] %.y] + %links [[%basic 'Links' '/~landscape/img/Links.png' '/~links'] %.y] %dojo [[%basic 'Dojo' '/~landscape/img/Dojo.png' '/~dojo'] %.y] %publish [[%basic 'Publish' '/~landscape/img/Publish.png' '/~publish'] %.y] == + tile-ordering [%chat %publish %links %weather %clock %dojo ~] == [~ this(state [%4 new-state])] :: @@ -57,17 +58,18 @@ %_ new-state tiles %- ~(gas by *tiles:store) - %+ turn `(list term)`[%chat %publish %link %dojo %weather %clock ~] + %+ turn `(list term)`[%chat %publish %links %weather %clock %dojo ~] |= =term :- term ^- tile:store ?+ term [[%custom ~] %.y] %chat [[%basic 'Chat' '/~landscape/img/Chat.png' '/~chat'] %.y] - %links [[%basic 'Links' '/~landscape/img/Links.png' '/~link'] %.y] + %links [[%basic 'Links' '/~landscape/img/Links.png' '/~links'] %.y] %dojo [[%basic 'Dojo' '/~landscape/img/Dojo.png' '/~dojo'] %.y] %publish [[%basic 'Publish' '/~landscape/img/Publish.png' '/~publish'] %.y] == + tile-ordering [%chat %publish %links %weather %clock %dojo ~] == :_ this(state [%4 new-state]) :- [%pass / %arvo %e %disconnect [~ /]] diff --git a/pkg/arvo/lib/launch-store.hoon b/pkg/arvo/lib/launch-store.hoon index 5f8836d7c7..36146faa08 100644 --- a/pkg/arvo/lib/launch-store.hoon +++ b/pkg/arvo/lib/launch-store.hoon @@ -26,10 +26,10 @@ %change-order [%'changeOrder' (terms tile-ordering.upd)] %change-first-time [%'changeFirstTime' b+first-time.upd] %change-is-shown - :- %change-is-shown + :- %'changeIsShown' %- pairs :~ [%name s+name.upd] - [%is-shown b+is-shown.upd] + [%'isShown' b+is-shown.upd] == :: %initial diff --git a/pkg/arvo/mar/launch/action.hoon b/pkg/arvo/mar/launch/action.hoon index 7d2a7bf111..594ca5e646 100644 --- a/pkg/arvo/mar/launch/action.hoon +++ b/pkg/arvo/mar/launch/action.hoon @@ -1,10 +1,8 @@ /+ *launch-store -:: |_ act=action -:: ++ grab |% ++ noun action - ++ json dejs:action + ++ json action:dejs -- -- diff --git a/pkg/arvo/mar/launch/update.hoon b/pkg/arvo/mar/launch/update.hoon index cf10fc6b4c..afe1758d32 100644 --- a/pkg/arvo/mar/launch/update.hoon +++ b/pkg/arvo/mar/launch/update.hoon @@ -9,5 +9,4 @@ |% ++ noun update -- -:: --