From bd8cb978eab8c1111794bf4966bbc20eb569e1dc Mon Sep 17 00:00:00 2001 From: OBONO Date: Tue, 24 Apr 2018 00:28:24 +0900 Subject: [PATCH] Version 0.1.2 - Change application name, folder name, and launcher icon - Modify licence notification --- .project | 2 +- AndroidManifest.xml | 4 ++-- README.md | 11 +++++++---- res/drawable-xhdpi/ic_launcher.png | Bin 2923 -> 9125 bytes res/raw/license.txt | 8 +++++--- res/values/strings.xml | 2 +- .../arduboyutil/FilePickerActivity.java | 15 +++++++++++---- src/com/obnsoft/arduboyutil/Utils.java | 12 ++++++++++-- 8 files changed, 37 insertions(+), 17 deletions(-) diff --git a/.project b/.project index 2c0a44f..d08e1dc 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - ArduboyUtility + ArbyUtility diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 52b0752..566a058 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="12" + android:versionName="0.1.2" > vP)eL0O3s88t5cd6c*bmS_I&|J)IzmU!J7&k`lba!D<%XR+a}q&SK|m#7 z-DO4J-F>~j*#5;mop*Qkcd2p#DgcyG3FQMpB|)%nwNokqDw6}c;;Zu4)9XOOE(xm zqf#oSGFpp)a6n)rJ@uvmw2I1|7BIjgmj2gA?^CP2>sw=J#*WB^D39?g3cG5ca_aR4pyF9=YHWr$Ip zd>@OiwCVGgj2dQ^_xrpjFe@L21#;KyhSFe-x4?#t4a2>gn@2w5di$dKKqi1xN~R>> zgQ5>maHOD?1t`*>@Pfm;1fMX5;2&gwJQMYzEE=wt*iqj}pXkowY4sIYA-)C=iPFC> z(cvG+b78ki=cp%T;ndF^Au)b$sR8ViLTe}iXj$G8J5KJX1px{)D8z-gCohyS!AuBx zlL>Nj_-!(Ma+E9|t(V^|-;0aI%^Bd8?zhVn^S3f3>KmCo=tr41@CWHU_*rqybP;4> z8Ux&`21ud=iU$G`0}!)2riKT|*C6MD07d8w2Lv{7&@K|vC&W4I#+LOHc6nGPhJPcy zjIWDZ4;STglPG~wQNaK|sR33|JS|s3v@GJbbYe#h36MqE8l+$Fefb!TIOW>uW^{V0b$?2NtU=0vdr~mr0*&bt>P6vXyGjTnnP@mIrB&F2c=TWZUuS@& zw3rsq9N?vdmtfy*uVw*KHE>Xp8sK{*D^Ix2tP_uDPw{E%C+~j#uDlujrZT_?dWUco zchXN}rf{-eC4_-&G>(>2Jc{}HYc;?kT0paD7Vv%Q_gH&)Z8ZpB*T6w*)Bt|Sz*vO8YrF-o}x49l!3M?n( zses395A@9I`8N-cqCw&X0a9T?EY!g~9r?KY`RQ}gq1k70XTQ6YkK5>J!VU7LH>itx zTe|xBV5I&ula}Hn0}N$=P&L3Tnn4qRm*TiB?X>?510-p*QVnnigB-$8<%w(*-N)kK;N z+$_DBM;9(%XlDUW-yjEN0SSEj3e`z}xc3rogqDXQYDg4@mkpPKRLKly=r&-^bZ2H< zr`xJGh^RIs>g}R=+RXyOWdR$Qwaf~l-Cyo*M*$+3t>h@PUlw3O&(W*2N&16LA2P+@ zk%N)BC=m(ZcSA~_6r^@bMfl`!5g0)qhVBraOd3H!$H=zchtyGRoBOf8|q+72gXzc9OF{ww)3 z_oca1@M;15b^fn55b&~23hdtN@Nb2H{d{Y)vD+C{8ij#924d9QQ82GCmug-ZIU4aUFKc0tWICR4peqfo7ftktLDFws$H)m8pVnv@Zhu0^s1_0F_GB z_7cMW-V8wKzhD4f*iwN5E3=SQF~umLS_pW1^pm44689uh{~i5l@}bFe;nIaR5by#E z*du~_ZFb56G_;rArB#O7KVLza;+V~hVN+C8I{?AK!SM0%fsKt#+Xdf(naWg1 zzngif1^%@p9aCz?!&UDt?xRv>3A2m_gl!BXT13P`Xx)eF+9(G+&jNOdCZ>6IGdm2& z$0&=oiy+IZTFvqRGgj)AXohIu;p!oR9}p0Lpr9alczD3v-2Bc9h*u2MN)41y(-pZI zW-0Aq2^76Kny8j2en&iAzH+&Z1U##g1KceCBMWe00l&~vx%RirTxK#ehG6e%57&;a z@bL72udlC=5EvK;7Z(?()#^K!i04R^#b<#J`jqtnL-n*#u07X9p8w$>m?oK`gL?-!c5sB7iyOSWyr9);g$O>v z-roN9=Z7Iu(_>O3 z0S9Q69Q+$b9-S5wRAW`JjIb27-r30+ojP?=<_950qtV=a@YT%yQth{{v_`)L{ot1D zhWjVp506?8;~8Ad)X;bqASK>%qQ!46Zil&`!#XM0TNP|!Hp&80`3S0zo1dGfO!~vs z>1sIHJHg)39`+sW#aO}9(-VGveqaeghLe-i&ER-kgG zie6z%ga9V&kuW-U>0CPqILHDvNWqp_CkwD-As>sxTXLOdrnH5?E5)%$(+5o95b6MT zM|U_oJA<1gF-~xEYmy&?5IZ}&)(793c~JTcRj~@a8hXLM!XG^!?g`g&SL5$nL6;dF z3m~dv^h8g7_GCLvM<38h0pFyYBR2@xOu4kSh2WMNf}3rigeko``0h3C=v3axD5Fw( zp2Y|YIQuvY5suD|uBvaQz`%P3!eXX{ay;-SAH9WuY9h-rOZwnHAGD)@r*u-# z*ApL=0{EU4hFU$BDU^FOayx34ZHCTWI%DFPi73h~!jXMPP`kAjp81}je8u3WnBbi0 zjKuszj9M@Xfl~uvQet9kk6DE2OjFo(wS&8pJ6xPyM6)EitMg~tL93~3yK(5z5Ufucg_sgRE(1QZd?J~+Fb*M#@7fR!Yj1uJ9$J!lOb2hl9~`TD`u z+7>3nA_53hB)#5crVFN4PDSd5RCq4*gsNO+Y${9WbH-W-C?j&NcBbFX{MOC_p43T! zZU;{sI2bMrvUfX$P7hf-lahxcE2>>p2V)CQg91T-$V^zKBLr2@#btIYcYp zSlRyDQWBm>APzPo3m8MIq(4R*t3_x)sHkgeO^u)wA@*bo9*bDe{5*c%@=fRsq2z!vt0#R&YPk{Biae*W7shJ{`gTyAni;`JEi0iWJJ(0XZ=IY0#8&%qB)W1T>YZ*cOi zoM1WI5^xa~}Q5xcx1_qQHVaKk<3{3+Vsv z{$dC&3#g|Zw2+`KQ$yQL3x97h2x^vy;0X8)@`KN4ANV=@LF=tWpjRM50zwejH4v^T zuAn+OIITw((TaJevgQYUf>HzdLegx?B@zN=6BQmRZ2!%C!_0fvnh9bd=gdFG{2)}SYcvO3!&+tCb#%tl8#!XVTA9Ra#n6Z5ZGU_v+ znyXTdj@t@(>_PMB7^4va@`!vYedyHrQ|&9@^u^N@v>}M7QWjuJi|H+@HZ~U))fR}+ z#~^7$5~72n;pgp#Kp(E*ejy0$9EyP00N9MR0ZW5zg)K(ZkHDg*7GdZ9o%r|8f1_bR z19orOjjemPBCaxygV7EWa+tZ4!~%#OW@ZsR`u3x3cYVMWTp_+r>MHav>q(vmsbdz> zv}T)&3WDQeNAxM|gV=$w@EYKSPUAWucy2I;HVj4Xqqztw4T9|;TV##PLUC>}h7K8u zu3fu|Go?$HE|`}+56|p>2ASoVpu9GcP|6fAbLa^X_!&gnYAy9y(MQCj%>;b>+sCAR zL`&LL%p*oj7n&*sI5I!AxWToS;9cU4DXXWT;W4h+Pwd8)bz4w3zYYn*6W~6?T?~$R zsz8j0Irwry=ARL-i$_dU3@jhAWT|Zsd}$T#EX}4+hH9Rvq4O8d(}zEQ*tVA_z4yy| zL=_|jyP_$wfErrN#}*TvI!BG@UeO}pvmTs<{{8x+bLY;``e~sJ(W2A%P9pdm@MgyY zzCOP2@$!LHo)xIP4Fu#cS+syS_%D6^Qu|$`_x>;MOF^zAag>=a3+T+8ZLwLXAh-;3 zLAZaoNX8swxn^^B6k&m3l7OyU`+fbJ7vSOx=V8vE1vj~%Q^@2q1=pdFna510&v*(# z^Zt+Tx9?@D?;d|w8g>^mWlV(#J|mwMd#SAD+Hdi&1wtc2#egg*IOwVXhX;hibA%_n zhj_!s)#s|mxfcbmP%mg|H8!qN^u8BqA(}mdfzuU0u!(A=1^ZlK8;@A_P^MC5v z24EMnj7euS3^6uLhT;C*%&unG&8%Z4GtM_H;EUhCAl(KX_1@T69CQwa+lS|*#{0Y9B#Ds%NO5O zy;ucKoVX3;S*AbpE^e%R&BWbOH}uSfGZfqqOjINbFlRns&>~eVAkzb(okGRbFE=Mw z3Gj3GgL_|hn6ETPRBaTJ?oUFu&~9R2rghfBL+1hYa&^-|RjJIi&x!)V=slzH|4I3l zakyy#IfrwIa>*z_PuWbX5}Hkg4f@XLi+khm72^QIT)ekn@)Z&+1Y$robSHQFJ* zIvxpw6A+pb3fqOYLS&QCYcWBStATAkKbCWiWy~VNp)U`~5%_4&N7(VN9oRW?Cw8W_ zj_o72Re&!8E2zWjM8O5sfj7`|;d(L6E=D5llS4JSj9 zke6AY+oEnr%t%C+&@Kq<7YNNN&9yIpC>B4jFA~)(WWq`5S2xh z@SWr<&;NK$@mAd-MWieWC^f?t_|H`NPr zE_No$F$l<~45sy6LGirXhpIva@1EY!dTN^=toi!FE5i#~f2}NtB?$KK-*4p{T*Z3^9((GUgH^o>T8%FJ7ZJ(c{NAe}tm!V*+n_9B}B(Lw^gfpg$Sc{>GA6~S|?C$z50>1}~X>YklF;g;3+9iRO|o&7;5mZu_;R z{wP~K2PMm9!@b<&svt!yjY3xT4EUt_U_j3ShrB~g$gffEd5?k~w?u+5$ zha+KN0)hqv!7k4Zv_wkO-gCXtJ)%2;eS+cV;|J%C&S+fPcqas`hM_z;q2S2Vc4#DNY*ODOjm`uw}n@SUpUDcD4cgUI5o56miJv0k6 zsCc8|?iBFHuYWj1R7LzrvyHV}&Fz2psyK8mi@d6*<6P;2u-b4;&r3tdXh)={cSC5d z|F!1u#l;WH*DS}#o+A-DG!!lsE?0@Tr|urarNkj~UM4ImEX0C;-@3lA%CWlcm_v|D zsCfP^74X|nzft`Y^|@v<%+3o5`K{}II+wd)U~ONdKhPJHf9)p5VSxj>&FO}a&LNmL zVjiZho@#88%BAQ<$zuU8+@%6e{B(j2 zKXsVYv(?>bChemchCTd6SI_nQ@%A-yOa9ZNgPO$t>>&7et<31~JUC_4xqr5yN+Ez9;vI z-2g0rSinfiqW@(;bC_bLOu{DD963|^VgG^&NG%Dw?m*15+7si_#=*P4H!?CCcyTZsYaIFKf1rRrfBlp8 zKE78WfO(Lt=>f{6>2!jB2F*3hc$TQ)ey=C)8RLVFddp^;9jj6^Xv)+gSbR|f!fL{h znV*U9k>QFlh6*DVj(|_T53IAS(RV;!+?Q}4Qe#swBxVRwVp7n%TW_czR*N$uZE_mI zCbRJJ76iO_cM1?3J#>_43K3<=0*D0=3-G0Bw3Z*cEJWlhuPARmH%zPQjzx?gKF>c90;kOCszu?Ljq!kWnE>ot%120U`+> zxQhi`ym*oFp3Ec7Yz@(5L-2(FW*Re<;`#okX%c~E$XCH!wJFx8&>juN_hEVQP&AYb z#gy_`bSkq2l{A&qp|S&lmIi^!q&@yU;(H*ud$JsS1}R-r;5XP$bWiQe?BQMJ-F)!N znW==*9i?}z0GTgOd`Y7=jN*V3(WE8lzx4;(A3WKjVH0T?%C98?7=aTWxp1dD(-5zsva-F4kt+ASx4E~V1B z&ChLq<8Buq^U{|uk#3=mXuLs$EP$Cvb~J%XDU<#yL}VKVXr+GGQj?Ai3rFJ7rRmt- zI10O0jm8tJ$Ku8H(=ffd2dKo*%b9C};e&?5x5yV%C0!Sm)FlZ?J(5J=Sq2iL6A>F3 z3-v>4P&u_&`#av>aox{<{G9(!5g@be&26MD)DqoK9C%rPBqo!BX&h~(u>`)2i4S$d z-j(C9Z(SxHUvoe9tQv!D4WqDWVHz4s?n9@X4ozxuL`8&XT384)4{Ojjir18*?nQJ= zG`#zIqeEH;m^^55?K7Z^DPU6QbkF>r9smmdX#xbicZO;X)R65=TcXiKG(i?XG)^1` zP%^!uidP{v-5WI}iP&71j^$-Tv8Xr&kLZW-I3NV1Z+;#8w-#*{?~DuzInPNV2n}#)0@=PN2Ka+)xAv6d!$wb z|H&2Ou&OQ<9SY2w4Wvbt1t!m#jD&s(V$4951S`%Jk(H4cyKF3?7e|9it`Yo)nIZJO zCRJmvE70930UPA$=<$!Ys{onzzki>!^Rz^13K4x|oS8Znams0cHF9$YBDpHE+2G5I z@Uu)2KPDbsE4oVE*wxdpwP7pjYwDq!uWL5(isL9|5RJDRZAZ}$M-zZbSwP_p2)Njy zfE_TDUFo}w0xmTXpl(wEa)TJT5CSFWi zC~LnEnMj*iEfEVyEKMW;3}Rs@KfeB>*hZo!eTxDXx%2w&f6ps-M0hfOOb+v37|I)s zZ-9l0v+AvtZ$VLJwz~i&`(N8nk&_~cVu(m53m_WK45LnzN{uvxE>IeQW-_H$i4b4f zma||6o?1Q&I~s}+UJ(V-E3SAiHThTv>>hx6H(&wb_U+?P|;wqnH6yDBhO^xQ}wDikT)nYf@waO2#{eWdb%S7r%n7V-EOOryY!;rUZCQ{0hV5&DYey2=-`kV%lwGfa@6#sBM zUAfZadahnjl;`F@CxXn)%{9-0QcWq26db`HU;QC(%Kdcjr+9qg<6`F=_m;$aG=wzZ z?C)oxD6{U0@09=Y_?Hx!9Z4KGNrWtbNg*2!WIhd~6XJ}RqWIRl61it29ft}5Y2tm7 znO;PVPc}C9nF|>x6LPh4wP?RtL~|0vhTa1+56EW@_jW|k`RoxjpU(oE_~Zl>555zldeKQJdwJ$ znvT4Eq@~X?XByG8;PkJjacuiB?47l4V?$ZUI# zr@hB(iFyhVBG8{6`&4WgxN_kNT{w4vI;3JxAXr1r5Vhm{8E1e00000NkvXXu0mjfO#nJr literal 2923 zcmbtW`#V%?8-CZUF$bq{97BvTLzHtV$CyD(lIChtHnZD<$`m9m`ovJ<{Fefzq;Kj8aet@nqu-s`!a`?;U{c@FSG0=3jl z)BylmtGNE_uv4IVNCfOXTAt>H9r#$z8V&%Ba#ywd*8pfRSNU^7(+8rz&(HhFY-nyk zhaG&9<0JtLB!DGAAT}rrkOCM1CWQz@0Fa9b1Zx7E&;>`J0erU*ujvFxXb*`dz;2$@ zb&~$?VviM$W^6ofZMATY*yD8Y0dd5K_<7DT-UY;@xMxI_UsD)D0J`B@EPdLhb6=1) zR5cRZk=X3EWN*g{CINNC(Zz00XZE>x&-12MezX-U1h(V$b z+ir^V{pr`Lr8jQgbVksrfDO%FTvN?4i{9JC<`*j94S_Mr-o37Hwgc=pe(R=Y%^^F5 z9vMLXkC-;j7UF8f9~ylz^V$oLN46i>#*_iglBR_SpvR}bM|-Z zbq5l}#eW5400h)*)h=%rKyIGd>%2*o*FGK-i_MtC#iA;ccZ5rh{AOtqFVVhS>!kJ4 zUcXCf+hImpBrC{L_N;vNLH0;g7U4b%BPm>=dk>ASn~l-!i#hVWU}Utbs|y~$9rM}i z9pXA?`0bXmbp$W-vRrlRw*CB)59B)cg-)k8;SSI%y!N`=$d% z;A(u=aaT(4i|f00bsKRUv%ZLDY+q2?(H}_4n8NzWow-*YHZINl*Um(q5$D#eTY}cp zr*p;Dp<;(r7>j9!;4PoHi?{NeS2<#_;pGO-5kxk?)VkcSM^BxEyn+>B7&@KjB5+2u z;JleLO&Av!Gu)VYx4Wl@Bj*D&|EYoc$y#fopC zohlMZ(y$gQ7rteXk4??~u+{l=lZRJy)G+<0*a=n5p{2+KHnGT?TqsVYo#jr(`lQ4Z zsZZ}Da_#q!UUzJcjgPkrZ>X)^m!PY{`5VkF%rPJQeMwS!(4m_PQ*CgEZ8`Th(e16A zwB8Uif1X8NMZr33zZ&bVbGF>&$NQ>DJWJ^_V$JKYwGdv1Wqa6Cxbf;7KT_-ODUgJX84y z6thb2E>!cPW~^Y$!6ek86c&=%kmF2Im{8T3C)jzK$*n10H#k7x*e+dM@L z{`IG**mS$e3~8rIzl0^q(z0_h$R~?za^%z&OKHAwcu-@vJ|Qs2)5wyDPT*7`h&EP8 zZ$H*2eAZ%%*Vc1ET{@AFo_y)Bn7lG%{n`|^9up%`Xr-zCy?yU|)~+i0MsLlEZ?|kj zz1)wI8bVuFaq2X&3?9!B<1o!J+(AoMVq#*fo9G>0Rb8c$xWq{wokdW)01g?WVY+af{Y?{vxjhS%T~r06;Ho3 z*;G%#)2o)kbQ?-FZNMF-C@rqO>{zoZHECFuzrfFMy+9+663YTELL!WIcy7Dex*sz= z|Eo+=WUczP*L-4r_Tm?BjUGnJNB)G>GsmR9MLCmc<;wNvQF*r7TwcHH$S4k#f8hsz z1 zFbFr3T+a7#9*|Fg=)0+7rWPgVv>j7RAa3R1v%%X`_8EyE4r-G~^TIBV1>i)(C(GV9 zGok)95@}tUEfzjpajY}>K=wLY(J@K^o}a-z`>uyY-)IgBtRTye;x{VdHC7ZD^Y8x@ zA4na(M^-@lyz-F7_`oN`BGTBC2e-xjizrxi&GW&Db{Ou<)n_lFnln=6fPWrYtn80; z@<>%)oMj!Qe^E`gnh!jDiW@{dBQaP_LJ!U=W6T>sU4rleZrejjN`HtQHsB!hqJ_O) zR$q9ODK1TM@kF?)ne`y~$!aCt+0esR8I{A~HR)?$&cL34OY#^=VFQZNeb3(chm2>} z$6He|qeT3{C%)tLEmjRRu)%a3>$EezQJ(cE$AibX#I}9TwyvJ?;vcM`?=~L&aPPya zjYC`qRpeic{Dr-xykQx*&IR_}6*X5Vtcj_}Fed~0TR?Pa3QL)aFv4S=kq|`{^<>j^ z6}liouf6KCn^#HC3|0QAPXtylvBKnz-DyD)A{0I>n^v@FtWcItV8mn=^l0Vk{T-f! z$U=glsEi^agzqjX0K8%8-92M`<%DeQ!BLGova@obCu{%cLIh{@yf4;2RQZ{{{u!kNO*{30Ipzxpo z$1MVJ@%aQaf`fgtVS>Y17kZk(8Tj*sUrZ`nIkX#jY9@9%oM^NatoP~|n3pdyzkG;r zDuJ;B8!1}(B%q~>6gji&lA(z-kKr1k0q@CbHRsc&QTA56m6h{%h?_IX?&GYl`h>-p zI=j*RpxgO#pKxkuQIj{+z$E2x#2O}F#mm-2#ZtvxS&#J@U)Zm(RxmNR&+9`Mcof#} z%dU4bMeN9&4g33l|P2Pedgq;ln8GgD8alC#J z*M!ih`tivl+qR7EVAW$_dp3vAQg)LSThzJR96M>_H#Xp_>x5V_Lz;YFbmzsT818O1 z9&||W(=u^#_0IfS;$Y;a(&lqitSLEh2iaZ)Tvm`H_U!q4ot|I(dv`+HL$cswEwP-& zj^)pm#WHB!lB0SKV8_eQYO|CUDTGyeil8L|!p}>E?jCkmvXIj^0ttJatx&U^hfH6G zKa*N6yqgSeHN>dLW)lb#p!u|>m%6>`(20sH`z!722(v;BB){@@eq+ZXx`9IJTxIlK zvv}FYrFIsh-_3bui0yCMCp<~?n$u6+bX5C@T(2UAApaOYFW%X?mv-DVnCr9beqCTQ u;)LaY+1Nv!q}o^8R*U|x_4S{<7Y48PC4^4Cbe_YuXRvBzh<}5xAnQN!x|DbT diff --git a/res/raw/license.txt b/res/raw/license.txt index 5d1814a..45602a5 100644 --- a/res/raw/license.txt +++ b/res/raw/license.txt @@ -1,4 +1,4 @@ -Copyright © 2017 OBONO +Copyright © 2017, 2018 OBONO http://d.hatena.ne.jp/OBONO Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -9,8 +9,10 @@ Unless required by applicable law or agreed to in writing, software distributed See the License for the specific language governing permissions and limitations under the License. ------ -Pixelart of Arduboy device by Piquesel (@huard_olivier). -https://twitter.com/huard_olivier +Acknowledgement + +Arduboy is a registered trademark of Arduboy, Inc. This application is not created by or licensed by Arduboy, Inc. So, DO NOT inquire of Arduboy, Inc. about this. +This comes with no warranties. This should be used at your own risk. The author of this has no responsibility. Some icons are generated by 無料素材サービス. https://sozai.cman.jp/ diff --git a/res/values/strings.xml b/res/values/strings.xml index 958cc6f..319739c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,7 +1,7 @@ OBN-A18 - Arduboy Utility + Arby Utility Choose file to read Choose file to write Serial monitor diff --git a/src/com/obnsoft/arduboyutil/FilePickerActivity.java b/src/com/obnsoft/arduboyutil/FilePickerActivity.java index 081f263..5bb619b 100644 --- a/src/com/obnsoft/arduboyutil/FilePickerActivity.java +++ b/src/com/obnsoft/arduboyutil/FilePickerActivity.java @@ -14,7 +14,7 @@ * limitations under the License. * * - * This source code was modified by OBONO in November 2017. + * This source code was modified by OBONO in April 2018. */ package com.obnsoft.arduboyutil; @@ -234,6 +234,14 @@ public boolean onCreateOptionsMenu(Menu menu) { return super.onCreateOptionsMenu(menu); } + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + MenuItem item = menu.findItem(R.id.menuFilePickerBack); + item.setVisible(!mStackPath.isEmpty()); + return true; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -241,9 +249,7 @@ public boolean onOptionsItemSelected(MenuItem item) { finish(); break; case R.id.menuFilePickerBack: - if (!mStackPath.isEmpty()) { - onBackPressed(); - } + onBackPressed(); return true; case R.id.menuFilePickerGoUpper: goToUpperDirectory(); @@ -264,6 +270,7 @@ public void setCurrentDirectory(String path) { public void onCurrentDirectoryChanged(String path) { TextView tv = (TextView) findViewById(R.id.textViewCurrentDirectory); tv.setText(getTrimmedCurrentDirectory(path)); + invalidateOptionsMenu(); } public void onFileSelected(String path) { diff --git a/src/com/obnsoft/arduboyutil/Utils.java b/src/com/obnsoft/arduboyutil/Utils.java index 2b7f45f..74ca321 100644 --- a/src/com/obnsoft/arduboyutil/Utils.java +++ b/src/com/obnsoft/arduboyutil/Utils.java @@ -52,10 +52,12 @@ public class Utils { public static final File TOP_DIRECTORY = - new File(Environment.getExternalStorageDirectory(), "ArduboyUtility"); + new File(Environment.getExternalStorageDirectory(), "ArbyUtility"); public static final File FLASH_DIRECTORY = new File(TOP_DIRECTORY, "Flash"); public static final File EEPROM_DIRECTORY = new File(TOP_DIRECTORY, "EEPROM"); public static final File SHOT_DIRECTORY = new File(TOP_DIRECTORY, "ScreenShot"); + public static final File OLD_TOP_DIRECTORY = + new File(Environment.getExternalStorageDirectory(), "ArduboyUtility"); private static final String SCHEME_FILE = "file"; private static final String SCHEME_CONTENT = "content"; @@ -123,7 +125,13 @@ public static void showToast(Context context, String msg) { /*-----------------------------------------------------------------------*/ public static void generateFolders() { - TOP_DIRECTORY.mkdir(); + if (!TOP_DIRECTORY.exists()) { + if (OLD_TOP_DIRECTORY.exists()) { + OLD_TOP_DIRECTORY.renameTo(TOP_DIRECTORY); + } else { + TOP_DIRECTORY.mkdir(); + } + } FLASH_DIRECTORY.mkdir(); EEPROM_DIRECTORY.mkdir(); SHOT_DIRECTORY.mkdir();