From 307f354deb593fca4356420a68682e6934338adb Mon Sep 17 00:00:00 2001 From: Jesse Young Date: Mon, 12 Sep 2011 19:06:03 -0700 Subject: [PATCH] add help screen --- AndroidManifest.xml | 3 ++ icons_license.txt | 3 ++ res/drawable-hdpi/ic_menu_equalizer.png | Bin 0 -> 1987 bytes res/drawable-hdpi/ic_menu_puzzle.png | Bin 0 -> 2275 bytes res/drawable-ldpi/ic_menu_equalizer.png | Bin 0 -> 969 bytes res/drawable-ldpi/ic_menu_puzzle.png | Bin 0 -> 1145 bytes res/drawable-mdpi/ic_menu_equalizer.png | Bin 0 -> 973 bytes res/drawable-mdpi/ic_menu_puzzle.png | Bin 0 -> 1571 bytes res/layout/help.xml | 19 +++++++++ res/menu/mainmenu.xml | 7 +++- res/values/strings.xml | 1 + src/org/envaya/kalsms/Help.java | 49 ++++++++++++++++++++++++ src/org/envaya/kalsms/Main.java | 3 ++ 13 files changed, 83 insertions(+), 2 deletions(-) create mode 100755 icons_license.txt create mode 100755 res/drawable-hdpi/ic_menu_equalizer.png create mode 100755 res/drawable-hdpi/ic_menu_puzzle.png create mode 100755 res/drawable-ldpi/ic_menu_equalizer.png create mode 100755 res/drawable-ldpi/ic_menu_puzzle.png create mode 100755 res/drawable-mdpi/ic_menu_equalizer.png create mode 100755 res/drawable-mdpi/ic_menu_puzzle.png create mode 100755 res/layout/help.xml create mode 100755 src/org/envaya/kalsms/Help.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 023fbb9..ac1e36c 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,6 +19,9 @@ + + + diff --git a/icons_license.txt b/icons_license.txt new file mode 100755 index 0000000..5b6e2a7 --- /dev/null +++ b/icons_license.txt @@ -0,0 +1,3 @@ +This work is licensed under the Creative Commons Attribution 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. + +These icons can be used both commercially and for personal use, but you must always add a link to www.androidicons.com inside your software or your website. You must not resell any icons or distribute them in any other way than referring to www.androidicons.com. The Icons as such are the property of the author. diff --git a/res/drawable-hdpi/ic_menu_equalizer.png b/res/drawable-hdpi/ic_menu_equalizer.png new file mode 100755 index 0000000000000000000000000000000000000000..553dd69221560d4d3deae19a70810773aea64cdc GIT binary patch literal 1987 zcmV;!2R!(RP)*W{2xP6;6w=MrM@Iv9B) zA;}V>>F(+2m&0_6*>;bnYkCyPrhm`}wW|L8>UCB1oA(MRDJdx_DJdx_DJdx_DJgli zV1p33fB*g)D=RDS5mD7~oDXMbXaAw9ar^e|?`&*r{DLvYT-W{Z(xprPRMoh3>(=)+ zH#g@QV_T!6qaU0~IUxjdT^FwFLI}Zp-=9;_Xfzt{YMKVu zb>TP;IOlw8Yim|*G%uqS6_8TCH8wT|!!Q5=!M41{4wDjK$JQ&Ekfp`k2|mWoCeg_al*G0ULQ7Jbj4*a6bAER8V+##nM6Q4|RP zIuQkou{<+@lD_GCdFgz90_R*wBa5O-%rFc?OWqpLHZTlB4!{J^M2>-`9Mkn)KRQJz z>LCBjnKM5EU;z;Ey$FC8U%4$VI=H=X4p6{Bj4>jjCV+JSFH-*|08!56b)Zpp(Bk5v z?l{idFJ8R3xUjG=*=;jsjM3GrSO4oc&VA1L@8;*{8{ISq@%E!A+S!K&iL!&Fl=IJ@ zKmSb-1U(1l`~KHF&s!QD9sL%7%iY=yYI&q}2BE9$pnARjGs7_8x-N8G@A}q=2+d{_ zzVE~L{kNBvmafdr&H3Hh7Ue+fK}5u^U%&p%YPAa6wjqQ-=O@0S9f%06RtuizAq>OA z)oOK;i2j|mFTEBHiuW2V3Fn0nJ^M&0q3b%LD8k6d2uJ(Japp+U1618l_T52f4^AFB zbm%F7$ta2tMNwD7l9?4R!>yx7kFKLj_8^L04tP}uJg8VIjf#T^0CODYlOPBd66f@C z5a%31h|f=+Jh_dWv!@>p!VCg{U}|dW&f~|AWe@~2048>8Ohl_v%0Em@Oe_Hi@H#sv z4h+M|$;su($;oQ~J^&!mJ?TaOLI4c_+W?xcV&JGWgF2$;O#oZyosp#E+RZty#SBV_ z2fAa;;^N|8*VotIY&M$!03ig1hliK1UAy*m72Tp=u`G>!2^6#FG$c-UDD@x2S4{Pp zc`59m!-o$Cwr%ei$T^3UQYn-7S}n0Ol}aV7R4O|L#!I7gP$yYGH&oaw2OY>gs2{RY z6@!SR2SH&6?NzE`zwAhJARKg1G_ojMS$*9pJcF|KkNrwjyb^(8*59iA`(dvF#llN0 zNqM9%h5jrCsf*>U&L-{B8lC^^mwnx&W8-zxG)1~POGLS(J(=>&qX*<=~D2fnV4CL2 z(9qCFLqkKqt<`E9sv7Z8m}SRtKC*55My*!cR2ko%>_NR|)!N$Hm5q&!_j^@mi3p8G zV>ArID*$u=KUdX=Yjfja7{1?ZHaUP_=NeedK=vS2!Z18nsZ=mLJPaviuIeliy;G~z zep##4LRF0*2;g}hJkR?H{+|vaBDS=&#M0B7F_y$PSyfcFxVZQY&N)oegr@CoLKued zeIKn>Yvjn0BQ6oG0f4H8=Xt2t>*L+*>PFEMW||O!0r*NrF}|k}QP^or(#LU}+&LsE zC8U%fB8-fTXlU=7LPbN@b!eIf(=?G~*KQPDVw!21{|SNstyVjUD1?BN@@cFcrrI+A z(zfj{q9{5VhGEa22to+N@y*JqQ>VOsG&tul3wfBa-a>M~VK literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_menu_puzzle.png b/res/drawable-hdpi/ic_menu_puzzle.png new file mode 100755 index 0000000000000000000000000000000000000000..f999360c726239bf79b8fcb3d18403f9e8057cf9 GIT binary patch literal 2275 zcmV<92pso`P)K~#90?OI=m9akCuopWZ++_`h_-eotNK)|=q#29MzLG40W z2-YMk`%u=!q>-jY?Sdj92m#TM*u<9*D~3w6HK2L%r3SSc1HJ^7q}CeK5_~DXlKy)$#>d_LScxA)%cpP9|h_BPB94$Iz|`Q|&n`Tm{n9H2mf0tE^bC{Un4fdbjV zK4}G3!if_nzUuq_i@xuFQ3w%xo_BL(WaRh9j~~CjnR@gcK_^e1EHTD@)o3(cQA%~` zXWMo>I5_z0p`oE;)6>(@X6R#W#!Irmah%_TVfa$5Rzta5hLjRSgfI-Tw6r9GAo#xT z`y9acHbbAjvY>P4&OJ{=S4*W5uU4xll}fOz);Cm2q0wmI;lqcBqDWV()#s+Cr*Gt~ zQ(sw->$-<5%i@(v1+MEt2+_V~+cs?5hLjS%?{nL>Uj&dlK|Jplqy-T%&+|UtNe*MI zYgm?ra=DC3r2;ACGenfT2lRynB@^YI=UJTdHaWduj6nzi*L6WeE?OTr&QrI(u^<4# z^SpPZl;C`2wK(UHQleBU-2}k%wxWI_2(?=6k`O{IXFUdtF>ubw^SnQ7hEDxNkRBZ! z{eW}+=2|y0#@-$q8~Y~!%^0IRmFkNa#26zYiUEXS7~Wd#Uad8>*0%wK0Ce8EK@&o@BPv^0Cgj<`&@2oH_IA;^N{@!Z37~o9rWs zFb3Ck_13Lh<+g3x20hPvBv@;$(P%U}xN=PYJd`3!%p`jsoo`*P2R{{|c;y8xZTBe>rg4_tI)oL+-)Z`d+ z61trGBo+iIv&~g&4NBvWJ;;q9lYX-j1bplgYsk+ebG71gHRPV=*YVN%3b_*WX(tEB zksz&eui-WYxe@dvSPxJTv?iW7f;zL?M(FUw5X3oeSK5p*5Rs{UQk4xW;c*FalD|Rk z1*KG`Dtf&zqzEA(glH240C60f3c5Xrh-GP!tcM_R`0(LxNhuFomh}{4%vMU>R!Y5j z>C&Y?A!$JbLBQAQ4n8hAd)3LfQ7V=GT&vYS6hhF#!ort)-~XmkYL6icfFPncElHUO znwXfVZr{HBcdqNcz&U4T@^Kt*S4w^D$dMy|RZ88iR;$f=y*@ZFFaXQ4a)&lQo4dj=TtdbUMwXk|v17;Ha$Wb^uIs{e-S(bU z6h-iTAHMHHDTQ*mjFFKM)M~XA8}J(eAp|VTLa9_bIWaNubF`XhF#tkqZXAG}3?$bh z##rh`e`*Uldi3aXgM))FcWk?WbKVYyl}ZIc5I`x_-kw=)(YX;wg72--(a~Q3Xrj9X zO8|7zsWdT?vbJbb6Erk5^z}-mA`Cg50oVjd$8kVJZPPcC$O}o}eP?)hxR;zZlHb;? zM5+i%M66n^KJ9s4S4`o|a?co>B_+di^UKPs_(hOAtAZ^A2My>~x`CVvL*h zRXN3^W%a92~tWyDTOGC+9XLSF)%P-p4;Jh-VUWyYjUkB z8|88twr#_*to(O1l9Z~+hcD-2xyQjm8%M><91+ z5h04Aw#zw=(>^y8h9RP;b-vTGtoA-zLiXlu`>a)=uE({^!c$85v#F`6H_%!>n03?N zeBXcl>eZ`9<2XLfIk$}!8DdQ}--*ul$9mR;x%DE}o0X)LKc1SJdL6(+vXg)YMdEE!ksZW2HEbUs{hvP{w1!8*V{~0v2zf^Y;~>(OScGU1+U$?B2cm zI1&AHxxR5CoA2Gb_f;Xp9@lkY+xDt4sPkG9(DU2X$N+BJc9^zdPeko5fYy2!0E>uL zI^t^&4-fAmBG|UwRS2&2jwp%(WL$sdMNn+p_8V~=pJI%a*P1}jj_3od(L;7!x2}|W zxYAk1UL;vEV2qtd#P@up@;r|Cws*L#R(1-v4002ovPDHLkV1l`=Rowsp literal 0 HcmV?d00001 diff --git a/res/drawable-ldpi/ic_menu_equalizer.png b/res/drawable-ldpi/ic_menu_equalizer.png new file mode 100755 index 0000000000000000000000000000000000000000..a2252e43120cd361482f8afee0b9256a3797c35f GIT binary patch literal 969 zcmV;)12+7LP)Yz`F)#!gvukS?7%X0OFK;-7zcigD;~62sZ`$AYPBWK`8NPac`+v^CuP$#r-z1yN&xW8i#a?z{A8Nu zTo4n=kR(Y@#>dCOG|k7wV)4GN>y_^Pot>R%wOXBy$K%j!Hs}1}B$LUxL?RK$gfcWT zGD3(5q9_6p{c^qM=jSL%5+EYTvg{j2mgSyIPeVi`mdoWKK@h-k9N?S}6A>aJ-Qj?U z{KAB0dKyB+4iTl`rt#Z%&A7>WDXbY^Lxn=2P^na2=5o1+yT%x!d_I4W$z-1Dx^BDc zj^p%95{B_LR4SDcM@L7wsi`S02ts#Iyu7?zsMqVy0pLU542_PCa#dBqFpOJ)+@_Qy zDNaNT5uLsmnwgntHX4n0jIkGpD7x!JM7C{z$z(D+u9>U#o=N_whY-;sq7?whdGHP* z-g;@>(l)EZEbBWcX4s?%CfAuyT&!Gbf-ol z;;O20S(YIdi(P-REQ6}5oQQZ3lTN2O5qTCPs6tFpl&_smCoPI%Wp;M9+BKlj*x1;1 zGMQXqj78laIF4gFjP*mIgo{j rb^t>FV7tt3i-?%lfIrYc1BKL2Ov1G{hX`3-00000NkvXXu0mjfkd3>_ literal 0 HcmV?d00001 diff --git a/res/drawable-ldpi/ic_menu_puzzle.png b/res/drawable-ldpi/ic_menu_puzzle.png new file mode 100755 index 0000000000000000000000000000000000000000..84b05d00306fb78cf84c3d6578ef2c6d49ecf146 GIT binary patch literal 1145 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 + + + + + + + \ No newline at end of file diff --git a/res/menu/mainmenu.xml b/res/menu/mainmenu.xml index 13b4fdc..1574d9c 100755 --- a/res/menu/mainmenu.xml +++ b/res/menu/mainmenu.xml @@ -1,12 +1,15 @@ - + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 5a5657d..acbed8b 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4,4 +4,5 @@ Settings Test Connection Check Messages + Help diff --git a/src/org/envaya/kalsms/Help.java b/src/org/envaya/kalsms/Help.java new file mode 100755 index 0000000..9c43ff5 --- /dev/null +++ b/src/org/envaya/kalsms/Help.java @@ -0,0 +1,49 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.envaya.kalsms; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.text.Html; +import android.view.Menu; +import android.widget.TextView; + +/** + * + * @author Jesse + */ +public class Help extends Activity { + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + + setContentView(R.layout.help); + + TextView help = (TextView) this.findViewById(R.id.help); + + String html = "KalSMS is a SMS gateway.

" + + "It forwards all incoming SMS messages received by this phone to a server on the internet, " + + "and also sends outgoing SMS messages from that server to other phones.

" + + "(See https://github.com/youngj/KalSMS/wiki " + + "for information about setting up a server.)

" + + "The Settings screen allows you configure KalSMS to work with a particular server, " + + "by entering the server URL, your phone number, " + + "and the password assigned to your phone on the server.

" + + "Menu icons cc/by www.androidicons.com

"; + + help.setText(Html.fromHtml(html)); + + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + startActivity(new Intent(this, Main.class)); + + return(true); + } +} diff --git a/src/org/envaya/kalsms/Main.java b/src/org/envaya/kalsms/Main.java index 9f00c0e..cfa9a5c 100755 --- a/src/org/envaya/kalsms/Main.java +++ b/src/org/envaya/kalsms/Main.java @@ -138,6 +138,9 @@ public class Main extends Activity { case R.id.check_now: app.checkOutgoingMessages(); return true; + case R.id.help: + startActivity(new Intent(this, Help.class)); + return true; case R.id.test: app.log("Testing server connection..."); new TestTask().execute(