From 4e661886b1e42c9bdd61d4aaa2e6403129f0aa1f Mon Sep 17 00:00:00 2001
From: Andrea Torlaschi <runnerway@gmail.com>
Date: Sun, 21 Aug 2016 16:32:20 +0200
Subject: [PATCH] ImportKeys: Changed UI a bit

---
 .../res/layout/import_keys_list_fragment.xml   | 18 ++++++++++++------
 .../res/menu/import_keys_file_fragment.xml     | 10 ++++------
 OpenKeychain/src/main/res/values/strings.xml   |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
index 6ca5c7374..a5bfdc998 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_fragment.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
         <import type="android.view.View" alias="V" />
-        <import type="org.sufficientlysecure.keychain.ui.ImportKeysListFragment" alias="i" />
+        <import type="org.sufficientlysecure.keychain.ui.ImportKeysListFragment" alias="I" />
 
         <variable name="status" type="int" />
         <variable name="advanced" type="boolean" />
@@ -19,14 +18,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:visibility="@{status == i.STATUS_LOADING ? V.VISIBLE : V.GONE}" />
+            android:visibility="@{status == I.STATUS_LOADING ? V.VISIBLE : V.GONE}" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="@string/error_nothing"
+            android:visibility="@{status == I.STATUS_FIRST ? V.VISIBLE : V.GONE}" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:text="@string/error_nothing_import"
-            android:visibility="@{status == i.STATUS_EMPTY ? V.VISIBLE : V.GONE}" />
+            android:visibility="@{status == I.STATUS_EMPTY ? V.VISIBLE : V.GONE}" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -34,7 +40,7 @@
             android:orientation="vertical"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
-            android:visibility="@{status == i.STATUS_LOADED ? V.VISIBLE : V.GONE}">
+            android:visibility="@{status == I.STATUS_LOADED ? V.VISIBLE : V.GONE}">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml
index 9b16771c6..dcd89ec8a 100644
--- a/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/menu/import_keys_file_fragment.xml
@@ -2,16 +2,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/menu_import_keys_file_paste"
-        android:icon="@drawable/ic_content_paste_white_24dp"
-        android:title="@string/menu_paste"
-        app:showAsAction="always" />
-
     <item
         android:id="@+id/menu_import_keys_file_open"
         android:icon="@drawable/ic_folder_white_24dp"
         android:title="@string/menu_open"
         app:showAsAction="always" />
 
+    <item
+        android:id="@+id/menu_import_keys_file_paste"
+        android:title="@string/menu_read_clipboard" />
+
 </menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6324c78ba..f7fa4a123 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -123,7 +123,7 @@
     <string name="menu_manage_keys">"Manage my keys"</string>
     <string name="menu_search">"Search"</string>
     <string name="menu_open">"Open"</string>
-    <string name="menu_paste">"Paste"</string>
+    <string name="menu_read_clipboard">"Read from clipboard"</string>
     <string name="menu_nfc_preferences">"NFC settings"</string>
     <string name="menu_beam_preferences">"Beam settings"</string>
     <string name="menu_encrypt_to">"Encrypt to…"</string>
@@ -390,8 +390,8 @@
     <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string>
     <string name="error_nfc_needed">"NFC must be enabled!"</string>
     <string name="error_beam_needed">"Beam must be enabled!"</string>
+    <string name="error_nothing">"Nothing to show yet."</string>
     <string name="error_nothing_import">"No keys found!"</string>
-    <string name="error_nothing_import_selected">"No keys selected for import!"</string>
     <string name="error_contacts_key_id_missing">"Retrieving the key ID from contacts failed!"</string>
     <string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string>
     <string name="error_denied_storage_permission">"Can not read files from storage because access has been denied!"</string>