Skip to content
Snippets Groups Projects
Commit 4ee33fb3 authored by Aleksandras Kostarevas's avatar Aleksandras Kostarevas
Browse files

Fix action key not being set by default

parent a3eae09d
No related branches found
No related tags found
No related merge requests found
...@@ -29,6 +29,7 @@ import org.futo.inputmethod.compat.AppWorkaroundsUtils; ...@@ -29,6 +29,7 @@ import org.futo.inputmethod.compat.AppWorkaroundsUtils;
import org.futo.inputmethod.latin.InputAttributes; import org.futo.inputmethod.latin.InputAttributes;
import org.futo.inputmethod.latin.R; import org.futo.inputmethod.latin.R;
import org.futo.inputmethod.latin.uix.actions.ActionRegistry; import org.futo.inputmethod.latin.uix.actions.ActionRegistry;
import org.futo.inputmethod.latin.uix.actions.RegistryKt;
import org.futo.inputmethod.latin.utils.AsyncResultHolder; import org.futo.inputmethod.latin.utils.AsyncResultHolder;
import org.futo.inputmethod.latin.utils.ResourceUtils; import org.futo.inputmethod.latin.utils.ResourceUtils;
import org.futo.inputmethod.latin.utils.TargetPackageInfoGetterTask; import org.futo.inputmethod.latin.utils.TargetPackageInfoGetterTask;
...@@ -147,7 +148,11 @@ public class SettingsValues { ...@@ -147,7 +148,11 @@ public class SettingsValues {
mIncludesOtherImesInLanguageSwitchList = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS mIncludesOtherImesInLanguageSwitchList = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS
? prefs.getBoolean(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false) ? prefs.getBoolean(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false)
: true /* forcibly */; : true /* forcibly */;
mActionKeyId = ActionRegistry.INSTANCE.actionStringIdToIdx(prefs.getString(Settings.PREF_ACTION_KEY_ID, "")); mActionKeyId = ActionRegistry.INSTANCE.actionStringIdToIdx(
prefs.getString(
Settings.PREF_ACTION_KEY_ID,
RegistryKt.getDefaultActionKey()
));
mShowsActionKey = mActionKeyId != -1; mShowsActionKey = mActionKeyId != -1;
mIsNumberRowEnabled = prefs.getBoolean(Settings.PREF_ENABLE_NUMBER_ROW, false); mIsNumberRowEnabled = prefs.getBoolean(Settings.PREF_ENABLE_NUMBER_ROW, false);
mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true);
......
...@@ -235,6 +235,10 @@ val DefaultActionSettings = mapOf( ...@@ -235,6 +235,10 @@ val DefaultActionSettings = mapOf(
ActionCategory.Disabled to listOf(MemoryDebugAction, SystemVoiceInputAction) ActionCategory.Disabled to listOf(MemoryDebugAction, SystemVoiceInputAction)
) )
val DefaultActionKey = DefaultActionSettings[ActionCategory.ActionKey]!!.firstOrNull()?.let {
ActionRegistry.actionToStringId(it)
} ?: ""
val ActionsSettings = SettingsKey( val ActionsSettings = SettingsKey(
stringPreferencesKey("actions_settings_map"), stringPreferencesKey("actions_settings_map"),
DefaultActionSettings.flattenToActionEditorItems().ensureWellFormed().serializeActionEditorItemListToString() DefaultActionSettings.flattenToActionEditorItems().ensureWellFormed().serializeActionEditorItemListToString()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment