diff --git a/.gitignore b/.gitignore index cf57b4a8..c36085e5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,9 +12,10 @@ bin/ gen/ -# Gradle files +# Gradle/build files .gradle/ build/ +release/ # Local configuration file (sdk path, etc) local.properties diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1a8a7c9e..ac1e4db8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,53 +1,38 @@ - + - + - - - - - - - + + - - + - + + + + + + - - - - - - - + + + + + + + - diff --git a/README.md b/README.md index 757fe944..15e8d973 100644 --- a/README.md +++ b/README.md @@ -21,34 +21,37 @@ That's it! Now you should be able to deploy and debug the app on your device. You can find more info in this [Github issue](https://github.com/android/input-samples/issues/18). ### Building a Release .apk -The project is configured to build an unsigned release variant by default. You just need to select the "release" variant from Android Studio options, then `Build -> Rebuild Project`. After that, just ignore all warnings until you get to the end of the process. You will find the `.apk` in the generated 'build/' folder. +The project is configured to build an unsigned release variant by default. + +- Select the "release" variant from Android Studio options (`Build` -> `Select Build Variant...`) +- `Build` -> `Rebuild Project`. After that, just ignore all warnings until you get to the end of the process. +- Find the `.apk` in the generated 'build/' folder. + +_Note that it may not be possible to install an unsigned `.apk` on newer versions of Android. You must either manually sign it or build a signed one instead._ ### Building a Signed .apk -- Make sure you have a signing key. If you don't have one, follow the [official manual](https://developer.android.com/studio/publish/app-signing#sign-apk). -- In `build.gradle` find the `signingConfigs` and `buildTypes` sections and uncomment them. -- Set properly the environment variables listed in `signingConfigs.release` _(You may need to restart Android Studio after that)_. Alternatively, you may simply type the actual key path, alias and passwords there. **Just make sure not to commit them!** -- Build the project normally. Android Studio should show you where it has generated the signed `.apk` file. If not, look for it in the `build/` folder. +Make sure you have a signing key. If you don't have one, follow the [official manual](https://developer.android.com/studio/publish/app-signing#sign-apk). + +- Select `Build` -> `Generate Signed Bundle / APK...`. +- Select `APK` and proceed to the next screen. +- Enter your key details (or create a new one) and continue to the next screen. +- Choose the "Release" variant, then click `Finish` to start building. +- Android Studio will tell you where the `.apk` is, but if it does not, try looking for it in the `release/` folder. ## Adding a new language To support a new language one needs to: -- Modify CharMap.java -- New Map needs to be created with the characters to be encountered in addWord or in the user dictionary when loaded. -- New character array needs to be added for characters that are to cycle on each number press. -- New array needs to be made to tell where the capital letters start in that array. -- modify LangHelper.java - Add status icons - - Create proper icons for each mode (e.g. "Ab", "En", "12") and each screen size. The font must be Roboto Lt at an adequate size to fit the icon square with minimum padding. Text must be white and the background must be transparent as per the [official Android guide](https://android-doc.github.io/guide/practices/ui_guidelines/icon_design_status_bar.html). To simplify the process, you could use Android Studio. It has a built-in icon generator accessible by right-cicking on "drawable" folder -> New -> Image Asset. Then choose "Icon Type": "Notification Icons", "Asset Type": Text, "Trim": No, "Padding": 0%. - - Add new entry in ICONMAP -- Add new LANGUAGE enum entry e.g. FR(3,5) (index, id) Where index is index in arrays like LOCALES, and id is the identifier used in the database and such. The latter should never change unless database update is done. -- Make sure new id matches const.xml -- Add the LOCALE of the language in the LOCALES Locale array -- Add translations for arrays.xml and strings.xml in to new files in the appropriate locale folder (e.g. res/values-de/arrays.xml.) AndroidStudio has a cute/nice Translation Editor which might be handy. - - Edit the base arrays.xml file to add the new language. (pref_lang_titles, pref_lang_values) - - Exclude translatable="false" items from the new locale arrays.xml file. -- Find a suitable dictionary and add it to assets - -That should be it? I hope. + - Create a proper icon for each screen size. The icon needs to contain the abbreviation of the language. (e.g. "En" for "English"). + - The font must be Roboto Lt at an adequate size to fit the icon square with minimum padding. + - The text must be white and the background must be transparent as per the [official Android guide](https://android-doc.github.io/guide/practices/ui_guidelines/icon_design_status_bar.html). + - To simplify the process, you could use Android Studio. It has a built-in icon generator accessible by right-cicking on "drawable" folder -> New -> Image Asset. Then choose "Icon Type": "Notification Icons", "Asset Type": Text, "Trim": No, "Padding": 0%. +- Find a suitable dictionary and add it to `assets` folder. +- Create a new language class in `languages/definitions/`. Make sure to set all properties. The ID must be the next available one. Currently, the range is limited between 1 and 31, so there can be 31 languages in total. +- Add the new language to the list in `LanguageCollection.java`. You only need to add it in one place, in the constructor. Please, be nice and maintain the alphabetical order. +- Add a new entry in `res/values/const.xml`. Make sure the new ID matches the one in the language class. +- Add new entries in `res/values/arrays.xml`. +- Add translations in `res/values/strings-your-lang`. The Android Studio translation editor is very handy. ## Using the app See the [user manual](docs/user-manual.md). diff --git a/assets/de-utf8.txt b/assets/de-utf8.txt index 0db76a16..5f251013 100644 --- a/assets/de-utf8.txt +++ b/assets/de-utf8.txt @@ -5954,7 +5954,6 @@ Andorra Andrang Andranges andre -André Andrea Andreas andrehen @@ -10441,8 +10440,6 @@ Atomzeitalter Atomzertrümmerung ATP ATS -Attaché -Attachés Attacke Attacken attackieren @@ -24205,7 +24202,7 @@ Bogenmaßes Bogens Bogenstück Bogenstücke -Bogotá +Bogota bogst Bohle Bohlen @@ -25901,7 +25898,6 @@ Cabaret Cabrio Cabriolet CAD -Café Cafeteria Calamares Callgirl @@ -26094,7 +26090,7 @@ chartern charterten Charts Chassis -Château +Chateau Chauffeur Chauffeure Chauffeuren @@ -26267,7 +26263,6 @@ Cineast cineastisch circa City -Cività Clan Claude Claudia @@ -26340,7 +26335,6 @@ Computerstimme Computertechnik Computerviren Concorde -Conférencier const Container cool @@ -26360,7 +26354,6 @@ Couleur Count-down Coup Coupe -Coupé Coupon Coupons Coups @@ -77418,7 +77411,7 @@ Militärarzt Militärärzte Militärärzten Militärarztes -Militärattachés +Militärattaches Militärbündnis Militärdienstes Militärdiktatur @@ -80903,7 +80896,6 @@ negierter negiertes negiertest negiertet -Negligé Negligee nehme nehmen @@ -101437,7 +101429,6 @@ Sortimentsbuchhändlern SOS Soße Soßen -Soufflé Soufflee Souffleur Souffleuren @@ -121119,12 +121110,8 @@ Variationsbreite Variationsrechnung Varietät Varietäten -Varieté Varietee Varietees -Varietés -Varietétheatern -Varietétheaters variierbare variiere variieren diff --git a/assets/en-utf8.txt b/assets/en-utf8.txt index c7dcba91..d313fffc 100644 --- a/assets/en-utf8.txt +++ b/assets/en-utf8.txt @@ -1,4 +1,3 @@ -A A's AA AA's @@ -1087,8 +1086,8 @@ Astoria Astrakhan AstroTurf Asturias -Asunción -Asunción's +Asuncion +Asuncion's Aswan Aswan's At @@ -1099,8 +1098,6 @@ Atahualpa Atalanta Atari Atari's -Atatürk -Atatürk's Athabasca Athabasca's Athena @@ -1261,7 +1258,6 @@ Aztecan's Aztecs Aztlan Aztlan's -B B's BA BA's @@ -1498,7 +1494,6 @@ Bartholdi's Bartholomew Bartlett Barton -Bartók Baruch Baryshnikov Basel @@ -1982,8 +1977,8 @@ Boers Boethius Bogart Bogart's -Bogotá -Bogotá's +Bogota +Bogota's Bohemia Bohemian Bohemian's @@ -2111,8 +2106,6 @@ Boyd Boyer Boyer's Boyle -Boötes -Boötes's Br Br's Brad @@ -2471,8 +2464,8 @@ Butler Butterfingers Butterfingers's Buxtehude -Buñuel -Buñuel's +Bunuel +Bunuel's Byblos Byblos's Byers @@ -2485,7 +2478,6 @@ Byzantine's Byzantines Byzantium Byzantium's -C C's CA CATV @@ -3481,7 +3473,6 @@ Conakry Conakry's Conan Conan's -Concepción Concetta Concetta's Concord @@ -3846,7 +3837,6 @@ Czechoslovakian's Czechoslovakians Czechs Czerny -D D's DA DA's @@ -4549,7 +4539,7 @@ Dutchman's Dutchmen Duvalier Dvina -Dvorák +Dvorak Dwayne Dwayne's Dwight @@ -4563,10 +4553,6 @@ Dyson's Dzerzhinsky Dzerzhinsky's Dzungaria -Dürer -Düsseldorf -Düsseldorf's -E E's EC ECG @@ -4837,8 +4823,8 @@ Elysian Elysium Elysium's Elysiums -Elysée -Elysée's +Elysee +Elysee's Emacs Emacs's Emanuel @@ -5028,8 +5014,6 @@ Estelle Estelle's Ester Ester's -Esterházy -Esterházy's Estes Esther Esther's @@ -5159,7 +5143,6 @@ Eysenck Eysenck's Ezekiel Ezra -F F's FAA FAQ @@ -5193,7 +5176,7 @@ FTC FUD FUDs FYI -Fabergé +Faberge Fabian Fabian's Facebook @@ -5613,13 +5596,10 @@ Fulton Fulton's Funafuti Fundy -Furtwängler -Furtwängler's Fushun Fuzhou Fuzhou's Fuzzbuster -G G's GA GB @@ -5891,7 +5871,6 @@ Gethsemane Getty Gettysburg Gettysburg's -Gewürztraminer Ghana Ghana's Ghanaian @@ -6217,10 +6196,6 @@ Grundy Grus Grus's Gruyeres -Gruyère -Gruyère's -Grünewald -Grünewald's Guadalajara Guadalajara's Guadalcanal @@ -6325,11 +6300,6 @@ Gwyn's Gypsies Gypsy Gypsy's -Gödel -Gödel's -Göteborg -Göteborg's -H H's HBO HF @@ -7076,9 +7046,6 @@ Hyundai Hyundai's Hz Hz's -Héloise -Héloise's -I I'd I'll I'm @@ -7418,7 +7385,6 @@ Izod Izod's Izvestia Izvestia's -J J's JFK JFK's @@ -7910,7 +7876,6 @@ Justinian's Jutland Jutland's Juvenal -K K's KFC KFC's @@ -8474,7 +8439,6 @@ Kyoto's Kyrgyzstan Kyushu Kyushu's -L L'Amour L'Oreal L'Ouverture @@ -9228,8 +9192,8 @@ Lula's Lully Lulu Lulu's -Lumière -Lumière's +Lumiere +Lumiere's Luna Luna's Lupe @@ -9297,7 +9261,6 @@ Lysistrata Lysistrata's Lysol Lysol's -M M's MA MA's @@ -9536,7 +9499,6 @@ Malibu's Malinda Malinda's Malinowski -Mallarmé Mallomars Mallomars's Mallory @@ -10830,9 +10792,8 @@ Myrtle's Mysore Myst Myst's -Münchhausen -Münchhausen's -N +Munchhausen +Munchhausen's N's NAACP NAFTA @@ -11345,7 +11306,6 @@ Nyasa Nyasa's Nyerere Nyerere's -O O'Brien O'Casey O'Connell @@ -11691,7 +11651,6 @@ Ozymandias Ozymandias's Ozzie Ozzie's -P P's PA PA's @@ -11840,8 +11799,6 @@ Paramaribo Paramaribo's Paramount Paramount's -Paraná -Paraná's Parcheesi Parcheesi's Pareto @@ -12276,8 +12233,6 @@ Podunk Poe Pogo Pogo's -Poincaré -Poincaré's Poiret Poiret's Poirot @@ -12286,8 +12241,8 @@ Poisson Poisson's Poitier Poitier's -Pokémon -Pokémon's +Pokemon +Pokemon's Poland Poland's Polanski @@ -12482,8 +12437,6 @@ Proust's Provencals Provence Provence's -Provençal -Provençal's Proverbs Providence Providence's @@ -12594,11 +12547,8 @@ Pythagorean Pythias Python Python's -Pétain -Pétain's -Pôrto -Pôrto's -Q +Porto +Porto's QWERTY Qaddafi Qaddafi's @@ -12655,8 +12605,6 @@ Quixotism Quixotism's Qumran Quonset -Québecois -R R's RAF RAF's @@ -12721,8 +12669,8 @@ Rafael Rafael's Raffles Raffles's -Ragnarök -Ragnarök's +Ragnarok +Ragnarok's Rainier Raleigh Raleigh's @@ -13355,7 +13303,6 @@ Rydberg's Ryder Ryukyu Ryukyu's -S S's SALT SALT's @@ -13703,8 +13650,8 @@ Schrieffer Schrieffer's Schroeder Schroeder's -Schrödinger -Schrödinger's +Schrodinger +Schrodinger's Schubert Schultz Schultz's @@ -14759,8 +14706,6 @@ Szilard Szilard's Szymborska Szymborska's -Sèvres -T T'ang T's TA @@ -14898,8 +14843,6 @@ Tanisha Tanisha's Tanner Tanner's -Tannhäuser -Tannhäuser's Tantalus Tantalus's Tanya @@ -15111,8 +15054,8 @@ Thespian Thespis Thespis's Thessalonian -Thessaloníki -Thessaloníki's +Thessaloniki +Thessaloniki's Thessaly Thessaly's Thieu @@ -15553,7 +15496,6 @@ Tyree's Tyrone Tyson Tyson's -U U's UAW UBS @@ -15709,7 +15651,6 @@ Uzbekistan Uzbekistan's Uzi Uzi's -V V's VA VAT @@ -15778,7 +15719,7 @@ Valparaiso Valparaiso's Valvoline Valvoline's -Valéry +Valery Van Vance Vancouver @@ -15834,9 +15775,9 @@ Velma Velma's Velveeta Velveeta's -Velásquez -Velásquez's -Velázquez +Velasquez +Velasquez's +Velazquez Venetian Venetian's Venetians @@ -16037,7 +15978,6 @@ Vulcan's Vulgate Vulgate's Vulgates -W W's WA WASP @@ -16490,7 +16430,6 @@ Wyoming's Wyomingite Wyomingite's Wyomingites -X X's XEmacs XEmacs's @@ -16530,7 +16469,6 @@ Xochipilli Xochipilli's Xuzhou Xuzhou's -Y Y's YMCA YMHA @@ -16674,7 +16612,6 @@ Yvette Yvette's Yvonne Yvonne's -Z Z's Zachariah Zachariah's @@ -16809,9 +16746,8 @@ Zyrtec Zyrtec's Zyuganov Zyuganov's -Zürich -Zürich's -a +Zurich +Zurich's aardvark aardvark's aardvarks @@ -16867,9 +16803,9 @@ abbreviation abbreviation's abbreviations abbrevs -abbé -abbé's -abbés +abbe +abbe's +abbes abdicate abdicated abdicates @@ -17664,7 +17600,7 @@ adieu adieu's adieus adipose -adiós +adios adj adjacent adjacently @@ -19722,11 +19658,6 @@ applicator's applicators applied applies -appliqué -appliqué's -appliquéd -appliquéing -appliqués apply applying appoint @@ -20720,9 +20651,6 @@ attaching attachment attachment's attachments -attaché -attaché's -attachés attack attack's attacked @@ -21203,7 +21131,6 @@ azimuths azure azure's azures -b baa baa's baaed @@ -23476,7 +23403,6 @@ blastoff blastoff's blastoffs blasts -blasé blat blatant blatantly @@ -24481,9 +24407,6 @@ bout's boutique boutique's boutiques -boutonnière -boutonnière's -boutonnières bouts bovine bovine's @@ -25907,7 +25830,6 @@ byways byword byword's bywords -c ca cab cab's @@ -26024,9 +25946,6 @@ cafeterias caffeinated caffeine caffeine's -café -café's -cafés cage cage's caged @@ -26286,9 +26205,6 @@ can't canal canal's canals -canapé -canapé's -canapés canard canard's canards @@ -28466,12 +28382,6 @@ chutney chutney's chutzpah chutzpah's -château -château's -châteaux -châtelaine -châtelaine's -châtelaines cicada cicada's cicadas @@ -28940,10 +28850,9 @@ clew's clewed clewing clews -cliché -cliché's -clichéd -clichés +cliche +cliche's +cliches click click's clicked @@ -28952,9 +28861,6 @@ clicks client client's clients -clientèle -clientèle's -clientèles cliff cliff's cliffhanger @@ -30754,9 +30660,6 @@ confrontations confronted confronting confronts -confrère -confrère's -confrères confuse confused confusedly @@ -31049,8 +30952,6 @@ consolidation consolidation's consolidations consoling -consommé -consommé's consonance consonance's consonances @@ -31982,9 +31883,6 @@ cortical cortices cortisone cortisone's -cortège -cortège's -cortèges coruscate coruscated coruscates @@ -33040,9 +32938,6 @@ crowned crowning crowns crows -croûton -croûton's -croûtons crucial crucially crucible @@ -33076,8 +32971,6 @@ crudest crudities crudity crudity's -crudités -crudités's cruel cruelly cruelties @@ -33197,9 +33090,6 @@ crystalline crystallographic crystallography crystals -crèche -crèche's -crèches cs ct cu @@ -33645,7 +33535,6 @@ cytoplasm's czarina czarina's czarinas -d d'Arezzo d'Estaing dB @@ -35289,9 +35178,6 @@ derricks derringer derringer's derringers -derrière -derrière's -derrières dervish dervish's dervishes @@ -37295,9 +37181,6 @@ divorce's divorced divorces divorcing -divorcée -divorcée's -divorcées divot divot's divots @@ -38527,17 +38410,6 @@ dyspeptic dyspeptic's dyspeptics dz -débutante -débutante's -débutantes -décolleté -dérailleur -dérailleur's -dérailleurs -détente -détente's -e -e'er eBay eBay's eMusic @@ -40128,9 +40000,6 @@ entry's entryway entryway's entryways -entrée -entrée's -entrées entwine entwined entwines @@ -41669,7 +41538,6 @@ eyetooth's eyewitness eyewitness's eyewitnesses -f fa fa's fable @@ -42491,12 +42359,6 @@ fey fez fez's fezzes -fiancé -fiancé's -fiancée -fiancée's -fiancées -fiancés fiasco fiasco's fiascoes @@ -43118,9 +42980,6 @@ flamboyance flamboyance's flamboyant flamboyantly -flambé -flambé's -flambéed flame flame's flamed @@ -44495,8 +44354,6 @@ franks frantic frantically frappes -frappé -frappé's frat frat's fraternal @@ -45188,10 +45045,6 @@ fuzziness's fuzzing fuzzy fwd -fête -fête's -fêtes -g gab gab's gabardine @@ -47804,7 +47657,6 @@ gyros gyroscope gyroscope's gyroscopes -h h'm ha haberdasher @@ -47833,9 +47685,6 @@ habituates habituating habituation habituation's -habitué -habitué's -habitués hacienda hacienda's haciendas @@ -50724,7 +50573,6 @@ hysterical hysterically hysterics hysterics's -i iPad iPhone iPod @@ -52465,9 +52313,6 @@ ingress ingress's ingresses ingrown -ingénue -ingénue's -ingénues inhabit inhabitable inhabitant @@ -53915,7 +53760,6 @@ ivory's ivy ivy's ix -j jab jab's jabbed @@ -53997,9 +53841,6 @@ jailer's jailers jailing jails -jalapeño -jalapeño's -jalapeños jalopies jalopy jalopy's @@ -54038,9 +53879,6 @@ japes japing jar jar's -jardinière -jardinière's -jardinières jargon jargon's jarred @@ -54641,7 +54479,6 @@ juxtaposing juxtaposition juxtaposition's juxtapositions -k kHz kW kaboom @@ -55204,9 +55041,6 @@ kroner kronor krypton krypton's -króna -króna's -krónur ks kudos kudos's @@ -55216,7 +55050,6 @@ kudzus kumquat kumquat's kumquats -l la la's lab @@ -57669,7 +57502,6 @@ lyricist lyricist's lyricists lyrics -m ma ma'am ma's @@ -57726,8 +57558,6 @@ mackinaws mackintosh mackintosh's mackintoshes -macramé -macramé's macro macro's macrobiotic @@ -58293,7 +58123,6 @@ manorial manors manpower manpower's -manqué mans mansard mansard's @@ -58356,8 +58185,6 @@ manuscript's manuscripts many many's -manège -manège's map map's maple @@ -58772,9 +58599,6 @@ maths mating matins matins's -matinée -matinée's -matinées matriarch matriarch's matriarchal @@ -58839,8 +58663,6 @@ matzohs matzos matzot matzoth -matériel -matériel's maudlin maul maul's @@ -61813,13 +61635,6 @@ mythologists mythology mythology's myths -métier -métier's -métiers -mêlée -mêlée's -mêlées -n nab nabbed nabbing @@ -61858,8 +61673,6 @@ naively naiver naivest naivety -naiveté -naiveté's naked nakedly nakedness @@ -63281,8 +63094,6 @@ nymphomaniac nymphomaniac's nymphomaniacs nymphs -née -o o'clock o'er oaf @@ -64542,7 +64353,6 @@ outright outrun outrunning outruns -outré outs outsell outselling @@ -65130,7 +64940,6 @@ oysters oz ozone ozone's -p pH pa pa's @@ -65999,7 +65808,6 @@ passports password password's passwords -passé past past's pasta @@ -70888,9 +70696,6 @@ protuberance protuberance's protuberances protuberant -protégé -protégé's -protégés proud prouder proudest @@ -70995,10 +70800,6 @@ prurient pry pry's prying -précis -précis's -précised -précising psalm psalm's psalmist @@ -71579,7 +71380,6 @@ pythons pyx pyx's pyxes -q qt qua quack @@ -71982,7 +71782,6 @@ quotient quotient's quotients quoting -r rabbi rabbi's rabbinate @@ -72975,7 +72774,6 @@ recheck's rechecked rechecking rechecks -recherché recidivism recidivism's recidivist @@ -75720,7 +75518,6 @@ riskiness's risking risks risky -risqué rite rite's rites @@ -76181,9 +75978,6 @@ routinely routines routing routs -roué -roué's -roués rove roved rover @@ -76497,7 +76291,6 @@ rutted rutting rye rye's -s sabbatical sabbatical's sabbaticals @@ -77118,11 +76911,6 @@ saunters sausage sausage's sausages -sauté -sauté's -sautéed -sautéing -sautés savage savage's savaged @@ -81070,9 +80858,6 @@ smuts smuttier smuttiest smutty -smörgåsbord -smörgåsbord's -smörgåsbords snack snack's snacked @@ -81520,9 +81305,6 @@ soil's soiled soiling soils -soirée -soirée's -soirées sojourn sojourn's sojourned @@ -81825,9 +81607,6 @@ sot's sots sottish sou'wester -soufflé -soufflé's -soufflés sough sough's soughed @@ -81871,9 +81650,6 @@ soupiest souping soups soupy -soupçon -soupçon's -soupçons sour sour's source @@ -85968,10 +85744,6 @@ systemic's systemics systems systolic -séance -séance's -séances -t tab tab's tabbed @@ -88439,7 +88211,6 @@ touchstone touchstone's touchstones touchy -touché tough tough's toughen @@ -90055,7 +89826,6 @@ tyrants tyro tyro's tyros -u ubiquitous ubiquitously ubiquity @@ -91814,7 +91584,6 @@ uvular uvular's uvulars uvulas -v vacancies vacancy vacancy's @@ -92484,9 +92253,6 @@ victory's victual victual's victuals -vicuña -vicuña's -vicuñas video video's videocassette @@ -92999,7 +92765,6 @@ vulva vulva's vulvae vying -w wabbit wabbits wackier @@ -95223,7 +94988,6 @@ wt wuss wuss's wusses -x xci xcii xciv @@ -95282,7 +95046,6 @@ xylophones xylophonist xylophonist's xylophonists -y y'all yacht yacht's @@ -95526,7 +95289,6 @@ yuppie yuppie's yuppies yups -z zanier zanies zaniest @@ -95675,20 +95437,3 @@ zwieback's zygote zygote's zygotes -Ångström -éclair -éclair's -éclairs -éclat -éclat's -élan -élan's -émigré -émigré's -émigrés -épée -épée's -épées -étude -étude's -études diff --git a/assets/fr-utf8.txt b/assets/fr-utf8.txt index 31964c1b..56f020b5 100644 --- a/assets/fr-utf8.txt +++ b/assets/fr-utf8.txt @@ -1,5 +1,3 @@ -a -à abaissa abaissable abaissables @@ -193253,7 +193251,6 @@ landaulet landaulets landaus lande -Länder landes landgrave landgraves @@ -200002,8 +199999,6 @@ madrigalistes madrigaux madrilène madrilènes -maelström -maelströms maestoso maestria maestro @@ -335641,7 +335636,6 @@ xylophone xylophones xyste xystes -y yacht yacht-club yacht-clubs diff --git a/build.gradle b/build.gradle index fe10aada..de26c1ad 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.3.0' } } apply plugin: 'com.android.application' @@ -12,6 +12,8 @@ apply plugin: 'com.android.application' dependencies { implementation "androidx.core:core:1.6.0" implementation 'androidx.preference:preference:1.1.1' + implementation "androidx.room:room-runtime:2.1.0" + annotationProcessor "androidx.room:room-compiler:2.1.0" } repositories { diff --git a/docs/user-manual.md b/docs/user-manual.md index c5bcbacd..64cbb95a 100644 --- a/docs/user-manual.md +++ b/docs/user-manual.md @@ -4,42 +4,68 @@ TT9 is an IME (Input Method Editor) for Android devices with hardware keypad. It Source code and documentation are available on Github: [https://github.com/sspanak/tt9](https://github.com/sspanak/tt9). ## Initial Setup -TODO: Initial config, loading a dictionary... +In order to use Traditional T9, you need to enable it as an Android keyboard. To do so: + +- Go to Android Settings → System → Languages → Keyboards. +- Add Traditional T9 IME. + +_The actual menu names may vary depending on your Android version and phone._ + +### Enabling Predictive Mode +With the default settings, it is only possible to type in 123 and ABC modes. In order to enable the Predictive mode, there are additional steps: + +- Open the [TT9 Configuration screen](#configuration-options). +- Select the desired languages. +- Load the dictionaries. + +_If you don't do the above, nothing will happen when you try to type in Predictive mode._ ## Hotkeys #### D-pad Up (↑): -Select previous word suggestion +Select previous word suggestion. #### D-pad Down (↓): -Select next word suggestion +Select next word suggestion. #### Left Soft Key: -Insert symbol or Add word depending on state and context. Add word only available in Predictive input mode. +Open Traditional T9 Configuration screen. #### Right Soft Key: -- **Short press:** Cycle input modes (Predictive → Abc → 123) -- **Long press:** Bring up the TT9 preference screen +Backspace. -#### Star (\*): -- **Short press:** Change case -- **Long press:** - - When multiple languages are enabled: Change language - - When single language is enabled: Bring up smiley insert dialog - - Numeric mode: Insert a star +#### 0 key +- In 123 mode: type "0" or hold it to type "+". +- In ABC mode: type secondary punctuation or hold to type "0". +- In Predictive mode: type space or hold to type "0". -#### Hash/Pound (#): -- **Short press:** Space -- **Long press:** - - New line - - Numeric mode: Insert hash/pound (#) +#### 1 to 9 keys +- In 123 mode: type the respective number. +- In ABC and Predictive mode: type a letter/punctuation character or hold to type the respective number. -#### Back (↩): -- **Short Press when there is text:** Usually, "backspace". However, some applications, most notably Firefox and Spotify, forbid this action in their search fields. This is due to the fact Android allows applications to take over control of the physical keypad and redefine what buttons do. Unfortunately, nothing can be done in such cases, "Back" will function as the application authors intended, instead of as backspace. -- **Short Press when there is no text:** System default, no special action (usually, go back) -- **Long Press:** System default, no special action +#### Text Mode Key (Hash/Pound/#): +- **Short press:** Cycle input modes (abc → ABC → Predictive → 123) +- **Short press while typing:** Change between UPPERCASE and lowercase. +- **Long press:** Select the next language. +- **Number-only fields:** Type a "#". Changing the mode is not possible in such fields. + +#### Other Actions Key (Star/✱): +- **Short press:** Add a word to the dictionary. +- **Long press:** Open Traditional T9 Preferences screen. + +#### Backspace Key (Back/↩): +- Just deletes text. + +**Note:** "Back" key plays a somewhat special role in Android. This role needs to be preserved for your phone to remain usable. Have in mind the notes below: +- **Short Press when there is no text**: Go back to the previous screen (the system default action). +- **Short Press when there is text:** Some applications, most notably Firefox and Spotify, take full control of the "Back" key. This means, it may function as the application authors intended, instead of as backspace. In such cases, you could use the on-screen backspace instead. Unfortunately, nothing else could be done, because this is a restriction posed by Android. +- **Long Press**: Whatever the system default action is (i.e. show running applications list). ## Configuration Options -TODO... +On the Configuration screen, you can choose your preferred languages, load a dictionary for Predictive mode or view this manual. + +To access it: +- Start typing in a text field to wake up TT9. +- Use the on-screen gear button or hold Other Actions Key. ## License - The source code, the logo image and the icons are licensed under [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). @@ -49,4 +75,4 @@ TODO... - "Negotiate" and "Vibrocentric" fonts are under [The Fontspring Desktop/Ebook Font End User License](desktop-ebook-EULA-1.8.txt) ## Privacy Policy -Traditional T9 does not collect any information about you or about the way you are using using the application. \ No newline at end of file +Traditional T9 does not collect any information about you or about the way you are using using the application. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2335d02f..d76646d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/keymap-samples/keymap.txt.emulator b/keymap-samples/keymap.txt.emulator deleted file mode 100644 index f7cf1a42..00000000 --- a/keymap-samples/keymap.txt.emulator +++ /dev/null @@ -1,15 +0,0 @@ -# Keycodes useful for emulator -# softleft = [ softright = ] -# star = ; pound = ' -DPAD_CENTER 23 -DPAD_DOWN 20 -DPAD_UP 19 -DPAD_LEFT 21 -DPAD_RIGHT 22 -SOFT_RIGHT 72 -SOFT_LEFT 71 -DEL 67 -BACK 4 -ENTER 66 -POUND 75 -STAR 74 diff --git a/keymap-samples/keymap.txt.sample b/keymap-samples/keymap.txt.sample deleted file mode 100644 index 507926d3..00000000 --- a/keymap-samples/keymap.txt.sample +++ /dev/null @@ -1,7 +0,0 @@ -# Remap left to right, and right to left -# lines that begin with a hash are ignored -# [keycode of original key](space)[keycode of new key] -#DPAD_LEFT -21 22 -#DPAD_RIGHT -22 21 diff --git a/res/drawable-anydpi-v24/ime_lang_bg_single.xml b/res/drawable-anydpi-v24/ime_lang_bg.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_bg_single.xml rename to res/drawable-anydpi-v24/ime_lang_bg.xml diff --git a/res/drawable-anydpi-v24/ime_lang_bg_lower.xml b/res/drawable-anydpi-v24/ime_lang_bg_lower.xml deleted file mode 100644 index c544087c..00000000 --- a/res/drawable-anydpi-v24/ime_lang_bg_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_bg_upper.xml b/res/drawable-anydpi-v24/ime_lang_bg_upper.xml deleted file mode 100644 index 14e63446..00000000 --- a/res/drawable-anydpi-v24/ime_lang_bg_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_cyrillic_single.xml b/res/drawable-anydpi-v24/ime_lang_cyrillic_single.xml deleted file mode 100644 index 7ea31e0a..00000000 --- a/res/drawable-anydpi-v24/ime_lang_cyrillic_single.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_de_single.xml b/res/drawable-anydpi-v24/ime_lang_de.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_de_single.xml rename to res/drawable-anydpi-v24/ime_lang_de.xml diff --git a/res/drawable-anydpi-v24/ime_lang_de_lower.xml b/res/drawable-anydpi-v24/ime_lang_de_lower.xml deleted file mode 100644 index 5423d3f8..00000000 --- a/res/drawable-anydpi-v24/ime_lang_de_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_de_upper.xml b/res/drawable-anydpi-v24/ime_lang_de_upper.xml deleted file mode 100644 index 25611447..00000000 --- a/res/drawable-anydpi-v24/ime_lang_de_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_en_single.xml b/res/drawable-anydpi-v24/ime_lang_en.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_en_single.xml rename to res/drawable-anydpi-v24/ime_lang_en.xml diff --git a/res/drawable-anydpi-v24/ime_lang_en_lower.xml b/res/drawable-anydpi-v24/ime_lang_en_lower.xml deleted file mode 100644 index 2a6f725c..00000000 --- a/res/drawable-anydpi-v24/ime_lang_en_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_en_upper.xml b/res/drawable-anydpi-v24/ime_lang_en_upper.xml deleted file mode 100644 index 2b4030f9..00000000 --- a/res/drawable-anydpi-v24/ime_lang_en_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_fr_single.xml b/res/drawable-anydpi-v24/ime_lang_fr.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_fr_single.xml rename to res/drawable-anydpi-v24/ime_lang_fr.xml diff --git a/res/drawable-anydpi-v24/ime_lang_fr_lower.xml b/res/drawable-anydpi-v24/ime_lang_fr_lower.xml deleted file mode 100644 index d110c861..00000000 --- a/res/drawable-anydpi-v24/ime_lang_fr_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_fr_upper.xml b/res/drawable-anydpi-v24/ime_lang_fr_upper.xml deleted file mode 100644 index 7bf4035a..00000000 --- a/res/drawable-anydpi-v24/ime_lang_fr_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_it_single.xml b/res/drawable-anydpi-v24/ime_lang_it.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_it_single.xml rename to res/drawable-anydpi-v24/ime_lang_it.xml diff --git a/res/drawable-anydpi-v24/ime_lang_it_lower.xml b/res/drawable-anydpi-v24/ime_lang_it_lower.xml deleted file mode 100644 index 16e186a1..00000000 --- a/res/drawable-anydpi-v24/ime_lang_it_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_it_upper.xml b/res/drawable-anydpi-v24/ime_lang_it_upper.xml deleted file mode 100644 index c45c162f..00000000 --- a/res/drawable-anydpi-v24/ime_lang_it_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_latin_single.xml b/res/drawable-anydpi-v24/ime_lang_latin_single.xml deleted file mode 100644 index 7fb1b02a..00000000 --- a/res/drawable-anydpi-v24/ime_lang_latin_single.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_ru_single.xml b/res/drawable-anydpi-v24/ime_lang_ru.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_ru_single.xml rename to res/drawable-anydpi-v24/ime_lang_ru.xml diff --git a/res/drawable-anydpi-v24/ime_lang_ru_lower.xml b/res/drawable-anydpi-v24/ime_lang_ru_lower.xml deleted file mode 100644 index 01acc6a3..00000000 --- a/res/drawable-anydpi-v24/ime_lang_ru_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_ru_upper.xml b/res/drawable-anydpi-v24/ime_lang_ru_upper.xml deleted file mode 100644 index 4dc0aeb8..00000000 --- a/res/drawable-anydpi-v24/ime_lang_ru_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_uk_single.xml b/res/drawable-anydpi-v24/ime_lang_uk.xml similarity index 100% rename from res/drawable-anydpi-v24/ime_lang_uk_single.xml rename to res/drawable-anydpi-v24/ime_lang_uk.xml diff --git a/res/drawable-anydpi-v24/ime_lang_uk_lower.xml b/res/drawable-anydpi-v24/ime_lang_uk_lower.xml deleted file mode 100644 index 9cd60903..00000000 --- a/res/drawable-anydpi-v24/ime_lang_uk_lower.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-anydpi-v24/ime_lang_uk_upper.xml b/res/drawable-anydpi-v24/ime_lang_uk_upper.xml deleted file mode 100644 index d7f2a73c..00000000 --- a/res/drawable-anydpi-v24/ime_lang_uk_upper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-hdpi/holdicon.png b/res/drawable-hdpi/holdicon.png deleted file mode 100644 index 87899dbd..00000000 Binary files a/res/drawable-hdpi/holdicon.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_bg_single.png b/res/drawable-hdpi/ime_lang_bg.png similarity index 100% rename from res/drawable-hdpi/ime_lang_bg_single.png rename to res/drawable-hdpi/ime_lang_bg.png diff --git a/res/drawable-hdpi/ime_lang_bg_lower.png b/res/drawable-hdpi/ime_lang_bg_lower.png deleted file mode 100644 index a02a8947..00000000 Binary files a/res/drawable-hdpi/ime_lang_bg_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_bg_upper.png b/res/drawable-hdpi/ime_lang_bg_upper.png deleted file mode 100644 index 177cd56d..00000000 Binary files a/res/drawable-hdpi/ime_lang_bg_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_cyrillic_single.png b/res/drawable-hdpi/ime_lang_cyrillic_single.png deleted file mode 100644 index 43c7bd1b..00000000 Binary files a/res/drawable-hdpi/ime_lang_cyrillic_single.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_de_single.png b/res/drawable-hdpi/ime_lang_de.png similarity index 100% rename from res/drawable-hdpi/ime_lang_de_single.png rename to res/drawable-hdpi/ime_lang_de.png diff --git a/res/drawable-hdpi/ime_lang_de_lower.png b/res/drawable-hdpi/ime_lang_de_lower.png deleted file mode 100644 index 82f72ced..00000000 Binary files a/res/drawable-hdpi/ime_lang_de_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_de_upper.png b/res/drawable-hdpi/ime_lang_de_upper.png deleted file mode 100644 index 9006b31d..00000000 Binary files a/res/drawable-hdpi/ime_lang_de_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_en_single.png b/res/drawable-hdpi/ime_lang_en.png similarity index 100% rename from res/drawable-hdpi/ime_lang_en_single.png rename to res/drawable-hdpi/ime_lang_en.png diff --git a/res/drawable-hdpi/ime_lang_en_lower.png b/res/drawable-hdpi/ime_lang_en_lower.png deleted file mode 100644 index 6d9abf1a..00000000 Binary files a/res/drawable-hdpi/ime_lang_en_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_en_upper.png b/res/drawable-hdpi/ime_lang_en_upper.png deleted file mode 100644 index 636f9ec8..00000000 Binary files a/res/drawable-hdpi/ime_lang_en_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_fr_single.png b/res/drawable-hdpi/ime_lang_fr.png similarity index 100% rename from res/drawable-hdpi/ime_lang_fr_single.png rename to res/drawable-hdpi/ime_lang_fr.png diff --git a/res/drawable-hdpi/ime_lang_fr_lower.png b/res/drawable-hdpi/ime_lang_fr_lower.png deleted file mode 100644 index 14b3e85c..00000000 Binary files a/res/drawable-hdpi/ime_lang_fr_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_fr_upper.png b/res/drawable-hdpi/ime_lang_fr_upper.png deleted file mode 100644 index fc25dd62..00000000 Binary files a/res/drawable-hdpi/ime_lang_fr_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_it_single.png b/res/drawable-hdpi/ime_lang_it.png similarity index 100% rename from res/drawable-hdpi/ime_lang_it_single.png rename to res/drawable-hdpi/ime_lang_it.png diff --git a/res/drawable-hdpi/ime_lang_it_lower.png b/res/drawable-hdpi/ime_lang_it_lower.png deleted file mode 100644 index 66d07982..00000000 Binary files a/res/drawable-hdpi/ime_lang_it_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_it_upper.png b/res/drawable-hdpi/ime_lang_it_upper.png deleted file mode 100644 index 3e2c4a69..00000000 Binary files a/res/drawable-hdpi/ime_lang_it_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_latin_single.png b/res/drawable-hdpi/ime_lang_latin_single.png deleted file mode 100644 index 0a9763bb..00000000 Binary files a/res/drawable-hdpi/ime_lang_latin_single.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_ru_single.png b/res/drawable-hdpi/ime_lang_ru.png similarity index 100% rename from res/drawable-hdpi/ime_lang_ru_single.png rename to res/drawable-hdpi/ime_lang_ru.png diff --git a/res/drawable-hdpi/ime_lang_ru_lower.png b/res/drawable-hdpi/ime_lang_ru_lower.png deleted file mode 100644 index 31324459..00000000 Binary files a/res/drawable-hdpi/ime_lang_ru_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_ru_upper.png b/res/drawable-hdpi/ime_lang_ru_upper.png deleted file mode 100644 index 99c275b7..00000000 Binary files a/res/drawable-hdpi/ime_lang_ru_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_uk_single.png b/res/drawable-hdpi/ime_lang_uk.png similarity index 100% rename from res/drawable-hdpi/ime_lang_uk_single.png rename to res/drawable-hdpi/ime_lang_uk.png diff --git a/res/drawable-hdpi/ime_lang_uk_lower.png b/res/drawable-hdpi/ime_lang_uk_lower.png deleted file mode 100644 index 09a1b45e..00000000 Binary files a/res/drawable-hdpi/ime_lang_uk_lower.png and /dev/null differ diff --git a/res/drawable-hdpi/ime_lang_uk_upper.png b/res/drawable-hdpi/ime_lang_uk_upper.png deleted file mode 100644 index 107da870..00000000 Binary files a/res/drawable-hdpi/ime_lang_uk_upper.png and /dev/null differ diff --git a/res/drawable-hdpi/key_eight.png b/res/drawable-hdpi/key_eight.png deleted file mode 100644 index e18ebde1..00000000 Binary files a/res/drawable-hdpi/key_eight.png and /dev/null differ diff --git a/res/drawable-hdpi/key_five.png b/res/drawable-hdpi/key_five.png deleted file mode 100644 index 59d73df6..00000000 Binary files a/res/drawable-hdpi/key_five.png and /dev/null differ diff --git a/res/drawable-hdpi/key_four.png b/res/drawable-hdpi/key_four.png deleted file mode 100644 index 35fa0317..00000000 Binary files a/res/drawable-hdpi/key_four.png and /dev/null differ diff --git a/res/drawable-hdpi/key_nine.png b/res/drawable-hdpi/key_nine.png deleted file mode 100644 index 332bb4d5..00000000 Binary files a/res/drawable-hdpi/key_nine.png and /dev/null differ diff --git a/res/drawable-hdpi/key_one.png b/res/drawable-hdpi/key_one.png deleted file mode 100644 index 5cbc17d0..00000000 Binary files a/res/drawable-hdpi/key_one.png and /dev/null differ diff --git a/res/drawable-hdpi/key_pound.png b/res/drawable-hdpi/key_pound.png deleted file mode 100644 index 447dcb3b..00000000 Binary files a/res/drawable-hdpi/key_pound.png and /dev/null differ diff --git a/res/drawable-hdpi/key_seven.png b/res/drawable-hdpi/key_seven.png deleted file mode 100644 index 59926d0a..00000000 Binary files a/res/drawable-hdpi/key_seven.png and /dev/null differ diff --git a/res/drawable-hdpi/key_six.png b/res/drawable-hdpi/key_six.png deleted file mode 100644 index 51510d64..00000000 Binary files a/res/drawable-hdpi/key_six.png and /dev/null differ diff --git a/res/drawable-hdpi/key_star.png b/res/drawable-hdpi/key_star.png deleted file mode 100644 index 653272be..00000000 Binary files a/res/drawable-hdpi/key_star.png and /dev/null differ diff --git a/res/drawable-hdpi/key_three.png b/res/drawable-hdpi/key_three.png deleted file mode 100644 index 9bbbd971..00000000 Binary files a/res/drawable-hdpi/key_three.png and /dev/null differ diff --git a/res/drawable-hdpi/key_two.png b/res/drawable-hdpi/key_two.png deleted file mode 100644 index 05cf2fe8..00000000 Binary files a/res/drawable-hdpi/key_two.png and /dev/null differ diff --git a/res/drawable-hdpi/key_zero.png b/res/drawable-hdpi/key_zero.png deleted file mode 100644 index d811d36f..00000000 Binary files a/res/drawable-hdpi/key_zero.png and /dev/null differ diff --git a/res/drawable-hdpi/rcycle.png b/res/drawable-hdpi/rcycle.png deleted file mode 100644 index 05b1ccc6..00000000 Binary files a/res/drawable-hdpi/rcycle.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_bg_single.png b/res/drawable-mdpi/ime_lang_bg.png similarity index 100% rename from res/drawable-mdpi/ime_lang_bg_single.png rename to res/drawable-mdpi/ime_lang_bg.png diff --git a/res/drawable-mdpi/ime_lang_bg_lower.png b/res/drawable-mdpi/ime_lang_bg_lower.png deleted file mode 100644 index f0aeeb36..00000000 Binary files a/res/drawable-mdpi/ime_lang_bg_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_bg_upper.png b/res/drawable-mdpi/ime_lang_bg_upper.png deleted file mode 100644 index 78d59cbe..00000000 Binary files a/res/drawable-mdpi/ime_lang_bg_upper.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_cyrillic_single.png b/res/drawable-mdpi/ime_lang_cyrillic_single.png deleted file mode 100644 index 3ab0f9ae..00000000 Binary files a/res/drawable-mdpi/ime_lang_cyrillic_single.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_de_single.png b/res/drawable-mdpi/ime_lang_de.png similarity index 100% rename from res/drawable-mdpi/ime_lang_de_single.png rename to res/drawable-mdpi/ime_lang_de.png diff --git a/res/drawable-mdpi/ime_lang_de_lower.png b/res/drawable-mdpi/ime_lang_de_lower.png deleted file mode 100644 index 8c8e0c29..00000000 Binary files a/res/drawable-mdpi/ime_lang_de_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_de_upper.png b/res/drawable-mdpi/ime_lang_de_upper.png deleted file mode 100644 index ea0033a4..00000000 Binary files a/res/drawable-mdpi/ime_lang_de_upper.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_en_single.png b/res/drawable-mdpi/ime_lang_en.png similarity index 100% rename from res/drawable-mdpi/ime_lang_en_single.png rename to res/drawable-mdpi/ime_lang_en.png diff --git a/res/drawable-mdpi/ime_lang_en_lower.png b/res/drawable-mdpi/ime_lang_en_lower.png deleted file mode 100644 index d5ad09af..00000000 Binary files a/res/drawable-mdpi/ime_lang_en_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_en_upper.png b/res/drawable-mdpi/ime_lang_en_upper.png deleted file mode 100644 index 2fff1a6a..00000000 Binary files a/res/drawable-mdpi/ime_lang_en_upper.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_fr_single.png b/res/drawable-mdpi/ime_lang_fr.png similarity index 100% rename from res/drawable-mdpi/ime_lang_fr_single.png rename to res/drawable-mdpi/ime_lang_fr.png diff --git a/res/drawable-mdpi/ime_lang_fr_lower.png b/res/drawable-mdpi/ime_lang_fr_lower.png deleted file mode 100644 index acd38fd8..00000000 Binary files a/res/drawable-mdpi/ime_lang_fr_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_fr_upper.png b/res/drawable-mdpi/ime_lang_fr_upper.png deleted file mode 100644 index 9100b6b9..00000000 Binary files a/res/drawable-mdpi/ime_lang_fr_upper.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_it_single.png b/res/drawable-mdpi/ime_lang_it.png similarity index 100% rename from res/drawable-mdpi/ime_lang_it_single.png rename to res/drawable-mdpi/ime_lang_it.png diff --git a/res/drawable-mdpi/ime_lang_it_lower.png b/res/drawable-mdpi/ime_lang_it_lower.png deleted file mode 100644 index 54506bd9..00000000 Binary files a/res/drawable-mdpi/ime_lang_it_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_it_upper.png b/res/drawable-mdpi/ime_lang_it_upper.png deleted file mode 100644 index 5b17de72..00000000 Binary files a/res/drawable-mdpi/ime_lang_it_upper.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_latin_single.png b/res/drawable-mdpi/ime_lang_latin_single.png deleted file mode 100644 index 7298ec93..00000000 Binary files a/res/drawable-mdpi/ime_lang_latin_single.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_ru_single.png b/res/drawable-mdpi/ime_lang_ru.png similarity index 100% rename from res/drawable-mdpi/ime_lang_ru_single.png rename to res/drawable-mdpi/ime_lang_ru.png diff --git a/res/drawable-mdpi/ime_lang_ru_lower.png b/res/drawable-mdpi/ime_lang_ru_lower.png deleted file mode 100644 index 75433184..00000000 Binary files a/res/drawable-mdpi/ime_lang_ru_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_ru_upper.png b/res/drawable-mdpi/ime_lang_ru_upper.png deleted file mode 100644 index d8b131cf..00000000 Binary files a/res/drawable-mdpi/ime_lang_ru_upper.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_uk_single.png b/res/drawable-mdpi/ime_lang_uk.png similarity index 100% rename from res/drawable-mdpi/ime_lang_uk_single.png rename to res/drawable-mdpi/ime_lang_uk.png diff --git a/res/drawable-mdpi/ime_lang_uk_lower.png b/res/drawable-mdpi/ime_lang_uk_lower.png deleted file mode 100644 index 65b9f60f..00000000 Binary files a/res/drawable-mdpi/ime_lang_uk_lower.png and /dev/null differ diff --git a/res/drawable-mdpi/ime_lang_uk_upper.png b/res/drawable-mdpi/ime_lang_uk_upper.png deleted file mode 100644 index bcf2329b..00000000 Binary files a/res/drawable-mdpi/ime_lang_uk_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_bg_single.png b/res/drawable-xhdpi/ime_lang_bg.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_bg_single.png rename to res/drawable-xhdpi/ime_lang_bg.png diff --git a/res/drawable-xhdpi/ime_lang_bg_lower.png b/res/drawable-xhdpi/ime_lang_bg_lower.png deleted file mode 100644 index 7e4a82d4..00000000 Binary files a/res/drawable-xhdpi/ime_lang_bg_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_bg_upper.png b/res/drawable-xhdpi/ime_lang_bg_upper.png deleted file mode 100644 index 5f390628..00000000 Binary files a/res/drawable-xhdpi/ime_lang_bg_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_cyrillic_single.png b/res/drawable-xhdpi/ime_lang_cyrillic_single.png deleted file mode 100644 index 8e04dc38..00000000 Binary files a/res/drawable-xhdpi/ime_lang_cyrillic_single.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_de_single.png b/res/drawable-xhdpi/ime_lang_de.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_de_single.png rename to res/drawable-xhdpi/ime_lang_de.png diff --git a/res/drawable-xhdpi/ime_lang_de_lower.png b/res/drawable-xhdpi/ime_lang_de_lower.png deleted file mode 100644 index 293312d6..00000000 Binary files a/res/drawable-xhdpi/ime_lang_de_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_de_upper.png b/res/drawable-xhdpi/ime_lang_de_upper.png deleted file mode 100644 index d833bf89..00000000 Binary files a/res/drawable-xhdpi/ime_lang_de_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_en_single.png b/res/drawable-xhdpi/ime_lang_en.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_en_single.png rename to res/drawable-xhdpi/ime_lang_en.png diff --git a/res/drawable-xhdpi/ime_lang_en_lower.png b/res/drawable-xhdpi/ime_lang_en_lower.png deleted file mode 100644 index 1ba2b4f9..00000000 Binary files a/res/drawable-xhdpi/ime_lang_en_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_en_upper.png b/res/drawable-xhdpi/ime_lang_en_upper.png deleted file mode 100644 index 2c835d52..00000000 Binary files a/res/drawable-xhdpi/ime_lang_en_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_fr_single.png b/res/drawable-xhdpi/ime_lang_fr.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_fr_single.png rename to res/drawable-xhdpi/ime_lang_fr.png diff --git a/res/drawable-xhdpi/ime_lang_fr_lower.png b/res/drawable-xhdpi/ime_lang_fr_lower.png deleted file mode 100644 index 01b49561..00000000 Binary files a/res/drawable-xhdpi/ime_lang_fr_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_fr_upper.png b/res/drawable-xhdpi/ime_lang_fr_upper.png deleted file mode 100644 index 0df7d20d..00000000 Binary files a/res/drawable-xhdpi/ime_lang_fr_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_it_single.png b/res/drawable-xhdpi/ime_lang_it.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_it_single.png rename to res/drawable-xhdpi/ime_lang_it.png diff --git a/res/drawable-xhdpi/ime_lang_it_lower.png b/res/drawable-xhdpi/ime_lang_it_lower.png deleted file mode 100644 index 3429b79f..00000000 Binary files a/res/drawable-xhdpi/ime_lang_it_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_it_upper.png b/res/drawable-xhdpi/ime_lang_it_upper.png deleted file mode 100644 index 11ef8097..00000000 Binary files a/res/drawable-xhdpi/ime_lang_it_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_latin_single.png b/res/drawable-xhdpi/ime_lang_latin_single.png deleted file mode 100644 index f11a0b28..00000000 Binary files a/res/drawable-xhdpi/ime_lang_latin_single.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_ru_single.png b/res/drawable-xhdpi/ime_lang_ru.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_ru_single.png rename to res/drawable-xhdpi/ime_lang_ru.png diff --git a/res/drawable-xhdpi/ime_lang_ru_lower.png b/res/drawable-xhdpi/ime_lang_ru_lower.png deleted file mode 100644 index 52e2a6d5..00000000 Binary files a/res/drawable-xhdpi/ime_lang_ru_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_ru_upper.png b/res/drawable-xhdpi/ime_lang_ru_upper.png deleted file mode 100644 index 8e9e095f..00000000 Binary files a/res/drawable-xhdpi/ime_lang_ru_upper.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_uk_single.png b/res/drawable-xhdpi/ime_lang_uk.png similarity index 100% rename from res/drawable-xhdpi/ime_lang_uk_single.png rename to res/drawable-xhdpi/ime_lang_uk.png diff --git a/res/drawable-xhdpi/ime_lang_uk_lower.png b/res/drawable-xhdpi/ime_lang_uk_lower.png deleted file mode 100644 index af88c49c..00000000 Binary files a/res/drawable-xhdpi/ime_lang_uk_lower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ime_lang_uk_upper.png b/res/drawable-xhdpi/ime_lang_uk_upper.png deleted file mode 100644 index 0cedfcef..00000000 Binary files a/res/drawable-xhdpi/ime_lang_uk_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_bg_single.png b/res/drawable-xxhdpi/ime_lang_bg.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_bg_single.png rename to res/drawable-xxhdpi/ime_lang_bg.png diff --git a/res/drawable-xxhdpi/ime_lang_bg_lower.png b/res/drawable-xxhdpi/ime_lang_bg_lower.png deleted file mode 100644 index aaffcfa9..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_bg_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_bg_upper.png b/res/drawable-xxhdpi/ime_lang_bg_upper.png deleted file mode 100644 index 1a117b09..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_bg_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_cyrillic_single.png b/res/drawable-xxhdpi/ime_lang_cyrillic_single.png deleted file mode 100644 index 418a30ba..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_cyrillic_single.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_de_single.png b/res/drawable-xxhdpi/ime_lang_de.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_de_single.png rename to res/drawable-xxhdpi/ime_lang_de.png diff --git a/res/drawable-xxhdpi/ime_lang_de_lower.png b/res/drawable-xxhdpi/ime_lang_de_lower.png deleted file mode 100644 index 0c51869c..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_de_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_de_upper.png b/res/drawable-xxhdpi/ime_lang_de_upper.png deleted file mode 100644 index 9ef96c43..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_de_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_en_single.png b/res/drawable-xxhdpi/ime_lang_en.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_en_single.png rename to res/drawable-xxhdpi/ime_lang_en.png diff --git a/res/drawable-xxhdpi/ime_lang_en_lower.png b/res/drawable-xxhdpi/ime_lang_en_lower.png deleted file mode 100644 index cf5b055f..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_en_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_en_upper.png b/res/drawable-xxhdpi/ime_lang_en_upper.png deleted file mode 100644 index 6fc8facb..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_en_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_fr_single.png b/res/drawable-xxhdpi/ime_lang_fr.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_fr_single.png rename to res/drawable-xxhdpi/ime_lang_fr.png diff --git a/res/drawable-xxhdpi/ime_lang_fr_lower.png b/res/drawable-xxhdpi/ime_lang_fr_lower.png deleted file mode 100644 index 17d57a7d..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_fr_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_fr_upper.png b/res/drawable-xxhdpi/ime_lang_fr_upper.png deleted file mode 100644 index b8b1581f..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_fr_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_it_single.png b/res/drawable-xxhdpi/ime_lang_it.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_it_single.png rename to res/drawable-xxhdpi/ime_lang_it.png diff --git a/res/drawable-xxhdpi/ime_lang_it_lower.png b/res/drawable-xxhdpi/ime_lang_it_lower.png deleted file mode 100644 index 70ac0a62..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_it_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_it_upper.png b/res/drawable-xxhdpi/ime_lang_it_upper.png deleted file mode 100644 index e44f28d1..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_it_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_latin_single.png b/res/drawable-xxhdpi/ime_lang_latin_single.png deleted file mode 100644 index 14eeb987..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_latin_single.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_ru_single.png b/res/drawable-xxhdpi/ime_lang_ru.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_ru_single.png rename to res/drawable-xxhdpi/ime_lang_ru.png diff --git a/res/drawable-xxhdpi/ime_lang_ru_lower.png b/res/drawable-xxhdpi/ime_lang_ru_lower.png deleted file mode 100644 index 1e1fac85..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_ru_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_ru_upper.png b/res/drawable-xxhdpi/ime_lang_ru_upper.png deleted file mode 100644 index d0f421bb..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_ru_upper.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_uk_single.png b/res/drawable-xxhdpi/ime_lang_uk.png similarity index 100% rename from res/drawable-xxhdpi/ime_lang_uk_single.png rename to res/drawable-xxhdpi/ime_lang_uk.png diff --git a/res/drawable-xxhdpi/ime_lang_uk_lower.png b/res/drawable-xxhdpi/ime_lang_uk_lower.png deleted file mode 100644 index 9f151c72..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_uk_lower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ime_lang_uk_upper.png b/res/drawable-xxhdpi/ime_lang_uk_upper.png deleted file mode 100644 index e397abb2..00000000 Binary files a/res/drawable-xxhdpi/ime_lang_uk_upper.png and /dev/null differ diff --git a/res/drawable/holdicon.png b/res/drawable/holdicon.png deleted file mode 100644 index 87899dbd..00000000 Binary files a/res/drawable/holdicon.png and /dev/null differ diff --git a/res/drawable/key_eight.png b/res/drawable/key_eight.png deleted file mode 100644 index e18ebde1..00000000 Binary files a/res/drawable/key_eight.png and /dev/null differ diff --git a/res/drawable/key_five.png b/res/drawable/key_five.png deleted file mode 100644 index 59d73df6..00000000 Binary files a/res/drawable/key_five.png and /dev/null differ diff --git a/res/drawable/key_four.png b/res/drawable/key_four.png deleted file mode 100644 index 35fa0317..00000000 Binary files a/res/drawable/key_four.png and /dev/null differ diff --git a/res/drawable/key_nine.png b/res/drawable/key_nine.png deleted file mode 100644 index 332bb4d5..00000000 Binary files a/res/drawable/key_nine.png and /dev/null differ diff --git a/res/drawable/key_one.png b/res/drawable/key_one.png deleted file mode 100644 index 5cbc17d0..00000000 Binary files a/res/drawable/key_one.png and /dev/null differ diff --git a/res/drawable/key_pound.png b/res/drawable/key_pound.png deleted file mode 100644 index 447dcb3b..00000000 Binary files a/res/drawable/key_pound.png and /dev/null differ diff --git a/res/drawable/key_seven.png b/res/drawable/key_seven.png deleted file mode 100644 index 59926d0a..00000000 Binary files a/res/drawable/key_seven.png and /dev/null differ diff --git a/res/drawable/key_six.png b/res/drawable/key_six.png deleted file mode 100644 index 51510d64..00000000 Binary files a/res/drawable/key_six.png and /dev/null differ diff --git a/res/drawable/key_star.png b/res/drawable/key_star.png deleted file mode 100644 index 653272be..00000000 Binary files a/res/drawable/key_star.png and /dev/null differ diff --git a/res/drawable/key_three.png b/res/drawable/key_three.png deleted file mode 100644 index 9bbbd971..00000000 Binary files a/res/drawable/key_three.png and /dev/null differ diff --git a/res/drawable/key_two.png b/res/drawable/key_two.png deleted file mode 100644 index 05cf2fe8..00000000 Binary files a/res/drawable/key_two.png and /dev/null differ diff --git a/res/drawable/key_zero.png b/res/drawable/key_zero.png deleted file mode 100644 index d811d36f..00000000 Binary files a/res/drawable/key_zero.png and /dev/null differ diff --git a/res/drawable/rcycle.png b/res/drawable/rcycle.png deleted file mode 100644 index 05b1ccc6..00000000 Binary files a/res/drawable/rcycle.png and /dev/null differ diff --git a/res/layout/addwordview.xml b/res/layout/addwordview.xml index e7f5ea27..f1a0cc1b 100644 --- a/res/layout/addwordview.xml +++ b/res/layout/addwordview.xml @@ -25,7 +25,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:onClick="addWordButton" - android:text="@string/add_word" /> + android:text="@string/add_word_add" />