wzray/tt9
1
0
Fork 0
Code Activity

Big changes: Multilingual, dbupdating, bugfixes:

Browse source 
* Multilingual backend support with initial Russian language support
* Updater service to update the database in the background, and overhauled
backend access
* Fixed long pressing numbers in Lang mode would not input digit
* Fixed Add Word not behaving as you would expect
* Some other minor fixes
This commit is contained in:
Clam 2014-02-17 00:03:14 +11:00
parent 878a8e594a
commit b0d403257b
64 changed files with 3040 additions and 1704 deletions
Download patch file Download diff file Expand all files Collapse all files

10
AndroidManifest.xml
View file

@ -26,9 +26,10 @@
android:resource="@xml/method" /> android:resource="@xml/method" />
</service> </service>
<service android:name=".DBUpdateService" />
<activity <activity
android:name="org.nyanya.android.traditionalt9.TraditionalT9Settings" android:name="org.nyanya.android.traditionalt9.TraditionalT9Settings"
android:label="@string/traditionalt9_settings" > android:label="@string/traditionalt9_settings" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -37,8 +38,9 @@
<activity <activity
android:theme="@android:style/Theme.Dialog" android:theme="@android:style/Theme.Dialog"
android:name="org.nyanya.android.traditionalt9.AddWordAct" android:name="org.nyanya.android.traditionalt9.AddWordAct"
android:label="@string/title_activity_add_word" > android:label="@string/title_activity_add_word"
android:excludeFromRecents="true" >
</activity> </activity>
</application> </application>
</manifest> </manifest>

2
assets/ru-utf8.txt
View file

@ -1,4 +1,4 @@
радость радость
ожидать ожидать
плакать плакать
желание желание

117
build.gradle
View file

@ -1,42 +1,99 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.6.+' classpath 'com.android.tools.build:gradle:0.7.+'
} }
} }
apply plugin: 'android' apply plugin: 'android'
ext {
keyStorePass = ''
keyPass = ''
}
dependencies { dependencies {
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
} }
android { android {
compileSdkVersion 10 compileSdkVersion 10
buildToolsVersion "19.0.0" buildToolsVersion "19.0.0"
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src'] java.srcDirs = ['src']
resources.srcDirs = ['src'] resources.srcDirs = ['src']
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
renderscript.srcDirs = ['src'] renderscript.srcDirs = ['src']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
} }
// Move the tests to tests/java, tests/res, etc... // Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests') instrumentTest.setRoot('tests')
// Move the build types to build-types/<type> // Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... which would // This moves them out of them default location under src/<type>/... which would
// conflict with src/ being used by the main source set. // conflict with src/ being used by the main source set.
// Adding new build types or product flavors should be accompanied // Adding new build types or product flavors should be accompanied
// by a similar customization. // by a similar customization.
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
}
}
// http://stackoverflow.com/a/19130098
signingConfigs {
release {
storeFile file(System.getenv("KEYSTORE"))
storePassword project.ext.keyStorePass
keyAlias System.getenv("KEYALIAS")
keyPassword project.ext.keyPass
}
}
buildTypes {
release {
signingConfig android.signingConfigs.release
}
}
} }
task getDictSizes {
inputs.files 'assets/en-utf8.txt', 'assets/ru-utf8.txt'
outputs.file "assets/dict.properties"
doLast {
ant.echo("Deleting old file...")
delete 'assets/dict.properties'
ant.echo("Calculating dict size...")
FileCollection dicts = files("assets/en-utf8.txt", "assets/ru-utf8.txt")
dicts.each {File file ->
ant.propertyfile(file:"assets/dict.properties") {
entry(key: "size."+ file.name, value: file.length())
}
}
}
}
task readPasswordFromInput << {
android.signingConfigs.release.storePassword = String.valueOf(System.console().readPassword("\nKeyStore Password: "))
android.signingConfigs.release.keyPassword = String.valueOf(System.console().readPassword("\nKey Password: "))
}
//http://stackoverflow.com/a/17484331
tasks.whenTaskAdded { task ->
if (task.name == 'packageRelease') {
task.dependsOn readPasswordFromInput
}
}
preBuild.dependsOn getDictSizes
preBuild.mustRunAfter getDictSizes

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013 #Mon Jan 13 17:37:00 EST 2014
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip

12
res/drawable/bggradient.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<!-- Gradient Bg for bootan --> <!-- Gradient Bg for bootan -->
<gradient <gradient
android:startColor="#424542" android:startColor="#424542"
android:endColor="#A5A2A5" android:endColor="#A5A2A5"
android:angle="90" /> android:angle="90" />
</shape> </shape>

12
res/drawable/button_custom.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_grad_press" <item android:drawable="@drawable/button_grad_press"
android:state_pressed="true" /> android:state_pressed="true" />
<item android:drawable="@drawable/button_grad" <item android:drawable="@drawable/button_grad"
android:state_focused="true" /> android:state_focused="true" />
<item android:drawable="@drawable/button_grad" /> <item android:drawable="@drawable/button_grad" />
</selector> </selector>

12
res/drawable/button_grad.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<!-- Gradient Bg for bootan --> <!-- Gradient Bg for button -->
<gradient <gradient
android:startColor="#181C18" android:startColor="#181C18"
android:endColor="#6B6D6B" android:endColor="#6B6D6B"
android:angle="90" /> android:angle="90" />
</shape> </shape>

12
res/drawable/button_grad_press.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<!-- Gradient Bg for bootan --> <!-- Gradient Bg for button -->
<gradient <gradient
android:startColor="#8C8E8C" android:startColor="#8C8E8C"
android:endColor="#636163" android:endColor="#636163"
android:angle="90" /> android:angle="90" />
</shape> </shape>

BIN
res/drawable/holdicon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/drawable/ic_launcher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
res/drawable/ime_en_lang_lower.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 842 B

BIN
res/drawable/ime_en_lang_single.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 749 B

BIN
res/drawable/ime_en_lang_upper.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 874 B

BIN
res/drawable/ime_en_text_lower.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 967 B

BIN
res/drawable/ime_en_text_single.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
res/drawable/ime_en_text_upper.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
res/drawable/ime_number.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 824 B

BIN
res/drawable/ime_ru_lang_lower.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 831 B

BIN
res/drawable/ime_ru_lang_single.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 764 B

BIN
res/drawable/ime_ru_lang_upper.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 752 B

BIN
res/drawable/ime_ru_text_lower.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 929 B

BIN
res/drawable/ime_ru_text_single.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
res/drawable/ime_ru_text_upper.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 828 B

BIN
res/drawable/key_eight.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
res/drawable/key_five.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
res/drawable/key_four.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
res/drawable/key_nine.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
res/drawable/key_one.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
res/drawable/key_pound.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
res/drawable/key_seven.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
res/drawable/key_six.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
res/drawable/key_star.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
res/drawable/key_three.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
res/drawable/key_two.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
res/drawable/key_zero.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
res/drawable/rcycle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

64
res/layout/addwordview.xml
View file

@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<EditText <EditText
android:id="@+id/add_word_text" android:id="@+id/add_word_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text" android:inputType="text"
android:privateImeOptions="org.nyanya.android.traditionalt9.addword=true" > android:privateImeOptions="org.nyanya.android.traditionalt9.addword=true" >
<requestFocus /> <requestFocus />
</EditText> </EditText>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
<Button <Button
android:id="@+id/add_word_add" android:id="@+id/add_word_add"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:onClick="addWordButton" android:onClick="addWordButton"
android:text="@string/add_word" /> android:text="@string/add_word" />
<Button <Button
android:id="@+id/add_word_cancel" android:id="@+id/add_word_cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:onClick="cancelButton" android:onClick="cancelButton"
android:text="@string/cancel" /> android:text="@string/cancel" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

70
res/layout/lbuttonhold.xml
View file

@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp" > android:padding="5dp" >
<TextView <TextView
android:id="@+id/left_hold_upper" android:id="@+id/left_hold_upper"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="2dp" android:padding="2dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="@string/main_left_insert" android:text="@string/main_left_insert"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/button_text" android:textColor="@color/button_text"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
android:id="@+id/left_hold_lower" android:id="@+id/left_hold_lower"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:drawableLeft="@drawable/holdicon" android:drawableLeft="@drawable/holdicon"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="2dp" android:padding="2dp"
android:text="@string/main_left_addword" android:text="@string/main_left_addword"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/button_text" android:textColor="@color/button_text"
android:textSize="11sp" /> android:textSize="11sp" />
</LinearLayout> </LinearLayout>

44
res/layout/lbuttonnohold.xml
View file

@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp" > android:padding="5dp" >
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="2dp" android:padding="2dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="@string/main_left_insert" android:text="@string/main_left_insert"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/button_text" android:textColor="@color/button_text"
android:textSize="15sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>

106
res/layout/mainview.xml
View file

@ -1,61 +1,61 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:background="@drawable/bggradient" android:background="@drawable/bggradient"
android:baselineAligned="true" android:baselineAligned="true"
android:gravity="bottom" android:gravity="bottom"
android:orientation="horizontal" > android:orientation="horizontal" >
<ViewSwitcher
android:id="@+id/main_left"
android:layout_width="190px"
android:layout_height="58dp"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true" >
<ViewSwitcher
android:id="@+id/main_left"
android:layout_width="190px"
android:layout_height="58dp"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true" >
<include android:id="@+id/main_left_nohold" layout="@layout/lbuttonnohold" /> <include android:id="@+id/main_left_nohold" layout="@layout/lbuttonnohold" />
<include android:id="@+id/main_left_hold" layout="@layout/lbuttonhold" /> <include android:id="@+id/main_left_hold" layout="@layout/lbuttonhold" />
</ViewSwitcher>
<Button </ViewSwitcher>
android:id="@+id/main_mid"
android:layout_width="94px"
android:layout_height="58dp"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:background="@drawable/button_custom"
android:focusable="false"
android:longClickable="true"
android:text="@string/main_mid"
android:textColor="@color/button_text" />
<RelativeLayout <Button
android:id="@+id/main_right" android:id="@+id/main_mid"
android:layout_width="190px" android:layout_width="94px"
android:layout_height="58dp" android:layout_height="58dp"
android:layout_marginLeft="1px" android:layout_marginLeft="1px"
android:layout_marginTop="0dp" android:layout_marginRight="1px"
android:background="@drawable/button_custom" android:background="@drawable/button_custom"
android:clickable="true" android:focusable="false"
android:focusable="false" android:longClickable="true"
android:longClickable="true" android:text="@string/main_mid"
android:paddingLeft="2dp" android:textColor="@color/button_text" />
android:paddingTop="1dp" >
<include <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/main_right"
android:layout_height="wrap_content" android:layout_width="190px"
android:layout_marginTop="0dp" android:layout_height="58dp"
layout="@layout/rbutton" /> android:layout_marginLeft="1px"
</RelativeLayout> android:layout_marginTop="0dp"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:paddingLeft="2dp"
android:paddingTop="1dp" >
</LinearLayout> <include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
layout="@layout/rbutton" />
</RelativeLayout>
</LinearLayout>

100
res/layout/mainviewold.xml
View file

@ -1,57 +1,57 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:background="@drawable/bggradient" android:background="@drawable/bggradient"
android:baselineAligned="true" android:baselineAligned="true"
android:gravity="bottom" android:gravity="bottom"
android:orientation="horizontal" > android:orientation="horizontal" >
<Button <Button
android:id="@+id/main_leftold" android:id="@+id/main_leftold"
android:layout_width="190px" android:layout_width="190px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="1px" android:layout_marginLeft="1px"
android:layout_marginRight="1px" android:layout_marginRight="1px"
android:background="@drawable/button_custom" android:background="@drawable/button_custom"
android:focusable="false" android:focusable="false"
android:longClickable="true" android:longClickable="true"
android:text="@string/main_left_insert" android:text="@string/main_left_insert"
android:textColor="@color/button_text" /> android:textColor="@color/button_text" />
<Button <Button
android:id="@+id/main_mid" android:id="@+id/main_mid"
android:layout_width="94px" android:layout_width="94px"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="1px" android:layout_marginLeft="1px"
android:layout_marginRight="1px" android:layout_marginRight="1px"
android:background="@drawable/button_custom" android:background="@drawable/button_custom"
android:focusable="false" android:focusable="false"
android:longClickable="true" android:longClickable="true"
android:text="@string/main_mid" android:text="@string/main_mid"
android:textColor="@color/button_text" /> android:textColor="@color/button_text" />
<RelativeLayout <RelativeLayout
android:id="@+id/main_right" android:id="@+id/main_right"
android:layout_width="190px" android:layout_width="190px"
android:layout_height="58dp" android:layout_height="58dp"
android:layout_marginLeft="1px" android:layout_marginLeft="1px"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:background="@drawable/button_custom" android:background="@drawable/button_custom"
android:clickable="true" android:clickable="true"
android:focusable="false" android:focusable="false"
android:longClickable="true" android:longClickable="true"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingTop="1dp" > android:paddingTop="1dp" >
<include <include
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
layout="@layout/rbutton" /> layout="@layout/rbutton" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

74
res/layout/rbutton.xml
View file

@ -1,42 +1,42 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp" > android:padding="5dp" >
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:drawableLeft="@drawable/rcycle" android:drawableLeft="@drawable/rcycle"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="2dp" android:padding="2dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="@string/main_right_upper" android:text="@string/main_right_upper"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/button_text" android:textColor="@color/button_text"
android:textSize="15sp" /> android:textSize="15sp" />
<TextView <TextView
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
android:drawableLeft="@drawable/holdicon" android:drawableLeft="@drawable/holdicon"
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="2dp" android:padding="2dp"
android:text="@string/main_right_lower" android:text="@string/main_right_lower"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/button_text" android:textColor="@color/button_text"
android:textSize="11sp" /> android:textSize="11sp" />
</LinearLayout> </LinearLayout>

358
res/layout/symbolview.xml
View file

@ -1,202 +1,202 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:padding="2dp" > android:padding="2dp" >
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingRight="2dp" > android:paddingRight="2dp" >
<TextView <TextView
android:id="@+id/text_keyone" android:id="@+id/text_keyone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/key_one" android:background="@drawable/key_one"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keytwo" android:id="@+id/text_keytwo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerInParent="false" android:layout_centerInParent="false"
android:background="@drawable/key_two" android:background="@drawable/key_two"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keythree" android:id="@+id/text_keythree"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/key_three" android:background="@drawable/key_three"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingRight="2dp" > android:paddingRight="2dp" >
<TextView <TextView
android:id="@+id/text_keyfour" android:id="@+id/text_keyfour"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/key_four" android:background="@drawable/key_four"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keyfive" android:id="@+id/text_keyfive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/key_five" android:background="@drawable/key_five"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keysix" android:id="@+id/text_keysix"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/key_six" android:background="@drawable/key_six"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingRight="2dp" > android:paddingRight="2dp" >
<TextView <TextView
android:id="@+id/text_keyseven" android:id="@+id/text_keyseven"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/key_seven" android:background="@drawable/key_seven"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keyeight" android:id="@+id/text_keyeight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/key_eight" android:background="@drawable/key_eight"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keynine" android:id="@+id/text_keynine"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/key_nine" android:background="@drawable/key_nine"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingRight="2dp" > android:paddingRight="2dp" >
<TextView <TextView
android:id="@+id/text_keystar" android:id="@+id/text_keystar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/key_star" android:background="@drawable/key_star"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:text="@string/symbol_prev" android:text="@string/symbol_prev"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" /> android:textColor="@color/key_text" />
<TextView <TextView
android:id="@+id/text_keyzero" android:id="@+id/text_keyzero"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/key_zero" android:background="@drawable/key_zero"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" android:textColor="@color/key_text"
android:textSize="30sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/text_keypound" android:id="@+id/text_keypound"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/key_pound" android:background="@drawable/key_pound"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:gravity="center" android:gravity="center"
android:text="@string/symbol_next" android:text="@string/symbol_next"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/key_text" /> android:textColor="@color/key_text" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

10
res/menu/add_word.xml
View file

@ -1,8 +1,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:title="@string/action_settings"/> android:title="@string/action_settings"/>
</menu> </menu>

61
res/values-ru/strings.xml Normal file
View file

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Traditional T9</string>
<string name="ime_name">Клавиатура T9</string>
<string name="ime_english">T9</string>
<string name="ime_number">Цифры</string>
<string name="pref_inputmode">Режим ввода по умолчанию</string>
<string name="pref_inputmode_desc">Режим ввода по умолчанию</string>
<string name="traditionalt9_settings">Traditional T9 настройки</string>
<string name="main_left_insert">вставить символ</string>
<string name="main_left_addword">Добавить слово</string>
<string name="main_mid">Готово</string>
<string name="main_mid_commit">Commit</string>
<string name="main_right_upper">Режим ввода</string>
<string name="main_right_lower">Изменить IME</string>
<string name="main_left_notfound">Добавить слово?</string>
<string name="ricon_desc">Hold Icon</string>
<string name="symbol_next">Следущая страница</string>
<string name="symbol_prev">Предыдущая страница</string>
<string name="add_word">Добавить слово</string>
<string name="ok">OK</string>
<string name="add_word_blank">Невозможно добавить слово.</string>
<string name="add_word_badchar">Невозможно добавить слово с таким символом %1$s.</string>
<string name="add_word_exist1">Слово (%1$s) уже есть в словаре.</string>
<string name="add_word_exist2">Слово (%1$s) уже есть в словаре %2$s.</string>
<string name="cancel">Отмена</string>
<string name="title_activity_add_word">Добавить слово</string>
<string name="action_settings">Настройки</string>
<string name="pref_russiansupport">Включить поддержку Русского языка</string>
<string name="pref_loaddict">Загрузить словарь</string>
<string name="pref_loaduserdict">Загрузить свой словарь</string>
<string name="pref_loaduserdictdesc">SDcard/traditionalt9/user.lang.dict (lang: en/ru)</string>
<string name="pref_nukedict">Nuke dictionary</string>
<string name="pref_backupdict">Backup dictionary</string>
<string name="pref_restoredict">Restore dictionary</string>
<string name="pref_querytest">Query test</string>
<string name="pref_testfunc">Test func</string>
<string name="pref_loadingdict">Загрузка словаря</string>
<string name="pref_loadinguserdict">Загрузка пользовательского словаря...</string>
<string name="pref_load_title">Загрузить словарь IME</string>
<string name="pref_loadingbackup">Восстановление словаря...</string>
<string name="pref_savingbackup">Сохранение словаря...</string>
<string name="pref_nukingdict">Очистка словаря... Пожалуйста, подождите...</string>
<string name="pref_backup_warn">Предупреждение: Существующая копия базы данных будет перезаписана. Продолжить?</string>
<string name="pref_backup_title">Резервное копирование базы данных IME</string>
<string name="pref_backup_noext">Ошибка: Внешняя память недоступна. Резервное копирование невозможно невозможно.</string>
<string name="pref_restore_warn">При восстановлении существующая база данных будет очищена. Если это нежелательно, то сначала выберите \"%1$s\" перед использованием этой опции.</string>
<string name="pref_restore_title">Восстановить базу данных IME</string>
<string name="pref_restore_noext">Ошибка: Внешняя память недоступна. Восстановление невозможно.</string>
<string name="pref_restore_nofile">Ошибка: Файл встановления не найден.</string>
<string name="pref_nuke_warn">Предупреждение: Будет выполнена очстка словаря. Продолжить?</string>
<string name="pref_nuke_title">Очистить IME словарь</string>
<string name="hello_world">Hello world!</string>
</resources>

34
res/values/arrays.xml
View file

@ -1,13 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="pref_inputmode_entries"> <string-array name="pref_inputmode_entries">
<item >English</item> <item >Dictionary</item>
<item >Text</item> <item >Text</item>
<item >Number</item> <item >Number</item>
</string-array> </string-array>
<string-array name="pref_inputmode_values"> <string-array name="pref_inputmode_values">
<item >0</item> <item >0</item>
<item >1</item> <item >1</item>
<item >2</item> <item >2</item>
</string-array> </string-array>
</resources>
<string-array name="pref_lang_defaults">
<item >0</item>
</string-array>
<string-array name="pref_lang_titles">
<item >English</item>
<item >Russian</item>
</string-array>
<string-array name="pref_lang_values">
<item >0</item>
<item >1</item>
</string-array>
</resources>

22
res/values/colors.xml
View file

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

30
res/values/dimens.xml
View file

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
/* /*
** **
** Copyright 2008, The Android Open Source Project ** Copyright 2008, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at ** You may obtain a copy of the License at
** **
** http://www.apache.org/licenses/LICENSE-2.0 ** http://www.apache.org/licenses/LICENSE-2.0
** **
** Unless required by applicable law or agreed to in writing, software ** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS, ** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and ** See the License for the specific language governing permissions and
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<resources> <resources>
<dimen name="key_height">50dip</dimen> <dimen name="key_height">50dip</dimen>
<dimen name="candidate_font_height">16sp</dimen> <dimen name="candidate_font_height">16sp</dimen>
<dimen name="candidate_vertical_padding">6sp</dimen> <dimen name="candidate_vertical_padding">6sp</dimen>
<dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen>
</resources> </resources>

119
res/values/strings.xml
View file

@ -1,54 +1,73 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="help_url">https://github.com/Clam-/TraditionalT9/wiki/Traditional-T9-keypad-IME-for-Android</string>
<string name="app_name">Traditional T9</string>
<string name="ime_name">Traditional T9</string>
<string name="ime_english">English</string>
<string name="ime_number">Numbers</string>
<string name="pref_inputmode">Default Input Mode</string>
<string name="pref_inputmode_desc">Default mode used for \'normal\' text entry</string>
<string name="traditionalt9_settings">Traditional T9 Settings</string>
<string name="main_left_insert">Insert symbol</string>
<string name="main_left_addword">Add word</string>
<string name="main_mid">Done</string>
<string name="main_mid_commit">Commit</string>
<string name="main_right_upper">Cycle Mode</string>
<string name="main_right_lower">Options</string>
<string name="main_left_notfound">Add word?</string>
<string name="ricon_desc">Hold Icon</string>
<string name="symbol_next">Next Page</string>
<string name="symbol_prev">Prev Page</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 symbol for %1$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="app_name">Traditional T9</string> <string name="no_keyboard_title">Warning: No keypad/keyboard</string>
<string name="ime_name">Traditional T9</string> <string name="no_keyboard">This device does not have a hardware keyboard/keypad, therefore it will not function in any useful way.
<string name="ime_english">English</string> Sorry for the inconvenience.</string>
<string name="ime_number">Numbers</string>
<string name="pref_inputmode">Default Input Mode</string>
<string name="pref_inputmode_desc">Default mode used for \'normal\' text entry</string>
<string name="traditionalt9_settings">Traditional T9 Settings</string>
<string name="main_left_insert">Insert symbol</string>
<string name="main_left_addword">Add word</string>
<string name="main_mid">Done</string>
<string name="main_mid_commit">Commit</string>
<string name="main_right_upper">Cycle Mode</string>
<string name="main_right_lower">Change IME</string>
<string name="main_left_notfound">Add word?</string>
<string name="ricon_desc">Hold Icon</string>
<string name="symbol_next">Next Page</string>
<string name="symbol_prev">Prev Page</string>
<string name="add_word">Add word</string>
<string name="ok">OK</string>
<string name="add_word_blank">Blank word not added.</string>
<string name="add_word_badchar">Cannot add word with unmappable symbol.</string>
<string name="add_word_exist1">Word (</string>
<string name="add_word_exist2">) already in DB.</string>
<string name="cancel">Cancel</string>
<string name="title_activity_add_word">Add Word</string>
<string name="action_settings">Settings</string>
<string name="pref_loaddict">Load dictionary</string>
<string name="pref_nukedict">Nuke dictionary</string>
<string name="pref_backupdict">Backup dictionary</string>
<string name="pref_restoredict">Restore dictionary</string>
<string name="pref_querytest">Query test</string>
<string name="pref_loadingdict">Loading dictionary…</string>
<string name="pref_loadingbackup">Restoring dictionary…</string>
<string name="pref_savingbackup">Backing up dictionary…</string>
<string name="pref_nukingdict">Nuking dictionary… Please wait…</string>
<string name="pref_backup_warn">Warning: An existing database backup exists. Do you wish to overwrite?</string>
<string name="pref_backup_title">Backup IME database</string>
<string name="pref_backup_noext">Error: No external storage available for backup. Backup will not continue.</string>
<string name="pref_restore_warn">Backup database entries will overwrite existing database entries. Entries not in the backup will be retained. If that is not desired behaviour select \"%1$s\" before selecting this option.</string>
<string name="pref_restore_title">Restore IME database</string>
<string name="pref_restore_noext">Error: No external storage available for restoring. Restore will not continue.</string>
<string name="pref_restore_nofile">Error: Backup file not found.</string>
<string name="pref_nuke_warn">Warning: This will delete your entire dictionary. Do you wish to continue?</string>
<string name="pref_nuke_title">Nuke IME dictionary</string>
<string name="hello_world">Hello world!</string>
</resources> <string name="updating_database_title">Updating dictionary database...</string>
<string name="updating_database">Updating dictionary database, this might take a while.</string>
<string name="updating_database_done">Updating dictionary database complete.</string>
<string name="updating_database_unavailable">Updating dictionary database, word input unavailable at this time.</string>
<string name="pref_lang_title">Multilingual support...</string>
<string name="pref_help">"Show help</string>
<string name="pref_loaddict">Load dictionary</string>
<string name="pref_loaduserdict">Load user dictionary</string>
<string name="pref_loaduserdictdesc">SDcard/traditionalt9/user.lang.dict (lang: en/ru)</string>
<string name="pref_nukedict">Nuke dictionary</string>
<string name="pref_backupdict">Backup dictionary</string>
<string name="pref_restoredict">Restore dictionary</string>
<string name="pref_querytest">Query test</string>
<string name="pref_testfunc">Test func</string>
<string name="pref_loadingdict">Loading dictionary…</string>
<string name="pref_loadinguserdict">Loading user dictionary…</string>
<string name="pref_load_title">Load IME dictionary</string>
<string name="pref_loadingbackup">Restoring dictionary…</string>
<string name="pref_savingbackup">Backing up dictionary…</string>
<string name="pref_nukingdict">Nuking dictionary… Please wait…</string>
<string name="pref_loaduser_notfound">Dictionary for %1$s not found. Not loading.</string>
<string name="pref_backup_warn">Warning: An existing database backup exists. Do you wish to overwrite?</string>
<string name="pref_backup_title">Backup IME database</string>
<string name="pref_backup_noext">Error: No external storage available for backup. Backup will not continue.</string>
<string name="pref_restore_warn">Backup database entries will overwrite existing database entries. Entries not in the backup will be retained. If that is not desired behaviour select \"%1$s\" before selecting this option.</string>
<string name="pref_restore_title">Restore IME database</string>
<string name="pref_restore_noext">Error: No external storage available for restoring. Restore will not continue.</string>
<string name="pref_restore_nofile">Error: Backup file not found.</string>
<string name="pref_nuke_warn">Warning: This will delete your entire dictionary. Do you wish to continue?</string>
<string name="pref_nuke_title">Nuke IME dictionary</string>
<string name="hello_world">Hello world!</string>
</resources>

32
res/values/styles.xml
View file

@ -1,20 +1,20 @@
<resources> <resources>
<!-- <!--
Base application theme, dependent on API level. This theme is replaced Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices. by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
--> -->
<style name="AppBaseTheme" parent="android:Theme.Light"> <style name="AppBaseTheme" parent="android:Theme.Light">
<!-- <!--
Theme customizations available in newer API levels can go in Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here. backward-compatibility can go here.
--> -->
</style> </style>
<!-- Application theme. --> <!-- Application theme. -->
<style name="AppTheme" parent="AppBaseTheme"> <style name="AppTheme" parent="AppBaseTheme">
<!-- All customizations that are NOT specific to a particular API-level can go here. --> <!-- All customizations that are NOT specific to a particular API-level can go here. -->
</style> </style>
</resources> </resources>

39
res/xml/prefs.xml
View file

@ -1,18 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:key="first_preferencescreen"> android:key="first_preferencescreen">
<ListPreference <Preference android:title="@string/pref_help" android:key="help"/>
android:key="pref_inputmode" <ListPreference
android:title="@string/pref_inputmode" android:key="pref_inputmode"
android:dialogTitle="@string/pref_inputmode" android:title="@string/pref_inputmode"
android:entries="@array/pref_inputmode_entries" android:dialogTitle="@string/pref_inputmode"
android:entryValues="@array/pref_inputmode_values" android:entries="@array/pref_inputmode_entries"
android:defaultValue="0" android:summary="@string/pref_inputmode_desc"/> android:entryValues="@array/pref_inputmode_values"
<Preference android:title="@string/pref_loaddict" android:key="loaddict"/> android:defaultValue="0" android:summary="@string/pref_inputmode_desc"/>
<Preference android:title="@string/pref_nukedict" android:key="nukedict"/> <pl.wavesoftware.widget.MultiSelectListPreference
<Preference android:title="@string/pref_backupdict" android:key="backupdict"/> android:defaultValue="@array/pref_lang_defaults"
<Preference android:title="@string/pref_restoredict" android:key="restoredict"/> android:entries="@array/pref_lang_titles"
<Preference android:title="@string/pref_querytest" android:key="querytest"/> android:entryValues="@array/pref_lang_values"
</PreferenceScreen> android:key="pref_lang_support"
android:persistent="true"
android:title="@string/pref_lang_title" />
<Preference android:title="@string/pref_loaddict" android:key="loaddict"/>
<Preference android:title="@string/pref_loaduserdict" android:summary="@string/pref_loaduserdictdesc" android:key="loaduserdict"/>
<Preference android:title="@string/pref_nukedict" android:key="nukedict"/>
<Preference android:title="@string/pref_backupdict" android:key="backupdict"/>
<Preference android:title="@string/pref_restoredict" android:key="restoredict"/>
<Preference android:title="@string/pref_querytest" android:key="querytest"/>
</PreferenceScreen>

315
src/com/stackoverflow/answer/UnicodeBOMInputStream.java Normal file
View file

@ -0,0 +1,315 @@
/* ____________________________________________________________________________
*
* File: UnicodeBOMInputStream.java
* Author: Gregory Pakosz.
* Date: 02 - November - 2005
* ____________________________________________________________________________
*/
package com.stackoverflow.answer;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
/**
* The <code>UnicodeBOMInputStream</code> class wraps any
* <code>InputStream</code> and detects the presence of any Unicode BOM
* (Byte Order Mark) at its beginning, as defined by
* <a href="http://www.faqs.org/rfcs/rfc3629.html">RFC 3629 - UTF-8, a transformation format of ISO 10646</a>
*
* <p>The
* <a href="http://www.unicode.org/unicode/faq/utf_bom.html">Unicode FAQ</a>
* defines 5 types of BOMs:<ul>
* <li><pre>00 00 FE FF = UTF-32, big-endian</pre></li>
* <li><pre>FF FE 00 00 = UTF-32, little-endian</pre></li>
* <li><pre>FE FF = UTF-16, big-endian</pre></li>
* <li><pre>FF FE = UTF-16, little-endian</pre></li>
* <li><pre>EF BB BF = UTF-8</pre></li>
* </ul></p>
*
* <p>Use the {@link #getBOM()} method to know whether a BOM has been detected
* or not.
* </p>
* <p>Use the {@link #skipBOM()} method to remove the detected BOM from the
* wrapped <code>InputStream</code> object.</p>
*/
public class UnicodeBOMInputStream extends InputStream
{
/**
* Type safe enumeration class that describes the different types of Unicode
* BOMs.
*/
public static final class BOM
{
/**
* NONE.
*/
public static final BOM NONE = new BOM(new byte[]{},"NONE");
/**
* UTF-8 BOM (EF BB BF).
*/
public static final BOM UTF_8 = new BOM(new byte[]{(byte)0xEF,
(byte)0xBB,
(byte)0xBF},
"UTF-8");
/**
* UTF-16, little-endian (FF FE).
*/
public static final BOM UTF_16_LE = new BOM(new byte[]{ (byte)0xFF,
(byte)0xFE},
"UTF-16 little-endian");
/**
* UTF-16, big-endian (FE FF).
*/
public static final BOM UTF_16_BE = new BOM(new byte[]{ (byte)0xFE,
(byte)0xFF},
"UTF-16 big-endian");
/**
* UTF-32, little-endian (FF FE 00 00).
*/
public static final BOM UTF_32_LE = new BOM(new byte[]{ (byte)0xFF,
(byte)0xFE,
(byte)0x00,
(byte)0x00},
"UTF-32 little-endian");
/**
* UTF-32, big-endian (00 00 FE FF).
*/
public static final BOM UTF_32_BE = new BOM(new byte[]{ (byte)0x00,
(byte)0x00,
(byte)0xFE,
(byte)0xFF},
"UTF-32 big-endian");
/**
* Returns a <code>String</code> representation of this <code>BOM</code>
* value.
*/
public final String toString()
{
return description;
}
/**
* Returns the bytes corresponding to this <code>BOM</code> value.
*/
public final byte[] getBytes()
{
final int length = bytes.length;
final byte[] result = new byte[length];
// Make a defensive copy
System.arraycopy(bytes,0,result,0,length);
return result;
}
private BOM(final byte bom[], final String description)
{
assert(bom != null) : "invalid BOM: null is not allowed";
assert(description != null) : "invalid description: null is not allowed";
assert(description.length() != 0) : "invalid description: empty string is not allowed";
this.bytes = bom;
this.description = description;
}
final byte bytes[];
private final String description;
} // BOM
/**
* Constructs a new <code>UnicodeBOMInputStream</code> that wraps the
* specified <code>InputStream</code>.
*
* @param inputStream an <code>InputStream</code>.
*
* @throws NullPointerException when <code>inputStream</code> is
* <code>null</code>.
* @throws IOException on reading from the specified <code>InputStream</code>
* when trying to detect the Unicode BOM.
*/
public UnicodeBOMInputStream(final InputStream inputStream) throws NullPointerException,
IOException
{
if (inputStream == null)
throw new NullPointerException("invalid input stream: null is not allowed");
in = new PushbackInputStream(inputStream,4);
final byte bom[] = new byte[4];
final int read = in.read(bom);
switch(read)
{
case 4:
if ((bom[0] == (byte)0xFF) &&
(bom[1] == (byte)0xFE) &&
(bom[2] == (byte)0x00) &&
(bom[3] == (byte)0x00))
{
this.bom = BOM.UTF_32_LE;
break;
}
else
if ((bom[0] == (byte)0x00) &&
(bom[1] == (byte)0x00) &&
(bom[2] == (byte)0xFE) &&
(bom[3] == (byte)0xFF))
{
this.bom = BOM.UTF_32_BE;
break;
}
case 3:
if ((bom[0] == (byte)0xEF) &&
(bom[1] == (byte)0xBB) &&
(bom[2] == (byte)0xBF))
{
this.bom = BOM.UTF_8;
break;
}
case 2:
if ((bom[0] == (byte)0xFF) &&
(bom[1] == (byte)0xFE))
{
this.bom = BOM.UTF_16_LE;
break;
}
else
if ((bom[0] == (byte)0xFE) &&
(bom[1] == (byte)0xFF))
{
this.bom = BOM.UTF_16_BE;
break;
}
default:
this.bom = BOM.NONE;
break;
}
if (read > 0)
in.unread(bom,0,read);
}
/**
* Returns the <code>BOM</code> that was detected in the wrapped
* <code>InputStream</code> object.
*
* @return a <code>BOM</code> value.
*/
public final BOM getBOM()
{
// BOM type is immutable.
return bom;
}
/**
* Skips the <code>BOM</code> that was found in the wrapped
* <code>InputStream</code> object.
*
* @return this <code>UnicodeBOMInputStream</code>.
*
* @throws IOException when trying to skip the BOM from the wrapped
* <code>InputStream</code> object.
*/
public final synchronized UnicodeBOMInputStream skipBOM() throws IOException
{
if (!skipped)
{
in.skip(bom.bytes.length);
skipped = true;
}
return this;
}
/**
* {@inheritDoc}
*/
public int read() throws IOException
{
return in.read();
}
/**
* {@inheritDoc}
*/
public int read(final byte b[]) throws IOException,
NullPointerException
{
return in.read(b,0,b.length);
}
/**
* {@inheritDoc}
*/
public int read(final byte b[],
final int off,
final int len) throws IOException,
NullPointerException
{
return in.read(b,off,len);
}
/**
* {@inheritDoc}
*/
public long skip(final long n) throws IOException
{
return in.skip(n);
}
/**
* {@inheritDoc}
*/
public int available() throws IOException
{
return in.available();
}
/**
* {@inheritDoc}
*/
public void close() throws IOException
{
in.close();
}
/**
* {@inheritDoc}
*/
public synchronized void mark(final int readlimit)
{
in.mark(readlimit);
}
/**
* {@inheritDoc}
*/
public synchronized void reset() throws IOException
{
in.reset();
}
/**
* {@inheritDoc}
*/
public boolean markSupported()
{
return in.markSupported();
}
private final PushbackInputStream in;
private final BOM bom;
private boolean skipped = false;
} // UnicodeBOMInputStream

18
src/org/nyanya/android/traditionalt9/AbsSymDialog.java
View file

@ -2,12 +2,15 @@ package org.nyanya.android.traditionalt9;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.TextView; import android.widget.TextView;
import java.util.Arrays;
public abstract class AbsSymDialog extends Dialog implements public abstract class AbsSymDialog extends Dialog implements
View.OnClickListener { View.OnClickListener {
@ -20,15 +23,15 @@ public abstract class AbsSymDialog extends Dialog implements
private String title; private String title;
private boolean started; private boolean started;
private static final int[] buttons = { private static final int[] buttons = {
R.id.text_keyone, R.id.text_keytwo, R.id.text_keyone, R.id.text_keytwo,
R.id.text_keythree, R.id.text_keyfour, R.id.text_keyfive, R.id.text_keythree, R.id.text_keyfour, R.id.text_keyfive,
R.id.text_keysix, R.id.text_keyseven, R.id.text_keyeight, R.id.text_keysix, R.id.text_keyseven, R.id.text_keyeight,
R.id.text_keynine, R.id.text_keyzero R.id.text_keynine, R.id.text_keyzero
}; };
private static final int[] buttons2 = { private static final int[] buttons2 = {
R.id.text_keystar, R.id.text_keystar,
R.id.text_keypound R.id.text_keypound
}; };
public AbsSymDialog(Context c, View mv) { public AbsSymDialog(Context c, View mv) {
@ -279,6 +282,11 @@ public abstract class AbsSymDialog extends Dialog implements
win.setAttributes(lp); win.setAttributes(lp);
win.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM); win.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
updateButtons(); updateButtons();
show(); try {
show();
} catch (Exception e) {
Log.e("AbsSymDialog", "Cannot create Dialog:");
Log.e("AbsSymDialog", Arrays.toString(e.getStackTrace()));
}
} }
} }

65
src/org/nyanya/android/traditionalt9/AddWordAct.java
View file

@ -1,52 +1,87 @@
package org.nyanya.android.traditionalt9; package org.nyanya.android.traditionalt9;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.app.Activity; import android.app.Activity;
import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast;
public class AddWordAct extends Activity { public class AddWordAct extends Activity {
View main; View main;
int lang;
SharedPreferences pref;
String origword;
@Override @Override
protected void onCreate(Bundle savedData) { protected void onCreate(Bundle savedData) {
super.onCreate(savedData); super.onCreate(savedData);
View v = getLayoutInflater().inflate(R.layout.addwordview, null); View v = getLayoutInflater().inflate(R.layout.addwordview, null);
EditText et = (EditText) v.findViewById(R.id.add_word_text); EditText et = (EditText) v.findViewById(R.id.add_word_text);
String word = getIntent().getStringExtra("org.nyanya.android.traditionalt9.word"); Intent i = getIntent();
origword = i.getStringExtra("org.nyanya.android.traditionalt9.word");
lang = i.getIntExtra("org.nyanya.android.traditionalt9.lang", -1);
if (lang == -1) {
Log.e("AddWordAct.onCreate", "lang is invalid. How?");
}
// Log.d("AddWord", "data.get: " + word); // Log.d("AddWord", "data.get: " + word);
et.setText(word); et.setText(origword);
et.setSelection(word.length()); et.setSelection(origword.length());
setContentView(v); setContentView(v);
main = v; main = v;
pref = PreferenceManager.getDefaultSharedPreferences(this);
} }
public void addWordButton(View v) { public void addWordButton(View v) {
EditText et = (EditText) main.findViewById(R.id.add_word_text); EditText et = (EditText) main.findViewById(R.id.add_word_text);
// Log.d("AddWordAct", "adding word: " + et.getText()); // Log.d("AddWordAct", "adding word: " + et.getText());
if (TraditionalT9.ghettoaccess == null) { doAddWord(et.getText().toString());
Log.e("AddWordAct.addWordbutton", "ghettoaccess is null? Oh no.");
} else {
TraditionalT9.ghettoaccess.doAddWord(et.getText().toString());
}
this.finish(); this.finish();
} }
public void doAddWord(String text) {
T9DB db = T9DB.getInstance(this);
try {
db.addWord(text, lang);
} catch (DBException e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
String msg = e.getMessage();
//Log.e("AddWord.doAddWord", msg);
builder.setMessage(msg).setTitle(R.string.add_word)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
}
});
AlertDialog dialog = builder.create();
// Window win = dialog.getWindow();
// WindowManager.LayoutParams lp = win.getAttributes();
// lp.token = getWindow().getWindow().getDecorView().getWindowToken();
// lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
// win.setAttributes(lp);
// win.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
dialog.show();
}
SharedPreferences.Editor prefedit = pref.edit();
prefedit.putString("last_word", text);
prefedit.commit();
}
public void cancelButton(View v) { public void cancelButton(View v) {
// Log.d("AddWordAct", "Cancelled..."); // Log.d("AddWordAct", "Cancelled...");
// TraditionalT9.ghettoaccess.addCancel();
this.finish(); this.finish();
} }
@Override
public void onStop() {
TraditionalT9.ghettoaccess.addCancel();
super.onStop();
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present. // Inflate the menu; this adds items to the action bar if it is present.

7
src/org/nyanya/android/traditionalt9/CandidateView.java
View file

@ -46,16 +46,15 @@ public class CandidateView extends View {
/** /**
* Construct a CandidateView for showing suggested words for completion. * Construct a CandidateView for showing suggested words for completion.
* *
* @param context * @param context
* @param attrs
*/ */
public CandidateView(Context context) { public CandidateView(Context context) {
super(context); super(context);
mSelectionHighlight = context.getResources().getDrawable( mSelectionHighlight = context.getResources().getDrawable(
android.R.drawable.list_selector_background); android.R.drawable.list_selector_background);
mSelectionHighlight.setState(new int[] { mSelectionHighlight.setState(new int[] {
android.R.attr.state_enabled, android.R.attr.state_focused, android.R.attr.state_enabled, android.R.attr.state_focused,
android.R.attr.state_window_focused, android.R.attr.state_pressed }); android.R.attr.state_window_focused, android.R.attr.state_pressed });
Resources r = context.getResources(); Resources r = context.getResources();

161
src/org/nyanya/android/traditionalt9/CharMap.java
View file

@ -1,5 +1,6 @@
package org.nyanya.android.traditionalt9; package org.nyanya.android.traditionalt9;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@ -8,77 +9,101 @@ import java.util.Map;
import android.util.Log; import android.util.Log;
public class CharMap { public class CharMap {
protected static final Map<Character, Integer> CHARTABLE; protected static final ArrayList<Map<Character, Integer>> CHARTABLE = new ArrayList<Map<Character, Integer>>(2);
static { static {
Map<Character, Integer> aMap = new HashMap<Character, Integer>(); Map<Character, Integer> enMap = new HashMap<Character, Integer>();
aMap.put('.', 1); aMap.put(',', 1); aMap.put('!', 1); aMap.put('?', 1); enMap.put('.', 1); enMap.put(',', 1); enMap.put('!', 1); enMap.put('?', 1);
aMap.put('-', 1); aMap.put('"', 1); aMap.put('\'', 1); aMap.put('@', 1); enMap.put('-', 1); enMap.put('"', 1); enMap.put('\'', 1); enMap.put('@', 1);
aMap.put('#', 1); aMap.put('$', 1); aMap.put('%', 1); aMap.put('&', 1); enMap.put('#', 1); enMap.put('$', 1); enMap.put('%', 1); enMap.put('&', 1);
aMap.put('*', 1); aMap.put('(', 1); aMap.put(')', 1); aMap.put('1', 1); enMap.put('*', 1); enMap.put('(', 1); enMap.put(')', 1); enMap.put('1', 1);
aMap.put(':', 1); aMap.put(';', 1); aMap.put('/', 1); aMap.put('\\', 1); enMap.put(':', 1); enMap.put(';', 1); enMap.put('/', 1); enMap.put('\\', 1);
aMap.put('+', 1); aMap.put('=', 1); aMap.put('<', 1); aMap.put('>', 1); enMap.put('+', 1); enMap.put('=', 1); enMap.put('<', 1); enMap.put('>', 1);
aMap.put('[', 1); aMap.put(']', 1); aMap.put('{', 1); aMap.put('}', 1); enMap.put('[', 1); enMap.put(']', 1); enMap.put('{', 1); enMap.put('}', 1);
aMap.put('^', 1); aMap.put('|', 1); aMap.put('_', 1); aMap.put('~', 1); enMap.put('^', 1); enMap.put('|', 1); enMap.put('_', 1); enMap.put('~', 1);
aMap.put('`', 1); enMap.put('`', 1);
aMap.put('a', 2); aMap.put('\u00e1', 2); aMap.put('\u00e4', 2); enMap.put('a', 2); enMap.put('\u00e1', 2); enMap.put('\u00e4', 2);
aMap.put('\u00e2', 2); aMap.put('\u00e0', 2); aMap.put('\u00e5', 2); enMap.put('\u00e2', 2); enMap.put('\u00e0', 2); enMap.put('\u00e5', 2);
aMap.put('b', 2); aMap.put('c', 2); aMap.put('\u00e7', 2); enMap.put('b', 2); enMap.put('c', 2); enMap.put('\u00e7', 2);
aMap.put('2', 2); aMap.put('d', 3); aMap.put('e', 3); enMap.put('2', 2); enMap.put('d', 3); enMap.put('e', 3);
aMap.put('\u00e9', 3); aMap.put('\u00eb', 3); aMap.put('\u00e8', 3); enMap.put('\u00e9', 3); enMap.put('\u00eb', 3); enMap.put('\u00e8', 3);
aMap.put('\u00ea', 3); aMap.put('f', 3); aMap.put('3', 3); enMap.put('\u00ea', 3); enMap.put('f', 3); enMap.put('3', 3);
aMap.put('g', 4); aMap.put('h', 4); aMap.put('i', 4); enMap.put('g', 4); enMap.put('h', 4); enMap.put('i', 4);
aMap.put('\u00ed', 4); aMap.put('\u00ef', 4); aMap.put('4', 4); enMap.put('\u00ed', 4); enMap.put('\u00ef', 4); enMap.put('4', 4);
aMap.put('j', 5); aMap.put('k', 5); aMap.put('l', 5); enMap.put('j', 5); enMap.put('k', 5); enMap.put('l', 5);
aMap.put('5', 5); aMap.put('m', 6); aMap.put('n', 6); enMap.put('5', 5); enMap.put('m', 6); enMap.put('n', 6);
aMap.put('\u00f1', 6); aMap.put('o', 6); aMap.put('\u00f3', 6); enMap.put('\u00f1', 6); enMap.put('o', 6); enMap.put('\u00f3', 6);
aMap.put('\u00f6', 6); aMap.put('\u00f4', 6); aMap.put('\u00fb', 6); enMap.put('\u00f6', 6); enMap.put('\u00f4', 6); enMap.put('\u00fb', 6);
aMap.put('6', 6); aMap.put('p', 7); aMap.put('q', 7); enMap.put('6', 6); enMap.put('p', 7); enMap.put('q', 7);
aMap.put('r', 7); aMap.put('s', 7); aMap.put('7', 7); enMap.put('r', 7); enMap.put('s', 7); enMap.put('7', 7);
aMap.put('t', 8); aMap.put('u', 8); aMap.put('\u00fc', 8); enMap.put('t', 8); enMap.put('u', 8); enMap.put('\u00fc', 8);
aMap.put('v', 8); aMap.put('8', 8); aMap.put('w', 9); enMap.put('v', 8); enMap.put('8', 8); enMap.put('w', 9);
aMap.put('x', 9); aMap.put('y', 9); aMap.put('z', 9); enMap.put('x', 9); enMap.put('y', 9); enMap.put('z', 9);
aMap.put('9', 9); aMap.put('+', 0); aMap.put('0', 0); enMap.put('9', 9); enMap.put('+', 0); enMap.put('0', 0);
CHARTABLE = Collections.unmodifiableMap(aMap); CHARTABLE.add(0, Collections.unmodifiableMap(enMap));
Map<Character, Integer> ruMap = new HashMap<Character, Integer>();
ruMap.put('.', 1); ruMap.put(',', 1); ruMap.put('!', 1); ruMap.put('?', 1);
ruMap.put('-', 1); ruMap.put('"', 1); ruMap.put('\'', 1); ruMap.put('@', 1);
ruMap.put('#', 1); ruMap.put('$', 1); ruMap.put('%', 1); ruMap.put('&', 1);
ruMap.put('*', 1); ruMap.put('(', 1); ruMap.put(')', 1); ruMap.put('1', 1);
ruMap.put(':', 1); ruMap.put(';', 1); ruMap.put('/', 1); ruMap.put('\\', 1);
ruMap.put('+', 1); ruMap.put('=', 1); ruMap.put('<', 1); ruMap.put('>', 1);
ruMap.put('[', 1); ruMap.put(']', 1); ruMap.put('{', 1); ruMap.put('}', 1);
ruMap.put('^', 1); ruMap.put('|', 1); ruMap.put('_', 1); ruMap.put('~', 1);
ruMap.put('`', 1); ruMap.put('1', 1);
ruMap.put('а', 2); ruMap.put('б', 2); ruMap.put('в', 2); ruMap.put('г', 2);
ruMap.put('2', 2);
ruMap.put('д', 3); ruMap.put('е', 3); ruMap.put('ё', 3); ruMap.put('ж', 3);
ruMap.put('з', 3); ruMap.put('3', 3);
ruMap.put('и', 4); ruMap.put('й', 4); ruMap.put('к', 4); ruMap.put('л', 4);
ruMap.put('4', 4);
ruMap.put('м', 5); ruMap.put('н', 5); ruMap.put('о', 5); ruMap.put('п', 5);
ruMap.put('5', 5);
ruMap.put('р', 6); ruMap.put('с', 6); ruMap.put('т', 6); ruMap.put('у', 6);
ruMap.put('6', 6);
ruMap.put('ф', 7); ruMap.put('х', 7); ruMap.put('ц', 7); ruMap.put('ч', 7);
ruMap.put('7', 7);
ruMap.put('ш', 8); ruMap.put('щ', 8); ruMap.put('ъ', 8); ruMap.put('ы', 8);
ruMap.put('8', 8);
ruMap.put('ь', 9); ruMap.put('э', 9); ruMap.put('ю', 9); ruMap.put('я', 9);
ruMap.put('9', 9);
ruMap.put('+', 0); ruMap.put('0', 0);
CHARTABLE.add(1, Collections.unmodifiableMap(ruMap));
} }
protected static final char[][] T9TABLE = { { '0', '+' },
{ '.', ',', '!', '?', '-', '"', '\'', '@', '#', '$', '%', '&', '*', '(', ')', '1' },
{ 'a', 'b', 'c', 'A', 'B', 'C', '2' }, { 'd', 'e', 'f', 'D', 'E', 'F', '3' },
{ 'g', 'h', 'i', 'G', 'H', 'I', '4' }, { 'j', 'k', 'l', 'J', 'K', 'L', '5' },
{ 'm', 'n', 'o', 'M', 'N', 'O', '6' }, { 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S', '7' },
{ 't', 'u', 'v', 'T', 'U', 'V', '8' }, { 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z', '9' },
{ ' ', '\n' } };
protected static final int[] T9CAPSTART = { 0, 0, 3, 3, 3, 3, 3, 4, 3, 4, 0 }; protected static final char[][] ENT9TABLE = { { '0', '+' },
{ '.', ',', '?', '!', '"', '\'', '-', '@', '$', '%', '&', '*', '(', ')', '_', '1' },
{ 'a', 'b', 'c', 'A', 'B', 'C', '2' }, { 'd', 'e', 'f', 'D', 'E', 'F', '3' },
{ 'g', 'h', 'i', 'G', 'H', 'I', '4' }, { 'j', 'k', 'l', 'J', 'K', 'L', '5' },
{ 'm', 'n', 'o', 'M', 'N', 'O', '6' }, { 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S', '7' },
{ 't', 'u', 'v', 'T', 'U', 'V', '8' }, { 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z', '9' },
{ ' ', '\n' } };
protected static final char[][] RUT9TABLE = { { '0', '+' },
{ '.', ',', '?', '!', '"', '\'', '-', '@', '$', '%', '&', '*', '(', ')', '_', '1' },
{ 'а', 'б', 'в', 'г', 'А', 'Б', 'В', 'Г', '2' }, { 'д', 'е', 'ё', 'ж', 'з', 'Д', 'Е', 'Ё', 'Ж', 'З', '3' },
{ 'и', 'й', 'к', 'л', 'И', 'Й', 'К', 'Л', '4' }, { 'м', 'н', 'о', 'п', 'М', 'Н', 'О', 'П', '5' },
{ 'р', 'с', 'т', 'у', 'Р', 'С', 'Т', 'У', '6' }, { 'ф', 'х', 'ц', 'ч', 'Ф', 'Х', 'Ц', 'Ч', '7' },
{ 'ш', 'щ', 'ъ', 'ы', 'Ш', 'Щ', 'Ъ', 'Ы', '8' }, { 'ь', 'э', 'ю', 'я', 'Ь', 'Э', 'Ю', 'Я', '9' },
{ ' ', '\n' } };
protected static final char[][][] T9TABLE = {ENT9TABLE, RUT9TABLE};
protected static int[] getSequence(String word) { protected static final int[] ENT9CAPSTART = { 0, 0, 3, 3, 3, 3, 3, 4, 3, 4, 0 };
int[] intseq = new int[word.length()]; protected static final int [] RUT9CAPSTART = {0, 0, 4, 5, 4, 4, 4, 4, 4, 4, 0};
String tword = word.toLowerCase(Locale.ENGLISH); protected static final int[][] T9CAPSTART = {ENT9CAPSTART, RUT9CAPSTART};
for (int i = 0; i < word.length(); i++) {
char c = tword.charAt(i);
Integer z = CharMap.CHARTABLE.get(c);
if (z == null) {
Log.e("getSequence",
"ERROR: " + (int) c + " NOT FOUND (" + Integer.toHexString((int) c) + ")");
throw new NullPointerException();
}
intseq[i] = z;
}
return intseq;
}
protected static String getStringSequence(String word) { protected static String getStringSequence(String word, int lang) {
StringBuilder seq = new StringBuilder(); StringBuilder seq = new StringBuilder();
String tword = word.toLowerCase(Locale.ENGLISH); String tword = word.toLowerCase(LangHelper.LOCALES[lang]);
for (int i = 0; i < word.length(); i++) { for (int i = 0; i < word.length(); i++) {
char c = tword.charAt(i); char c = tword.charAt(i);
Integer z = CharMap.CHARTABLE.get(c); Integer z = CharMap.CHARTABLE.get(lang).get(c);
if (z == null) { if (z == null) {
Log.e("getStringSequence", Log.e("getStringSequence",
"ERROR: " + (int) c + " NOT FOUND (" + Integer.toHexString((int) c) + ")"); "ERROR: " + (int) c + " NOT FOUND FOR [" + lang + "] (" + Integer.toHexString((int) c) + ") Index: " + i);
throw new NullPointerException(); throw new NullPointerException();
} }
seq.append(z.toString()); seq.append(z.toString());
} }
return seq.toString(); return seq.toString();
} }
} }

71
src/org/nyanya/android/traditionalt9/DBUpdateService.java Normal file
View file

@ -0,0 +1,71 @@
package org.nyanya.android.traditionalt9;
import android.app.IntentService;
import android.app.Notification;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
import android.os.Handler;
import android.util.Log;
import android.widget.Toast;
public class DBUpdateService extends IntentService {
private static final int UPDATING_NOTIFICATION_ID = 9640142;
private Handler mHandler;
// http://stackoverflow.com/a/20690225
public class DisplayToast implements Runnable {
private final Context mContext;
CharSequence mText;
public DisplayToast(Context mContext, CharSequence text){
this.mContext = mContext;
mText = text;
}
public void run(){
Toast.makeText(mContext, mText, Toast.LENGTH_SHORT).show();
}
}
public DBUpdateService() {
super("DBUpdateService");
mHandler = new Handler();
}
/**
* The IntentService calls this method from the default worker thread with
* the intent that started the service. When this method returns, IntentService
* stops the service, as appropriate.
*/
@Override
protected void onHandleIntent(Intent intent) {
// do things
T9DB dbhelper = T9DB.getInstance(this);
if (dbhelper.getSQLDB(this) != null) {
return;
}
Log.d("T9DBUpdate.onHandle", "Update pass check.");
// do real things
Notification notification = new Notification(R.drawable.ime_en_lang_lower, getText(R.string.updating_database_title),
System.currentTimeMillis());
Intent notificationIntent = new Intent(this, DBUpdateService.class);
PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
notification.setLatestEventInfo(this, getText(R.string.updating_database_title),
getText(R.string.updating_database), pendingIntent);
startForeground(UPDATING_NOTIFICATION_ID, notification);
//put this in a thread
mHandler.post(new DisplayToast(this, getText(R.string.updating_database)));
SQLiteDatabase tdb = dbhelper.getWritableDatabase();
dbhelper.setSQLDB(tdb);
mHandler.post(new DisplayToast(this, getText(R.string.updating_database_done)));
Log.d("T9DBUpdate.onHandle", "done.");
}
}

3
src/org/nyanya/android/traditionalt9/InterfaceHandler.java
View file

@ -126,8 +126,7 @@ public class InterfaceHandler implements View.OnClickListener, View.OnLongClickL
parent.showAddWord(); parent.showAddWord();
break; break;
case R.id.main_right: case R.id.main_right:
((InputMethodManager) parent.getSystemService(Context.INPUT_METHOD_SERVICE)) parent.launchOptions();
.showInputMethodPicker();
break; break;
default: default:
return false; return false;

34
src/org/nyanya/android/traditionalt9/LangHelper.java Normal file
View file

@ -0,0 +1,34 @@
package org.nyanya.android.traditionalt9;
import java.util.Locale;
public class LangHelper {
protected static final Locale RUSSIAN = new Locale("ru","RU");
protected static final int EN = 0;
protected static final int RU = 1;
protected static final Locale[] LOCALES = {Locale.ENGLISH, RUSSIAN};
protected static final String[] LANGS = {"EN", "RU"};
protected static final int NLANGS = LANGS.length;
protected static String getString(int lang) {
return LANGS[lang];
}
//[LANG][MODE][CAPSMODE] = iconref
// first group en, first line LANG, second line TEXT, last line NUM
protected static final int[][][] ICONMAP = {
{
//English resources
{R.drawable.ime_en_lang_lower, R.drawable.ime_en_lang_single, R.drawable.ime_en_lang_upper},
{R.drawable.ime_en_text_lower, R.drawable.ime_en_text_single, R.drawable.ime_en_text_upper},
{R.drawable.ime_number},
},
{
// Russian resources
{R.drawable.ime_ru_lang_lower, R.drawable.ime_ru_lang_single, R.drawable.ime_ru_lang_upper}, //LANG
{R.drawable.ime_ru_text_lower, R.drawable.ime_ru_text_single, R.drawable.ime_ru_text_upper}, //TEXT
{R.drawable.ime_number}, //NUM
}
};
}

386
src/org/nyanya/android/traditionalt9/T9DB.java
View file

@ -1,11 +1,16 @@
package org.nyanya.android.traditionalt9; package org.nyanya.android.traditionalt9;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale; import java.util.Locale;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.Service;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteConstraintException;
@ -13,11 +18,15 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.provider.BaseColumns; import android.provider.BaseColumns;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
public class T9DB { public class T9DB {
private static volatile T9DB instance = null;
protected boolean ready = true;
protected static final String DATABASE_NAME = "t9dict.db"; protected static final String DATABASE_NAME = "t9dict.db";
protected static final int DATABASE_VERSION = 1; protected static final int DATABASE_VERSION = 2;
protected static final String WORD_TABLE_NAME = "word"; protected static final String WORD_TABLE_NAME = "word";
protected static final String FREQ_TRIGGER_NAME = "freqtrigger"; protected static final String FREQ_TRIGGER_NAME = "freqtrigger";
// 50k, 10k // 50k, 10k
@ -25,11 +34,15 @@ public class T9DB {
private static final int FREQ_DIV = 10000; private static final int FREQ_DIV = 10000;
protected static final String COLUMN_ID = BaseColumns._ID; protected static final String COLUMN_ID = BaseColumns._ID;
protected static final String COLUMN_LANG = "lang";
protected static final String COLUMN_SEQ = "seq"; protected static final String COLUMN_SEQ = "seq";
protected static final String COLUMN_WORD = "word"; protected static final String COLUMN_WORD = "word";
protected static final String COLUMN_FREQUENCY = "freq"; protected static final String COLUMN_FREQUENCY = "freq";
private static final String QUERY1 = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
" WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + "=?" +
" ORDER BY " + COLUMN_FREQUENCY + " DESC";
private static final int MAX_RESULTS = 8; private static final int MAX_RESULTS = 8;
private static final int CAPS_OFF = 0; private static final int CAPS_OFF = 0;
@ -39,78 +52,157 @@ public class T9DB {
private DatabaseHelper mOpenHelper; private DatabaseHelper mOpenHelper;
private SQLiteDatabase db; private SQLiteDatabase db;
private Context parent; private Context mContext;
public T9DB(Context caller) { public T9DB(Context caller) {
// create db // create db
parent = caller; mContext = caller;
mOpenHelper = new DatabaseHelper(caller); mOpenHelper = new DatabaseHelper(caller);
} }
public static SQLiteDatabase getSQLDB(Context caller) { public static T9DB getInstance(Context caller) {
return new DatabaseHelper(caller).getWritableDatabase(); if (instance == null) {
synchronized (T9DB.class){
if (instance == null) {
instance = new T9DB (caller);
instance.init();
}
}
}
return instance;
} }
public void init() { public static SQLiteDatabase getSQLDB(Context caller) {
db = mOpenHelper.getWritableDatabase(); T9DB t9dbhelper = getInstance(caller);
// mOpenHelper.onUpgrade(db, 0, DATABASE_VERSION); //Log.d("T9DB.getSQLDB", "db:" + t9dbhelper.db.isOpen());
return t9dbhelper.db;
}
private void init() {
if (mOpenHelper.needsUpgrading() ) {
ready = false;
Log.i("T9.init", "needsUpgrading");
// start updating service
if (db != null) {
try {
db.close();
} catch (NullPointerException e) { }
db = null;
}
Intent intent = new Intent(mContext, DBUpdateService.class);
Log.i("T9.init", "Invoking update service...");
mContext.startService(intent);
} else {
db = mOpenHelper.getWritableDatabase();
}
}
protected boolean checkReady() {
if (ready) {
if (db == null) {
db = getWritableDatabase();
}
return true;
} else {
return false;
}
}
protected SQLiteDatabase getWritableDatabase() {
return mOpenHelper.getWritableDatabase();
}
protected void setSQLDB(SQLiteDatabase tdb) {
synchronized (T9DB.class){
db = tdb;
ready = true;
}
} }
public void close() { public void close() {
db.close(); try { db.close(); }
} catch (NullPointerException e) { }
public void nuke() {
init();
mOpenHelper.onUpgrade(db, 0, DATABASE_VERSION);
db.close();
db = null; db = null;
} }
public void addWord(String iword) throws DBException { public void nuke() {
Resources r = parent.getResources(); Log.i("T9DB.nuke", "Deleting database...");
synchronized (T9DB.class){
if (db != null) {
db.close();
}
if (!mContext.deleteDatabase(DATABASE_NAME)) {
Log.e("T9DB", "Couldn't delete database.");
}
Log.i("T9DB.nuke", "Preparing database...");
getWritableDatabase().close();
db = null;
ready = true;
init();
}
Log.i("T9DB.nuke", "Done...");
}
public void addWord(String iword, int lang) throws DBException {
Resources r = mContext.getResources();
if (iword.equals("")) { if (iword.equals("")) {
throw new DBException(r.getString(R.string.add_word_blank)); throw new DBException(r.getString(R.string.add_word_blank));
} }
// get int sequence // get int sequence
String seq; String seq;
try { try {
seq = CharMap.getStringSequence(iword); seq = CharMap.getStringSequence(iword, lang);
} catch (NullPointerException e) { } catch (NullPointerException e) {
throw new DBException(r.getString(R.string.add_word_badchar)); throw new DBException(r.getString(R.string.add_word_badchar, LangHelper.LANGS[lang]));
} }
// add int sequence into num table // add int sequence into num table
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(COLUMN_SEQ, seq); values.put(COLUMN_SEQ, seq);
values.put(COLUMN_LANG, lang);
// add word into word // add word into word
values.put(COLUMN_WORD, iword); values.put(COLUMN_WORD, iword);
values.put(COLUMN_FREQUENCY, 1); values.put(COLUMN_FREQUENCY, 1);
if (!checkReady()) {
Log.e("T9DB.addWord", "not ready");
Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
return;
}
try { try {
db.insertOrThrow(WORD_TABLE_NAME, null, values); db.insertOrThrow(WORD_TABLE_NAME, null, values);
} catch (SQLiteConstraintException e) { } catch (SQLiteConstraintException e) {
String msg = r.getString(R.string.add_word_exist1) + iword String msg = r.getString(R.string.add_word_exist2, iword, LangHelper.LANGS[lang]);
+ r.getString(R.string.add_word_exist2);
Log.w("T9DB.addWord", msg); Log.w("T9DB.addWord", msg);
throw new DBException(msg); throw new DBException(msg);
} }
} }
public void incrementWord(int id) { public void incrementWord(int id) {
if (!checkReady()) {
Log.e("T9DB.incrementWord", "not ready");
Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
return;
}
db.execSQL( db.execSQL(
"UPDATE " + WORD_TABLE_NAME + "UPDATE " + WORD_TABLE_NAME +
" SET " + COLUMN_FREQUENCY + " = " + COLUMN_FREQUENCY + "+ 1" + " SET " + COLUMN_FREQUENCY + " = " + COLUMN_FREQUENCY + "+ 1" +
" WHERE " + COLUMN_ID + " = \"" + id + "\""); " WHERE " + COLUMN_ID + " = \"" + id + "\"");
// if id's freq is greater than X we should normalise those with the // if id's freq is greater than FREQ_MAX, it gets normalized with trigger
// same seq
} }
protected String getWord(String is) { protected String getWord(String is, int lang) {
String result = null; String result = null;
String q = String q =
"SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME + "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
" WHERE " + COLUMN_SEQ + "=?" + " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + "=?" +
" ORDER BY " + COLUMN_FREQUENCY + " DESC"; " ORDER BY " + COLUMN_FREQUENCY + " DESC";
Cursor cur = db.rawQuery(q, new String[] { is }); if (!checkReady()) {
Log.e("T9DB.getWord", "not ready");
Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
return "";
}
Cursor cur = db.rawQuery(q, new String[] { is, String.valueOf(lang) });
int hits = 0; int hits = 0;
if (cur.moveToFirst()) { if (cur.moveToFirst()) {
result = cur.getString(0); result = cur.getString(0);
@ -122,15 +214,15 @@ public class T9DB {
int islen = is.length(); int islen = is.length();
char c = is.charAt(islen - 1); char c = is.charAt(islen - 1);
c++; c++;
q = "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME + q = "SELECT " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME +
" WHERE " + COLUMN_SEQ + " >= '" + is + "1" + "' AND " + COLUMN_SEQ + " < '" " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + " >= '" + is + "1" +
+ is.substring(0, islen - 1) + c + "'" + "' AND " + COLUMN_SEQ + " < '" + is.substring(0, islen - 1) + c + "'" +
" ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" + " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
" LIMIT " + (MAX_RESULTS - hits); " LIMIT " + (MAX_RESULTS - hits);
cur = db.rawQuery(q, null); cur = db.rawQuery(q, new String[] { String.valueOf(lang) });
if (cur.moveToFirst()) { if (cur.moveToFirst()) {
result = cur.getString(1); result = cur.getString(0);
} }
if (result == null) { if (result == null) {
result = ""; result = "";
@ -139,50 +231,48 @@ public class T9DB {
} }
return result; return result;
} }
public void updateWords(String is, ArrayList<String> stringList, ArrayList<Integer> intList, public void updateWords(String is, ArrayList<String> stringList, ArrayList<Integer> intList,
int capsMode) { int capsMode, int lang) {
stringList.clear(); stringList.clear();
intList.clear(); intList.clear();
// String[] sa = packInts(stringToInts(is), true); // String[] sa = packInts(stringToInts(is), true);
int islen = is.length(); int islen = is.length();
String q =
"SELECT " + COLUMN_ID + ", " + COLUMN_WORD + " FROM " + WORD_TABLE_NAME + if (!checkReady()) {
" WHERE " + COLUMN_SEQ + "=?" + Log.e("T9DB.updateWords", "not ready");
" ORDER BY " + COLUMN_FREQUENCY + " DESC"; Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
Cursor cur = db.rawQuery(q, new String[] { is }); return;
}
Cursor cur = db.rawQuery(QUERY1, new String[] { String.valueOf(lang), is });
int hits = 0; int hits = 0;
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) { for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0)); intList.add(cur.getInt(0));
stringList.add(cur.getString(1)); stringList.add(cur.getString(1));
if (hits >= 15) { // if (hits >= 15) {
break; // break;
} // }
hits++; hits++;
} }
cur.close(); cur.close();
if (hits < 4) {
// TODO: profile this and if it takes too long to only do it when hits is super low...
if (hits < 10) {
char c = is.charAt(islen - 1); char c = is.charAt(islen - 1);
c++; c++;
// q = "SELECT " + COLUMN_WORD +", " + COLUMN_FREQUENCY + String q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD +
// " FROM " + WORD_TABLE_NAME + " FROM " + WORD_TABLE_NAME +
// " WHERE " + COLUMN_SEQ + " LIKE ?" + " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + " >= '" + is + "1" +
// " ORDER BY " + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY + "' AND " + COLUMN_SEQ + " < '" + is.substring(0, islen - 1) + c + "'" +
// " DESC;"; " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
// c = db.rawQuery(q, new String[] {is + "_%"}); " LIMIT " + (MAX_RESULTS - hits);
// above is hella slow below is gotta query fast cur = db.rawQuery(q, new String[] { String.valueOf(lang) });
q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD +
" FROM " + WORD_TABLE_NAME +
" WHERE " + COLUMN_SEQ + " >= '" + is + "1" + "' AND " + COLUMN_SEQ + " < '"
+ is.substring(0, islen - 1) + c + "'" +
" ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
" LIMIT " + (MAX_RESULTS - hits);
cur = db.rawQuery(q, null);
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) { for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0)); intList.add(cur.getInt(0));
stringList.add(cur.getString(1)); stringList.add(cur.getString(1));
if (hits >= 10) { if (hits >= 20) {
break; break;
} }
hits++; hits++;
@ -203,36 +293,36 @@ public class T9DB {
while (iter.hasNext()) { while (iter.hasNext()) {
word = iter.next(); word = iter.next();
switch (capsMode) { switch (capsMode) {
case CAPS_ALL: case CAPS_ALL:
wordtemp = word.toUpperCase(Locale.US); wordtemp = word.toUpperCase(LangHelper.LOCALES[lang]);
if (wordtemp.equals(word)) { if (wordtemp.equals(word)) {
index++; index++;
continue; continue;
} else if (stringList.contains(wordtemp)) { } else if (stringList.contains(wordtemp)) {
// remove this entry // remove this entry
iter.remove(); iter.remove();
removed = true; removed = true;
} else { } else {
stringList.set(index, wordtemp); stringList.set(index, wordtemp);
} }
break; break;
case CAPS_SINGLE: case CAPS_SINGLE:
if (word.length() > 1) { if (word.length() > 1) {
wordtemp = word.substring(0, 1).toUpperCase(Locale.US) + word.substring(1); wordtemp = word.substring(0, 1).toUpperCase(LangHelper.LOCALES[lang]) + word.substring(1);
} else { } else {
wordtemp = word.toUpperCase(Locale.US); wordtemp = word.toUpperCase(LangHelper.LOCALES[lang]);
} }
if (wordtemp.equals(word)) { if (wordtemp.equals(word)) {
index++; index++;
continue; continue;
} else if (stringList.contains(wordtemp)) { } else if (stringList.contains(wordtemp)) {
// remove this entry // remove this entry
iter.remove(); iter.remove();
removed = true; removed = true;
} else { } else {
stringList.set(index, wordtemp); stringList.set(index, wordtemp);
} }
break; break;
} }
if (removed) { if (removed) {
intList.remove(index); intList.remove(index);
@ -241,21 +331,27 @@ public class T9DB {
index++; index++;
} }
} }
//Log.d("T9DB.updateWords", "i:" + is + " words:" + Arrays.toString(stringList.toArray()));
return; return;
} }
protected void updateWordsW(String is, ArrayList<String> stringList, protected void updateWordsW(String is, ArrayList<String> stringList,
ArrayList<Integer> intList, ArrayList<Integer> freq) { ArrayList<Integer> intList, ArrayList<Integer> freq, int lang) {
stringList.clear(); stringList.clear();
intList.clear(); intList.clear();
freq.clear(); freq.clear();
// String[] sa = packInts(stringToInts(is), true); // String[] sa = packInts(stringToInts(is), true);
int islen = is.length(); int islen = is.length();
String q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY + String q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
" FROM " + WORD_TABLE_NAME + " FROM " + WORD_TABLE_NAME +
" WHERE " + COLUMN_SEQ + "=?" + " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + "=?" +
" ORDER BY " + COLUMN_FREQUENCY + " DESC"; " ORDER BY " + COLUMN_FREQUENCY + " DESC";
Cursor cur = db.rawQuery(q, new String[] { is }); if (!checkReady()) {
Log.e("T9DB.updateWordsW", "not ready");
Toast.makeText(mContext, R.string.database_notready, Toast.LENGTH_SHORT).show();
return;
}
Cursor cur = db.rawQuery(q, new String[] { is, String.valueOf(lang) });
int hits = 0; int hits = 0;
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) { for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0)); intList.add(cur.getInt(0));
@ -270,20 +366,13 @@ public class T9DB {
if (hits < 4) { if (hits < 4) {
char c = is.charAt(islen - 1); char c = is.charAt(islen - 1);
c++; c++;
// q = "SELECT " + COLUMN_WORD +", " + COLUMN_FREQUENCY + q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
// " FROM " + WORD_TABLE_NAME + " FROM " + WORD_TABLE_NAME +
// " WHERE " + COLUMN_SEQ + " LIKE ?" + " WHERE " + COLUMN_LANG + "=? AND " + COLUMN_SEQ + " >= '" + is +
// " ORDER BY " + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY + "' AND " + COLUMN_SEQ + " < '" + is.substring(0, islen - 1) + c + "'" +
// " DESC;"; " ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
// c = db.rawQuery(q, new String[] {is + "_%"}); " LIMIT " + (MAX_RESULTS - hits);
// above is hella slow cur = db.rawQuery(q, new String[] { String.valueOf(lang) });
q = "SELECT " + COLUMN_ID + ", " + COLUMN_WORD + ", " + COLUMN_FREQUENCY +
" FROM " + WORD_TABLE_NAME +
" WHERE " + COLUMN_SEQ + " >= '" + is + "' AND " + COLUMN_SEQ
+ " < '" + is.substring(0, islen - 1) + c + "'" +
" ORDER BY " + COLUMN_FREQUENCY + " DESC, " + COLUMN_SEQ + " ASC" +
" LIMIT " + (MAX_RESULTS - hits);
cur = db.rawQuery(q, null);
for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) { for (cur.moveToFirst(); !cur.isAfterLast(); cur.moveToNext()) {
intList.add(cur.getInt(0)); intList.add(cur.getInt(0));
@ -301,37 +390,64 @@ public class T9DB {
private static class DatabaseHelper extends SQLiteOpenHelper { private static class DatabaseHelper extends SQLiteOpenHelper {
Context mContext = null;
DatabaseHelper(Context context) { DatabaseHelper(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION); super(context, DATABASE_NAME, null, DATABASE_VERSION);
mContext = context;
} }
// partial code from parent class SQLiteOpenHelper
protected boolean needsUpgrading() {
//quick and dirty check to see if an existing database exists.
if (mContext.databaseList().length > 0) {
SQLiteDatabase db = mContext.openOrCreateDatabase(DATABASE_NAME, 0, null);
int version = db.getVersion();
db.close();
if (version < DATABASE_VERSION) {
return true;
}
else {
return false;
}
} else {
return false;
}
}
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
db.execSQL("CREATE TABLE " + WORD_TABLE_NAME + " (" + db.execSQL("CREATE TABLE IF NOT EXISTS " + WORD_TABLE_NAME + " (" +
COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
COLUMN_SEQ + " TEXT, " + COLUMN_LANG + " INTEGER, " +
COLUMN_WORD + " TEXT UNIQUE, " + COLUMN_SEQ + " TEXT, " +
COLUMN_FREQUENCY + " INTEGER" + ")"); COLUMN_WORD + " TEXT, " +
COLUMN_FREQUENCY + " INTEGER, " +
"UNIQUE(" + COLUMN_LANG + ", " + COLUMN_WORD + ") )");
db.execSQL("CREATE INDEX idx ON " + WORD_TABLE_NAME + "(" db.execSQL("CREATE INDEX idx ON " + WORD_TABLE_NAME + "("
+ COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY + " DESC )"); + COLUMN_LANG + ", " + COLUMN_SEQ + " ASC, " + COLUMN_FREQUENCY + " DESC )");
db.execSQL("CREATE TRIGGER " + FREQ_TRIGGER_NAME + db.execSQL("CREATE TRIGGER IF NOT EXISTS " + FREQ_TRIGGER_NAME +
" AFTER UPDATE ON " + WORD_TABLE_NAME + " AFTER UPDATE ON " + WORD_TABLE_NAME +
" WHEN NEW." + COLUMN_FREQUENCY + " > " + FREQ_MAX + " WHEN NEW." + COLUMN_FREQUENCY + " > " + FREQ_MAX +
" BEGIN" + " BEGIN" +
" UPDATE " + WORD_TABLE_NAME + " SET " + COLUMN_FREQUENCY + " = " " UPDATE " + WORD_TABLE_NAME + " SET " + COLUMN_FREQUENCY + " = "
+ COLUMN_FREQUENCY + " / " + FREQ_DIV + + COLUMN_FREQUENCY + " / " + FREQ_DIV +
" WHERE " + COLUMN_SEQ + " = NEW." + COLUMN_SEQ + ";" + " WHERE " + COLUMN_SEQ + " = NEW." + COLUMN_SEQ + ";" +
" END;"); " END;");
} }
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
Log.w("T9DB", "Upgrading database from version " + oldVersion + " to " + newVersion Log.i("T9DB.onUpgrade", "Upgrading database from version " + oldVersion + " to " + newVersion);
+ ", which will destroy all old data"); if (oldVersion == 1) {
db.execSQL("DROP TABLE IF EXISTS " + WORD_TABLE_NAME); db.execSQL("ALTER TABLE " + WORD_TABLE_NAME + " ADD COLUMN " +
db.execSQL("DROP INDEX IF EXISTS idx"); COLUMN_LANG + " INTEGER");
onCreate(db); db.execSQL("DROP INDEX IF EXISTS idx");
Log.w("T9DB", "Done."); onCreate(db);
ContentValues updatedata = new ContentValues();
updatedata.put(COLUMN_LANG, 0);
db.update(WORD_TABLE_NAME, updatedata, null, null);
}
Log.i("T9DB.onUpgrade", "Done.");
} }
} }
} }

1161
src/org/nyanya/android/traditionalt9/TraditionalT9.java
View file

File diff suppressed because it is too large Load diff

908
src/org/nyanya/android/traditionalt9/TraditionalT9Settings.java
View file

File diff suppressed because it is too large Load diff

73
src/org/nyanya/android/traditionalt9/Utils.java Normal file
View file

@ -0,0 +1,73 @@
package org.nyanya.android.traditionalt9;
import android.text.InputType;
import android.util.Log;
public class Utils {
public static void printFlags(int inputType) {
if ((inputType & InputType.TYPE_CLASS_DATETIME) == InputType.TYPE_CLASS_DATETIME)
Log.i("Utils.printFlags", "TYPE_CLASS_DATETIME");
if ((inputType & InputType.TYPE_CLASS_NUMBER) == InputType.TYPE_CLASS_NUMBER)
Log.i("Utils.printFlags", "TYPE_CLASS_NUMBER");
if ((inputType & InputType.TYPE_CLASS_PHONE) == InputType.TYPE_CLASS_PHONE)
Log.i("Utils.printFlags", "TYPE_CLASS_PHONE");
if ((inputType & InputType.TYPE_CLASS_TEXT) == InputType.TYPE_CLASS_TEXT)
Log.i("Utils.printFlags", "TYPE_CLASS_TEXT");
if ((inputType & InputType.TYPE_DATETIME_VARIATION_DATE) == InputType.TYPE_DATETIME_VARIATION_DATE)
Log.i("Utils.printFlags", "TYPE_DATETIME_VARIATION_DATE");
if ((inputType & InputType.TYPE_DATETIME_VARIATION_NORMAL) == InputType.TYPE_DATETIME_VARIATION_NORMAL)
Log.i("Utils.printFlags", "TYPE_DATETIME_VARIATION_NORMAL");
if ((inputType & InputType.TYPE_DATETIME_VARIATION_TIME) == InputType.TYPE_DATETIME_VARIATION_TIME)
Log.i("Utils.printFlags", "YPE_DATETIME_VARIATION_TIME");
if ((inputType & InputType.TYPE_NULL) == InputType.TYPE_NULL)
Log.i("Utils.printFlags", "TYPE_NULL");
if ((inputType & InputType.TYPE_NUMBER_FLAG_DECIMAL) == InputType.TYPE_NUMBER_FLAG_DECIMAL)
Log.i("Utils.printFlags", "TYPE_NUMBER_FLAG_DECIMAL");
if ((inputType & InputType.TYPE_NUMBER_FLAG_SIGNED) == InputType.TYPE_NUMBER_FLAG_SIGNED)
Log.i("Utils.printFlags", "TYPE_NUMBER_FLAG_SIGNED");
if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE) == InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_AUTO_COMPLETE");
if ((inputType & InputType.TYPE_TEXT_FLAG_AUTO_CORRECT) == InputType.TYPE_TEXT_FLAG_AUTO_CORRECT)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_AUTO_CORRECT");
if ((inputType & InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS) == InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_CAP_CHARACTERS");
if ((inputType & InputType.TYPE_TEXT_FLAG_CAP_SENTENCES) == InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_CAP_SENTENCES");
if ((inputType & InputType.TYPE_TEXT_FLAG_CAP_WORDS) == InputType.TYPE_TEXT_FLAG_CAP_WORDS)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_CAP_WORDS");
if ((inputType & InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE) == InputType.TYPE_TEXT_FLAG_IME_MULTI_LINE)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_IME_MULTI_LINE");
if ((inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) == InputType.TYPE_TEXT_FLAG_MULTI_LINE)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_MULTI_LINE");
if ((inputType & InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS) == InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
Log.i("Utils.printFlags", "TYPE_TEXT_FLAG_NO_SUGGESTIONS");
if ((inputType & InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_EMAIL_ADDRESS");
if ((inputType & InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT) == InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_EMAIL_SUBJECT");
if ((inputType & InputType.TYPE_TEXT_VARIATION_FILTER) == InputType.TYPE_TEXT_VARIATION_FILTER)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_FILTER");
if ((inputType & InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE) == InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_LONG_MESSAGE");
if ((inputType & InputType.TYPE_TEXT_VARIATION_NORMAL) == InputType.TYPE_TEXT_VARIATION_NORMAL)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_NORMAL");
if ((inputType & InputType.TYPE_TEXT_VARIATION_PASSWORD) == InputType.TYPE_TEXT_VARIATION_PASSWORD)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_PASSWORD");
if ((inputType & InputType.TYPE_TEXT_VARIATION_PERSON_NAME) == InputType.TYPE_TEXT_VARIATION_PERSON_NAME)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_PERSON_NAME");
if ((inputType & InputType.TYPE_TEXT_VARIATION_PHONETIC) == InputType.TYPE_TEXT_VARIATION_PHONETIC)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_PHONETIC");
if ((inputType & InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS) == InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_POSTAL_ADDRESS");
if ((inputType & InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE) == InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_SHORT_MESSAGE");
if ((inputType & InputType.TYPE_TEXT_VARIATION_URI) == InputType.TYPE_TEXT_VARIATION_URI)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_URI");
if ((inputType & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_VISIBLE_PASSWORD");
if ((inputType & InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT)
Log.i("Utils.printFlags", "TYPE_TEXT_VARIATION_WEB_EDIT_TEXT");
}
}

198
src/pl/wavesoftware/widget/MultiSelectListPreference.java Normal file
View file

@ -0,0 +1,198 @@
package pl.wavesoftware.widget;
// https://gist.github.com/cardil/4754571/07b4b6ffd37b440bbdec2cafa1ab7411c5ad3873
// modified to work specifically for this service
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnMultiChoiceClickListener;
import android.content.res.TypedArray;
import android.preference.ListPreference;
import android.util.AttributeSet;
import android.util.Log;
public class MultiSelectListPreference extends ListPreference {
private String separator;
private static final String DEFAULT_SEPARATOR = "\u0001\u0007\u001D\u0007\u0001";
private boolean[] entryChecked;
public MultiSelectListPreference(Context context, AttributeSet attributeSet) {
super(context, attributeSet);
entryChecked = new boolean[getEntries().length];
separator = DEFAULT_SEPARATOR;
}
public MultiSelectListPreference(Context context) {
this(context, null);
}
@Override
protected void onPrepareDialogBuilder(Builder builder) {
CharSequence[] entries = getEntries();
CharSequence[] entryValues = getEntryValues();
if (entries == null || entryValues == null
|| entries.length != entryValues.length) {
throw new IllegalStateException(
"MultiSelectListPreference requires an entries array and an entryValues "
+ "array which are both the same length");
}
restoreCheckedEntries();
OnMultiChoiceClickListener listener = new DialogInterface.OnMultiChoiceClickListener() {
public void onClick(DialogInterface dialog, int which, boolean val) {
entryChecked[which] = val;
}
};
builder.setMultiChoiceItems(entries, entryChecked, listener);
}
private CharSequence[] unpack(CharSequence val) {
if (val == null || "".equals(val)) {
return new CharSequence[0];
} else {
return ((String) val).split(separator);
}
}
// added method
public static int[] defaultunpack2Int(CharSequence val) {
if (val == null || "".equals(val)) {
//Log.w("MultiSelectPref.defaultunpack", "val is null or empty");
return new int[] {0}; //default pref
} else {
String[] sa = ((String) val).split(DEFAULT_SEPARATOR);
if (sa.length < 1) {
Log.w("MultiSelectPref.defaultunpack", "split is less than 1");
return new int[] {0}; //default pref
}
int[] ia = new int[sa.length];
for (int x=0;x<sa.length;x++) {
ia[x] = Integer.valueOf(sa[x]);
}
return ia;
}
}
/**
* Gets the entries values that are selected
*
* @return the selected entries values
*/
public CharSequence[] getCheckedValues() {
return unpack(getValue());
}
private void restoreCheckedEntries() {
CharSequence[] entryValues = getEntryValues();
// Explode the string read in sharedpreferences
CharSequence[] vals = unpack(getValue());
if (vals != null) {
List<CharSequence> valuesList = Arrays.asList(vals);
for (int i = 0; i < entryValues.length; i++) {
CharSequence entry = entryValues[i];
entryChecked[i] = valuesList.contains(entry);
}
}
}
@Override
protected void onDialogClosed(boolean positiveResult) {
List<CharSequence> values = new ArrayList<CharSequence>();
CharSequence[] entryValues = getEntryValues();
if (positiveResult && entryValues != null) {
for (int i = 0; i < entryValues.length; i++) {
if (entryChecked[i] == true) {
String val = (String) entryValues[i];
values.add(val);
}
}
String value = join(values, separator);
setSummary(prepareSummary(values));
setValueAndEvent(value);
}
}
//modified to make sure some sane thing gets stored
private void setValueAndEvent(String value) {
if (callChangeListener(unpack(value))) {
if (value == null || value.length() < 1) {
setValue("0"); //default
} else {
setValue(value);
}
}
}
private CharSequence prepareSummary(List<CharSequence> joined) {
List<String> titles = new ArrayList<String>();
CharSequence[] entryTitle = getEntries();
CharSequence[] entryValues = getEntryValues();
int ix = 0;
for (CharSequence value : entryValues) {
if (joined.contains(value)) {
titles.add((String) entryTitle[ix]);
}
ix += 1;
}
return join(titles, ", ");
}
@Override
protected Object onGetDefaultValue(TypedArray typedArray, int index) {
return typedArray.getTextArray(index);
}
@Override
protected void onSetInitialValue(boolean restoreValue,
Object rawDefaultValue) {
String value = null;
CharSequence[] defaultValue;
if (rawDefaultValue == null) {
defaultValue = new CharSequence[0];
} else {
defaultValue = (CharSequence[]) rawDefaultValue;
}
List<CharSequence> joined = Arrays.asList(defaultValue);
String joinedDefaultValue = join(joined, separator);
if (restoreValue) {
value = getPersistedString(joinedDefaultValue);
} else {
value = joinedDefaultValue;
}
setSummary(prepareSummary(Arrays.asList(unpack(value))));
setValueAndEvent(value);
}
/**
* Joins array of object to single string by separator
*
* Credits to kurellajunior on this post
* http://snippets.dzone.com/posts/show/91
*
* @param iterable
* any kind of iterable ex.: <code>["a", "b", "c"]</code>
* @param separator
* separetes entries ex.: <code>","</code>
* @return joined string ex.: <code>"a,b,c"</code>
*/
protected static String join(Iterable<?> iterable, String separator) {
Iterator<?> oIter;
if (iterable == null || (!(oIter = iterable.iterator()).hasNext()))
return "";
StringBuilder oBuilder = new StringBuilder(String.valueOf(oIter.next()));
while (oIter.hasNext())
oBuilder.append(separator).append(oIter.next());
return oBuilder.toString();
}
}