added a long spacebar option

app/src/main/java/io/github/sspanak/tt9/ui/main/MainLayoutNumpad.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.hacks.DeviceInfo;
 import io.github.sspanak.tt9.ime.TraditionalT9;
+import io.github.sspanak.tt9.languages.LanguageKind;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.ui.main.keys.SoftKey;
 import io.github.sspanak.tt9.ui.main.keys.SoftKeySettings;
@@ -53,6 +54,8 @@ class MainLayoutNumpad extends BaseMainLayout {
 				|| keyId == R.id.soft_key_lf4
 				|| keyId == R.id.soft_key_0
 				|| keyId == R.id.soft_key_100
+				|| keyId == R.id.soft_key_punctuation_201
+				|| keyId == R.id.soft_key_punctuation_202
 			) {
 				key.render();
 			}
@@ -82,6 +85,8 @@ class MainLayoutNumpad extends BaseMainLayout {
 				|| keyId == R.id.soft_key_lf4
 				|| keyId == R.id.soft_key_0
 				|| keyId == R.id.soft_key_100
+				|| keyId == R.id.soft_key_punctuation_201
+				|| keyId == R.id.soft_key_punctuation_202
 			) {
 				key.render();
 			}
@@ -124,8 +129,7 @@ class MainLayoutNumpad extends BaseMainLayout {
 	}
 
 
-	private int getKeyColumnHeight() {
+	private int getKeyColumnHeight(int keyHeight) {
-		int keyHeight = calculateKeyHeight();
 		int lastKeyHeight = tt9.getSettings().isNumpadShapeV() ? Math.round(keyHeight * SettingsStore.SOFT_KEY_V_SHAPE_RATIO_OUTER) : keyHeight;
 		return keyHeight * 3 + lastKeyHeight;
 	}
@@ -149,7 +153,6 @@ class MainLayoutNumpad extends BaseMainLayout {
 		rightParams.weight = layoutWeight;
 		leftColumn.setLayoutParams(leftParams);
 		rightColumn.setLayoutParams(rightParams);
-
 	}
 
 
@@ -161,7 +164,7 @@ class MainLayoutNumpad extends BaseMainLayout {
 				Math.round(resources.getDimension(R.dimen.numpad_status_bar_spacing_top))
 				+ resources.getDimensionPixelSize(R.dimen.numpad_status_bar_spacing_bottom)
 				+ resources.getDimensionPixelSize(R.dimen.numpad_suggestion_height)
-				+ getKeyColumnHeight()
+				+ getKeyColumnHeight(calculateKeyHeight())
 				+ Math.round(resources.getDimension(R.dimen.numpad_keys_spacing_bottom));
 		}
 
@@ -169,6 +172,17 @@ class MainLayoutNumpad extends BaseMainLayout {
 	}
 
 
+	private void showLongSpace(boolean yes, int keyHeight) {
+		LinearLayout longSpacePanel = view != null ? view.findViewById(R.id.panel_long_spacebar) : null;
+		if (longSpacePanel != null) {
+			longSpacePanel.setVisibility(yes ? LinearLayout.VISIBLE : LinearLayout.GONE);
+			LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) longSpacePanel.getLayoutParams();
+			params.height = keyHeight;
+			longSpacePanel.setLayoutParams(params);
+		}
+	}
+
+
 	@Override
 	protected void enableClickHandlers() {
 		super.enableClickHandlers();
@@ -188,21 +202,28 @@ class MainLayoutNumpad extends BaseMainLayout {
 			return keys;
 		}
 
+		// status bar
 		ViewGroup statusBar = view.findViewById(R.id.status_bar_container);
 		keys.add(statusBar.findViewById(R.id.soft_key_left_arrow));
 		keys.add(statusBar.findViewById(R.id.soft_key_right_arrow));
 
+
+		// left Fn
+		ViewGroup left = view.findViewById(R.id.numpad_column_fn_left);
+		keys.add(left.findViewById(R.id.soft_key_settings));
+		keys.add(left.findViewById(R.id.soft_key_add_word));
+		keys.add(left.findViewById(R.id.soft_key_shift));
+		keys.add(left.findViewById(R.id.soft_key_lf4));
+
+		// right Fn
+		ViewGroup right = view.findViewById(R.id.numpad_column_fn_right);
+		keys.add(right.findViewById(R.id.soft_key_numpad_backspace));
+		keys.add(right.findViewById(R.id.soft_key_filter));
+		keys.add(right.findViewById(R.id.soft_key_rf3));
+		keys.add(right.findViewById(R.id.soft_key_numpad_ok));
+
+		// digits panel
 		ViewGroup table = view.findViewById(R.id.main_soft_keys);
-		keys.add(table.findViewById(R.id.soft_key_settings));
-		keys.add(table.findViewById(R.id.soft_key_add_word));
-		keys.add(table.findViewById(R.id.soft_key_shift));
-		keys.add(table.findViewById(R.id.soft_key_lf4));
-
-		keys.add(table.findViewById(R.id.soft_key_numpad_backspace));
-		keys.add(table.findViewById(R.id.soft_key_filter));
-		keys.add(table.findViewById(R.id.soft_key_rf3));
-		keys.add(table.findViewById(R.id.soft_key_numpad_ok));
-
 		keys.add(table.findViewById(R.id.soft_key_0));
 		keys.add(table.findViewById(R.id.soft_key_1));
 		keys.add(table.findViewById(R.id.soft_key_2));
@@ -216,6 +237,7 @@ class MainLayoutNumpad extends BaseMainLayout {
 		keys.add(table.findViewById(R.id.soft_key_punctuation_1));
 		keys.add(table.findViewById(R.id.soft_key_punctuation_2));
 
+		// text editing panel
 		keys.add(table.findViewById(R.id.soft_key_100));
 		keys.add(table.findViewById(R.id.soft_key_101));
 		keys.add(table.findViewById(R.id.soft_key_102));
@@ -229,6 +251,11 @@ class MainLayoutNumpad extends BaseMainLayout {
 		keys.add(table.findViewById(R.id.soft_key_punctuation_101));
 		keys.add(table.findViewById(R.id.soft_key_punctuation_102));
 
+		// Long space panel
+		keys.add(table.findViewById(R.id.soft_key_200));
+		keys.add(table.findViewById(R.id.soft_key_punctuation_201));
+		keys.add(table.findViewById(R.id.soft_key_punctuation_202));
+
 		keys.addAll(getKeysFromContainer(view.findViewById(R.id.status_bar_container)));
 
 		return keys;
@@ -237,11 +264,17 @@ class MainLayoutNumpad extends BaseMainLayout {
 
 	@Override
 	void render() {
+		int defaultKeyHeight = calculateKeyHeight();
+
 		getView();
 		enableClickHandlers();
-		setKeyHeight(calculateKeyHeight());
+		setKeyHeight(defaultKeyHeight);
 		setWidth(tt9.getSettings().getWidthPercent(), tt9.getSettings().getAlignment());
 		setKeyColumnWidth(tt9.getSettings().getNumpadFnKeyScale());
+		showLongSpace(
+			tt9.getSettings().isNumpadShapeLongSpace() && !tt9.isInputModeNumeric() && !LanguageKind.isKorean(tt9.getLanguage()),
+			defaultKeyHeight
+		);
 		for (SoftKey key : getKeys()) {
 			key.render();
 		}

app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyNumber0.java

@@ -12,14 +12,29 @@ public class SoftKeyNumber0 extends SoftKeyNumber {
 	public SoftKeyNumber0(Context context, AttributeSet attrs) { super(context, attrs); }
 	public SoftKeyNumber0(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
 
+
+	private boolean isTransparentWhenTextEditing() {
+		return tt9 != null && LanguageKind.isKorean(tt9.getLanguage()) && tt9.isTextEditingActive();
+	}
+
+
+	protected boolean isHiddenWhenLongSpace() {
+		return tt9 != null
+			&& tt9.getSettings().isNumpadShapeLongSpace()
+			&& !tt9.isInputModeNumeric()
+			&& !LanguageKind.isKorean(tt9.getLanguage());
+	}
+
+
 	@Override
 	protected int getNumber(int keyId) {
 		return 0;
 	}
 
+
 	@Override
 	protected String getHoldText() {
-		if (tt9 == null) {
+		if (tt9 == null || isHiddenWhenLongSpace()) {
 			return null;
 		}
 
@@ -36,6 +51,7 @@ public class SoftKeyNumber0 extends SoftKeyNumber {
 		return super.getLocalizedNumber(getNumber(getId()));
 	}
 
+
 	@Override
 	protected String getTitle() {
 		if (tt9 == null || tt9.isInputModeNumeric()) {
@@ -45,6 +61,7 @@ public class SoftKeyNumber0 extends SoftKeyNumber {
 		return (LanguageKind.isKorean(tt9.getLanguage())) ? getKoreanCharList() : "␣";
 	}
 
+
 	private String getKoreanCharList() {
 		if (tt9 == null || tt9.getLanguage() == null) {
 			return null;
@@ -60,6 +77,7 @@ public class SoftKeyNumber0 extends SoftKeyNumber {
 		return list.toString();
 	}
 
+
 	@Override
 	protected float getTitleScale() {
 		if (tt9 != null && !tt9.isInputModeNumeric() && !LanguageKind.isKorean(tt9.getLanguage())) {
@@ -70,14 +88,19 @@ public class SoftKeyNumber0 extends SoftKeyNumber {
 	}
 
 
-	@Override
+	private void setVisibility() {
-	public void render() {
+		getOverlayWrapper();
-		if (tt9 != null && LanguageKind.isKorean(tt9.getLanguage()) && tt9.isTextEditingActive()) {
+		if (isHiddenWhenLongSpace()) {
-			setVisibility(GONE);
+			overlay.setVisibility(GONE);
+		} else if (isTransparentWhenTextEditing()) {
+			overlay.setVisibility(INVISIBLE);
 		} else {
-			setVisibility(VISIBLE);
+			overlay.setVisibility(VISIBLE);
 		}
+	}
 
+
+	private void setEnabled() {
 		setEnabled(
 			tt9 != null
 				&& (
@@ -85,7 +108,13 @@ public class SoftKeyNumber0 extends SoftKeyNumber {
 					|| (!LanguageKind.isKorean(tt9.getLanguage()) && !tt9.isInputModeNumeric())
 				)
 		);
+	}
 
+
+	@Override
+	public void render() {
+		setVisibility();
+		setEnabled();
 		super.render();
 	}
 }

app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyNumber0Long.java

@@ -0,0 +1,11 @@
+package io.github.sspanak.tt9.ui.main.keys;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class SoftKeyNumber0Long extends SoftKeyNumber0 {
+	public SoftKeyNumber0Long(Context context) { super(context); }
+	public SoftKeyNumber0Long(Context context, AttributeSet attrs) { super(context, attrs); }
+	public SoftKeyNumber0Long(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
+	@Override protected boolean isHiddenWhenLongSpace() { return false; }
+}

app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuation.java

@@ -13,6 +13,18 @@ public class SoftKeyPunctuation extends SoftKey {
 	public SoftKeyPunctuation(Context context, AttributeSet attrs) { super(context, attrs); }
 	public SoftKeyPunctuation(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); }
 
+	protected boolean isHiddenWhenLongSpace() {
+		return
+			tt9 != null
+			&& tt9.getSettings().isNumpadShapeLongSpace()
+			&& !tt9.isInputModeNumeric()
+			&& !LanguageKind.isKorean(tt9.getLanguage());
+	}
+
+	protected boolean isTransparentWhenTextEditing() {
+		return tt9 != null && tt9.isTextEditingActive();
+	}
+
 	@Override
 	protected boolean handleRelease() {
 		return
@@ -33,9 +45,9 @@ public class SoftKeyPunctuation extends SoftKey {
 		}
 
 		int keyId = getId();
-		if (keyId == R.id.soft_key_punctuation_1) {
+		if (keyId == R.id.soft_key_punctuation_1 || keyId == R.id.soft_key_punctuation_201) {
 			return getKey1Char();
-		} else if (keyId == R.id.soft_key_punctuation_2) {
+		} else if (keyId == R.id.soft_key_punctuation_2 || keyId == R.id.soft_key_punctuation_202) {
 			return getKey2Char();
 		}
 
@@ -67,4 +79,18 @@ public class SoftKeyPunctuation extends SoftKey {
 
 		super.setHeight(height);
 	}
+
+
+	@Override
+	public void render() {
+		if (isHiddenWhenLongSpace()) {
+			setVisibility(GONE);
+		} else if (isTransparentWhenTextEditing()) {
+			setVisibility(INVISIBLE);
+		} else {
+			setVisibility(VISIBLE);
+		}
+
+		super.render();
+	}
 }

app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SoftKeyPunctuationShort.java

@@ -0,0 +1,11 @@
+package io.github.sspanak.tt9.ui.main.keys;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+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; }
+}

app/src/main/res/layout/main_numpad.xml

@@ -10,10 +10,20 @@
 		<include layout="@layout/panel_numpad_status_bar" />
 
 		<LinearLayout style="@style/TTheme.Numpad.Column.Container" android:id="@+id/main_soft_keys">
+
 			<include layout="@layout/panel_numpad_left" />
-			<include layout="@layout/panel_numpad_digits" />
+
-			<include layout="@layout/panel_numpad_text_editing" />
+			<LinearLayout style="@style/TTheme.Numpad.CentralBlock">
+				<LinearLayout style="@style/TTheme.Numpad.CentralBlock.Digits1to9">
+					<include layout="@layout/panel_numpad_digits" />
+					<include layout="@layout/panel_numpad_text_editing" />
+				</LinearLayout>
+
+				<include layout="@layout/panel_long_spacebar" />
+			</LinearLayout>
+
 			<include layout="@layout/panel_numpad_right" />
+
 		</LinearLayout>
 	</LinearLayout>
 

app/src/main/res/layout/panel_long_spacebar.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/TTheme.Numpad.CentralBlock.Row.LongSpacebar"
+	android:id="@+id/panel_long_spacebar">
+
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyPunctuationShort
+		style="@style/TTheme.Numpad.Key.ShortPunctuation"
+		android:id="@+id/soft_key_punctuation_201" />
+
+	<RelativeLayout style="@style/TTheme.Numpad.Key.LongSpace.Overlay.Wrapper">
+		<io.github.sspanak.tt9.ui.main.keys.SoftKeyNumber0Long
+			style="@style/TTheme.Numpad.Key.Number"
+			android:id="@+id/soft_key_200" />
+		<include layout="@layout/key_overlay_number_hold_text" />
+	</RelativeLayout>
+
+	<io.github.sspanak.tt9.ui.main.keys.SoftKeyPunctuationShort
+		style="@style/TTheme.Numpad.Key.ShortPunctuation"
+		android:id="@+id/soft_key_punctuation_202" />
+
+</LinearLayout>

app/src/main/res/values-bg/strings.xml

@@ -27,6 +27,7 @@
 	<string name="pref_backspace_recomposing_summary">Връщай списъка с предложения при натискане на Backspace на края на дума. (Не работи в някои приложения.)</string>
 	<string name="pref_choose_languages">Езици</string>
 	<string name="dictionary_truncate_title">Изтрий всички</string>
+	<string name="pref_numpad_shape_long_space">Дълъг интервал</string>
 	<string name="pref_numpad_width">Ширина</string>
 	<string name="pref_predict_word_pairs">Запомняне на двойки думи</string>
 	<string name="pref_predict_word_pairs_summary">Запомняй често ползвани фрази, за по-точно подсказване на думи.</string>

app/src/main/res/values-de/strings.xml

@@ -42,6 +42,7 @@
 	<string name="pref_backspace_recomposing">Wortnachbearbeitung</string>
 	<string name="pref_backspace_recomposing_summary">Die Vorschlagsliste zurückbringen, indem Sie am Ende eines Wortes die Rücktaste drücken. (Nicht in allen Apps unterstützt)</string>
 	<string name="pref_choose_languages">Sprachen</string>
+	<string name="pref_numpad_shape_long_space">Lange Leertaste</string>
 	<string name="pref_numpad_width">Breite</string>
 	<string name="pref_predict_word_pairs">Wortpaare lernen</string>
 	<string name="pref_predict_word_pairs_summary">Häufig verwendete Phrasen merken, um die Genauigkeit der Vorschläge zu verbessern.</string>

app/src/main/res/values-es/strings.xml

@@ -51,6 +51,7 @@
 	<string name="dictionary_truncate_title">Borrar todos</string>
 	<string name="dictionary_truncate_unselected">Borrar no seleccionados</string>
 	<string name="dictionary_truncated">Diccionario eliminado con éxito.</string>
+	<string name="pref_numpad_shape_long_space">Barra espaciadora larga</string>
 	<string name="pref_numpad_width">Anchura</string>
 	<string name="pref_predict_word_pairs">Aprender pares de palabras</string>
 	<string name="pref_predict_word_pairs_summary">Recordar frases de uso común para mejorar las sugerencias de palabras.</string>

app/src/main/res/values-fr/strings.xml

@@ -28,6 +28,7 @@
 	<string name="pref_backspace_recomposing_summary">Ramener la liste de suggestions en appuyant sur Retour arrière à la fin d\'un mot. (Non pris en charge dans certaines applications)</string>
 	<string name="pref_choose_languages">Langues</string>
 	<string name="dictionary_truncate_title">Supprimer tous</string>
+	<string name="pref_numpad_shape_long_space">Grande barre d\'espace</string>
 	<string name="pref_numpad_width">Largeur</string>
 	<string name="pref_predict_word_pairs">Mémoriser les paires de mots</string>
 	<string name="pref_predict_word_pairs_summary">Apprendre des phrases couramment utilisées pour améliorer les suggestions.</string>

app/src/main/res/values-it/strings.xml

@@ -45,6 +45,7 @@
 	<string name="pref_backspace_recomposing_summary">Riportare l\'elenco dei suggerimenti premendo Backspace alla fine di una parola. (Non supportato in alcune app)</string>
 	<string name="pref_choose_languages">Lingue</string>
 
+	<string name="pref_numpad_shape_long_space">Barra spaziatrice lunga</string>
 	<string name="pref_numpad_width">Larghezza</string>
 	<string name="pref_predict_word_pairs">Memorizzare coppie di parole</string>
 	<string name="pref_predict_word_pairs_summary">Ricordare frasi comunemente usate per migliorare i suggerimenti di parole.</string>

app/src/main/res/values-iw/strings.xml

@@ -55,6 +55,7 @@
 	<string name="pref_haptic_feedback_summary">לרטוט בעת לחיצה על מקש וירטואלי.</string>
 	<string name="pref_help">עזרה</string>
 
+	<string name="pref_numpad_shape_long_space">מקש רווח ארוך</string>
 	<string name="pref_numpad_width">רוחב</string>
 	<string name="pref_predict_word_pairs">ללמוד צמדי מילים</string>
 	<string name="pref_predict_word_pairs_summary">לזכור ביטויים נפוצים כדי לשפר את דיוק ההצעות.</string>

app/src/main/res/values-lt/strings.xml

@@ -60,6 +60,7 @@
 	<string name="pref_upside_down_keys">Atvirkštinė klavišų tvarka</string>
 	<string name="pref_upside_down_keys_summary">Įjunkite šį nustatymą jei pirmoje eilutėje turite 7–8–9, o ne 1–2–3.</string>
 
+	<string name="pref_numpad_shape_long_space">Ilga tarpo juosta</string>
 	<string name="pref_numpad_width">Plotis</string>
 	<string name="pref_predict_word_pairs">Išmokti žodžių poras</string>
 	<string name="pref_predict_word_pairs_summary">Įsiminti dažnai naudojamas frazes, kad pagerintumėte žodžių pasiūlymus.</string>

app/src/main/res/values-nl/strings.xml

@@ -42,6 +42,7 @@
 	<string name="pref_backspace_recomposing">Woordherbewerking</string>
 	<string name="pref_backspace_recomposing_summary">Breng de suggestielijst terug door Backspace te drukken aan het einde van een woord. (Niet ondersteund in sommige apps)</string>
 	<string name="pref_choose_languages">Talen</string>
+	<string name="pref_numpad_shape_long_space">Lange spatiebalk</string>
 	<string name="pref_numpad_width">Breedte</string>
 	<string name="pref_predict_word_pairs">Woordenparen leren</string>
 	<string name="pref_predict_word_pairs_summary">Veelgebruikte zinnen onthouden om de nauwkeurigheid van suggesties te verbeteren.</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -56,6 +56,7 @@
 	<string name="pref_haptic_feedback_summary">Vibrar ao pressionar uma tecla virtual.</string>
 	<string name="pref_help">Ajuda</string>
 
+	<string name="pref_numpad_shape_long_space">Barra de espaço longa</string>
 	<string name="pref_numpad_width">Largura</string>
 	<string name="pref_predict_word_pairs">Aprender pares de palavras</string>
 	<string name="pref_predict_word_pairs_summary">Lembrar de frases comumente usadas para melhorar as sugestões de palavras.</string>

app/src/main/res/values-ru/strings.xml

@@ -28,6 +28,7 @@
 	<string name="pref_backspace_recomposing_summary">Вернуть список предложений, нажав клавишу Backspace в конце слова. (Не поддерживается в некоторых приложениях)</string>
 	<string name="pref_choose_languages">Языки</string>
 	<string name="dictionary_truncate_title">Удалить все</string>
+	<string name="pref_numpad_shape_long_space">Длинный пробел</string>
 	<string name="pref_numpad_width">Ширина</string>
 	<string name="pref_predict_word_pairs">Запоминать пары слов</string>
 	<string name="pref_predict_word_pairs_summary">Запоминать часто используемые фразы для улучшения предложений слов.</string>

app/src/main/res/values-tr/strings.xml

@@ -43,6 +43,7 @@
 	<string name="pref_backspace_recomposing_summary">Kelimenin sonunda Geri tuşuna basarak öneri listesini geri getirmek. (Bazı uygulamalarda desteklenmez)</string>
 	<string name="pref_choose_languages">Diller</string>
 
+	<string name="pref_numpad_shape_long_space">Uzun boşluk tuşu</string>
 	<string name="pref_numpad_width">Genişlik</string>
 	<string name="pref_predict_word_pairs">Kelime çiftlerini öğren</string>
 	<string name="pref_predict_word_pairs_summary">Öneri doğruluğunu artırmak için sık kullanılan ifadeleri hatırla.</string>

app/src/main/res/values-uk/strings.xml

@@ -66,6 +66,7 @@
 	<string name="pref_upside_down_keys">Зворотній порядок клавіш</string>
 	<string name="pref_upside_down_keys_summary">Використовуйте це налаштування, якщо у вас в першому ряді 7–8–9 замість 1–2–3.</string>
 
+	<string name="pref_numpad_shape_long_space">Довгий пробіл</string>
 	<string name="pref_numpad_width">Ширина</string>
 	<string name="pref_predict_word_pairs">Запам’ятовувати пари слів</string>
 	<string name="pref_predict_word_pairs_summary">Запам\'ятовувати часто вживані фрази для покращення пропозицій слів.</string>

app/src/main/res/values/styles.xml

@@ -200,9 +200,10 @@
 
 
 	<!--*******************************************
-		Numpad Columns
+		Numpad Blocks and Columns
 	*******************************************-->
 
+	<!-- Fn + Digit keys container -->
 	<style name="TTheme.Numpad.Column.Container" parent="">
 		<item name="android:gravity">bottom</item>
 		<item name="android:layout_width">match_parent</item>
@@ -210,6 +211,7 @@
 		<item name="android:orientation">horizontal</item>
 	</style>
 
+	<!-- any column, including digit columns inside the CentralBlock -->
 	<style name="TTheme.Numpad.Column" parent="">
 		<item name="android:layout_width">0dp</item>
 		<item name="android:layout_height">wrap_content</item>
@@ -217,10 +219,33 @@
 		<item name="android:orientation">vertical</item>
 	</style>
 
+	<!-- left and right columns -->
 	<style name="TTheme.Numpad.Column.Fn" parent="TTheme.Numpad.Column">
 		<item name="android:layout_weight">@dimen/numpad_key_fn_layout_weight</item>
 	</style>
 
+	<!-- digit columns, text editing columns, long spacebar row -->
+	<style name="TTheme.Numpad.CentralBlock" parent="">
+		<item name="android:gravity">bottom</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_weight">3</item>
+		<item name="android:orientation">vertical</item>
+	</style>
+
+	<style name="TTheme.Numpad.CentralBlock.Digits1to9" parent="">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:gravity">bottom</item>
+	</style>
+
+	<style name="TTheme.Numpad.CentralBlock.Row.LongSpacebar" parent="">
+		<item name="android:gravity">center</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:orientation">horizontal</item>
+		<item name="android:visibility">gone</item>
+	</style>
 
 	<!--*******************************************
 		Numpad Key Overlays
@@ -234,6 +259,11 @@
 		<item name="android:padding">0dp</item>
 	</style>
 
+	<style name="TTheme.Numpad.Key.LongSpace.Overlay.Wrapper" parent="TTheme.Numpad.Key.Overlay.Wrapper">
+		<item name="android:layout_weight">3</item>
+		<item name="android:layout_width">0dp</item>
+	</style>
+
 	<style name="TTheme.Numpad.Key.Overlay.Element" parent="">
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">match_parent</item>
@@ -359,4 +389,9 @@
 		<item name="android:background">@android:color/transparent</item>
 	</style>
 
+	<style name="TTheme.Numpad.Key.ShortPunctuation" parent="TTheme.Numpad.Key.Number">
+		<item name="android:layout_weight">1</item>
+		<item name="android:layout_width">0dp</item>
+	</style>
+
 </resources>