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 0000000..553dd69 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_equalizer.png differ diff --git a/res/drawable-hdpi/ic_menu_puzzle.png b/res/drawable-hdpi/ic_menu_puzzle.png new file mode 100755 index 0000000..f999360 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_puzzle.png differ diff --git a/res/drawable-ldpi/ic_menu_equalizer.png b/res/drawable-ldpi/ic_menu_equalizer.png new file mode 100755 index 0000000..a2252e4 Binary files /dev/null and b/res/drawable-ldpi/ic_menu_equalizer.png differ diff --git a/res/drawable-ldpi/ic_menu_puzzle.png b/res/drawable-ldpi/ic_menu_puzzle.png new file mode 100755 index 0000000..84b05d0 Binary files /dev/null and b/res/drawable-ldpi/ic_menu_puzzle.png differ diff --git a/res/drawable-mdpi/ic_menu_equalizer.png b/res/drawable-mdpi/ic_menu_equalizer.png new file mode 100755 index 0000000..c639dab Binary files /dev/null and b/res/drawable-mdpi/ic_menu_equalizer.png differ diff --git a/res/drawable-mdpi/ic_menu_puzzle.png b/res/drawable-mdpi/ic_menu_puzzle.png new file mode 100755 index 0000000..2bdf2f2 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_puzzle.png differ diff --git a/res/layout/help.xml b/res/layout/help.xml new file mode 100755 index 0000000..0f5f75d --- /dev/null +++ b/res/layout/help.xml @@ -0,0 +1,19 @@ + + + + + + + + \ 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(