aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-16 02:56:14 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-16 02:56:14 +0200
commit24f2a9468c2495d312aa5a8d05273ea644ab6da8 (patch)
treea2268fb1573b621518298805421438bcaac64d83 /OpenKeychain/src/main/res/layout
parent81ce075df9e656c662c00c603388e950013c384a (diff)
downloadopen-keychain-24f2a9468c2495d312aa5a8d05273ea644ab6da8.tar.gz
open-keychain-24f2a9468c2495d312aa5a8d05273ea644ab6da8.tar.bz2
open-keychain-24f2a9468c2495d312aa5a8d05273ea644ab6da8.zip
multidecrypt: display all outputUris as individual items
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_list_entry.xml65
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml63
2 files changed, 66 insertions, 62 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
index 7b9515170..e6ee67580 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
@@ -184,69 +184,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/file_list">
+ android:id="@+id/file_list"
+ android:orientation="vertical">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/file"
- android:clickable="true"
- android:background="?android:selectableItemBackground"
- >
-
- <ImageView
- android:id="@+id/thumbnail"
- android:layout_gravity="center_vertical"
- android:layout_width="36dp"
- android:layout_height="36dp"
- android:scaleType="center"
- android:padding="6dp"
- android:src="@drawable/ic_doc_generic_am" />
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:layout_weight="1">
-
- <TextView
- android:id="@+id/filename"
- android:maxLines="1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="?android:attr/textColorSecondary"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:ellipsize="end"
- android:text=""
- tools:text="filename.jpg" />
-
- <TextView
- android:id="@+id/filesize"
- 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"
- android:text=""
- tools:text="14kb" />
-
- </LinearLayout>
-
- <ImageView
- android:id="@+id/context_menu"
- android:scaleType="center"
- android:layout_width="36dip"
- android:layout_height="48dip"
- android:clickable="true"
- android:background="?android:selectableItemBackground"
- android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" />
-
- </LinearLayout>
+ <include layout="@layout/decrypt_list_file_item" />
</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
new file mode 100644
index 000000000..b37ac1013
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/file"
+ android:clickable="true"
+ android:background="?android:selectableItemBackground"
+ >
+
+ <ImageView
+ android:id="@+id/thumbnail"
+ android:layout_gravity="center_vertical"
+ android:layout_width="36dp"
+ android:layout_height="36dp"
+ android:scaleType="center"
+ android:padding="6dp"
+ android:src="@drawable/ic_doc_generic_am" />
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/filename"
+ android:maxLines="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:ellipsize="end"
+ android:text=""
+ tools:text="filename.jpg" />
+
+ <TextView
+ android:id="@+id/filesize"
+ 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"
+ android:text=""
+ tools:text="14kb" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/context_menu"
+ android:scaleType="center"
+ android:layout_width="36dip"
+ android:layout_height="48dip"
+ android:clickable="true"
+ android:background="?android:selectableItemBackground"
+ android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" />
+
+</LinearLayout> \ No newline at end of file