diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-29 13:18:07 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-29 13:18:07 +0100 |
| commit | 9e0466d1e643c07d1c3de088ddf2e5655899a50c (patch) | |
| tree | 8b77dc7bce5f8aeadac51124a3275465ca6f3c9e /src/main/res | |
| parent | 199ae3a4d8253fb00cdef5556763a46a319a2d46 (diff) | |
refactored omemo to take multiple recipients
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_trust_keys.xml | 29 | ||||
| -rw-r--r-- | src/main/res/layout/keys_card.xml | 31 |
2 files changed, 34 insertions, 26 deletions
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 6f8a1bc9..d7bb7628 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -80,34 +80,11 @@ </LinearLayout> <LinearLayout - android:id="@+id/foreign_keys_card" + android:id="@+id/foreign_keys" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TextView - android:id="@+id/foreign_keys_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> - - <LinearLayout - android:id="@+id/foreign_keys_details" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:divider="?android:dividerHorizontal" - android:showDividers="middle" - android:orientation="vertical"> - </LinearLayout> + android:visibility="gone" + android:orientation="vertical"> </LinearLayout> diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml new file mode 100644 index 00000000..7a502816 --- /dev/null +++ b/src/main/res/layout/keys_card.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +android:id="@+id/foreign_keys_card" +android:layout_width="fill_parent" +android:layout_height="wrap_content" +android:layout_marginLeft="@dimen/activity_horizontal_margin" +android:layout_marginRight="@dimen/activity_horizontal_margin" +android:layout_marginTop="@dimen/activity_vertical_margin" +android:layout_marginBottom="@dimen/activity_vertical_margin" +android:background="@drawable/infocard_border" +android:orientation="vertical" +android:padding="@dimen/infocard_padding"> + +<TextView + android:id="@+id/foreign_keys_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold"/> + +<LinearLayout + android:id="@+id/foreign_keys_details" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:divider="?android:dividerHorizontal" + android:showDividers="middle" + android:orientation="vertical"> +</LinearLayout> + +</LinearLayout>
\ No newline at end of file |