aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-03-01 11:26:59 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-03-01 11:26:59 +0100
commit198dc2c6b444671ec71deb10fbbaaced6e03dced (patch)
tree407efdea59b9d4eaf8852141272fc153f50f0846 /src/main/res/layout
parent134c75ae01eee45882d17a4d2fc721f4ccf3ca80 (diff)
let users confirm each member in a conference even if that contact is already trusted
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/keys_card.xml60
1 files changed, 34 insertions, 26 deletions
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 7a502816..d3271d1b 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -1,31 +1,39 @@
<?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">
+<LinearLayout android:id="@+id/foreign_keys_card"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@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"/>
+ <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
+ android:id="@+id/foreign_keys_details"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle">
+ </LinearLayout>
+ <TextView
+ android:layout_marginTop="8dp"
+ android:id="@+id/no_keys_to_accept"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/black87"
+ android:text="@string/no_keys_just_confirm"
+ android:textSize="?attr/TextSizeBody"/>
</LinearLayout> \ No newline at end of file