diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-04-08 21:05:15 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-04-08 21:05:15 +0200 |
| commit | bdd23a5ff2d1d1e82a83f72c7889db33376ae50f (patch) | |
| tree | 8cbbd93f54c5dab5b62aed996f1956aff855ed6d /src/main/res/layout/activity_trust_keys.xml | |
| parent | 9b39e693d0ea9e1917d37c8c570529ab9a6c52b7 (diff) | |
offer a more convienient way to disable omemo from trust keys dialog
Diffstat (limited to 'src/main/res/layout/activity_trust_keys.xml')
| -rw-r--r-- | src/main/res/layout/activity_trust_keys.xml | 62 |
1 files changed, 50 insertions, 12 deletions
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index f52d0fe99..431348f19 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -30,22 +30,60 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="@dimen/card_padding_regular"> + android:orientation="vertical"> - <TextView - android:id="@+id/key_error_message_title" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/error_trustkeys_title" - android:textAppearance="@style/TextAppearance.AppCompat.Title" /> + android:orientation="vertical" + android:padding="@dimen/card_padding_regular"> + + <TextView + android:id="@+id/key_error_message_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8sp" + android:text="@string/error_trustkeys_title" + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> + + <TextView + android:id="@+id/key_error_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> + + <TextView + android:id="@+id/key_error_general" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <TextView + android:id="@+id/key_error_hint_mutual" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8sp" + android:text="@string/error_trustkey_hint_mutual" + android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" /> + </LinearLayout> - <TextView - android:id="@+id/key_error_message" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:textAppearance="@style/TextAppearance.AppCompat.Title" /> + android:layout_gravity="right" + android:gravity="right"> + + <Button + android:id="@+id/disable_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minWidth="0dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:text="@string/disable_encryption" + android:textColor="@color/accent" /> + </LinearLayout> </LinearLayout> </android.support.v7.widget.CardView> |