From 3b48e49067314ae29fb6dff7200d428c277548bd Mon Sep 17 00:00:00 2001 From: Helium314 Date: Fri, 12 Jan 2024 11:05:38 +0100 Subject: [PATCH] load the correct file when editing symbols layouts, fixes #407 --- .../latin/settings/AdvancedSettingsFragment.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AdvancedSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AdvancedSettingsFragment.kt index aeedfdf44..6112e885d 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AdvancedSettingsFragment.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AdvancedSettingsFragment.kt @@ -98,15 +98,15 @@ class AdvancedSettingsFragment : SubScreenFragment() { findPreference("pref_backup_restore")?.setOnPreferenceClickListener { showBackupRestoreDialog() } findPreference("custom_symbols_layout")?.setOnPreferenceClickListener { - val file = "${CUSTOM_LAYOUT_PREFIX}symbols.txt" - val oldLayout = if (File(file).exists()) null else context.assets.open("layouts${File.separator}symbols.txt").reader().readText() - editCustomLayout(file, context, oldLayout, true) + val layoutName = Settings.readSymbolsLayoutName(context, context.resources.configuration.locale).takeIf { it.startsWith(CUSTOM_LAYOUT_PREFIX) } + val oldLayout = if (layoutName != null) null else context.assets.open("layouts${File.separator}symbols.txt").reader().readText() + editCustomLayout(layoutName ?: "${CUSTOM_LAYOUT_PREFIX}symbols.txt", context, oldLayout, true) true } findPreference("custom_shift_symbols_layout")?.setOnPreferenceClickListener { - val file = "${CUSTOM_LAYOUT_PREFIX}shift_symbols.txt" - val oldLayout = if (File(file).exists()) null else context.assets.open("layouts${File.separator}symbols_shifted.txt").reader().readText() - editCustomLayout(file, context, oldLayout, true) + val layoutName = Settings.readShiftedSymbolsLayoutName(context).takeIf { it.startsWith(CUSTOM_LAYOUT_PREFIX) } + val oldLayout = if (layoutName != null) null else context.assets.open("layouts${File.separator}symbols_shifted.txt").reader().readText() + editCustomLayout(layoutName ?: "${CUSTOM_LAYOUT_PREFIX}shift_symbols.txt", context, oldLayout, true) true } }