From 8b77e22aa88020ae1fec3124a5ba05d1d9bfee90 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Sat, 10 May 2025 15:21:28 +0300
Subject: [PATCH] fixed missing key characters after the big refactoring

---
 .../settings/SettingsPunctuation.java           | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java
index c9b4f5f4..e61203fd 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsPunctuation.java
@@ -82,18 +82,11 @@ class SettingsPunctuation extends SettingsInput {
 
 	@NonNull
 	public ArrayList<String> getOrderedKeyChars(Language language, int number) {
-		ArrayList<String> orderedChars = new ArrayList<>();
-		if (language == null) {
-			return orderedChars;
-		}
-
-		if (number == 0) {
-			orderedChars = getSpecialCharsAsList(language);
-		} else if (number == 1) {
-			orderedChars = getPunctuationAsList(language);
-		}
-
-		return orderedChars;
+		return switch (number) {
+			case 0 -> getSpecialCharsAsList(language);
+			case 1 -> getPunctuationAsList(language);
+			default -> language != null ? language.getKeyCharacters(number) : new ArrayList<>();
+		};
 	}