diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 66eaa51..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.DS_Store -.gradle -/.idea/libraries -/.idea/workspace.xml -/build -/captures -/local.properties -/versions.properties -Thumbs.db \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index d6a959b..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SpellIt \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 9a8b7e5..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 8d2df47..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index ccc2a99..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 7965fcf..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index bf18285..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/AndroidManifest.xml similarity index 54% rename from app/src/main/AndroidManifest.xml rename to AndroidManifest.xml index cb8016d..9181204 100644 --- a/app/src/main/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,20 +1,14 @@ - - - + package="net.thauvin.erik.android.spellit" + android:versionCode="1" android:versionName="0.1"> + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/SpellIt.iml b/SpellIt.iml deleted file mode 100644 index b646eda..0000000 --- a/SpellIt.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index 0a6bfbf..0000000 --- a/app/app.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 6f8749a..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'versionPlugin' - -android { - compileSdkVersion 8 - buildToolsVersion "21.1.2" - - defaultConfig { - applicationId "net.thauvin.erik.android.spellit" - minSdkVersion 3 - targetSdkVersion 3 - versionCode 3 - versionName "0.3.0" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - - versionPlugin { - buildTypesMatcher = 'release' - supportBuildNumber = false - - fileNameFormat = '$projectName' - } -} diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml deleted file mode 100644 index e9bdeb1..0000000 --- a/app/src/main/res/layout/about.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml deleted file mode 100644 index 38c3589..0000000 --- a/app/src/main/res/layout/main.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - + + + + + diff --git a/res/values/arrays.xml b/res/values/arrays.xml new file mode 100644 index 0000000..842279e --- /dev/null +++ b/res/values/arrays.xml @@ -0,0 +1,79 @@ + + + + Adam + Boy + Charlie + David + Edward + Frank + George + Henry + Ida + John + King + Lincoln + Mary + Nora + Ocean + Paul + Queen + Robert + Sam + Tom + Union + Victor + William + X-Ray + Young + Zebra + Zero + One + Two + Three + Four + Five + Six + Seven + Eight + Niner + + + Alpha + Bravo + Charlie + Delta + Echo + Foxtrot + Golf + Hotel + India + Juliet + Kilo + Lima + Mike + November + Oscar + Papa + Quebec + Romeo + Sierra + Tango + Uniform + Victor + Whiskey + X-Ray + Yankee + Zulu + Zero + One + Two + Three + Four + Five + Six + Seven + Eight + Nine (Niner) + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml new file mode 100644 index 0000000..b71656e --- /dev/null +++ b/res/values/strings.xml @@ -0,0 +1,18 @@ + + + SpellIt + Spell It! + Tap to continue... + Tap to repeat... + Start typing for history... + Please type something... + NATO Phonetic + G as in Google + © 2008 Erik C. Thauvin\nAll Rights Reserved\n\nerik@thauvin.net\n\nhttp://mobile.thauvin.net + About + OK + Cancel + as in + <space> + <done> + diff --git a/screenshots/1.png b/screenshots/1.png deleted file mode 100644 index 26292ba..0000000 Binary files a/screenshots/1.png and /dev/null differ diff --git a/screenshots/feature.png b/screenshots/feature.png deleted file mode 100644 index 4e037a7..0000000 Binary files a/screenshots/feature.png and /dev/null differ diff --git a/screenshots/icon-hi.png b/screenshots/icon-hi.png deleted file mode 100644 index 50b2b7b..0000000 Binary files a/screenshots/icon-hi.png and /dev/null differ diff --git a/screenshots/market.png b/screenshots/market.png deleted file mode 100644 index b6a6d2f..0000000 Binary files a/screenshots/market.png and /dev/null differ diff --git a/screenshots/promo.png b/screenshots/promo.png deleted file mode 100644 index 60c47d6..0000000 Binary files a/screenshots/promo.png and /dev/null differ diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/sign.bat b/sign.bat new file mode 100644 index 0000000..6809692 --- /dev/null +++ b/sign.bat @@ -0,0 +1,10 @@ +@echo off +"%JAVA_HOME%\bin\jarsigner" -verbose -keystore "%USERPROFILE%\personal\android.keystore" "%1" android +if errorlevel 1 goto ERROR +"%JAVA_HOME%\bin\jarsigner" -verify "%1" +if errorlevel 1 goto ERROR +goto DONE +:ERROR +@pause +:DONE +@echo on \ No newline at end of file diff --git a/src/net/thauvin/erik/android/spellit/R.java b/src/net/thauvin/erik/android/spellit/R.java new file mode 100644 index 0000000..ac67d21 --- /dev/null +++ b/src/net/thauvin/erik/android/spellit/R.java @@ -0,0 +1,48 @@ +/* AUTO-GENERATED FILE. DO NOT MODIFY. + * + * This class was automatically generated by the + * aapt tool from the resource data it found. It + * should not be modified by hand. + */ + +package net.thauvin.erik.android.spellit; + +public final class R { + public static final class array { + public static final int alphabet=0x7f040000; + public static final int nato_alphabet=0x7f040001; + } + public static final class attr { + } + public static final class drawable { + public static final int icon=0x7f020000; + } + public static final class id { + public static final int about_text_fld=0x7f060000; + public static final int main_entry_fld=0x7f060001; + public static final int main_result_fld=0x7f060003; + public static final int main_spell_btn=0x7f060002; + public static final int main_tap_lbl=0x7f060004; + } + public static final class layout { + public static final int about=0x7f030000; + public static final int main=0x7f030001; + } + public static final class string { + public static final int about_menu_txt=0x7f050009; + public static final int about_txt=0x7f050008; + public static final int alert_dialog_cancel=0x7f05000b; + public static final int alert_dialog_ok=0x7f05000a; + public static final int app_name=0x7f050000; + public static final int as_in_txt=0x7f05000c; + public static final int done_txt=0x7f05000e; + public static final int main_entry_err_txt=0x7f050005; + public static final int main_entry_hint_txt=0x7f050004; + public static final int main_spell_btn_txt=0x7f050001; + public static final int main_tap_lbl_repeat_txt=0x7f050003; + public static final int main_tap_lbl_txt=0x7f050002; + public static final int nato_menu_txt=0x7f050006; + public static final int sample_txt=0x7f050007; + public static final int space_txt=0x7f05000d; + } +} diff --git a/app/src/main/java/net/thauvin/erik/android/spellit/SpellIt.java b/src/net/thauvin/erik/android/spellit/SpellIt.java similarity index 79% rename from app/src/main/java/net/thauvin/erik/android/spellit/SpellIt.java rename to src/net/thauvin/erik/android/spellit/SpellIt.java index 82d3e88..ae52834 100644 --- a/app/src/main/java/net/thauvin/erik/android/spellit/SpellIt.java +++ b/src/net/thauvin/erik/android/spellit/SpellIt.java @@ -1,7 +1,7 @@ /* * @(#)SpellIt.java * - * Copyright (c) 2008-2012, Erik C. Thauvin (http://erik.thauvin.net/) + * Copyright (c) 2008, Erik C. Thauvin (http://erik.thauvin.net/) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,13 +31,12 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: SpellIt.java 88 2010-08-05 23:29:48Z erik $ + * $Id$ * */ package net.thauvin.erik.android.spellit; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import android.app.Activity; @@ -46,19 +45,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.pm.PackageManager.NameNotFoundException; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.text.ClipboardManager; -import android.text.Editable; import android.text.TextUtils; -import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; -import android.view.View.OnTouchListener; -import android.view.inputmethod.InputMethodManager; import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; import android.widget.Button; @@ -69,7 +62,7 @@ import android.widget.Toast; * SpellIt is a alphabet speller for Android. * * @author Erik C. Thauvin - * @version $Revision: 88 $, $Date: 2010-08-05 16:29:48 -0700 (Thu, 05 Aug 2010) $ + * @version $Revision$, $Date$ * @created Oct 30, 2008 * @since 1.0 */ @@ -179,55 +172,11 @@ public class SpellIt extends Activity entryFld.setText(clip.getText()); } - final Drawable imgX = getResources().getDrawable(android.R.drawable.presence_offline); - - manageClearButton(entryFld, imgX); - - entryFld.setOnTouchListener(new OnTouchListener() + entryFld.setOnClickListener(new Button.OnClickListener() { - @Override - public boolean onTouch(View v, MotionEvent event) + public void onClick(View view) { - // Is there an X showing? - if (entryFld.getCompoundDrawables()[2] == null) - { - return false; - } - - // Only do this for up touches - if (event.getAction() != MotionEvent.ACTION_UP) - { - return false; - } - - // Is touch on our clear button? - if (event.getX() > entryFld.getWidth() - entryFld.getPaddingRight() - imgX.getIntrinsicWidth()) - { - entryFld.requestFocusFromTouch(); - entryFld.setText(""); - } - return false; - } - }); - - entryFld.addTextChangedListener(new TextWatcher() - { - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) - { - manageClearButton(entryFld, imgX); - } - - @Override - public void afterTextChanged(Editable s) - { - - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) - { - + spellBtn.performClick(); } }); @@ -239,9 +188,6 @@ public class SpellIt extends Activity if (!TextUtils.isEmpty(newEntry)) { - final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(spellBtn.getWindowToken(), 0); - tapLbl.setText(R.string.main_tap_lbl_txt); if (!newEntry.equals(getEntry())) @@ -293,24 +239,6 @@ public class SpellIt extends Activity return mNato; } - /** - * Manages the clear button. - * - * @param view The text view. - * @param img The image. - */ - private void manageClearButton(TextView view, Drawable img) - { - if (view.getText().toString().equals("")) - { - view.setCompoundDrawablesWithIntrinsicBounds(view.getCompoundDrawables()[0], view.getCompoundDrawables()[1], null, view.getCompoundDrawables()[3]); - } - else - { - view.setCompoundDrawablesWithIntrinsicBounds(view.getCompoundDrawables()[0], view.getCompoundDrawables()[1], img, view.getCompoundDrawables()[3]); - } - } - /** * Called when the activity is first created. */ @@ -338,9 +266,9 @@ public class SpellIt extends Activity final LayoutInflater factory = LayoutInflater.from(this); final View aboutView = factory.inflate(R.layout.about, null); - new AlertDialog.Builder(this).setView(aboutView).setIcon(android.R.drawable.ic_dialog_info) - .setTitle(getString(R.string.app_name) + ' ' + getVersionNumber()) - .setPositiveButton(R.string.alert_dialog_ok, new DialogInterface.OnClickListener() + new AlertDialog.Builder(this).setView(aboutView).setIcon(android.R.drawable.ic_dialog_info).setTitle( + getString(R.string.app_name) + ' ' + getVersionNumber()).setPositiveButton(R.string.alert_dialog_ok, + new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -446,13 +374,16 @@ public class SpellIt extends Activity private void setHistory(String history) { final String[] entries = TextUtils.split(history, ","); - Collections.addAll(mHistory, entries); + for (final String entry : entries) + { + mHistory.add(entry); + } } /** * Sets the NATO flag. * - * @param isNato The new NATO flag. + * @param nato The new NATO flag. */ private void setNato(boolean isNato) { @@ -465,7 +396,7 @@ public class SpellIt extends Activity { final char c = getEntry().charAt(getCurrentChar()); - if ((c < 123) && (c > 96) || (c < 91) && (c > 64)) + if ((c < 123) && (c > 96)) { int offset = 97;