Skip to content

Commit ac6e75f

Browse files
committed
Fix settings persistence and Swedish å character
- Fix inconsistent default values between init() and reloadSettings() in KeyboardViewModel (keyboardScale min was 0.3 vs 0.25) - Add missing 0_0_up direction mapping in KeyboardLayout for Swedish å - Swipe up on top-left key now correctly outputs å/Å in Swedish layout
1 parent 38ec4fc commit ac6e75f

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

wurstfingerKeyboard/KeyboardLayout.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ private extension KeyboardLayout {
290290
center: centers[0][0],
291291
locale: config.locale,
292292
textMap: [
293+
.up: config.specialCharacters["0_0_up"] ?? "",
293294
.right: "-",
294295
.downRight: config.specialCharacters["0_0_downRight"] ?? "v",
295296
.down: config.specialCharacters["0_0_down"] ?? "",
@@ -300,6 +301,7 @@ private extension KeyboardLayout {
300301
],
301302
returnOverrides: [
302303
.upLeft: .cycleAccents,
304+
.up: .text((config.specialCharacters["0_0_up"] ?? "").uppercased(with: config.locale)),
303305
.right: .text("÷"),
304306
.downRight: .text((config.specialCharacters["0_0_downRight"] ?? "v").uppercased(with: config.locale)),
305307
.down: .text((config.specialCharacters["0_0_down"] ?? "").uppercased(with: config.locale)),

wurstfingerKeyboard/KeyboardViewModel.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,20 @@ final class KeyboardViewModel: ObservableObject {
246246
utilityColumnLeading = newUtilityValue
247247
}
248248

249-
let savedRatio = sharedDefaults.object(forKey: "keyAspectRatio") as? Double ?? 1.5
249+
// Use same defaults as init() for consistency
250+
let savedRatio = sharedDefaults.object(forKey: "keyAspectRatio") as? Double ?? DeviceLayoutUtils.defaultKeyAspectRatio
250251
let newAspectRatio = min(1.62, max(1.0, savedRatio))
251252
if keyAspectRatio != newAspectRatio {
252253
keyAspectRatio = newAspectRatio
253254
}
254255

255-
let savedScale = sharedDefaults.object(forKey: "keyboardScale") as? Double ?? 1.0
256-
let newScale = min(1.0, max(0.3, savedScale))
256+
let savedScale = sharedDefaults.object(forKey: "keyboardScale") as? Double ?? DeviceLayoutUtils.defaultKeyboardScale
257+
let newScale = min(1.0, max(0.25, savedScale))
257258
if keyboardScale != newScale {
258259
keyboardScale = newScale
259260
}
260261

261-
let savedPosition = sharedDefaults.object(forKey: "keyboardHorizontalPosition") as? Double ?? 0.5
262+
let savedPosition = sharedDefaults.object(forKey: "keyboardHorizontalPosition") as? Double ?? DeviceLayoutUtils.defaultKeyboardPosition
262263
let newPosition = min(1.0, max(0.0, savedPosition))
263264
if keyboardHorizontalPosition != newPosition {
264265
keyboardHorizontalPosition = newPosition

0 commit comments

Comments
 (0)