From 273cd87c2bc4e9b8b2f746e32a211609a827bf9f Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Wed, 6 Mar 2024 21:18:09 +0100
Subject: [PATCH] add separate turkis layout fixes #339 fixes #508

---
 app/src/main/assets/language_key_texts/tr.txt | 10 +-----
 app/src/main/assets/layouts/turkish.txt       | 34 +++++++++++++++++++
 app/src/main/res/xml/method.xml               |  4 +--
 3 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/assets/layouts/turkish.txt

diff --git a/app/src/main/assets/language_key_texts/tr.txt b/app/src/main/assets/language_key_texts/tr.txt
index 8ad9c50a7..73459f8d8 100644
--- a/app/src/main/assets/language_key_texts/tr.txt
+++ b/app/src/main/assets/language_key_texts/tr.txt
@@ -1,7 +1,7 @@
 [popup_keys]
 a â ä á
 e ə é
-i ı î ï ì í į ī
+ı i î ï ì í į ī
 o ö ô œ ò ó õ ø ō
 u ü û ù ú ū
 s ş ß ś š
@@ -10,11 +10,3 @@ n ň ñ
 c ç ć č
 y ý
 z ž
-
-[extra_keys]
-1: ğ
-1: ü
-2: ş
-2: î
-3: ö
-3: ç
diff --git a/app/src/main/assets/layouts/turkish.txt b/app/src/main/assets/layouts/turkish.txt
new file mode 100644
index 000000000..2da3d0d48
--- /dev/null
+++ b/app/src/main/assets/layouts/turkish.txt
@@ -0,0 +1,34 @@
+q
+w
+e
+r
+t
+y
+u
+ı
+o
+p
+ğ
+ü
+
+a
+s
+d
+f
+g
+h
+j
+k
+l
+ş
+i
+
+z
+x
+c
+v
+b
+n
+m
+ö
+ç
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index d7e53ea1e..f0f35ae07 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -94,7 +94,7 @@
     te_IN: Telugu (India)/telugu
     th: Thai/thai
     tl: Tagalog/qwerty+
-    tr: Turkish/qwerty
+    tr: Turkish/turkish
     ur_PK: Urdu Pakistan
     uk: Ukrainian/ukrainian
     uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout.
@@ -925,7 +925,7 @@
             android:imeSubtypeLocale="tr"
             android:languageTag="tr"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty+,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=turkish,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
     <subtype android:icon="@drawable/ic_ime_switcher"