From 2194ea461e3a7faf7a74e7ec838cbbd87f416236 Mon Sep 17 00:00:00 2001 From: Naveen Singh <36371707+naveensingh@users.noreply.github.com> Date: Wed, 27 Aug 2025 15:53:53 +0530 Subject: [PATCH] fix: use activity context in keyboard language management dialog (#249) Replaced application context usage with activity context in `ManageKeyboardLanguagesAdapter` so that the proper resource is resolved as per the attached base context in BaseSimpleActivity. Refs: https://github.com/FossifyOrg/Keyboard/issues/238 --- CHANGELOG.md | 8 ++++++-- .../keyboard/adapters/ManageKeyboardLanguagesAdapter.kt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1051f182..6398367b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- German QWERTZ layout without dedicated umlaut keys ([#47]) + ### Changed - Updated French AZERTY layout ([#134]) - Updated Spanish layout ([#206]) -### Added -- German QWERTZ layout without dedicated umlaut keys ([#47]) +### Fixed +- Keyboard language management dialog now respects `Use English language` preference ([#238]) ## [1.4.0] - 2025-08-22 ### Added @@ -83,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#202]: https://github.com/FossifyOrg/Keyboard/issues/202 [#222]: https://github.com/FossifyOrg/Keyboard/issues/222 [#230]: https://github.com/FossifyOrg/Keyboard/issues/230 +[#238]: https://github.com/FossifyOrg/Keyboard/issues/238 [Unreleased]: https://github.com/FossifyOrg/Keyboard/compare/1.4.0...HEAD [1.4.0]: https://github.com/FossifyOrg/Keyboard/compare/1.3.0...1.4.0 diff --git a/app/src/main/kotlin/org/fossify/keyboard/adapters/ManageKeyboardLanguagesAdapter.kt b/app/src/main/kotlin/org/fossify/keyboard/adapters/ManageKeyboardLanguagesAdapter.kt index b5ef81b4..ee910696 100644 --- a/app/src/main/kotlin/org/fossify/keyboard/adapters/ManageKeyboardLanguagesAdapter.kt +++ b/app/src/main/kotlin/org/fossify/keyboard/adapters/ManageKeyboardLanguagesAdapter.kt @@ -28,7 +28,7 @@ internal class ManageKeyboardLanguagesAdapter( override fun onBindViewHolder(holder: MyViewHolder, position: Int) { val item = languagesList[position] holder.languageCheckboxItem.apply { - text = config.context.getKeyboardLanguageText(item) + text = context.getKeyboardLanguageText(item) isChecked = selectedLanguages.contains(item) setOnClickListener { @@ -47,7 +47,7 @@ internal class ManageKeyboardLanguagesAdapter( fun getSelectedLanguages(): MutableSet { val defaultLang = config.getDefaultLanguage() - if (selectedLanguages.size == 0) { + if (selectedLanguages.isEmpty()) { selectedLanguages.add(defaultLang) } return selectedLanguages