diff options
Diffstat (limited to 'src/org/madore')
| -rw-r--r-- | src/org/madore/android/unicodeMap/UnicodeMapActivity.java | 93 |
1 files changed, 89 insertions, 4 deletions
diff --git a/src/org/madore/android/unicodeMap/UnicodeMapActivity.java b/src/org/madore/android/unicodeMap/UnicodeMapActivity.java index 0c80741..5410b11 100644 --- a/src/org/madore/android/unicodeMap/UnicodeMapActivity.java +++ b/src/org/madore/android/unicodeMap/UnicodeMapActivity.java @@ -379,9 +379,10 @@ public final class UnicodeMapActivity extends ListActivity { if ( ( event.getAction() == KeyEvent.ACTION_DOWN ) && ( keyCode == KeyEvent.KEYCODE_ENTER ) ) { String s = textForm.getText().toString(); - if ( ! Pattern.matches("^\\s*$", s) ) + if ( ! Pattern.matches("^\\s*$", s) ) { doSearch(s); - dialog.dismiss(); + dialog.dismiss(); + } return true; } return false; @@ -391,10 +392,91 @@ public final class UnicodeMapActivity extends ListActivity { btn.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { String s = textForm.getText().toString(); - if ( ! Pattern.matches("^\\s*$", s) ) { + if ( ! Pattern.matches("^\\s*$", s) ) doSearch(s); - dialog.dismiss(); + dialog.dismiss(); + } + }); + dialog.show(); + } + + protected void doGo(String s) { + try { + s = s.replaceAll("\\s+", ""); + int code = Integer.parseInt(s, 16); + if ( code < 0 || code >= 0x110000 ) + throw new NumberFormatException(); + int codeFrom = Math.max((code&~31)-32, 0); + int codeTo = Math.min((code|31)+32, 0x110000); + String str = String.format("%04X\u2013%04X", codeFrom, codeTo-1); + Display newDisp + = new RangeDisplay(str, codeFrom, codeTo, rangeLimit); + saveDisplay(); + doDisplay(newDisp, true); + int dichoFrom = 0; + int dichoTo = Math.min(codeTo-codeFrom, lv.getAdapter().getCount()); + int dicho = Math.max(Math.min(code-codeFrom, dichoTo-1), 0); + LOOP: + while ( true ) { + if ( dichoTo <= dichoFrom+1 ) + break LOOP; + UnicodeCharacter chx + = (UnicodeCharacter) lv.getAdapter().getItem(dicho); + int codex = chx.getCodePoint(); + if ( codex == code ) + break LOOP; + else if ( codex > code ) { + dichoTo = dicho; + dicho = (dichoFrom+dichoTo)/2; + } else if ( codex < code ) { + dichoFrom = dicho; + dicho = (dichoFrom+dichoTo)/2; + } + } + lv.setSelectionFromTop(dicho, 0); + if ( db.getSingle(code) == null ) + Toast.makeText(UnicodeMapActivity.this, + R.string.no_character, + Toast.LENGTH_SHORT).show(); + } catch (NumberFormatException e) { + Toast.makeText(UnicodeMapActivity.this, + R.string.invalid_codepoint, + Toast.LENGTH_SHORT).show(); + } + } + + protected void queryGo() { + final Dialog dialog = new Dialog(UnicodeMapActivity.this); + // dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setTitle(R.string.go_title); + dialog.setOwnerActivity(this); + dialog.setContentView(R.layout.go_dialog); + dialog.setCancelable(true); + // dialog.getWindow().setLayout(ViewGroup.LayoutParams.FILL_PARENT, + // ViewGroup.LayoutParams.WRAP_CONTENT); + final EditText textForm + = (EditText) dialog.findViewById(R.id.goForm); + textForm.setOnKeyListener(new View.OnKeyListener() { + public boolean onKey(View view, int keyCode, KeyEvent event) { + if ( ( event.getAction() == KeyEvent.ACTION_DOWN ) + && ( keyCode == KeyEvent.KEYCODE_ENTER ) ) { + String s = textForm.getText().toString(); + if ( ! Pattern.matches("^\\s*$", s) ) { + doGo(s); + dialog.dismiss(); + } + return true; } + return false; + } + }); + final Button btn = (Button) dialog.findViewById(R.id.goButton); + btn.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + String s = textForm.getText().toString(); + if ( ! Pattern.matches("^\\s*$", s) ) + doGo(s); + dialog.dismiss(); } }); dialog.show(); @@ -432,6 +514,9 @@ public final class UnicodeMapActivity extends ListActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch ( item.getItemId() ) { + case R.id.menuGo: + queryGo(); + return true; case R.id.menuSearch: querySearch(); return true; |