Merge pull request #321 from alescdb/key-vectors

Replace unicode keys by vector drawable

18 files changed, 91 insertions, 46 deletions

diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_white.png b/app/src/main/res/drawable-hdpi/ic_keyboard_white.png
deleted file mode 100644
index 5352d4c..0000000
--- a/app/src/main/res/drawable-hdpi/ic_keyboard_white.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_white.png b/app/src/main/res/drawable-mdpi/ic_keyboard_white.png
deleted file mode 100644
index e8c24c7..0000000
--- a/app/src/main/res/drawable-mdpi/ic_keyboard_white.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_white.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_white.png
deleted file mode 100644
index 2b6b9b4..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_keyboard_white.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_white.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_white.png
deleted file mode 100644
index 9d0bed2..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_keyboard_white.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white.png
deleted file mode 100644
index f77d9d2..0000000
--- a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white.png
+++ /dev/null
diff --git a/app/src/main/res/drawable/ic_keyboard.xml b/app/src/main/res/drawable/ic_keyboard.xml
new file mode 100644
index 0000000..bd0b357
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20,5H4c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2zm-9,3h2v2h-2V8zm0,3h2v2h-2v-2zM8,8h2v2H8V8zm0,3h2v2H8v-2zm-1,2H5v-2h2v2zm0,-3H5V8h2v2zm9,7H8v-2h8v2zm0,-4h-2v-2h2v2zm0,-3h-2V8h2v2zm3,3h-2v-2h2v2zm0,-3h-2V8h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
new file mode 100644
index 0000000..2a810b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_left.xml b/app/src/main/res/drawable/ic_keyboard_arrow_left.xml
new file mode 100644
index 0000000..876aaca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_left.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14,5.5l-6,6 6,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
new file mode 100644
index 0000000..e1e9f45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
new file mode 100644
index 0000000..bcb548c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_tab.xml b/app/src/main/res/drawable/ic_keyboard_tab.xml
new file mode 100644
index 0000000..03ec6ed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_tab.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11.59,7.41L15.17,11H1v2h14.17l-3.59,3.59L13,18l6,-6 -6,-6 -1.41,1.41zM20,6v12h2V6h-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/inc_keyboard.xml b/app/src/main/res/layout/inc_keyboard.xml
index 945e1b9..ffea1b1 100644
--- a/app/src/main/res/layout/inc_keyboard.xml
+++ b/app/src/main/res/layout/inc_keyboard.xml
@@ -15,8 +15,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<LinearLayout android:id="@+id/keyboard_group"
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/keyboard_group"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:layout_alignParentBottom="true"
@@ -44,123 +45,128 @@
 				android:id="@+id/button_ctrl"
 				style="@style/KeyboardButton"
 				android:contentDescription="@string/image_description_toggle_control_character"
-				android:text="@string/button_key_ctrl"/>
+				android:text="@string/button_key_ctrl" />
 
 			<Button
 				android:id="@+id/button_esc"
 				style="@style/KeyboardButton"
 				android:contentDescription="@string/image_description_send_escape_character"
-				android:text="@string/button_key_esc"/>
+				android:text="@string/button_key_esc" />
 
-			<Button
+			<ImageView
 				android:id="@+id/button_tab"
 				style="@style/KeyboardButton"
+				android:padding="6dp"
 				android:contentDescription="@string/image_description_send_tab_character"
-				android:text="@string/button_key_tab"/>
+				android:src="@drawable/ic_keyboard_tab" />
 
-			<Button
+			<ImageView
 				android:id="@+id/button_up"
 				style="@style/KeyboardButton"
+				android:padding="4dp"
 				android:contentDescription="@string/image_description_up"
-				android:text="@string/button_key_up"/>
+				android:src="@drawable/ic_keyboard_arrow_up" />
 
-			<Button
+			<ImageView
 				android:id="@+id/button_down"
 				style="@style/KeyboardButton"
+				android:padding="4dp"
 				android:contentDescription="@string/image_description_down"
-				android:text="@string/button_key_down"/>
+				android:src="@drawable/ic_keyboard_arrow_down" />
 
-			<Button
+			<ImageView
 				android:id="@+id/button_left"
 				style="@style/KeyboardButton"
+				android:padding="4dp"
 				android:contentDescription="@string/image_description_left"
-				android:text="@string/button_key_left"/>
+				android:src="@drawable/ic_keyboard_arrow_left" />
 
-			<Button
+			<ImageView
 				android:id="@+id/button_right"
 				style="@style/KeyboardButton"
+				android:padding="4dp"
 				android:contentDescription="@string/image_description_right"
-				android:text="@string/button_key_right"/>
+				android:src="@drawable/ic_keyboard_arrow_right" />
 
 			<Button
 				android:id="@+id/button_home"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_home"/>
+				android:text="@string/button_key_home" />
 
 			<Button
 				android:id="@+id/button_end"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_end"/>
+				android:text="@string/button_key_end" />
 
 			<Button
 				android:id="@+id/button_pgup"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_pgup"/>
+				android:text="@string/button_key_pgup" />
 
 			<Button
 				android:id="@+id/button_pgdn"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_pgdn"/>
+				android:text="@string/button_key_pgdn" />
 
 			<Button
 				android:id="@+id/button_f1"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f1"/>
+				android:text="@string/button_key_f1" />
 
 			<Button
 				android:id="@+id/button_f2"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f2"/>
+				android:text="@string/button_key_f2" />
 
 			<Button
 				android:id="@+id/button_f3"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f3"/>
+				android:text="@string/button_key_f3" />
 
 			<Button
 				android:id="@+id/button_f4"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f4"/>
+				android:text="@string/button_key_f4" />
 
 			<Button
 				android:id="@+id/button_f5"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f5"/>
+				android:text="@string/button_key_f5" />
 
 			<Button
 				android:id="@+id/button_f6"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f6"/>
+				android:text="@string/button_key_f6" />
 
 			<Button
 				android:id="@+id/button_f7"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f7"/>
+				android:text="@string/button_key_f7" />
 
 			<Button
 				android:id="@+id/button_f8"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f8"/>
+				android:text="@string/button_key_f8" />
 
 			<Button
 				android:id="@+id/button_f9"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f9"/>
+				android:text="@string/button_key_f9" />
 
 			<Button
 				android:id="@+id/button_f10"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f10"/>
+				android:text="@string/button_key_f10" />
 
 			<Button
 				android:id="@+id/button_f11"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f11"/>
+				android:text="@string/button_key_f11" />
 
 			<Button
 				android:id="@+id/button_f12"
 				style="@style/KeyboardButton"
-				android:text="@string/button_key_f12"/>
+				android:text="@string/button_key_f12" />
 		</LinearLayout>
 	</HorizontalScrollView>
 
@@ -169,5 +175,5 @@
 		style="@style/KeyboardKey"
 		android:background="@drawable/keyboard_keyboard_border"
 		android:contentDescription="@string/image_description_show_keyboard"
-		android:src="@drawable/ic_keyboard_white"/>
+		android:src="@drawable/ic_keyboard" />
 </LinearLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 432357f..4f86971 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -226,7 +226,6 @@
   <string name="image_description_right">Tecla cursor a la derecha</string>
   <string name="button_key_esc">Escape</string>
   <string name="button_key_ctrl">Ctrl</string>
-  <string name="button_key_tab">TAB (Tabulador)</string>
   <string name="button_key_home">Inicio</string>
   <string name="button_key_end">Finalizar</string>
   <string name="button_key_pgup">Re Pág</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 6104e7a..1184ef4 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_desc">SSH bezero soil, ahaltsu eta librea</string>
   <string name="service_desc">SSH konexio eta kargatutako gako publikoak mantentzen ditu</string>
   <string name="title_hosts_list">Ostalariak</string>
@@ -213,5 +213,4 @@
   <string name="image_description_right">Eskuina gezia</string>
   <string name="button_key_esc">Esc</string>
   <string name="button_key_ctrl">Ktrl</string>
-  <string name="button_key_tab">Tab</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 212114b..9d06e08 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -226,7 +226,6 @@
   <string name="image_description_right">右矢印</string>
   <string name="button_key_esc">Esc</string>
   <string name="button_key_ctrl">Ctrl</string>
-  <string name="button_key_tab">Tab</string>
   <string name="button_key_home">Home</string>
   <string name="button_key_end">End</string>
   <string name="button_key_pgup">PgUp</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1daebfe..a4cb39f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -226,7 +226,6 @@
   <string name="image_description_right">向右的箭头</string>
   <string name="button_key_esc">Esc</string>
   <string name="button_key_ctrl">Ctrl</string>
-  <string name="button_key_tab">Tab</string>
   <string name="button_key_home">Home</string>
   <string name="button_key_end">End</string>
   <string name="button_key_pgup">PgUp</string>
diff --git a/app/src/main/res/values/notrans.xml b/app/src/main/res/values/notrans.xml
index 4311e3b..5e1ab03 100644
--- a/app/src/main/res/values/notrans.xml
+++ b/app/src/main/res/values/notrans.xml
@@ -21,13 +21,4 @@
 	<string name="app_name" translatable="false">ConnectBot</string>
 
 	<string name="copyright_info" translatable="false">ConnectBot is provided under the Apache License, Version 2.0 (the &#x201C;License&#x201D;).  Here are a few key points:\n\nYou may not use this program except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &#x201C;AS IS&#x201D; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
-
-	<!-- "Up" button in virtual keyboard. -->
-	<string name="button_key_up">\u25B2</string>
-	<!-- "Down" button in virtual keyboard. -->
-	<string name="button_key_down">\u25BC</string>
-	<!-- "Left" button in virtual keyboard. -->
-	<string name="button_key_left">\u25C0</string>
-	<!-- "Right" button in virtual keyboard. -->
-	<string name="button_key_right">\u25B6</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 824f664..e5dfeef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -590,8 +590,6 @@
 	<string name="button_key_esc">Esc</string>
 	<!-- Text for the "Ctrl" button in virtual keyboard. -->
 	<string name="button_key_ctrl">Ctrl</string>
-	<!-- Text for the "Tab" button in virtual keyboard. -->
-	<string name="button_key_tab">Tab</string>
 
 	<!-- Text for the "Home" button in virtual keyboard. -->
 	<string name="button_key_home">Home</string>