aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_activity.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_final_fragment.xml1
-rw-r--r--OpenKeychain/src/main/res/layout/create_key_input_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_files_activity.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/decrypt_text_activity.xml8
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_activity.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_text_activity.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_activity.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml1
-rw-r--r--OpenKeychain/src/main/res/layout/indeterminate_progress.xml9
-rw-r--r--OpenKeychain/src/main/res/layout/key_list_fragment.xml68
-rw-r--r--OpenKeychain/src/main/res/layout/qr_code_activity.xml4
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml1
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml9
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml126
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml (renamed from OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml)0
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml43
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml5
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml105
20 files changed, 213 insertions, 201 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index c42fd4d4b..b9d5206a1 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -7,8 +7,14 @@
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
+ <!--
+ fitsSystemWindows and layout_marginTop from
+ https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+ -->
<FrameLayout
android:layout_below="@id/toolbar_include"
+ android:fitsSystemWindows="true"
+ android:layout_marginTop="-25dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 97eba9cd1..9b6a807cb 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -66,6 +66,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
+ android:checked="true"
android:text="@string/create_key_upload"
android:id="@+id/create_key_upload" />
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 026d98004..f678825aa 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -6,7 +6,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="false"
+ android:fillViewport="true"
android:layout_above="@+id/create_key_button_divider">
<LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 608fce111..06c1dda7b 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -7,8 +7,14 @@
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
+ <!--
+ fitsSystemWindows and layout_marginTop from
+ https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+ -->
<LinearLayout
android:layout_below="@id/toolbar_include"
+ android:fitsSystemWindows="true"
+ android:layout_marginTop="-25dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index b97fc9c8e..a692b3681 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -6,9 +6,15 @@
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
-
+
+ <!--
+ fitsSystemWindows and layout_marginTop from
+ https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+ -->
<LinearLayout
android:layout_below="@id/toolbar_include"
+ android:fitsSystemWindows="true"
+ android:layout_marginTop="-25dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index d292b1a5b..168e6d0be 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -7,9 +7,15 @@
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
+ <!--
+ fitsSystemWindows and layout_marginTop from
+ https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+ -->
<LinearLayout
android:layout_below="@id/toolbar_include"
android:id="@+id/content_frame"
+ android:fitsSystemWindows="true"
+ android:layout_marginTop="-25dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 66abd03b1..fd7fd6672 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -7,9 +7,15 @@
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
+ <!--
+ fitsSystemWindows and layout_marginTop from
+ https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+ -->
<LinearLayout
android:layout_below="@id/toolbar_include"
android:id="@+id/content_frame"
+ android:fitsSystemWindows="true"
+ android:layout_marginTop="-25dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 93d630437..dcdd9a31a 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -7,8 +7,14 @@
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
+ <!--
+ fitsSystemWindows and layout_marginTop from
+ https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+ -->
<LinearLayout
android:layout_below="@id/toolbar_include"
+ android:fitsSystemWindows="true"
+ android:layout_marginTop="-25dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index 46ec736ca..6f52e1938 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -1,5 +1,4 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/indeterminate_progress.xml b/OpenKeychain/src/main/res/layout/indeterminate_progress.xml
new file mode 100644
index 000000000..8515e83a4
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/indeterminate_progress.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:padding="0dp"
+ android:src="@drawable/ic_refresh_white_24dp"
+ style="@style/Widget.AppCompat.ActionButton" />
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 3c46b4f9c..65935f9c8 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -2,48 +2,41 @@
<RelativeLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ >
- <org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/key_list_swipe_container"
+ <!--rebuild functionality of ListFragment -->
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
- <!--rebuild functionality of ListFragment -->
- <FrameLayout
+ android:layout_height="match_parent">
+
+ <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+ android:id="@+id/key_list_list"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:drawSelectorOnTop="true"
+ android:fastScrollEnabled="true"
+ android:paddingLeft="16dp"
+ android:paddingRight="32dp"
+ android:scrollbarStyle="outsideOverlay" />
- <se.emilsjolander.stickylistheaders.StickyListHeadersListView
- android:id="@+id/key_list_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"
- android:drawSelectorOnTop="true"
- android:fastScrollEnabled="true"
- android:paddingBottom="16dp"
- android:paddingLeft="16dp"
- android:paddingRight="32dp"
- android:scrollbarStyle="outsideOverlay" />
+ <LinearLayout
+ android:id="@+id/key_list_empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:visibility="visible">
- <LinearLayout
- android:id="@+id/key_list_empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:gravity="center"
- android:orientation="vertical"
- android:visibility="visible">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="@string/key_list_empty_text1"
- android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:text="@string/key_list_empty_text1"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
- </LinearLayout>
- </FrameLayout>
- </org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout>
+ </LinearLayout>
+ </FrameLayout>
<com.getbase.floatingactionbutton.FloatingActionsMenu
android:id="@+id/fab_main"
@@ -58,9 +51,10 @@
fab:fab_addButtonPlusIconColor="@color/icons"
fab:fab_expandDirection="up"
fab:fab_labelStyle="@style/FabMenuStyle"
- android:layout_marginBottom="16dp"
+ android:layout_marginBottom="8dp"
android:layout_marginRight="16dp"
- android:layout_marginEnd="16dp">
+ android:layout_marginEnd="16dp"
+ >
<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_add_qr_code"
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 4ce097f40..5709bf0ff 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -12,11 +12,12 @@
android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="horizontal">
<android.support.v7.widget.CardView
android:id="@+id/qr_code_image_layout"
android:transitionName="qr_code"
+ android:layout_gravity="center_vertical"
android:layout_margin="32dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -30,6 +31,7 @@
android:id="@+id/qr_code_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ app:dominantMeasurement="width"
app:aspectRatioEnabled="true" />
</android.support.v7.widget.CardView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index e2d153e0d..1a45370a5 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -134,6 +134,7 @@
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
card_view:cardBackgroundColor="@android:color/white"
+ card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true"
card_view:cardCornerRadius="4dp">
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
index 2232ea9f2..d512477aa 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
@@ -8,15 +8,6 @@
android:orientation="vertical">
<TextView
- style="@style/SectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
- android:text="@string/section_certs" />
-
- <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/holo_gray_bright"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
new file mode 100644
index 000000000..a29c9fbee
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
@@ -0,0 +1,126 @@
+<?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="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/holo_gray_bright"
+ android:padding="8dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="@string/key_trust_header_text"
+ android:gravity="center_horizontal" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dip"
+ android:background="?android:attr/listDivider" />
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:descendantFocusability="beforeDescendants"
+ android:orientation="vertical"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp">
+
+ <TextView
+ style="@style/SectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginTop="8dp"
+ android:text="@string/section_should_you_trust"
+ android:layout_weight="1" />
+
+ <TextView
+ android:id="@+id/view_key_trust_readout"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginTop="14dp"
+ android:layout_marginLeft="8dp"
+ android:layout_weight="1"
+ style="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ style="@style/SectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginTop="14dp"
+ android:text="@string/section_cloud_evidence"
+ android:layout_weight="1" />
+
+ <LinearLayout
+ android:id="@+id/view_key_trust_search_cloud"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/listPreferredItemHeight"
+ android:clickable="true"
+ android:paddingRight="4dp"
+ style="@style/SelectableItem"
+ android:orientation="horizontal">
+
+ <TextView
+ android:paddingLeft="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:text="@string/key_trust_start_cloud_search"
+ android:layout_weight="1"
+ android:gravity="center_vertical" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:padding="8dp"
+ android:src="@drawable/ic_action_search_cloud"
+ android:layout_gravity="center_vertical" />
+
+ </LinearLayout>
+
+
+ <TextView
+ android:id="@+id/view_key_trust_cloud_narrative"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginTop="14dp"
+ android:layout_marginBottom="14dp"
+ android:layout_marginLeft="8dp"
+ android:layout_weight="1"
+ style="?android:attr/textAppearanceMedium" />
+
+ <TableLayout
+ android:id="@+id/view_key_proof_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/view_key_proof_verify_header"
+ style="@style/SectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginTop="16dp"
+ android:text="@string/section_proof_details"
+ android:layout_weight="1" />
+
+ <TextView
+ android:id="@+id/view_key_proof_verify_detail"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginTop="14dp"
+ android:layout_marginLeft="8dp"
+ android:layout_weight="1"
+ style="?android:attr/textAppearanceMedium" />
+
+
+ </LinearLayout>
+
+ </ScrollView>
+</LinearLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml
index 0ffd151c1..0ffd151c1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
index d4272b816..3347a514c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
@@ -28,49 +28,6 @@
android:layout_marginBottom="4dp"
android:layout_weight="1" />
- <TextView
- style="@style/SectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="14dp"
- android:text="@string/section_actions"
- android:layout_weight="1" />
-
- <LinearLayout
- android:id="@+id/view_key_action_certify"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:clickable="true"
- android:paddingRight="4dp"
- style="@style/SelectableItem"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/view_key_action_certify_text"
- android:paddingLeft="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:text="@string/key_view_action_certify"
- android:layout_weight="1"
- android:gravity="center_vertical" />
-
- <ImageView
- android:id="@+id/view_key_action_certify_image"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:padding="8dp"
- android:src="@drawable/status_signature_verified_cutout_24px"
- android:layout_gravity="center_vertical" />
-
- </LinearLayout>
-
- <View
- android:id="@+id/view_key_action_certify_divider"
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:background="?android:attr/listDivider" />
-
</LinearLayout>
</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 7b382dca5..a6224a8d1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -68,11 +68,11 @@
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
-
<android.support.v7.widget.CardView
android:id="@+id/view_key_qr_code_layout"
android:transitionName="qr_code"
android:visibility="visible"
+ android:layout_marginTop="16dp"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center_horizontal"
@@ -81,6 +81,7 @@
android:foreground="?android:attr/selectableItemBackground"
card_view:cardBackgroundColor="@android:color/white"
card_view:cardUseCompatPadding="true"
+ card_view:cardElevation="2dp"
card_view:cardCornerRadius="4dp">
<ImageView
@@ -93,7 +94,7 @@
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
- android:layout_marginTop="14dp"
+ android:layout_marginTop="16dp"
android:text="@string/section_share_key"
android:layout_weight="1" />
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 8e1bad3a8..bba412f99 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardBackgroundColor="@android:color/white"
- card_view:cardElevation="2sp"
+ card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true"
card_view:cardCornerRadius="4dp">
diff --git a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml
deleted file mode 100644
index f97401271..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:focusable="true"
- android:focusableInTouchMode="true"
- android:descendantFocusability="beforeDescendants"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
-
- <TextView
- style="@style/SectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="8dp"
- android:text="@string/section_should_you_trust"
- android:layout_weight="1" />
-
- <TextView
- android:id="@+id/view_key_trust_readout"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="14dp"
- android:layout_marginLeft="8dp"
- android:layout_weight="1"
- style="?android:attr/textAppearanceMedium"/>
-
- <TextView
- style="@style/SectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="14dp"
- android:text="@string/section_cloud_evidence"
- android:layout_weight="1" />
-
- <LinearLayout
- android:id="@+id/view_key_trust_search_cloud"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:clickable="true"
- android:paddingRight="4dp"
- style="@style/SelectableItem"
- android:orientation="horizontal">
-
- <TextView
- android:paddingLeft="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:text="@string/key_trust_start_cloud_search"
- android:layout_weight="1"
- android:gravity="center_vertical" />
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:padding="8dp"
- android:src="@drawable/ic_action_search_cloud"
- android:layout_gravity="center_vertical" />
-
- </LinearLayout>
-
-
- <TextView
- android:id="@+id/view_key_trust_cloud_narrative"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="14dp"
- android:layout_marginBottom="14dp"
- android:layout_marginLeft="8dp"
- android:layout_weight="1"
- style="?android:attr/textAppearanceMedium" />
-
- <TableLayout
- android:id="@+id/view_key_proof_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-
- <TextView
- android:id="@+id/view_key_proof_verify_header"
- style="@style/SectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="16dp"
- android:text="@string/section_proof_details"
- android:layout_weight="1" />
-
- <TextView
- android:id="@+id/view_key_proof_verify_detail"
- android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_marginTop="14dp"
- android:layout_marginLeft="8dp"
- android:layout_weight="1"
- style="?android:attr/textAppearanceMedium"/>
-
-
- </LinearLayout>
-
-</ScrollView>