diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 8 insertions, 80 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml index 52e7fceb5..312dee6ba 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_item.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml @@ -13,7 +13,8 @@ android:layout_marginLeft="14dp" android:layout_marginStart="14dp" android:src="@drawable/dns" - android:layout_gravity="center_vertical" /> + android:layout_gravity="center_vertical" + android:scaleType="fitCenter" /> <LinearLayout android:orientation="vertical" @@ -46,8 +47,8 @@ android:id="@+id/user_id_item_certified_layout" android:layout_width="22dp" android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:layout_marginEnd="8dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:layout_gravity="center_vertical" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/linked_id_item_unknown.xml b/OpenKeychain/src/main/res/layout/linked_id_item_unknown.xml deleted file mode 100644 index d80b814ca..000000000 --- a/OpenKeychain/src/main/res/layout/linked_id_item_unknown.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?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="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - android:singleLine="true"> - - <LinearLayout - android:orientation="vertical" - android:layout_gravity="center_vertical" - android:layout_width="0dip" - android:layout_marginLeft="8dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - android:layout_height="wrap_content" - android:layout_weight="1"> - - <TextView - android:id="@+id/linked_id_uri" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="uri" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/user_id_item_comment" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/tertiary_text_light" - android:text="unknown linked identity type" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/user_id_item_certified_layout" - android:layout_width="22dp" - android:layout_height="wrap_content" - android:layout_marginRight="12dp" - android:layout_marginEnd="12dp" - android:layout_gravity="center_vertical" - android:orientation="vertical"> - - <ImageView - android:id="@+id/user_id_item_certified" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/status_signature_unverified_cutout_24dp" - android:layout_gravity="center_horizontal" /> - - </LinearLayout> - -</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index c260a35d3..abd71416f 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -29,28 +29,7 @@ android:layout_height="wrap_content" android:text="Linked Identity" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <ImageView - android:minHeight="?android:attr/listPreferredItemHeight" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/linked_id_type_icon" - android:layout_marginLeft="14dp" - android:layout_marginStart="14dp" - android:src="@drawable/dns" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="14dp" - android:layout_marginStart="14dp" - android:text="This is a DNS linked identity~\nLorem ipsum\nmore text\neven more text\nyoooyoyo" - android:layout_gravity="center_vertical" /> - - </LinearLayout> + <include layout="@layout/linked_id_item" /> <LinearLayout android:layout_width="match_parent" @@ -65,11 +44,12 @@ style="?android:attr/borderlessButtonStyle" /> <Space - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" /> <Button + android:id="@+id/button_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="View" @@ -78,6 +58,7 @@ /> <Button + android:id="@+id/verify_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Verify" |