From 604905937c8d4a1db42a34a61973d4c4490c3403 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 4 May 2014 22:27:46 -0400 Subject: grr --- res/drawable-hdpi/keyboard.png | Bin 0 -> 4615 bytes res/drawable-hdpi/minak.png | Bin 0 -> 6727 bytes res/drawable-mdpi/keyboard.png | Bin 0 -> 1994 bytes res/drawable-mdpi/minak.png | Bin 0 -> 4052 bytes res/drawable-xhdpi/keyboard.png | Bin 0 -> 3912 bytes res/drawable-xhdpi/minak.png | Bin 0 -> 15365 bytes res/drawable/emacs.svg | 182 +++++++++++ res/drawable/keyboard.png | Bin 0 -> 1977 bytes res/drawable/minak.svg | 373 ++++++++++++++++++++++ res/icons/keyboard.png | Bin 1977 -> 0 bytes res/icons/keyboard/drawable-hdpi/ic_launcher.png | Bin 4615 -> 0 bytes res/icons/keyboard/drawable-mdpi/ic_launcher.png | Bin 1994 -> 0 bytes res/icons/keyboard/drawable-xhdpi/ic_launcher.png | Bin 3912 -> 0 bytes res/icons/minak.svg | 373 ---------------------- res/icons/minak/drawable-hdpi/ic_launcher.png | Bin 6727 -> 0 bytes res/icons/minak/drawable-mdpi/ic_launcher.png | Bin 4052 -> 0 bytes res/icons/minak/drawable-xhdpi/ic_launcher.png | Bin 15365 -> 0 bytes src/us/minak/CreateGestureActivity.java | 2 +- src/us/minak/OnCharacterEnteredListener.java | 5 + src/us/minak/SettingsActivity.java | 37 +-- src/us/minak/SettingsUtil.java | 22 ++ 21 files changed, 598 insertions(+), 396 deletions(-) create mode 100644 res/drawable-hdpi/keyboard.png create mode 100644 res/drawable-hdpi/minak.png create mode 100644 res/drawable-mdpi/keyboard.png create mode 100644 res/drawable-mdpi/minak.png create mode 100644 res/drawable-xhdpi/keyboard.png create mode 100644 res/drawable-xhdpi/minak.png create mode 100644 res/drawable/emacs.svg create mode 100644 res/drawable/keyboard.png create mode 100644 res/drawable/minak.svg delete mode 100644 res/icons/keyboard.png delete mode 100644 res/icons/keyboard/drawable-hdpi/ic_launcher.png delete mode 100644 res/icons/keyboard/drawable-mdpi/ic_launcher.png delete mode 100644 res/icons/keyboard/drawable-xhdpi/ic_launcher.png delete mode 100644 res/icons/minak.svg delete mode 100644 res/icons/minak/drawable-hdpi/ic_launcher.png delete mode 100644 res/icons/minak/drawable-mdpi/ic_launcher.png delete mode 100644 res/icons/minak/drawable-xhdpi/ic_launcher.png create mode 100644 src/us/minak/OnCharacterEnteredListener.java create mode 100644 src/us/minak/SettingsUtil.java diff --git a/res/drawable-hdpi/keyboard.png b/res/drawable-hdpi/keyboard.png new file mode 100644 index 0000000..2494b61 Binary files /dev/null and b/res/drawable-hdpi/keyboard.png differ diff --git a/res/drawable-hdpi/minak.png b/res/drawable-hdpi/minak.png new file mode 100644 index 0000000..80f80a0 Binary files /dev/null and b/res/drawable-hdpi/minak.png differ diff --git a/res/drawable-mdpi/keyboard.png b/res/drawable-mdpi/keyboard.png new file mode 100644 index 0000000..deb71bc Binary files /dev/null and b/res/drawable-mdpi/keyboard.png differ diff --git a/res/drawable-mdpi/minak.png b/res/drawable-mdpi/minak.png new file mode 100644 index 0000000..9fce689 Binary files /dev/null and b/res/drawable-mdpi/minak.png differ diff --git a/res/drawable-xhdpi/keyboard.png b/res/drawable-xhdpi/keyboard.png new file mode 100644 index 0000000..8944a37 Binary files /dev/null and b/res/drawable-xhdpi/keyboard.png differ diff --git a/res/drawable-xhdpi/minak.png b/res/drawable-xhdpi/minak.png new file mode 100644 index 0000000..7a86237 Binary files /dev/null and b/res/drawable-xhdpi/minak.png differ diff --git a/res/drawable/emacs.svg b/res/drawable/emacs.svg new file mode 100644 index 0000000..9872a08 --- /dev/null +++ b/res/drawable/emacs.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/keyboard.png b/res/drawable/keyboard.png new file mode 100644 index 0000000..e2c3c74 Binary files /dev/null and b/res/drawable/keyboard.png differ diff --git a/res/drawable/minak.svg b/res/drawable/minak.svg new file mode 100644 index 0000000..bb9b9fc --- /dev/null +++ b/res/drawable/minak.svg @@ -0,0 +1,373 @@ + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + +inak + \ No newline at end of file diff --git a/res/icons/keyboard.png b/res/icons/keyboard.png deleted file mode 100644 index e2c3c74..0000000 Binary files a/res/icons/keyboard.png and /dev/null differ diff --git a/res/icons/keyboard/drawable-hdpi/ic_launcher.png b/res/icons/keyboard/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 2494b61..0000000 Binary files a/res/icons/keyboard/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/res/icons/keyboard/drawable-mdpi/ic_launcher.png b/res/icons/keyboard/drawable-mdpi/ic_launcher.png deleted file mode 100644 index deb71bc..0000000 Binary files a/res/icons/keyboard/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/res/icons/keyboard/drawable-xhdpi/ic_launcher.png b/res/icons/keyboard/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 8944a37..0000000 Binary files a/res/icons/keyboard/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/res/icons/minak.svg b/res/icons/minak.svg deleted file mode 100644 index bb9b9fc..0000000 --- a/res/icons/minak.svg +++ /dev/null @@ -1,373 +0,0 @@ - - - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - -inak - \ No newline at end of file diff --git a/res/icons/minak/drawable-hdpi/ic_launcher.png b/res/icons/minak/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 80f80a0..0000000 Binary files a/res/icons/minak/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/res/icons/minak/drawable-mdpi/ic_launcher.png b/res/icons/minak/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 9fce689..0000000 Binary files a/res/icons/minak/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/res/icons/minak/drawable-xhdpi/ic_launcher.png b/res/icons/minak/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 7a86237..0000000 Binary files a/res/icons/minak/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/src/us/minak/CreateGestureActivity.java b/src/us/minak/CreateGestureActivity.java index 6844b36..19fbc83 100644 --- a/src/us/minak/CreateGestureActivity.java +++ b/src/us/minak/CreateGestureActivity.java @@ -83,7 +83,7 @@ public class CreateGestureActivity extends Activity { return; } - final GestureLibrary store = SettingsActivity.getStore(); + final GestureLibrary store = SettingsUtil.getGestureLibrary(this); store.addGesture(name.toString(), mGesture); store.save(); diff --git a/src/us/minak/OnCharacterEnteredListener.java b/src/us/minak/OnCharacterEnteredListener.java new file mode 100644 index 0000000..82226b6 --- /dev/null +++ b/src/us/minak/OnCharacterEnteredListener.java @@ -0,0 +1,5 @@ +package us.minak; + +public interface OnCharacterEnteredListener { + void characterEntered(String character); +} \ No newline at end of file diff --git a/src/us/minak/SettingsActivity.java b/src/us/minak/SettingsActivity.java index b366826..30b1e7b 100644 --- a/src/us/minak/SettingsActivity.java +++ b/src/us/minak/SettingsActivity.java @@ -27,9 +27,8 @@ import android.view.ContextMenu; import android.view.MenuItem; import android.view.LayoutInflater; import android.view.ViewGroup; -import android.gesture.GestureLibrary; import android.gesture.Gesture; -import android.gesture.GestureLibraries; +import android.gesture.GestureLibrary; import android.widget.TextView; import android.widget.EditText; import android.widget.AdapterView; @@ -49,7 +48,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Comparator; import java.util.Set; -import java.io.File; public class SettingsActivity extends ListActivity { private static final int STATUS_SUCCESS = 0; @@ -67,16 +65,12 @@ public class SettingsActivity extends ListActivity { // Type: long (id) private static final String GESTURES_INFO_ID = "gestures.info_id"; - private final File mStoreFile = new File(Environment.getExternalStorageDirectory(), "gestures"); - private final Comparator mSorter = new Comparator() { public int compare(NamedGesture object1, NamedGesture object2) { return object1.name.compareTo(object2.name); } }; - private static GestureLibrary sStore; - private GesturesAdapter mAdapter; private GesturesLoadTask mTask; private TextView mEmpty; @@ -85,6 +79,12 @@ public class SettingsActivity extends ListActivity { private EditText mInput; private NamedGesture mCurrentRenameGesture; + private SettingsActivity mThis; + public SettingsActivity() { + super(); + mThis = this; + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -94,19 +94,12 @@ public class SettingsActivity extends ListActivity { mAdapter = new GesturesAdapter(this); setListAdapter(mAdapter); - if (sStore == null) { - sStore = GestureLibraries.fromFile(mStoreFile); - } mEmpty = (TextView) findViewById(android.R.id.empty); loadGestures(); registerForContextMenu(getListView()); } - static GestureLibrary getStore() { - return sStore; - } - public void reloadGestures(View v) { loadGestures(); } @@ -169,9 +162,9 @@ public class SettingsActivity extends ListActivity { long id = state.getLong(GESTURES_INFO_ID, -1); if (id != -1) { - final Set entries = sStore.getGestureEntries(); + final Set entries = SettingsUtil.getGestureLibrary(this).getGestureEntries(); out: for (String name : entries) { - for (Gesture gesture : sStore.getGestures(name)) { + for (Gesture gesture : SettingsUtil.getGestureLibrary(this).getGestures(name)) { if (gesture.getID() == id) { mCurrentRenameGesture = new NamedGesture(); mCurrentRenameGesture.name = name; @@ -279,9 +272,9 @@ out: for (String name : entries) { for (int i = 0; i < count; i++) { final NamedGesture gesture = adapter.getItem(i); if (gesture.gesture.getID() == renameGesture.gesture.getID()) { - sStore.removeGesture(gesture.name, gesture.gesture); + SettingsUtil.getGestureLibrary(this).removeGesture(gesture.name, gesture.gesture); gesture.name = mInput.getText().toString(); - sStore.addGesture(gesture.name, gesture.gesture); + SettingsUtil.getGestureLibrary(this).addGesture(gesture.name, gesture.gesture); break; } } @@ -300,8 +293,8 @@ out: for (String name : entries) { } private void deleteGesture(NamedGesture gesture) { - sStore.removeGesture(gesture.name, gesture.gesture); - sStore.save(); + SettingsUtil.getGestureLibrary(this).removeGesture(gesture.name, gesture.gesture); + SettingsUtil.getGestureLibrary(this).save(); final GesturesAdapter adapter = mAdapter; adapter.setNotifyOnChange(false); @@ -341,7 +334,7 @@ out: for (String name : entries) { return STATUS_NO_STORAGE; } - final GestureLibrary store = sStore; + final GestureLibrary store = SettingsUtil.getGestureLibrary(mThis); if (store.load()) { for (String name : store.getGestureEntries()) { @@ -388,7 +381,7 @@ out: for (String name : entries) { getListView().setVisibility(View.GONE); mEmpty.setVisibility(View.VISIBLE); mEmpty.setText(getString(R.string.gestures_error_loading, - mStoreFile.getAbsolutePath())); + SettingsUtil.getGestureFile(mThis).getAbsolutePath())); } else { findViewById(R.id.addButton).setEnabled(true); findViewById(R.id.reloadButton).setEnabled(true); diff --git a/src/us/minak/SettingsUtil.java b/src/us/minak/SettingsUtil.java new file mode 100644 index 0000000..c3c0603 --- /dev/null +++ b/src/us/minak/SettingsUtil.java @@ -0,0 +1,22 @@ +package us.minak; + +import android.content.ContextWrapper; +import android.gesture.GestureLibrary; +import android.gesture.GestureLibraries; +import java.io.File; + +public class SettingsUtil { + private static File sGestureFile = null; + private static GestureLibrary sGestureLibrary = null; + + public static File getGestureFile(ContextWrapper context) { + if (sGestureFile == null) + sGestureFile = new File(context.getExternalFilesDir(null), "gestures.ttf"); + return sGestureFile; + } + public static GestureLibrary getGestureLibrary(ContextWrapper context) { + if (sGestureLibrary == null) + sGestureLibrary = GestureLibraries.fromFile(getGestureFile(context)); + return sGestureLibrary; + } +} -- cgit v1.2.3