From e430bbfeaca135c38872cd0892e7efd77358ecb9 Mon Sep 17 00:00:00 2001
From: Emil Kosz <ekosz@int.pl>
Date: Mon, 4 Nov 2024 19:22:04 +0100
Subject: [PATCH] Misc. changes, arabic fixes

---
 README.md                                     | 11 +++---
 .../eu/cfpi_fpsi/titanboard/InputView.java    |  4 +--
 .../main/res/drawable/button_transparent.xml  |  1 +
 app/src/main/res/drawable/candidate.xml       | 35 -------------------
 app/src/main/res/layout/clip.xml              |  3 +-
 app/src/main/res/layout/input.xml             | 12 +++----
 app/src/main/res/layout/symbol.xml            |  2 +-
 app/src/main/res/values/colors.xml            |  2 --
 app/src/main/res/values/dimens.xml            | 12 +++----
 app/src/main/res/xml/keymaps_titan.xml        |  2 +-
 app/src/main/res/xml/method.xml               |  2 +-
 11 files changed, 22 insertions(+), 64 deletions(-)
 delete mode 100644 app/src/main/res/drawable/candidate.xml

diff --git a/README.md b/README.md
index 6db4e17..ffb53b7 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,14 @@ Cupcake.
 a given key. This also applies for alternate (alt) symbols
 - 9 supported languages, with more planned (which are trivial to add)
 - No hard to memorize key combinations; reasonably uses what the physical keyboard has to offer
-- Pasting from clipboard akin to Gboard
-- Occupied screen estate is minimized; on Android 5.0 and higher, an additional floating interface
-mode is supported, which floats above the text you're typing, thus making the keyboard occupy no
-space at all
+- Clipboard management
 
 ## Planned features
 - Autocorrect
 - Emojis
-- More sophisticated clipboard management
+- Support for content other than text in clipboard
+- Floating interface, which is placed over the current text in certain contexts, to save screen
+space
 
 ## Supported languages
 - English
@@ -28,7 +27,7 @@ space at all
 - Polish
 - Russian (Phonetic)
 - Greek (polytonic diacritics under Q)
-- Arabic (Intellark)
+- Arabic (Phonetic)
 
 ## Supported devices
 Thus far, the supported devices are:
diff --git a/app/src/main/java/eu/cfpi_fpsi/titanboard/InputView.java b/app/src/main/java/eu/cfpi_fpsi/titanboard/InputView.java
index 83c0daa..40944a8 100644
--- a/app/src/main/java/eu/cfpi_fpsi/titanboard/InputView.java
+++ b/app/src/main/java/eu/cfpi_fpsi/titanboard/InputView.java
@@ -66,8 +66,8 @@ public class InputView extends RelativeLayout {
 
         mSymbolLayout.setMargins(0, 0,
                 getResources().getDimensionPixelSize(R.dimen.default_space), 0);
-        mClipLayout.setMargins(0,
-                getResources().getDimensionPixelSize(R.dimen.default_space), 0, 0);
+        mClipLayout.setMargins(0, 0, 0,
+                getResources().getDimensionPixelSize(R.dimen.default_space));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
             mSymbolLayout.setMarginEnd(getResources().getDimensionPixelSize(R.dimen.default_space));
diff --git a/app/src/main/res/drawable/button_transparent.xml b/app/src/main/res/drawable/button_transparent.xml
index 7e95a79..87858cd 100644
--- a/app/src/main/res/drawable/button_transparent.xml
+++ b/app/src/main/res/drawable/button_transparent.xml
@@ -26,6 +26,7 @@
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/button_active" />
+            <corners android:radius="@dimen/default_border_radius" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/candidate.xml b/app/src/main/res/drawable/candidate.xml
deleted file mode 100644
index 38e276a..0000000
--- a/app/src/main/res/drawable/candidate.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ An input method for the Unihertz Titan/physical keyboard phones
-  ~ Copyright (C) 2024 Emil Kosz
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <item android:state_pressed="false">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/candidate" />
-            <corners android:topLeftRadius="@dimen/default_border_radius"
-                android:topRightRadius="@dimen/default_border_radius"/>
-        </shape>
-    </item>
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/candidate_active" />
-            <corners android:topLeftRadius="@dimen/default_border_radius"
-                android:topRightRadius="@dimen/default_border_radius" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/clip.xml b/app/src/main/res/layout/clip.xml
index d153e38..473517f 100644
--- a/app/src/main/res/layout/clip.xml
+++ b/app/src/main/res/layout/clip.xml
@@ -20,8 +20,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:divider="?android:listDivider">
+    android:layout_height="wrap_content">
 
     <Button
         android:id="@+id/paste_button"
diff --git a/app/src/main/res/layout/input.xml b/app/src/main/res/layout/input.xml
index 48d3ec9..3a30604 100644
--- a/app/src/main/res/layout/input.xml
+++ b/app/src/main/res/layout/input.xml
@@ -23,18 +23,16 @@
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
     android:background="@color/background"
-    android:paddingLeft="@dimen/default_space"
-    android:paddingTop="@dimen/default_space"
-    android:paddingRight="@dimen/default_space">
+    android:padding="@dimen/default_space">
 
     <HorizontalScrollView
         android:id="@+id/symbol_list_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/container_height"
+        android:layout_height="match_parent"
         android:layout_alignTop="@id/clipboard_button"
+        android:layout_alignBottom="@id/clipboard_button"
         android:layout_marginEnd="@dimen/default_space"
         android:layout_marginRight="@dimen/default_space"
-        android:layout_marginBottom="0dp"
         android:layout_toStartOf="@+id/clipboard_button"
         android:layout_toLeftOf="@id/clipboard_button">
 
@@ -42,9 +40,7 @@
             android:id="@+id/symbol_list"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-        </LinearLayout>
+            android:orientation="horizontal" />
     </HorizontalScrollView>
 
     <ImageButton
diff --git a/app/src/main/res/layout/symbol.xml b/app/src/main/res/layout/symbol.xml
index c0a54e0..eba56f8 100644
--- a/app/src/main/res/layout/symbol.xml
+++ b/app/src/main/res/layout/symbol.xml
@@ -20,7 +20,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/candidate"
+    android:background="@drawable/button_transparent"
     android:gravity="center"
     android:textColor="@color/text_color"
     android:textSize="@dimen/symbol_text_size">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index fb77a97..b818642 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,8 +22,6 @@
     <color name="button">#444</color>
     <color name="button_toggled">#555</color>
     <color name="button_active">#666</color>
-    <color name="candidate">#333</color>
-    <color name="candidate_active">#666</color>
     <color name="text_color">#EEE</color>
     <color name="danger_text_color">#FF0000</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index db1b0ca..a7d7716 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,15 +19,15 @@
 
 <resources>
     <dimen name="default_space">8dp</dimen>
-    <dimen name="container_height">56dp</dimen>
+
     <dimen name="button_size">48dp</dimen>
     <dimen name="symbol_width">40dp</dimen>
-    <dimen name="default_text_size">16sp</dimen>
-    <dimen name="symbol_text_size">18sp</dimen>
-    <dimen name="long_text_size">14dp</dimen>
-    <dimen name="image_button_vertical_padding">12dp</dimen>
-    <dimen name="image_button_horizontal_padding">14dp</dimen>
     <dimen name="clipboard_popup_width">256dp</dimen>
     <dimen name="clipboard_popup_height">256dp</dimen>
+
+    <dimen name="default_text_size">16sp</dimen>
+    <dimen name="symbol_text_size">18sp</dimen>
+    <dimen name="long_text_size">14sp</dimen>
+
     <dimen name="default_border_radius">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/keymaps_titan.xml b/app/src/main/res/xml/keymaps_titan.xml
index 9368ea5..6b4a2c5 100644
--- a/app/src/main/res/xml/keymaps_titan.xml
+++ b/app/src/main/res/xml/keymaps_titan.xml
@@ -1511,7 +1511,7 @@
         </key>
         <key code="37"> <!-- I -->
             <base value="ي" />
-            <base value="ؚ" /> <!-- Kasrah -->
+            <base value="ِ" /> <!-- Kasrah -->
             <alt value="2" />
         </key>
         <key code="38"> <!-- J -->
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 27257e9..b9aa150 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:settingsActivity="cfpi_fpsi.eu.titanboard.PreferenceActivity">
+    android:settingsActivity="eu.cfpi_fpsi.titanboard.PreferenceActivity">
     <!-- Needed for higher Android version so it can be the only used input method.
      None of these subtypes are actually used. -->
     <subtype