From f6a74fc4f9873ccae957a9898af1b417ac0af610 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Thu, 6 Feb 2025 15:02:11 +0200
Subject: [PATCH] code cleanup

---
 .../tt9/ui/main/keys/SoftKeyPunctuation.java   | 16 +++++++---------
 .../ui/main/keys/SoftKeyPunctuationShort.java  | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java
index f5f14856..b8d64eb9 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java
@@ -39,29 +39,27 @@ public class SoftKeyPunctuation extends SoftKey {
 		return "*".equals(keyChar) ? "✱" : keyChar;
 	}
 
-	private String getKeyChar() {
-		if (!validateTT9Handler()) {
-			return "";
-		}
-
+	protected String getKeyChar() {
 		int keyId = getId();
-		if (keyId == R.id.soft_key_punctuation_1 || keyId == R.id.soft_key_punctuation_201) {
+		if (keyId == R.id.soft_key_punctuation_1) {
 			return getKey1Char();
-		} else if (keyId == R.id.soft_key_punctuation_2 || keyId == R.id.soft_key_punctuation_202) {
+		} else if (keyId == R.id.soft_key_punctuation_2) {
 			return getKey2Char();
 		}
 
 		return "";
 	}
 
-	private String getKey1Char() {
+	protected String getKey1Char() {
+		if (tt9 == null) return "";
 		if (tt9.isInputModePhone()) return "*";
 		if (tt9.isInputModeNumeric()) return ",";
 
 		return "!";
 	}
 
-	private String getKey2Char() {
+	protected String getKey2Char() {
+		if (tt9 == null) return "";
 		if (tt9.isInputModePhone()) return "#";
 		if (tt9.isInputModeNumeric()) return ".";
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuationShort.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuationShort.java
index 33eb0c53..bb0536ab 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuationShort.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuationShort.java
@@ -3,9 +3,27 @@ package io.github.sspanak.tt9.ui.main.keys;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import io.github.sspanak.tt9.R;
+
 public class SoftKeyPunctuationShort extends SoftKeyPunctuation {
 	public SoftKeyPunctuationShort(Context context) { super(context); }
 	public SoftKeyPunctuationShort(Context context, AttributeSet attrs) { super(context, attrs); }
 	public SoftKeyPunctuationShort(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
+
 	@Override protected boolean isHiddenWhenLongSpace() { return false; }
+
+	protected String getKeyChar() {
+		if (!validateTT9Handler()) {
+			return "";
+		}
+
+		int keyId = getId();
+		if (keyId == R.id.soft_key_punctuation_201) {
+			return getKey1Char();
+		} else if (keyId == R.id.soft_key_punctuation_202) {
+			return getKey2Char();
+		}
+
+		return super.getKeyChar();
+	}
 }