aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-06 01:08:12 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-06 01:08:12 +0200
commit881a50207af0a9f9f5aa69f451110de786779b54 (patch)
tree776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/layout
parent0bfac9989f801aa93d8bc336307d60b817995688 (diff)
parent6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff)
downloadopen-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz
open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2
open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip
Merge branch 'master' into yubikey
Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/add_subkey_dialog.xml (renamed from OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml)195
-rw-r--r--OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_dialog.xml86
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml53
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_key_item.xml172
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_section.xml41
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml96
-rw-r--r--OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml16
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_activity.xml13
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml68
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml31
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_content.xml30
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml39
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml117
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml74
-rw-r--r--OpenKeychain/src/main/res/layout/file_list_entry.xml60
-rw-r--r--OpenKeychain/src/main/res/layout/file_list_entry_add.xml21
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_list_entry.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/recipient_box_entry.xml24
-rw-r--r--OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml51
-rw-r--r--OpenKeychain/src/main/res/layout/select_key_item.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_share_fragment.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_subkey_item.xml57
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_user_id_item.xml2
25 files changed, 490 insertions, 768 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
index a4258b998..e1ccfee1f 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_subkey_added_item.xml
+++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
@@ -1,127 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="5dp">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:minWidth="10dp"
- android:background="@color/android_green_light" />
+ android:layout_height="match_parent">
<TableLayout
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingLeft="8dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
android:stretchColumns="1">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="4dp"
+ android:text="@string/key_creation_el_gamal_info" />
+
<TableRow>
<TextView
- android:id="@+id/label_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_expiry" />
+ android:text="@string/label_algorithm" />
- <Button
- android:id="@+id/expiry"
+ <Spinner
+ android:id="@+id/add_subkey_algorithm"
android:layout_width="match_parent"
- android:layout_height="40dp"
- android:text="@string/none"
- android:background="@drawable/button_edgy" />
+ android:layout_height="wrap_content"
+ android:padding="4dp" />
</TableRow>
- <TableRow
- android:id="@+id/row_certify">
+ <TableRow>
<TextView
- android:id="@+id/label_usage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_usage" />
- <CheckBox
- android:id="@+id/chkCertify"
- android:enabled = "false"
- android:layout_width="wrap_content"
+ android:text="@string/label_key_size" />
+
+ <Spinner
+ android:id="@+id/add_subkey_size"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/flag_certify" />
+ android:gravity="right"
+ android:padding="4dp" />
</TableRow>
+ <TextView
+ android:id="@+id/add_subkey_custom_key_size_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:text="@string/key_size_custom_info"
+ android:visibility="gone" />
+
+ <EditText
+ android:id="@+id/add_subkey_custom_key_size_input"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:inputType="number"
+ android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/add_subkey_custom_key_size_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical" />
+
<TableRow
- android:id="@+id/row_sign">
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp">
<TextView
- android:id="@+id/label_usage2"
+ android:id="@+id/label_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
- android:text="@string/label_usage" />
+ android:text="@string/label_expiry" />
+
<CheckBox
- android:id="@+id/chkSign"
+ android:id="@+id/add_subkey_no_expiry"
+ android:checked="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/flag_sign" />
+ android:text="@string/btn_no_date" />
+
</TableRow>
<TableRow
- android:id="@+id/row_encrypt">
+ android:id="@+id/add_subkey_expiry_row"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip" />
- <CheckBox
- android:id="@+id/chkEncrypt"
+
+ <DatePicker
+ android:id="@+id/add_subkey_expiry_date_picker"
+ android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/flag_encrypt" />
+ android:spinnersShown="true"
+ android:calendarViewShown="false" />
+
</TableRow>
- <TableRow
- android:id="@+id/row_authenticate">
+ <TableRow>
<TextView
+ android:id="@+id/label_usage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingRight="10dip" />
+ android:paddingRight="10dip"
+ android:text="@string/label_usage" />
+
+
<CheckBox
- android:id="@+id/chkAuthenticate"
+ android:id="@+id/add_subkey_flag_certify"
+ android:enabled="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/flag_authenticate" />
+ android:text="@string/flag_certify" />
</TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/key_creation_el_gamal_info" />
-
<TableRow>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/label_algorithm" />
+ android:paddingRight="10dip" />
- <Spinner
- android:id="@+id/create_key_algorithm"
- android:layout_width="match_parent"
+ <CheckBox
+ android:id="@+id/add_subkey_flag_sign"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp" />
+ android:text="@string/flag_sign" />
</TableRow>
<TableRow>
@@ -130,50 +153,30 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/label_key_size" />
+ android:paddingRight="10dip" />
- <Spinner
- android:id="@+id/create_key_size"
- android:layout_width="match_parent"
+ <CheckBox
+ android:id="@+id/add_subkey_flag_encrypt"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="right"
- android:padding="4dp" />
+ android:text="@string/flag_encrypt" />
</TableRow>
- <TextView
- android:id="@+id/custom_key_size_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/key_size_custom_info"
- android:visibility="gone" />
+ <TableRow>
- <EditText
- android:id="@+id/custom_key_size_input"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:inputType="number"
- android:visibility="gone" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingRight="10dip" />
- <TextView
- android:id="@+id/custom_key_size_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:visibility="gone" />
+ <CheckBox
+ android:id="@+id/add_subkey_flag_authenticate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/flag_authenticate" />
+ </TableRow>
</TableLayout>
- <ImageButton
- android:id="@+id/subkey_added_item_delete"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:padding="8dp"
- android:src="@drawable/ic_action_cancel"
- android:layout_gravity="center_vertical"
- style="@style/SelectableItem" />
-</LinearLayout> \ No newline at end of file
+</ScrollView> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index 7bb861547..aaeae78e0 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -53,7 +53,7 @@
android:text="@string/api_settings_create_key"
android:background="@drawable/button_edgy"
android:drawableLeft="@drawable/ic_action_accounts"
- android:textSize="14dip"/>
+ android:textSize="14sp"/>
<org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/create_key_dialog.xml b/OpenKeychain/src/main/res/layout/create_key_dialog.xml
deleted file mode 100644
index 16eef08c4..000000000
--- a/OpenKeychain/src/main/res/layout/create_key_dialog.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <TableLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:stretchColumns="1" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/key_creation_el_gamal_info" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/key_creation_weak_rsa_info" />
-
- <TableRow>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/label_algorithm" />
-
- <Spinner
- android:id="@+id/create_key_algorithm"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="4dp" />
- </TableRow>
-
- <TableRow>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/label_key_size" />
-
- <Spinner
- android:id="@+id/create_key_size"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="right"
- android:padding="4dp" />
- </TableRow>
-
- <TextView
- android:id="@+id/custom_key_size_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp"
- android:text="@string/key_size_custom_info"
- android:visibility="gone"/>
-
- <EditText
- android:id="@+id/custom_key_size_input"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:inputType="number"
- android:visibility="gone"/>
-
- <TextView
- android:id="@+id/custom_key_size_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:padding="4dp" />
-
- </TableLayout>
-
-</ScrollView> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 098aaaea1..6ff827894 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -26,32 +26,41 @@
android:orientation="vertical">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <EditText
- android:id="@+id/decrypt_file_filename"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="top|left"
- android:inputType="textMultiLine|textUri"
- android:lines="4"
- android:maxLines="10"
- android:minLines="2"
- android:scrollbars="vertical" />
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:orientation="horizontal"
- <ImageButton
android:id="@+id/decrypt_file_browse"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="4dp"
- android:src="@drawable/ic_action_collection"
- android:background="@drawable/button_rounded"
- android:layout_gravity="center_vertical"/>
+ android:clickable="true"
+ style="@style/SelectableItem">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/label_file_colon"
+ android:gravity="center_vertical"/>
+
+ <TextView
+ android:id="@+id/decrypt_file_filename"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:hint="@string/filemanager_title_open"
+ android:drawableRight="@drawable/ic_action_collection"
+ android:drawablePadding="8dp"
+ android:gravity="center_vertical"/>
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"
+ android:layout_marginBottom="8dp"/>
+
<CheckBox
android:id="@+id/decrypt_file_delete_after_decryption"
android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
deleted file mode 100644
index 81fb643ab..000000000
--- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
-
- <TableLayout
- android:id="@+id/table_keylayout"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:stretchColumns="1" >
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_keyId"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_key_id" />
-
- <TextView
- android:id="@+id/keyId"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="5dip"
- android:text="00000000 00000000"
- android:typeface="monospace" />
- </TableRow>
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_algorithm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_algorithm" />
-
- <TextView
- android:id="@+id/algorithm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="5dip"
- android:text="@string/label_name" />
- </TableRow>
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_creation"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_creation" />
-
- <TextView
- android:id="@+id/creation"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- </TableRow>
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_expiry"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_expiry" />
-
- <Button
- android:id="@+id/expiry"
- android:layout_width="match_parent"
- android:layout_height="40dp"
- android:text="@string/none"
- android:background="@drawable/button_edgy" />
- </TableRow>
-
- <TableRow
- android:id="@+id/row_certify">
-
- <TextView
- android:id="@+id/label_usage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_usage" />
- <CheckBox
- android:id="@+id/chkCertify"
- android:enabled = "false"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/flag_certify" />
- </TableRow>
-
- <TableRow
- android:id="@+id/row_sign">
-
- <TextView
- android:id="@+id/label_usage2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip"
- android:text="@string/label_usage" />
- <CheckBox
- android:id="@+id/chkSign"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/flag_sign" />
- </TableRow>
-
- <TableRow
- android:id="@+id/row_encrypt">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip" />
- <CheckBox
- android:id="@+id/chkEncrypt"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/flag_encrypt" />
- </TableRow>
-
- <TableRow
- android:id="@+id/row_authenticate">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="10dip" />
- <CheckBox
- android:id="@+id/chkAuthenticate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/flag_authenticate" />
- </TableRow>
- </TableLayout>
-
- <ImageButton
- android:id="@+id/delete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:src="@drawable/minus"
- android:background="@drawable/button_rounded_red"/>
- </LinearLayout>
-
- <View
- android:id="@+id/separator"
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider" />
-
-</org.sufficientlysecure.keychain.ui.widget.KeyEditor>
-
diff --git a/OpenKeychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml
deleted file mode 100644
index 6cfe18bd6..000000000
--- a/OpenKeychain/src/main/res/layout/edit_key_section.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <LinearLayout
- android:id="@+id/header"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal" >
-
- <TextView
- android:id="@+id/title"
- style="@style/SectionHeader"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:singleLine="true"
- android:text="Section Name" />
-
- <ImageButton
- android:id="@+id/plusbutton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:src="@drawable/plus"
- android:background="@drawable/button_rounded_green"/>
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/editors"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="6dip" />
-
-</org.sufficientlysecure.keychain.ui.widget.SectionView> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
deleted file mode 100644
index 877ea77db..000000000
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <RadioButton
- android:id="@+id/isMainUserId"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/label_main_user_id" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
-
- <TableLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="5dip"
- android:text="@string/label_name" />
-
- <EditText
- android:id="@+id/name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:inputType="textPersonName|textCapWords" />
- </TableRow>
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_email"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="5dip"
- android:text="@string/label_email" />
-
- <AutoCompleteTextView
- android:id="@+id/email"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:inputType="textEmailAddress" />
- </TableRow>
-
- <TableRow>
-
- <TextView
- android:id="@+id/label_comment"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingRight="5dip"
- android:text="@string/label_comment" />
-
- <EditText
- android:id="@+id/user_id_item_comment"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:inputType="text"/>
- </TableRow>
- </TableLayout>
-
- <ImageButton
- android:id="@+id/delete"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_margin="10dip"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="6dip"
- android:src="@drawable/minus"
- android:background="@drawable/button_rounded_red" />
- </LinearLayout>
-
- <View
- android:id="@+id/separator"
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider" />
-
-</org.sufficientlysecure.keychain.ui.widget.UserIdEditor> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
new file mode 100644
index 000000000..062f07863
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <DatePicker
+ android:id="@+id/edit_subkey_expiry_date_picker"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:spinnersShown="true"
+ android:calendarViewShown="false" />
+ <!-- Hide calendarView in tablets because of the unix warparound bug. -->
+
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
index 65c2ee8fd..839bddc75 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_activity.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
- xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
- android:id="@+id/drawer_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+<android.support.v4.widget.FixedDrawerLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/drawer_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".ui.EncryptActivity">
<include layout="@layout/encrypt_content"/>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index cde92b477..4d82477bc 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -12,66 +11,29 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:padding="0dp"
+ android:layout_margin="0dp"
+ style="@android:style/Widget.EditText">
- <CheckBox
- android:id="@+id/sign"
+ <TextView
+ android:paddingLeft="12dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/label_sign" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/label_asymmetric_from" />
- <LinearLayout
+ <Spinner
+ android:id="@+id/sign"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="4dip">
+ android:layout_gravity="center_vertical" />
- <TextView
- android:id="@+id/mainUserId"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="end"
- android:singleLine="true"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@+id/mainUserIdRest"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="end"
- android:singleLine="true"
- android:text=""
- android:textAppearance="?android:attr/textAppearanceSmall" />
- </LinearLayout>
</LinearLayout>
- <LinearLayout
+ <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
+ android:id="@+id/recipient_list"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/label_selectPublicKeys"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:text="@string/label_select_public_keys"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <Button
- android:id="@+id/btn_selectEncryptKeys"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_margin="4dp"
- android:text="@string/select_keys_button_default"
- android:background="@drawable/button_edgy"
- android:drawableLeft="@drawable/ic_action_person" />
- </LinearLayout>
+ android:layout_height="wrap_content" />
</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
new file mode 100644
index 000000000..703f9133b
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:padding="4dp"
+ android:layout_height="wrap_content">
+ <TextView android:id="@android:id/title"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="18sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"/>
+ <TextView android:id="@android:id/text1"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="14sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_marginTop="-4dip"/>
+ <TextView android:id="@android:id/text2"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="14sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_marginTop="-4dip"/>
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml
index a9a7db3e5..e5edc6657 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml
@@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/content_frame"
- android:layout_marginLeft="@dimen/drawer_content_padding"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <android.support.v4.view.ViewPager
- android:id="@+id/encrypt_pager_mode"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/content_frame"
+ android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="match_parent"
- android:layout_height="150dp">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <android.support.v4.view.PagerTabStrip
- android:id="@+id/encrypt_pager_tab_strip_mode"
+ <include layout="@layout/notify_area"/>
+
+ <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager
+ android:id="@+id/encrypt_pager_mode"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:textColor="@color/emphasis" />
- </android.support.v4.view.ViewPager>
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ </org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager>
<android.support.v4.view.ViewPager
android:id="@+id/encrypt_pager_content"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
index ac990653a..67f7032c1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
@@ -21,43 +21,4 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <CheckBox
- android:id="@+id/deleteAfterEncryption"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/label_delete_after_encryption"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <CheckBox
- android:id="@+id/shareAfterEncryption"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/label_share_after_encryption"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <CheckBox
- android:id="@+id/asciiArmor"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="@string/label_ascii_armor"/>
- </LinearLayout>
</merge>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
index 4142b3de6..b853ac2fb 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -1,87 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
- xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="4dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <EditText
- android:id="@+id/filename"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="top|left"
- android:inputType="textMultiLine|textUri"
- android:lines="4"
- android:maxLines="10"
- android:minLines="2"
- android:scrollbars="vertical" />
-
- <ImageButton
- android:id="@+id/btn_browse"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="4dp"
- android:layout_gravity="center_vertical"
- android:src="@drawable/ic_action_collection"
- android:background="@drawable/button_rounded"/>
- </LinearLayout>
-
- <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
- custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
- custom:foldedIcon="fa-chevron-right"
- custom:unFoldedIcon="fa-chevron-down">
-
- <include layout="@layout/encrypt_content_adv_settings" />
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:orientation="vertical">
+ <ListView
+ android:id="@+id/selected_files_list"
+ android:dividerHeight="4dip"
+ android:divider="@android:color/transparent"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:layout_marginTop="8dp"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"/>
- </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider"/>
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <!-- Note: The following construct should be a widget, we use it quiet often -->
- <TextView
- android:id="@+id/action_encrypt_file"
+ <LinearLayout
+ android:id="@+id/action_encrypt_share"
android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:text="@string/btn_encrypt_file"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_marginBottom="8dp"
android:clickable="true"
style="@style/SelectableItem"
- android:drawableRight="@drawable/ic_action_save"
- android:drawablePadding="8dp"
- android:gravity="center_vertical"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_marginBottom="8dp" />
+ android:orientation="horizontal">
+
+ <TextView
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:text="@string/btn_encrypt_share_file"
+ android:layout_weight="1"
+ android:drawableRight="@drawable/ic_action_share"
+ android:drawablePadding="8dp"
+ android:gravity="center_vertical"/>
<View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider"
- android:layout_above="@+id/action_encrypt_file" />
+ android:layout_width="1dip"
+ android:layout_height="match_parent"
+ android:gravity="right"
+ android:layout_marginBottom="8dp"
+ android:layout_marginTop="8dp"
+ android:background="?android:attr/listDivider"/>
- </RelativeLayout>
+ <ImageButton
+ android:id="@+id/action_encrypt_file"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:padding="8dp"
+ android:src="@drawable/ic_action_save"
+ android:layout_gravity="center_vertical"
+ style="@style/SelectableItem"/>
+
+ </LinearLayout>
</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
index 89381e499..699f991a7 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
@@ -1,52 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/modeSymmetric"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:stretchColumns="1"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:orientation="vertical">
+ android:layout_centerVertical="true">
- <TableLayout
- android:id="@+id/modeSymmetric"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:stretchColumns="1"
- android:layout_centerVertical="true">
+ <TableRow>
- <TableRow>
+ <TextView
+ android:id="@+id/label_passphrase"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="8dp"
+ android:text="@string/label_passphrase"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/label_passphrase"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="8dp"
- android:text="@string/label_passphrase"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ <EditText
+ android:id="@+id/passphrase"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textPassword" />
+ </TableRow>
- <EditText
- android:id="@+id/passphrase"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="textPassword" />
- </TableRow>
+ <TableRow>
- <TableRow>
+ <TextView
+ android:id="@+id/label_passphraseAgain"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="8dp"
+ android:text="@string/label_passphrase_again"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/label_passphraseAgain"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="8dp"
- android:text="@string/label_passphrase_again"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <EditText
- android:id="@+id/passphraseAgain"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="textPassword" />
- </TableRow>
- </TableLayout>
-</RelativeLayout> \ No newline at end of file
+ <EditText
+ android:id="@+id/passphraseAgain"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textPassword" />
+ </TableRow>
+</TableLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
new file mode 100644
index 000000000..f6fde2447
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:background="@drawable/attachment_bg_holo">
+
+ <ImageView
+ android:id="@+id/thumbnail"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:scaleType="center"
+ android:layout_width="48dip"
+ android:layout_height="48dip"/>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@+id/thumbnail"
+ android:layout_centerVertical="true">
+
+ <TextView
+ android:id="@+id/filename"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="32dip"
+ android:maxLines="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:ellipsize="end"/>
+
+ <TextView
+ android:id="@+id/filesize"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="32dip"
+ android:maxLines="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="12sp"
+ android:ellipsize="end"/>
+
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/action_remove_file_from_list"
+ android:layout_width="48dip"
+ android:layout_height="48dip"
+ android:layout_alignParentRight="true"
+ android:paddingRight="16dip"
+ android:paddingLeft="16dip"
+ android:src="@drawable/ic_action_cancel"
+ android:clickable="true"
+ android:layout_centerVertical="true"
+ style="@style/SelectableItem"/>
+</RelativeLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
new file mode 100644
index 000000000..f2caab653
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:padding="4dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ style="@style/SelectableItem">
+ <TextView
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:text="@string/btn_add_files"
+ android:drawableLeft="@drawable/ic_action_collection"
+ android:drawablePadding="8dp"
+ android:gravity="center"/>
+</FrameLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
index 56f34e2eb..773250dc6 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
@@ -100,7 +100,7 @@
android:orientation="vertical" />
<TextView
- android:id="@+id/keyId"
+ android:id="@+id/subkey_item_key_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0xBBBBBBBBBBBBBBBB"
diff --git a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
new file mode 100644
index 000000000..a7862c515
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/attachment_bg_holo">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="4dip"
+ android:id="@android:id/text1"
+ android:layout_gravity="center_vertical"/>
+
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="12dip"
+ android:cropToPadding="true"
+ android:background="#ccc"
+ android:scaleType="centerCrop"/>
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
new file mode 100644
index 000000000..9d2d1e9a9
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="48dip"
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="vertical"
+ android:layout_weight="1">
+ <TextView android:id="@android:id/title"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="18sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dip"
+ android:singleLine="true"
+ android:ellipsize="end"/>
+ <TextView android:id="@android:id/text1"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="14sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dip"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_marginTop="-4dip"/>
+ <TextView android:id="@android:id/text2"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="14sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dip"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_marginTop="-4dip"/>
+ </LinearLayout>
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="56dip"
+ android:layout_height="56dip"
+ android:layout_marginLeft="12dip"
+ android:cropToPadding="true"
+ android:background="#ccc"
+ android:scaleType="centerCrop"/>
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml
index 90635e6a4..4fe80c7e1 100644
--- a/OpenKeychain/src/main/res/layout/select_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_key_item.xml
@@ -38,7 +38,7 @@
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
- android:id="@+id/keyId"
+ android:id="@+id/subkey_item_key_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0xBBBBBBBBBBBBBBB"
diff --git a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
index 63eeb8eaf..e5fd3f9f2 100644
--- a/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
@@ -15,7 +15,7 @@
android:text="@string/api_settings_select_key"
android:drawableLeft="@drawable/ic_action_accounts"
android:background="@drawable/button_edgy"
- android:textSize="14dp"/>
+ android:textSize="14sp"/>
<LinearLayout
android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
index a8786c461..0895098d4 100644
--- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
@@ -133,7 +133,6 @@
android:id="@+id/view_key_action_upload"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -144,8 +143,7 @@
android:layout_weight="1"
android:drawableRight="@drawable/ic_action_upload"
android:drawablePadding="8dp"
- android:gravity="center_vertical"
- android:editable="false" />
+ android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
index 226ed52cf..af7e32039 100644
--- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
@@ -6,36 +6,39 @@
android:orientation="horizontal"
android:singleLine="true">
- <ImageView
- android:id="@+id/ic_masterKey"
+ <FrameLayout
+ android:id="@+id/subkey_item_buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:src="@drawable/key_small"
- android:padding="8dp"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true" />
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/user_id_item_edit_image"
- android:src="@drawable/ic_action_edit"
- android:padding="8dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true" />
+ android:layout_alignParentEnd="true">
+
+ <ImageView
+ android:id="@+id/subkey_item_edit_image"
+ android:src="@drawable/ic_action_edit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp" />
+
+ <ImageButton
+ android:id="@+id/subkey_item_delete_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:src="@drawable/ic_action_cancel"
+ style="@style/SelectableItem" />
+
+ </FrameLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_toRightOf="@id/ic_masterKey"
- android:layout_toLeftOf="@id/user_id_item_edit_image"
+ android:layout_toLeftOf="@id/subkey_item_buttons"
android:layout_centerVertical="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginRight="8dp"
- android:id="@+id/linearLayout">
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp">
<LinearLayout
android:layout_width="match_parent"
@@ -46,7 +49,7 @@
android:paddingTop="2dip">
<TextView
- android:id="@+id/keyId"
+ android:id="@+id/subkey_item_key_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0x00000000"
@@ -55,7 +58,7 @@
android:layout_weight="1" />
<ImageView
- android:id="@+id/ic_certifyKey"
+ android:id="@+id/subkey_item_ic_certify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/certify_small"
@@ -63,7 +66,7 @@
android:layout_gravity="center_vertical" />
<ImageView
- android:id="@+id/ic_encryptKey"
+ android:id="@+id/subkey_item_ic_encrypt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/encrypted_small"
@@ -71,7 +74,7 @@
android:layout_gravity="center_vertical" />
<ImageView
- android:id="@+id/ic_signKey"
+ android:id="@+id/subkey_item_ic_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/signed_small"
@@ -79,7 +82,7 @@
android:layout_gravity="center_vertical" />
<ImageView
- android:id="@+id/ic_revokedKey"
+ android:id="@+id/subkey_item_ic_revoked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/revoked_key_small"
@@ -94,7 +97,7 @@
android:layout_height="match_parent">
<TextView
- android:id="@+id/keyDetails"
+ android:id="@+id/subkey_item_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingRight="5dip"
@@ -103,7 +106,7 @@
android:layout_weight="1" />
<TextView
- android:id="@+id/keyExpiry"
+ android:id="@+id/subkey_item_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Expiry: 4/7/2016"
diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
index e6dae3eeb..24e8e1a10 100644
--- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
@@ -69,7 +69,7 @@
android:layout_height="match_parent"
android:src="@drawable/ic_action_edit"
android:padding="8dp"
- android:layout_gravity="center_horizontal" />
+ android:layout_gravity="center_vertical" />
<ImageButton
android:id="@+id/user_id_item_delete_button"