diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_activity.xml | 20 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml | 25 |
2 files changed, 36 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 2cba78f37..332b95ce5 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -50,18 +50,19 @@ android:layout_weight="1" android:background="@android:color/white" /> - <LinearLayout + <RelativeLayout android:id="@+id/import_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" android:background="@android:color/white"> <View + android:id="@+id/import_divider" android:layout_width="match_parent" android:layout_height="1dip" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:background="?android:attr/listDivider" /> <TextView @@ -70,7 +71,10 @@ android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_below="@id/import_divider" android:text="@string/import_import" android:minHeight="?android:attr/listPreferredItemHeight" android:drawableRight="@drawable/ic_file_download_grey_24dp" @@ -79,6 +83,12 @@ android:clickable="true" android:background="?android:selectableItemBackground" /> - </LinearLayout> + <RelativeLayout + android:id="@+id/import_snackbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/import_import" /> + + </RelativeLayout> </LinearLayout> </RelativeLayout>
\ No newline at end of file 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 6a21e0dc1..c08d66cc1 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 @@ -99,14 +99,12 @@ android:layout_weight="1" /> <LinearLayout - android:id="@+id/view_key_action_key_share" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:clickable="true" - android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView + android:id="@+id/view_key_action_key_share" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" @@ -116,7 +114,25 @@ android:layout_weight="1" android:drawableRight="@drawable/ic_share_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" /> + android:gravity="center_vertical" + android:background="?android:selectableItemBackground"/> + + <View + 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" /> + + <ImageButton + android:id="@+id/view_key_action_key_nfc" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_nfc_grey_24dp" + android:layout_gravity="center_vertical" + android:background="?android:selectableItemBackground" /> <View android:layout_width="1dip" @@ -154,6 +170,7 @@ </LinearLayout> + <View android:layout_width="match_parent" android:layout_height="1dip" |