1
0
Fork 0

Phew. Changed settings backend. Used more ENUM, fixed some bugs.

* Settings now use the database instead of SharedPreferences (which are
  bad)
  * Changed many constants to now be ENUMs.
  * Changed some character mappings which were too big.
  * Added limit to number of results returned to stop crash.
  * Changed Lang id so can do binary operations on it
  * Removed some old code
This commit is contained in:
Clam 2014-11-03 22:46:02 +11:00
parent 300e9df54b
commit b40db96182
44 changed files with 1043 additions and 483 deletions

View file

@ -1,29 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="pref_inputmode_entries">
<item >Dictionary</item>
<item >Text</item>
<item >Number</item>
</string-array>
<string-array translatable="false" name="pref_inputmode_values">
<item >0</item>
<item >1</item>
<item >2</item>
<item>Dictionary</item>
<item>Text</item>
<item>Number</item>
</string-array>
<integer-array translatable="false" name="pref_inputmode_values">
<item>@integer/INPUT_DICT</item>
<item>@integer/INPUT_TEXT</item>
<item>@integer/INPUT_NUM</item>
</integer-array>
<string-array translatable="false" name="pref_lang_defaults">
<item >0</item>
</string-array>
<string-array name="pref_lang_titles">
<item >English</item>
<item >Russian</item>
<item >German</item>
</string-array>
<string-array translatable="false" name="pref_lang_values">
<item >0</item>
<item >1</item>
<item >2</item>
<item>English</item>
<item>Russian</item>
<item>German</item>
</string-array>
<integer-array translatable="false" name="pref_lang_values">
<item>@integer/LANG_EN</item>
<item>@integer/LANG_RU</item>
<item>@integer/LANG_DE</item>
</integer-array>
<string-array name="capsMode">
<item>Caps off</item>

View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="candidate_normal">#FF000000</color>
<color name="candidate_recommended">#FFE35900</color>
<color name="candidate_other">#ff808080</color>
<color name="candidate_background">#bbffffff</color>
<color name="button_press">#FFFCBE2B</color>
<color name="candidate_recommended">#ffc66ac3</color>
<color name="candidate_other">#ff68f0e9</color>
<color name="candidate_background">#e19185df</color>
<color name="button_focus">#FF2A9AEB</color>
<color name="button_default">#FFA8A8A8</color>
<color name="button_text">#FFFFFFFF</color>

14
res/values/const.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- MAKE SURE THESE MATCH WITH LangHelper.java -->
<integer name="LANG_EN">1</integer>
<integer name="LANG_RU">2</integer>
<integer name="LANG_DE">4</integer>
<integer name="INPUT_DICT">0</integer>
<integer name="INPUT_TEXT">1</integer>
<integer name="INPUT_NUM">2</integer>
<integer name="INPUT_DEFAULT">@integer/INPUT_DICT</integer>
<integer name="LANG_DEFAULT">@integer/LANG_EN</integer>
</resources>

View file

@ -22,16 +22,15 @@
<string name="symbol_page">Page: %1$s/%2$s</string>
<string name="add_word">Add word</string>
<string name="ok">OK</string>
<string name="close">Close</string>
<string name="add_word_blank">Blank word not added.</string>
<string name="add_word_badchar">Cannot add word with unmappable character for %1$s (%2$s).</string>
<string name="add_word_exist1">Word (%1$s) already in DB.</string>
<string name="add_word_exist2">Word (%1$s) already in DB for %2$s.</string>
<string name="cancel">Cancel</string>
<string name="title_activity_add_word">Add Word</string>
<string name="action_settings">Settings</string>
<string name="database_notready">Database unavailable.</string>
<string name="database_settings_notready">Database unavailable. Using default settings.</string>
<string name="updating_database_title">Updating dictionary database…</string>
<string name="updating_database">Updating dictionary database, this might take a while.</string>

View file

@ -17,4 +17,8 @@
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
</style>
<declare-styleable name="PrefItem">
<attr name="title" format="string" />
<attr name="summary" format="string" />
</declare-styleable>
</resources>