From 753e5fa6a236b7fac07d37795b2593cfaeb94e9c Mon Sep 17 00:00:00 2001 From: Helium314 Date: Fri, 14 Jun 2024 18:17:26 +0200 Subject: [PATCH] properly open json files not sure why it works now, while it apparently did not before --- .../helium314/keyboard/keyboard/internal/KeyboardBuilder.kt | 2 +- .../keyboard/latin/settings/LanguageSettingsFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardBuilder.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardBuilder.kt index f528f0117..399b4963b 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardBuilder.kt +++ b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardBuilder.kt @@ -122,7 +122,7 @@ open class KeyboardBuilder(protected val mContext: Context, row.forEach { it.setAbsoluteDimensions(currentX, currentY) if (DebugFlags.DEBUG_ENABLED) - Log.d(TAG, "setting size and position for ${it.mLabel}, ${it.mCode}: x ${currentX.toInt()}, w ${it.mAbsoluteWidth.toInt()}") + Log.d(TAG, "setting size and position for ${it.mLabel ?: it.mIconName}, ${it.mCode}: x ${currentX.toInt()}, w ${it.mAbsoluteWidth.toInt()}") currentX += it.mAbsoluteWidth } currentY += row.first().mAbsoluteHeight diff --git a/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsFragment.kt b/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsFragment.kt index 92d90bb53..3c3d0fa15 100644 --- a/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsFragment.kt +++ b/app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsFragment.kt @@ -209,7 +209,7 @@ class LanguageSettingsFragment : Fragment(R.layout.language_settings) { val intent = Intent(Intent.ACTION_OPEN_DOCUMENT) .addCategory(Intent.CATEGORY_OPENABLE) // todo: any working way to allow only json and text files? - .putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("text/*", "application/octet-stream")) // doesn't allow opening json files with "application/json" + .putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("text/*", "application/octet-stream", "application/json")) .setType("*/*") layoutFilePicker.launch(intent) }