Make add word dialog autofocus text field, input word after adding an…

…d assign max priority to newly added word

src/org/nyanya/android/traditionalt9/AddWordAct.java

@@ -2,22 +2,28 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Notification;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
 import org.nyanya.android.traditionalt9.T9DB.DBSettings.SETTING;
 
 public class AddWordAct extends Activity {
+	public static final String WORD_ADDED_NOTIFICATION = "TT9_WORD_ADDED_NOTIFICATION";
+	public static final String WORD_ADDED_NOTIFICATION_WORD_VALUE = "TT9_WORD_ADDED_NOTIFICATION_WORD_VALUE";
 
 	View main;
 	int lang;
 	String origword;
 
+
 	@Override
 	protected void onCreate(Bundle savedData) {
 		super.onCreate(savedData);
@@ -37,11 +43,28 @@ protected void onCreate(Bundle savedData) {
 		main = v;
 	}
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		EditText et = (EditText) findViewById(R.id.add_word_text);
+		if(et != null) {
+			et.requestFocus();
+			InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+			imm.showSoftInput(et, InputMethodManager.SHOW_IMPLICIT);
+		}
+	}
+
 	public void addWordButton(View v) {
 		EditText et = (EditText) main.findViewById(R.id.add_word_text);
+		String word = et.getText().toString();
 		// Log.d("AddWordAct", "adding word: " + et.getText());
-		doAddWord(et.getText().toString());
+		doAddWord(word);
 		this.finish();
+
+		Intent intent = new Intent();
+		intent.setAction(WORD_ADDED_NOTIFICATION);
+		intent.putExtra(WORD_ADDED_NOTIFICATION_WORD_VALUE, word);
+		sendBroadcast(intent);
 	}
 
 	public void doAddWord(String text) {

src/org/nyanya/android/traditionalt9/T9DB.java

@@ -353,7 +353,10 @@ protected void addWord(String iword, LANGUAGE lang, int freq) throws DBException
 			return;
 		}
 		try {
-			db.insertOrThrow(WORD_TABLE_NAME, null, values);
+			long insertedWordId = db.insertOrThrow(WORD_TABLE_NAME, null, values);
+			if(insertedWordId > 0) {
+				incrementWord(insertedWordId);
+			}
 		} catch (SQLiteConstraintException e) {
 			String msg = r.getString(R.string.add_word_exist2, iword, lang.name());
 			Log.w("T9DB.addWord", msg);
@@ -365,7 +368,7 @@ protected void addWord(String iword, LANGUAGE lang) throws DBException {
 		addWord(iword, lang, 1);
 	}
 
-	protected void incrementWord(int id) {
+	protected void incrementWord(long id) {
 		if (!checkReady()) {
 			Log.e("T9DB.incrementWord", "not ready");
 			Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();

src/org/nyanya/android/traditionalt9/TraditionalT9.java

@@ -1,6 +1,9 @@
 package org.nyanya.android.traditionalt9;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.inputmethodservice.InputMethodService;
 import android.inputmethodservice.KeyboardView;
@@ -96,6 +99,25 @@ public void run() {
 
 	private Toast modeNotification = null;
 
+	private BroadcastReceiver mWordAddedReceiver = new BroadcastReceiver() {
+		@Override
+		public void onReceive(Context context, Intent intent) {
+			if(intent.getAction().equals(AddWordAct.WORD_ADDED_NOTIFICATION)) {
+				String word = intent.getStringExtra(AddWordAct.WORD_ADDED_NOTIFICATION_WORD_VALUE);
+				if(word != null) {
+					if (currentInputConnection == null)
+						return;
+					currentInputConnection.beginBatchEdit();
+					if (mComposing.length() > 0 || mComposingI.length() > 0) {
+						commitTyped();
+					}
+					currentInputConnection.commitText(word, 1);
+					currentInputConnection.endBatchEdit();
+				}
+			}
+		}
+	};
+
 	/**
 	 * Main initialization of the input method component. Be sure to call to
 	 * super class.
@@ -111,6 +133,10 @@ public void onCreate() {
 			interfacehandler = new InterfaceHandler(getLayoutInflater().inflate(R.layout.mainview,
 					null), this);
 		}
+
+		IntentFilter wordAddedIFlt = new IntentFilter();
+		wordAddedIFlt.addAction(AddWordAct.WORD_ADDED_NOTIFICATION);
+		registerReceiver(mWordAddedReceiver, wordAddedIFlt);
 	}
 
 	@Override
@@ -220,6 +246,7 @@ protected void showAddWord() {
 			awintent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
 			awintent.putExtra("org.nyanya.android.traditionalt9.word", template);
 			awintent.putExtra("org.nyanya.android.traditionalt9.lang", mLang.id);
+
 			clearState();
 			currentInputConnection.setComposingText("", 0);
 			currentInputConnection.finishComposingText();
@@ -462,6 +489,7 @@ private void finish() {
 	@Override
 	public void onDestroy() {
 		db.close();
+		unregisterReceiver(mWordAddedReceiver);
 		super.onDestroy();
 	}