From de90cc2dccd63ca6541d4d83f6e7d2a2a2b49851 Mon Sep 17 00:00:00 2001 From: dslul Date: Wed, 30 Sep 2020 10:25:08 +0200 Subject: [PATCH] remove emoji button for TYPE_TEXT_VARIATION_SHORT_MESSAGE --- .../define/{DebugFlags.java => DebugFlags.kt} | 20 +++++--------- ...tants.java => DecoderSpecificConstants.kt} | 26 ++++++++----------- .../define/{JniLibName.java => JniLibName.kt} | 14 +++------- ...roductionFlags.java => ProductionFlags.kt} | 24 +++++++---------- app/src/main/res/xml/key_styles_enter.xml | 9 ------- 5 files changed, 30 insertions(+), 63 deletions(-) rename app/src/main/java/org/dslul/openboard/inputmethod/latin/define/{DebugFlags.java => DebugFlags.kt} (62%) rename app/src/main/java/org/dslul/openboard/inputmethod/latin/define/{DecoderSpecificConstants.java => DecoderSpecificConstants.kt} (58%) rename app/src/main/java/org/dslul/openboard/inputmethod/latin/define/{JniLibName.java => JniLibName.kt} (66%) rename app/src/main/java/org/dslul/openboard/inputmethod/latin/define/{ProductionFlags.java => ProductionFlags.kt} (56%) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DebugFlags.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DebugFlags.kt similarity index 62% rename from app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DebugFlags.java rename to app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DebugFlags.kt index 594541e2e..9804bd72f 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DebugFlags.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DebugFlags.kt @@ -13,19 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.dslul.openboard.inputmethod.latin.define -package org.dslul.openboard.inputmethod.latin.define; +import android.content.SharedPreferences -import android.content.SharedPreferences; - -public final class DebugFlags { - public static final boolean DEBUG_ENABLED = false; - - private DebugFlags() { - // This class is not publicly instantiable. - } - - @SuppressWarnings("unused") - public static void init(final SharedPreferences prefs) { - } -} +object DebugFlags { + const val DEBUG_ENABLED = false + fun init(prefs: SharedPreferences?) {} +} \ No newline at end of file diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DecoderSpecificConstants.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DecoderSpecificConstants.kt similarity index 58% rename from app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DecoderSpecificConstants.java rename to app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DecoderSpecificConstants.kt index dafbfa2a0..fdbf72897 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DecoderSpecificConstants.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/DecoderSpecificConstants.kt @@ -13,26 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License */ - -package org.dslul.openboard.inputmethod.latin.define; +package org.dslul.openboard.inputmethod.latin.define /** * Decoder specific constants for LatinIme. */ -public class DecoderSpecificConstants { - +object DecoderSpecificConstants { // Must be equal to MAX_WORD_LENGTH in native/jni/src/defines.h - public static final int DICTIONARY_MAX_WORD_LENGTH = 48; + const val DICTIONARY_MAX_WORD_LENGTH = 48 // (MAX_PREV_WORD_COUNT_FOR_N_GRAM + 1)-gram is supported in Java side. Needs to modify // MAX_PREV_WORD_COUNT_FOR_N_GRAM in native/jni/src/defines.h for suggestions. - public static final int MAX_PREV_WORD_COUNT_FOR_N_GRAM = 3; - - public static final String DECODER_DICT_SUFFIX = ""; - - public static final boolean SHOULD_VERIFY_MAGIC_NUMBER = true; - public static final boolean SHOULD_VERIFY_CHECKSUM = true; - public static final boolean SHOULD_USE_DICT_VERSION = true; - public static final boolean SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION = false; - public static final boolean SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION = true; -} + const val MAX_PREV_WORD_COUNT_FOR_N_GRAM = 3 + const val DECODER_DICT_SUFFIX = "" + const val SHOULD_VERIFY_MAGIC_NUMBER = true + const val SHOULD_VERIFY_CHECKSUM = true + const val SHOULD_USE_DICT_VERSION = true + const val SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION = false + const val SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION = true +} \ No newline at end of file diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/JniLibName.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/JniLibName.kt similarity index 66% rename from app/src/main/java/org/dslul/openboard/inputmethod/latin/define/JniLibName.java rename to app/src/main/java/org/dslul/openboard/inputmethod/latin/define/JniLibName.kt index b68a6d021..a16270b32 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/JniLibName.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/JniLibName.kt @@ -13,14 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.dslul.openboard.inputmethod.latin.define -package org.dslul.openboard.inputmethod.latin.define; - -public final class JniLibName { - private JniLibName() { - // This class is not publicly instantiable. - } - - public static final String JNI_LIB_NAME = "jni_latinime"; - //public static final String JNI_LIB_NAME2 = "jni_latinimegoogle"; -} +object JniLibName { + const val JNI_LIB_NAME = "jni_latinime" //public static final String JNI_LIB_NAME2 = "jni_latinimegoogle"; +} \ No newline at end of file diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/ProductionFlags.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/ProductionFlags.kt similarity index 56% rename from app/src/main/java/org/dslul/openboard/inputmethod/latin/define/ProductionFlags.java rename to app/src/main/java/org/dslul/openboard/inputmethod/latin/define/ProductionFlags.kt index 76a7686ce..1cea2b216 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/ProductionFlags.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/define/ProductionFlags.kt @@ -13,30 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.dslul.openboard.inputmethod.latin.define -package org.dslul.openboard.inputmethod.latin.define; - -public final class ProductionFlags { - private ProductionFlags() { - // This class is not publicly instantiable. - } - - public static final boolean IS_HARDWARE_KEYBOARD_SUPPORTED = false; +object ProductionFlags { + const val IS_HARDWARE_KEYBOARD_SUPPORTED = false /** * Include all suggestions from all dictionaries in - * {@link org.dslul.openboard.inputmethod.latin.SuggestedWords#mRawSuggestions}. + * [org.dslul.openboard.inputmethod.latin.SuggestedWords.mRawSuggestions]. */ - public static final boolean INCLUDE_RAW_SUGGESTIONS = false; + const val INCLUDE_RAW_SUGGESTIONS = false /** * When false, the metrics logging is not yet ready to be enabled. */ - public static final boolean IS_METRICS_LOGGING_SUPPORTED = false; + const val IS_METRICS_LOGGING_SUPPORTED = false /** - * When {@code false}, the split keyboard is not yet ready to be enabled. + * When `false`, the split keyboard is not yet ready to be enabled. */ - public static final boolean IS_SPLIT_KEYBOARD_SUPPORTED = true; - -} + const val IS_SPLIT_KEYBOARD_SUPPORTED = true +} \ No newline at end of file diff --git a/app/src/main/res/xml/key_styles_enter.xml b/app/src/main/res/xml/key_styles_enter.xml index fe80ad800..055542b21 100644 --- a/app/src/main/res/xml/key_styles_enter.xml +++ b/app/src/main/res/xml/key_styles_enter.xml @@ -245,15 +245,6 @@ latin:keySpec="!icon/enter_key|!code/key_shift_enter" latin:parentStyle="defaultEnterKeyStyle" /> - - - -