From f00622a2a9f4c6af4af9d2545d11c1569f75de59 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 28 Nov 2017 13:09:00 +0100
Subject: [PATCH] Open: better icon

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/res/drawable/ic_action_open.xml | 7 +++++++
 app/src/main/res/drawable/ic_open.xml        | 9 ---------
 app/src/main/res/menu/config_list.xml        | 2 +-
 app/src/main/res/values/strings.xml          | 4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_action_open.xml
 delete mode 100644 app/src/main/res/drawable/ic_open.xml

diff --git a/app/src/main/res/drawable/ic_action_open.xml b/app/src/main/res/drawable/ic_action_open.xml
new file mode 100644
index 00000000..b4fb5a65
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_open.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M11,15V12H9V15H6V17H9V20H11V17H14V15H11Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_open.xml b/app/src/main/res/drawable/ic_open.xml
deleted file mode 100644
index f76831cd..00000000
--- a/app/src/main/res/drawable/ic_open.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"
-        android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/menu/config_list.xml b/app/src/main/res/menu/config_list.xml
index 9a0a481c..0e94e7ff 100644
--- a/app/src/main/res/menu/config_list.xml
+++ b/app/src/main/res/menu/config_list.xml
@@ -9,7 +9,7 @@
     <item
         android:id="@+id/menu_action_import"
         android:alphabeticShortcut="o"
-        android:icon="@drawable/ic_open"
+        android:icon="@drawable/ic_action_open"
         android:showAsAction="ifRoom"
         android:title="@string/import_config" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3c59739..4f548672 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
         <item quantity="one">%d configuration selected</item>
         <item quantity="other">%d configurations selected</item>
     </plurals>
-    <string name="add">Add</string>
+    <string name="add">Add empty config</string>
     <string name="add_activity_title">New WireGuard configuration</string>
     <string name="add_peer">Add peer</string>
     <string name="addresses">Addresses</string>
@@ -25,7 +25,7 @@
     <string name="hint_optional">(optional)</string>
     <string name="hint_random">(random)</string>
     <string name="iface">Interface</string>
-    <string name="import_config">Import</string>
+    <string name="import_config">Import config from file</string>
     <string name="listen_port">Listen port</string>
     <string name="mtu">MTU</string>
     <string name="name">Name</string>