aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-03-20 21:33:54 +0100
committerChristian Schneppe <christian@pix-art.de>2018-03-20 21:33:54 +0100
commit76e10f17a62f867116c146d7be9da3ea8dfc311d (patch)
tree63ca6a8902078517e5dd8447a78decb65f3fa6f0 /src/main/res
parent7df82563ab8650e3694a2b64acc9864e443078f3 (diff)
parent17d279b9c3f7dfa716592cca9f5fb2c9f3dd3cf6 (diff)
Merge branch 'app_compat'
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable-hdpi/ic_action_download.pngbin244 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_action_secure.pngbin263 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/switch_thumb_disable.pngbin1870 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/switch_thumb_off_normal.pngbin1866 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/switch_thumb_off_pressed.pngbin2389 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/switch_thumb_on_normal.pngbin1988 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/switch_thumb_on_pressed.pngbin2566 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/tab_selected_conversations.9.pngbin87 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.pngbin88 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.pngbin92 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.pngbin84 -> 0 bytes
-rw-r--r--src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.pngbin88 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_action_download.pngbin197 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_action_secure.pngbin210 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/switch_thumb_disable.pngbin1092 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/switch_thumb_off_normal.pngbin1103 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/switch_thumb_off_pressed.pngbin1502 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/switch_thumb_on_normal.pngbin1171 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/switch_thumb_on_pressed.pngbin1609 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/tab_selected_conversations.9.pngbin85 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.pngbin87 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.pngbin91 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.pngbin84 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.pngbin88 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_action_download.pngbin307 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_action_secure.pngbin323 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/switch_thumb_disable.pngbin2676 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/switch_thumb_off_normal.pngbin2671 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/switch_thumb_off_pressed.pngbin3418 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/switch_thumb_on_normal.pngbin2836 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/switch_thumb_on_pressed.pngbin3704 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/tab_selected_conversations.9.pngbin88 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.pngbin89 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.pngbin94 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.pngbin85 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.pngbin89 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_action_download.pngbin387 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_action_secure.pngbin445 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/switch_thumb_disable.pngbin4641 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/switch_thumb_off_normal.pngbin4667 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.pngbin5882 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/switch_thumb_on_normal.pngbin5031 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.pngbin6398 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/tab_selected_conversations.9.pngbin92 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.pngbin93 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.pngbin97 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.pngbin86 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.pngbin90 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/switch_thumb_disable.pngbin6619 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.pngbin6723 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.pngbin8331 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.pngbin7466 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.pngbin9373 -> 0 bytes
-rw-r--r--src/main/res/drawable/actionbar_tab_indicator.xml21
-rw-r--r--src/main/res/drawable/ic_visibility.xml9
-rw-r--r--src/main/res/drawable/ic_visibility_off.xml9
-rw-r--r--src/main/res/drawable/switch_back_off.xml19
-rw-r--r--src/main/res/drawable/switch_back_on.xml16
-rw-r--r--src/main/res/drawable/switch_thumb.xml12
-rw-r--r--src/main/res/drawable/visibility_toggle_drawable.xml5
-rw-r--r--src/main/res/layout/account_row.xml1
-rw-r--r--src/main/res/layout/activity_change_password.xml104
-rw-r--r--src/main/res/layout/activity_contact_details.xml456
-rw-r--r--src/main/res/layout/activity_edit_account.xml1226
-rw-r--r--src/main/res/layout/activity_fullscreen_message.xml5
-rw-r--r--src/main/res/layout/activity_muc_details.xml386
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml2
-rw-r--r--src/main/res/layout/activity_set_presence.xml131
-rw-r--r--src/main/res/layout/activity_start_conversation.xml25
-rw-r--r--src/main/res/layout/activity_trust_keys.xml234
-rw-r--r--src/main/res/layout/contact.xml107
-rw-r--r--src/main/res/layout/contact_key.xml106
-rw-r--r--src/main/res/layout/conversation_list_row.xml2
-rw-r--r--src/main/res/layout/keys_card.xml73
-rw-r--r--src/main/res/layout/message_content.xml2
-rw-r--r--src/main/res/layout/message_received.xml1
-rw-r--r--src/main/res/layout/message_sent.xml1
-rw-r--r--src/main/res/layout/message_status.xml1
-rw-r--r--src/main/res/layout/presence_template.xml2
-rw-r--r--src/main/res/layout/show_location_infowindow.xml26
-rw-r--r--src/main/res/layout/tool_bar.xml8
-rw-r--r--src/main/res/menu/attachment_choices.xml34
-rw-r--r--src/main/res/menu/change_presence.xml7
-rw-r--r--src/main/res/menu/choose_contact.xml11
-rw-r--r--src/main/res/menu/contact_details.xml11
-rw-r--r--src/main/res/menu/conversations.xml77
-rw-r--r--src/main/res/menu/editaccount.xml23
-rw-r--r--src/main/res/menu/encryption_choices.xml19
-rw-r--r--src/main/res/menu/manageaccounts.xml9
-rw-r--r--src/main/res/menu/manageaccounts_context.xml5
-rw-r--r--src/main/res/menu/muc_details.xml13
-rw-r--r--src/main/res/menu/publish_avatar.xml5
-rw-r--r--src/main/res/menu/select_multiple.xml5
-rw-r--r--src/main/res/menu/share_with.xml5
-rw-r--r--src/main/res/menu/showlocation.xml5
-rw-r--r--src/main/res/menu/start_conversation.xml47
-rw-r--r--src/main/res/menu/trust_keys.xml5
-rw-r--r--src/main/res/menu/verify_otr.xml7
-rw-r--r--src/main/res/values-v21/dimens.xml3
-rw-r--r--src/main/res/values-v21/themes.xml57
-rw-r--r--src/main/res/values/attrs.xml7
-rw-r--r--src/main/res/values/dimens.xml10
-rw-r--r--src/main/res/values/strings.xml13
-rw-r--r--src/main/res/values/styles.xml15
-rw-r--r--src/main/res/values/themes.xml51
-rw-r--r--src/main/res/xml/preferences.xml16
106 files changed, 1668 insertions, 1782 deletions
diff --git a/src/main/res/drawable-hdpi/ic_action_download.png b/src/main/res/drawable-hdpi/ic_action_download.png
deleted file mode 100644
index 596fd582c..000000000
--- a/src/main/res/drawable-hdpi/ic_action_download.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png
deleted file mode 100644
index e066ba4dc..000000000
--- a/src/main/res/drawable-hdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_disable.png b/src/main/res/drawable-hdpi/switch_thumb_disable.png
deleted file mode 100644
index edf2a0cb6..000000000
--- a/src/main/res/drawable-hdpi/switch_thumb_disable.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png b/src/main/res/drawable-hdpi/switch_thumb_off_normal.png
deleted file mode 100644
index e68516df5..000000000
--- a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png
deleted file mode 100644
index 66a71eed8..000000000
--- a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png b/src/main/res/drawable-hdpi/switch_thumb_on_normal.png
deleted file mode 100644
index 07b504b8a..000000000
--- a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png
deleted file mode 100644
index 2afb5d515..000000000
--- a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 68b1dd750..000000000
--- a/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 557452d31..000000000
--- a/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index e91a93fa1..000000000
--- a/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 3dbdb6156..000000000
--- a/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index c4a248118..000000000
--- a/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_action_download.png b/src/main/res/drawable-mdpi/ic_action_download.png
deleted file mode 100644
index e2a58608f..000000000
--- a/src/main/res/drawable-mdpi/ic_action_download.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png
deleted file mode 100644
index fcb585f6f..000000000
--- a/src/main/res/drawable-mdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_disable.png b/src/main/res/drawable-mdpi/switch_thumb_disable.png
deleted file mode 100644
index 5aca01b01..000000000
--- a/src/main/res/drawable-mdpi/switch_thumb_disable.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png b/src/main/res/drawable-mdpi/switch_thumb_off_normal.png
deleted file mode 100644
index b077942d0..000000000
--- a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png
deleted file mode 100644
index 31a66b563..000000000
--- a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png b/src/main/res/drawable-mdpi/switch_thumb_on_normal.png
deleted file mode 100644
index a20e6c03c..000000000
--- a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png
deleted file mode 100644
index f8ee1b838..000000000
--- a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
deleted file mode 100644
index e18c2e9c6..000000000
--- a/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 5ce9469df..000000000
--- a/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 4bb9e6a64..000000000
--- a/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 255fb97f0..000000000
--- a/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 8803ec053..000000000
--- a/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_download.png b/src/main/res/drawable-xhdpi/ic_action_download.png
deleted file mode 100644
index a43f70428..000000000
--- a/src/main/res/drawable-xhdpi/ic_action_download.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png
deleted file mode 100644
index 05b6acc74..000000000
--- a/src/main/res/drawable-xhdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_disable.png b/src/main/res/drawable-xhdpi/switch_thumb_disable.png
deleted file mode 100644
index e416b4feb..000000000
--- a/src/main/res/drawable-xhdpi/switch_thumb_disable.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png
deleted file mode 100644
index 230a84bc0..000000000
--- a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png
deleted file mode 100644
index e80086d99..000000000
--- a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png
deleted file mode 100644
index a771329d7..000000000
--- a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png
deleted file mode 100644
index cd88d6586..000000000
--- a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 7de791d70..000000000
--- a/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index b9ab85694..000000000
--- a/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index 2fe1ffada..000000000
--- a/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 3d59b0d0d..000000000
--- a/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index 2da35fe80..000000000
--- a/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_download.png b/src/main/res/drawable-xxhdpi/ic_action_download.png
deleted file mode 100644
index d01732ee9..000000000
--- a/src/main/res/drawable-xxhdpi/ic_action_download.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
deleted file mode 100644
index 76e1190d6..000000000
--- a/src/main/res/drawable-xxhdpi/ic_action_secure.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxhdpi/switch_thumb_disable.png
deleted file mode 100644
index 3ff8a48dd..000000000
--- a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png
deleted file mode 100644
index de02d19e5..000000000
--- a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png
deleted file mode 100644
index 7dee139ef..000000000
--- a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png
deleted file mode 100644
index de13a5993..000000000
--- a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png
deleted file mode 100644
index 6c260776e..000000000
--- a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
deleted file mode 100644
index 9f13a9c20..000000000
--- a/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
deleted file mode 100644
index 0b20a8af2..000000000
--- a/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
deleted file mode 100644
index f6dab1b05..000000000
--- a/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
deleted file mode 100644
index 31f944a83..000000000
--- a/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
deleted file mode 100644
index a54ea8506..000000000
--- a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png
deleted file mode 100644
index 865f11dbe..000000000
--- a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png
deleted file mode 100644
index 268a63435..000000000
--- a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png
deleted file mode 100644
index dc15d1838..000000000
--- a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png
deleted file mode 100644
index e66b72411..000000000
--- a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png
deleted file mode 100644
index eddb55bb8..000000000
--- a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml
deleted file mode 100644
index ffd36f6fe..000000000
--- a/src/main/res/drawable/actionbar_tab_indicator.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <!-- Non focused states -->
- <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
- <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
-
- <!-- Focused states -->
- <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
- <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
-
- <!-- Pressed -->
- <!-- Non focused states -->
- <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
- <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
-
- <!-- Focused states -->
- <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
- <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
-
-</selector> \ No newline at end of file
diff --git a/src/main/res/drawable/ic_visibility.xml b/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 000000000..57ba4f002
--- /dev/null
+++ b/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector> \ No newline at end of file
diff --git a/src/main/res/drawable/ic_visibility_off.xml b/src/main/res/drawable/ic_visibility_off.xml
new file mode 100644
index 000000000..fd954d349
--- /dev/null
+++ b/src/main/res/drawable/ic_visibility_off.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector> \ No newline at end of file
diff --git a/src/main/res/drawable/switch_back_off.xml b/src/main/res/drawable/switch_back_off.xml
deleted file mode 100644
index 9082347b2..000000000
--- a/src/main/res/drawable/switch_back_off.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_enabled="false">
- <shape android:shape="rectangle">
- <solid android:color="#D5D5D5" />
-
- <corners android:radius="99dp" />
- </shape>
- </item>
- <item android:state_enabled="true">
- <shape android:shape="rectangle">
- <solid android:color="#939393" />
-
- <corners android:radius="99dp" />
- </shape>
- </item>
-
-</selector> \ No newline at end of file
diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml
deleted file mode 100644
index ae78edecc..000000000
--- a/src/main/res/drawable/switch_back_on.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false">
- <shape android:shape="rectangle">
- <solid android:color="#D5D5D5" />
- <corners android:radius="99dp" />
- </shape>
- </item>
- <item android:state_enabled="true">
- <shape android:shape="rectangle">
- <!-- 30% accent on white -->
- <solid android:color="#b3ddf7" />
- <corners android:radius="99dp" />
- </shape>
- </item>
-</selector> \ No newline at end of file
diff --git a/src/main/res/drawable/switch_thumb.xml b/src/main/res/drawable/switch_thumb.xml
deleted file mode 100644
index da33e46c3..000000000
--- a/src/main/res/drawable/switch_thumb.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:drawable="@drawable/switch_thumb_disable" android:state_enabled="false" />
- <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_pressed="true" />
- <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_focused="true" />
- <item android:drawable="@drawable/switch_thumb_on_normal" android:state_checked="true" />
- <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_pressed="true" />
- <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_focused="true" />
- <item android:drawable="@drawable/switch_thumb_off_normal" android:state_checked="false" />
-
-</selector> \ No newline at end of file
diff --git a/src/main/res/drawable/visibility_toggle_drawable.xml b/src/main/res/drawable/visibility_toggle_drawable.xml
new file mode 100644
index 000000000..9c887e7e9
--- /dev/null
+++ b/src/main/res/drawable/visibility_toggle_drawable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_visibility" android:state_checked="true" />
+ <item android:drawable="@drawable/ic_visibility_off" android:state_checked="false" />
+</selector> \ No newline at end of file
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index d36eecccb..c50485f56 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -13,7 +13,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
- android:src="@drawable/ic_profile"
android:contentDescription="@string/account_image_description"
android:background="@drawable/message_border"
android:padding="1dp"
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 8808227e3..1dfdc8309 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -1,79 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200">
+ android:background="?attr/color_background_secondary">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@+id/button_bar">
- <LinearLayout
+ <android.support.v7.widget.CardView
android:layout_width="match_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:layout_marginBottom="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
- android:padding="@dimen/infocard_padding"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/current_password_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/current_password"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:layout_marginTop="@dimen/activity_vertical_margin">
- <EditText
- android:id="@+id/current_password"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:hint="@string/password"
- android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/new_password"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
- <EditText
- android:id="@+id/new_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:hint="@string/password"
- android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/current_password_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+ app:passwordToggleEnabled="true"
+ app:passwordToggleTint="?attr/color_text_secondary">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/account_settings_confirm_password"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <android.support.design.widget.TextInputEditText
+ android:id="@+id/current_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:hint="@string/current_password"
+ android:inputType="textPassword"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
+ android:textSize="?attr/TextSizeBody" />
+ </android.support.design.widget.TextInputLayout>
- <EditText
- android:id="@+id/new_password_confirm"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/password"
- android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
- </LinearLayout>
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/new_password_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+ app:passwordToggleEnabled="true"
+ app:passwordToggleTint="?attr/color_text_secondary">
+
+ <android.support.design.widget.TextInputEditText
+ android:id="@+id/new_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:hint="@string/new_password"
+ android:inputType="textPassword"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
+ android:textSize="?attr/TextSizeBody" />
+ </android.support.design.widget.TextInputLayout>
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
</ScrollView>
<LinearLayout
@@ -97,7 +89,7 @@
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/black12" />
+ android:background="?attr/divider" />
<Button
android:id="@+id/right_button"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 031110bea..75ef17978 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -1,250 +1,246 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/grey200">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
- <LinearLayout
- android:id="@+id/details_main_layout"
+ <ScrollView
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_height="fill_parent"
+ android:background="@color/grey200">
- <RelativeLayout
+ <LinearLayout
+ android:id="@+id/details_main_layout"
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:padding="@dimen/infocard_padding">
-
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/contact_display_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="@string/contact"
- android:textColor="@color/black87"
- android:textIsSelectable="false"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:paddingBottom="5dp"
- android:textAlignment="center"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true" />
-
- <QuickContactBadge
- android:id="@+id/details_contact_badge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:adjustViewBounds="true"
- android:background="@drawable/message_border"
- android:maxHeight="384dp"
- android:maxWidth="384dp"
- android:padding="1dp"
- android:layout_below="@+id/contact_display_name"
- android:layout_centerHorizontal="true" />
-
- <LinearLayout
- android:id="@+id/details_jidbox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/details_contact_badge"
- android:layout_marginTop="16dp"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/details_contactjid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="@string/account_settings_example_jabber_id"
- android:textColor="@color/black87"
- android:textIsSelectable="true"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:visibility="gone" />
-
- <com.wefika.flowlayout.FlowLayout
- android:id="@+id/tags"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
- android:layout_marginLeft="-2dp"
- android:layout_marginTop="4dp"
- android:orientation="horizontal">
- </com.wefika.flowlayout.FlowLayout>
-
- <TextView
- android:id="@+id/details_lastseen"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeBody"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp" />
-
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/status_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="4dp"
- android:gravity="center_horizontal"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeBody"
- android:textStyle="italic"
- android:layout_marginBottom="4dp" />
-
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/resource"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="4dp"
- android:gravity="center_horizontal"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeBody"
- android:textStyle="italic"
- android:layout_marginBottom="4dp" />
-
- <Button
- android:id="@+id/add_contact_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center_horizontal"
- android:text="@string/add_contact"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp" />
-
- <CheckBox
- android:id="@+id/details_send_presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/add_contact_button"
- android:text="@string/send_presence_updates"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:layout_marginTop="4dp" />
-
- <CheckBox
- android:id="@+id/details_receive_presence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/details_send_presence"
- android:text="@string/receive_presence_updates"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:orientation="vertical">
- </LinearLayout>
-
- <TextView
- android:id="@+id/details_account"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/details_jidbox"
- android:layout_marginTop="32dp"
- android:text="@string/using_account"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:visibility="gone" />
- </RelativeLayout>
-
- <RelativeLayout
- 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:padding="@dimen/infocard_padding">
-
- <RelativeLayout
- android:layout_width="fill_parent"
+ <android.support.v7.widget.CardView
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:touchscreenBlocksFocus="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true" >
+ 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">
- <TextView
- android:id="@+id/notification_status_text"
- android:layout_width="wrap_content"
+ <RelativeLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/notify_on_all_messages"
- android:layout_centerVertical="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/notification_status_button" />
+ android:padding="@dimen/card_padding_regular">
+
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/contact_display_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:paddingBottom="5dp"
+ android:text="@string/contact"
+ android:textAlignment="center"
+ android:textColor="@color/black87"
+ android:textIsSelectable="false"
+ android:textSize="?attr/TextSizeHeadline"
+ android:textStyle="bold" />
+
+ <QuickContactBadge
+ android:id="@+id/details_contact_badge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/contact_display_name"
+ android:layout_centerHorizontal="true"
+ android:adjustViewBounds="true"
+ android:background="@drawable/message_border"
+ android:maxHeight="384dp"
+ android:maxWidth="384dp"
+ android:padding="1dp"
+ android:scaleType="centerCrop" />
+
+ <LinearLayout
+ android:id="@+id/details_jidbox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/details_contact_badge"
+ android:layout_marginTop="16dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/details_contactjid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/account_settings_example_jabber_id"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title"
+ android:textIsSelectable="true"
+ android:visibility="gone" />
+
+ <com.wefika.flowlayout.FlowLayout
+ android:id="@+id/tags"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginLeft="-2dp"
+ android:layout_marginTop="4dp"
+ android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout>
+
+ <TextView
+ android:id="@+id/details_lastseen"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/status_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:gravity="center_horizontal"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/resource"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:gravity="center_horizontal"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody"
+ android:textStyle="italic" />
+
+ <Button
+ android:id="@+id/add_contact_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:text="@string/add_contact" />
+
+ <CheckBox
+ android:id="@+id/details_send_presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/add_contact_button"
+ android:layout_marginTop="4dp"
+ android:text="@string/send_presence_updates"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+ <CheckBox
+ android:id="@+id/details_receive_presence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/details_send_presence"
+ android:text="@string/receive_presence_updates"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/details_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/details_jidbox"
+ android:layout_marginTop="32dp"
+ android:text="@string/using_account"
+ android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+ android:visibility="gone" />
+ </RelativeLayout>
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
+ android:layout_width="match_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">
- <ImageButton
- android:id="@+id/notification_status_button"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
+ <RelativeLayout
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:src="@drawable/ic_notifications_grey600_24dp" />
- </RelativeLayout>
-
- </RelativeLayout>
-
- <LinearLayout
- android:id="@+id/keys_wrapper"
- 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">
-
- <LinearLayout
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:padding="@dimen/card_padding_regular"
+ android:touchscreenBlocksFocus="true">
+
+ <TextView
+ android:id="@+id/notification_status_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/notification_status_button"
+ android:text="@string/notify_on_all_messages"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
+
+ <ImageButton
+ android:id="@+id/notification_status_button"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="center_horizontal"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:padding="@dimen/image_button_padding"
+ android:src="@drawable/ic_notifications_grey600_24dp" />
+ </RelativeLayout>
+
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
+ android:id="@+id/keys_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ 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">
<LinearLayout
- android:id="@+id/details_contact_keys"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:divider="?android:dividerHorizontal"
android:orientation="vertical"
- android:showDividers="middle">
+ android:padding="@dimen/card_padding_list">
+
+ <LinearLayout
+ android:id="@+id/details_contact_keys"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle"></LinearLayout>
+
+ <Button
+ android:id="@+id/show_inactive_devices"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="8dp"
+ android:text="@string/show_inactive_devices"
+ android:textColor="@color/accent" />
</LinearLayout>
-
- <Button
- android:id="@+id/show_inactive_devices"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="8dp"
- android:text="@string/show_inactive_devices"
- android:textColor="@color/accent" />
- </LinearLayout>
+ </android.support.v7.widget.CardView>
</LinearLayout>
- </LinearLayout>
-
-</ScrollView>
+ </ScrollView>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 7b60b7a64..b685e9cad 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -1,732 +1,732 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/grey200">
+ xmlns:tools="http://schemas.android.com/tools">
- <ScrollView
- android:layout_width="fill_parent"
+ <RelativeLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_above="@+id/button_bar"
- android:layout_alignParentTop="true">
+ android:background="?attr/color_background_secondary">
- <LinearLayout
- android:id="@+id/account_main_layout"
- android:layout_width="match_parent"
+ <ScrollView
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_above="@+id/button_bar"
+ android:layout_alignParentTop="true">
- <RelativeLayout
- android:id="@+id/editor"
- android:layout_width="fill_parent"
+ <LinearLayout
+ android:id="@+id/account_main_layout"
+ android:layout_width="match_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">
-
- <com.makeramen.roundedimageview.RoundedImageView
- android:id="@+id/avater"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginBottom="16dp"
- android:adjustViewBounds="true"
- android:background="@drawable/message_border"
- android:contentDescription="@string/account_image_description"
- android:maxHeight="384dp"
- android:maxWidth="384dp"
- android:padding="1dp"
- app:riv_corner_radius="5dp" />
+ android:orientation="vertical">
- <LinearLayout
+ <RelativeLayout
+ android:id="@+id/editor"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/avater"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/account_jid_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/account_settings_jabber_id"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
-
- <AutoCompleteTextView
- android:id="@+id/account_jid"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/account_settings_example_jabber_id"
- android:inputType="textEmailAddress"
- android:imeOptions="actionNext"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
+ 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/card_padding_regular">
- <TextView
+ <com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/avater"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:text="@string/account_settings_password"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
-
- <EditText
- android:id="@+id/account_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/password"
- android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="16dp"
+ android:adjustViewBounds="true"
+ android:background="@drawable/message_border"
+ android:contentDescription="@string/account_image_description"
+ android:maxHeight="384dp"
+ android:maxWidth="384dp"
+ android:padding="1dp"
+ app:riv_corner_radius="5dp" />
<LinearLayout
- android:id="@+id/name_port"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:orientation="horizontal"
- android:weightSum="1">
+ android:layout_below="@+id/avater"
+ android:orientation="vertical">
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="0.8"
- android:orientation="vertical">
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/account_jid_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/account_settings_jabber_id">
- <TextView
- android:id="@+id/textView"
- android:layout_width="wrap_content"
+ <AutoCompleteTextView
+ android:id="@+id/account_jid"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/account_settings_hostname"
- android:textColor="@color/black87"
+ android:imeOptions="actionNext"
+ android:inputType="textEmailAddress"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody" />
+ </android.support.design.widget.TextInputLayout>
- <EditText
- android:id="@+id/hostname"
- android:layout_width="fill_parent"
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/account_password_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+ app:passwordToggleEnabled="true"
+ app:passwordToggleTint="?attr/color_text_secondary">
+
+ <android.support.design.widget.TextInputEditText
+ android:id="@+id/account_password"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/hostname_or_onion"
- android:inputType="textNoSuggestions"
+ android:hint="@string/password"
+ android:inputType="textPassword"
android:textColor="@color/black87"
android:textColorHint="@color/black54"
android:textSize="?attr/TextSizeBody" />
- </LinearLayout>
+ </android.support.design.widget.TextInputLayout>
<LinearLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="0.2"
- android:orientation="vertical">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/account_settings_port"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:id="@+id/name_port"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:orientation="horizontal"
+ android:weightSum="1">
- <EditText
- android:id="@+id/port"
- android:layout_width="match_parent"
+ <LinearLayout
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:inputType="number"
- android:maxLength="5"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
+ android:layout_weight="0.8"
+ android:orientation="vertical">
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/hostname_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/account_settings_hostname">
+
+ <EditText
+ android:id="@+id/hostname"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textNoSuggestions"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
+ android:textSize="?attr/TextSizeBody" />
+ </android.support.design.widget.TextInputLayout>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0.2"
+ android:orientation="vertical">
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/port_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:hint="@string/account_settings_port">
+
+ <EditText
+ android:id="@+id/port"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:inputType="number"
+ android:maxLength="5"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
+ android:textSize="?attr/TextSizeBody" />
+ </android.support.design.widget.TextInputLayout>
+ </LinearLayout>
</LinearLayout>
+
+ <CheckBox
+ android:id="@+id/account_register_new"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/register_account"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
+
+ <TextView
+ android:id="@+id/account_confirm_password_desc"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/account_settings_confirm_password"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:visibility="gone" />
+
+ <EditText
+ android:id="@+id/account_password_confirm"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:hint="@string/confirm_password"
+ android:inputType="textPassword"
+ android:textColor="@color/black87"
+ android:textColorHint="@color/black54"
+ android:textSize="?attr/TextSizeBody"
+ android:visibility="gone" />
</LinearLayout>
+ </RelativeLayout>
- <CheckBox
- android:id="@+id/account_register_new"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:text="@string/register_account"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <RelativeLayout
+ android:id="@+id/os_optimization"
+ 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/card_padding_regular"
+ android:visibility="gone">
<TextView
- android:id="@+id/account_confirm_password_desc"
+ android:id="@+id/os_optimization_headline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/account_settings_confirm_password"
+ android:text="@string/battery_optimizations_enabled"
android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:visibility="gone" />
+ android:textSize="?attr/TextSizeHeadline"
+ android:textStyle="bold" />
- <EditText
- android:id="@+id/account_password_confirm"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/os_optimization_body"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_below="@+id/os_optimization_headline"
+ android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
- android:hint="@string/confirm_password"
- android:inputType="textPassword"
+ android:text="@string/battery_optimizations_enabled_explained"
android:textColor="@color/black87"
- android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody"
- android:visibility="gone" />
- </LinearLayout>
- </RelativeLayout>
+ android:textSize="?attr/TextSizeBody" />
- <RelativeLayout
- android:id="@+id/os_optimization"
- 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"
- android:visibility="gone">
-
- <TextView
- android:id="@+id/os_optimization_headline"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/battery_optimizations_enabled"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/os_optimization_body"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/os_optimization_headline"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:text="@string/battery_optimizations_enabled_explained"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
-
- <Button
- android:id="@+id/os_optimization_disable"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/os_optimization_body"
- android:layout_marginRight="-8dp"
- android:text="@string/disable"
- android:textColor="@color/accent" />
- </RelativeLayout>
+ <Button
+ android:id="@+id/os_optimization_disable"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/os_optimization_body"
+ android:layout_marginRight="-8dp"
+ android:text="@string/disable"
+ android:textColor="@color/accent" />
+ </RelativeLayout>
- <LinearLayout
- android:id="@+id/stats"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- 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"
- android:visibility="gone">
-
- <TableLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:shrinkColumns="0"
- android:stretchColumns="1">
+ <LinearLayout
+ android:id="@+id/stats"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ 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/card_padding_regular"
+ android:visibility="gone">
- <TableRow
- android:layout_width="fill_parent"
+ <TableLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- tools:ignore="UselessParent">
+ android:shrinkColumns="0"
+ android:stretchColumns="1">
- <TextView
- android:layout_width="wrap_content"
+ <TableRow
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_session_established"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ tools:ignore="UselessParent">
- <TextView
- android:id="@+id/session_est"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_session_established"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- </TableLayout>
+ <TextView
+ android:id="@+id/session_est"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TableLayout
- android:id="@+id/server_info_more"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:shrinkColumns="0"
- android:stretchColumns="1"
- android:visibility="gone">
+ </TableLayout>
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TableLayout
+ android:id="@+id/server_info_more"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:shrinkColumns="0"
+ android:stretchColumns="1"
+ android:visibility="gone">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_pep"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_pep"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_pep"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_pep"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_blocking"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_blocking"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_blocking"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_blocking"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_stream_management"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_sm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_stream_management"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_sm"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_roster_version"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_roster_version"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_roster_version"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_roster_version"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_carbon_messages"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_carbons"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_carbon_messages"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_carbons"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_mam"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_mam"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_mam"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_mam"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_csi"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_csi"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_csi"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:id="@+id/push_row"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_csi"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_push"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:id="@+id/push_row"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_push"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_push"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/server_info_push"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
+ </TableRow>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/server_info_http_upload"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/server_info_http_upload"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_http_upload"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- </TableRow>
- </TableLayout>
+ <TextView
+ android:id="@+id/server_info_http_upload"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
- <RelativeLayout
- android:id="@+id/pgp_fingerprint_box"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginTop="32dp">
+ </TableRow>
+ </TableLayout>
- <LinearLayout
+ <RelativeLayout
+ android:id="@+id/pgp_fingerprint_box"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/action_delete_pgp"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/pgp_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:fontFamily="monospace"
- android:textColor="@color/primary"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
+ android:layout_height="match_parent"
+ android:layout_marginTop="32dp">
- <TextView
- android:id="@+id/pgp_fingerprint_desc"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/openpgp_key_id"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo" />
- </LinearLayout>
-
- <ImageButton
- android:id="@+id/action_delete_pgp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:alpha="1.0"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_remove"
- android:visibility="visible" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/otr_fingerprint_box"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginTop="24dp">
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/action_delete_pgp"
+ android:orientation="vertical">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/action_copy_to_clipboard"
- android:orientation="vertical">
+ <TextView
+ android:id="@+id/pgp_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="monospace"
+ android:textColor="@color/primary"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
- <TextView
- android:id="@+id/otr_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:fontFamily="monospace"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
+ <TextView
+ android:id="@+id/pgp_fingerprint_desc"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/openpgp_key_id"
+ android:textColor="@color/black54"
+ android:textSize="?attr/TextSizeInfo" />
+ </LinearLayout>
- <TextView
- android:id="@+id/otr_fingerprint_desc"
+ <ImageButton
+ android:id="@+id/action_delete_pgp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/otr_fingerprint"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo" />
-
- </LinearLayout>
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:alpha="1.0"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_remove"
+ android:visibility="visible" />
+ </RelativeLayout>
- <ImageButton
- android:id="@+id/action_copy_to_clipboard"
+ <RelativeLayout
+ android:id="@+id/otr_fingerprint_box"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
- android:contentDescription="@string/copy_otr_clipboard_description"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_copy"
- android:visibility="visible" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/axolotl_fingerprint_box"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginTop="24dp">
+ android:layout_height="match_parent"
+ android:layout_marginTop="24dp">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/axolotl_actions"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/axolotl_fingerprint"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="monospace"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+ android:orientation="vertical">
- <TextView
- android:id="@+id/own_fingerprint_desc"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/omemo_fingerprint"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/otr_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="monospace"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
- <LinearLayout
- android:id="@+id/axolotl_actions"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:orientation="vertical">
+ <TextView
+ android:id="@+id/otr_fingerprint_desc"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/otr_fingerprint"
+ android:textColor="@color/black54"
+ android:textSize="?attr/TextSizeInfo" />
+
+ </LinearLayout>
<ImageButton
- android:id="@+id/action_copy_axolotl_to_clipboard"
+ android:id="@+id/action_copy_to_clipboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
- android:contentDescription="@string/copy_omemo_clipboard_description"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/copy_otr_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
android:visibility="visible" />
+ </RelativeLayout>
- <ImageButton
- android:id="@+id/action_regenerate_omemo_key"
+ <RelativeLayout
+ android:id="@+id/axolotl_fingerprint_box"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginTop="24dp">
+
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
- android:contentDescription="@string/regenerate_omemo_key"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_refresh"
- android:visibility="gone" />
- </LinearLayout>
- </RelativeLayout>
- </LinearLayout>
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/axolotl_actions"
+ android:orientation="vertical">
- <LinearLayout
- android:id="@+id/other_device_keys_card"
- 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"
- android:visibility="gone">
-
- <TextView
- android:id="@+id/other_device_keys_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/other_devices"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold" />
+ <TextView
+ android:id="@+id/axolotl_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="monospace"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
+
+ <TextView
+ android:id="@+id/own_fingerprint_desc"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/omemo_fingerprint"
+ android:textColor="@color/black54"
+ android:textSize="?attr/TextSizeInfo" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/axolotl_actions"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:orientation="vertical">
+
+ <ImageButton
+ android:id="@+id/action_copy_axolotl_to_clipboard"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/copy_omemo_clipboard_description"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_copy"
+ android:visibility="visible" />
+
+ <ImageButton
+ android:id="@+id/action_regenerate_omemo_key"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/regenerate_omemo_key"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_refresh"
+ android:visibility="gone" />
+ </LinearLayout>
+ </RelativeLayout>
+ </LinearLayout>
<LinearLayout
- android:id="@+id/other_device_keys"
+ android:id="@+id/other_device_keys_card"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="?android:dividerHorizontal"
+ 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:showDividers="middle"></LinearLayout>
+ android:padding="@dimen/card_padding_regular"
+ android:visibility="gone">
- <Button
- android:id="@+id/clear_devices"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="@string/clear_other_devices"
- android:textColor="@color/accent" />
+ <TextView
+ android:id="@+id/other_device_keys_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/other_devices"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeHeadline"
+ android:layout_margin="@dimen/list_padding"
+ android:textStyle="bold" />
+
+ <LinearLayout
+ android:id="@+id/other_device_keys"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle"></LinearLayout>
+
+ <Button
+ android:id="@+id/clear_devices"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/clear_other_devices"
+ android:textColor="@color/accent" />
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
- </ScrollView>
+ </ScrollView>
- <LinearLayout
- android:id="@+id/button_bar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentStart="true">
-
- <Button
- android:id="@+id/cancel_button"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/cancel"
- android:textColor="@color/black87" />
-
- <View
- android:layout_width="1dp"
- android:layout_height="fill_parent"
- android:layout_marginBottom="7dp"
- android:layout_marginTop="7dp"
- android:background="@color/black12" />
-
- <Button
- android:id="@+id/save_button"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="0dp"
+ <LinearLayout
+ android:id="@+id/button_bar"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:enabled="false"
- android:text="@string/save"
- android:textColor="@color/black54" />
- </LinearLayout>
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true">
+
+ <Button
+ android:id="@+id/cancel_button"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/cancel"
+ android:textColor="@color/black87" />
-</RelativeLayout> \ No newline at end of file
+ <View
+ android:layout_width="1dp"
+ android:layout_height="fill_parent"
+ android:layout_marginBottom="7dp"
+ android:layout_marginTop="7dp"
+ android:background="@color/black12" />
+
+ <Button
+ android:id="@+id/save_button"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:enabled="false"
+ android:text="@string/save"
+ android:textColor="@color/black54" />
+ </LinearLayout>
+ </RelativeLayout>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml
index b97117c8b..bc6eeb850 100644
--- a/src/main/res/layout/activity_fullscreen_message.xml
+++ b/src/main/res/layout/activity_fullscreen_message.xml
@@ -5,11 +5,6 @@
android:orientation="vertical"
android:background="@android:color/black">
- <include
- android:id="@+id/toolbar"
- layout="@layout/tool_bar">
- </include>
-
<com.github.chrisbanes.photoview.PhotoView
android:id="@id/message_image_view"
android:layout_width="match_parent"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index ac49a28c3..35a779cf4 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -11,114 +11,104 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <LinearLayout
- android:layout_width="fill_parent"
+ <android.support.v7.widget.CardView
+ android:layout_width="match_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">
-
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/conference_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="@string/conference_subject"
- android:textColor="@color/black87"
- android:textIsSelectable="false"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:paddingBottom="5dp"
- android:textAlignment="center"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true" />
+ android:orientation="vertical">
- <RelativeLayout
- android:layout_width="fill_parent"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/muc_settings">
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
- <TextView
- android:id="@+id/muc_conference_type"
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/conference_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/change_conference_button"
- android:text="@string/private_conference"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:paddingBottom="5dp"
+ android:text="@string/conference_subject"
+ android:textAlignment="center"
android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:textIsSelectable="false"
+ android:textSize="?attr/TextSizeHeadline"
+ android:textStyle="bold" />
- <ImageButton
- android:id="@+id/change_conference_button"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:layout_gravity="center_horizontal"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_settings" />
- </RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/muc_settings"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <RelativeLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/muc_conference_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/change_conference_button"
+ android:text="@string/private_conference"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
- <TextView
- android:id="@+id/notification_status_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/notify_on_all_messages"
- android:layout_centerVertical="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/notification_status_button" />
+ <ImageButton
+ android:id="@+id/change_conference_button"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="center_horizontal"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_settings" />
+ </RelativeLayout>
- <ImageButton
- android:id="@+id/notification_status_button"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:src="@drawable/ic_notifications_grey600_24dp" />
- </RelativeLayout>
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/details_account"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:layout_marginTop="32dp"
- android:text="@string/using_account"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:visibility="gone" />
+ <TextView
+ android:id="@+id/notification_status_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/notification_status_button"
+ android:text="@string/notify_on_all_messages"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
- <TextView
- android:id="@+id/muc_jabberid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:text="@string/account_settings_example_jabber_id"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:textIsSelectable="true"
- android:visibility="gone" />
- </LinearLayout>
+ <ImageButton
+ android:id="@+id/notification_status_button"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="center_horizontal"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:padding="@dimen/image_button_padding"
+ android:src="@drawable/ic_notifications_grey600_24dp" />
+ </RelativeLayout>
- <LinearLayout
+ <TextView
+ android:id="@+id/muc_jabberid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:text="@string/account_settings_example_jabber_id"
+ android:textIsSelectable="true"
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
android:id="@+id/muc_more_details"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -126,141 +116,149 @@
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">
-
+ android:orientation="vertical">
- <RelativeLayout
- android:layout_width="fill_parent"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="32dp">
-
- <com.makeramen.roundedimageview.RoundedImageView
- android:id="@+id/your_photo"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_alignParentEnd="false"
- android:layout_alignParentLeft="true"
- android:padding="1dp"
- android:src="@drawable/ic_profile"
- app:riv_corner_radius="36dp"
- app:riv_border_width="1dp"
- app:riv_border_color="@color/grey500"
- android:layout_alignParentRight="false" />
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_list">
- <LinearLayout
+ <RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toRightOf="@+id/your_photo"
- android:orientation="vertical"
- android:paddingLeft="8dp">
+ android:layout_marginBottom="32dp">
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/muc_your_nick"
- android:layout_width="wrap_content"
+ <com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/your_photo"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_alignParentEnd="false"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="false"
+ android:padding="1dp"
+ app:riv_border_color="@color/grey500"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="36dp" />
+
+ <LinearLayout
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline" />
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/your_photo"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/avatar_item_distance">
- <TextView
- android:id="@+id/muc_role"
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/muc_your_nick"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+ <TextView
+ android:id="@+id/muc_role"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/edit_nick_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
- </LinearLayout>
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_edit_dark" />
+ </RelativeLayout>
+
+ <LinearLayout
+ android:id="@+id/muc_members"
+ android:layout_width="fill_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle"></LinearLayout>
- <ImageButton
- android:id="@+id/edit_nick_button"
+ <Button
+ android:id="@+id/invite"
+ style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_edit_dark" />
- </RelativeLayout>
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="24dp"
+ android:text="@string/invite_contact" />
- <LinearLayout
- android:id="@+id/muc_members"
- android:layout_width="fill_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:divider="?android:dividerHorizontal"
- android:orientation="vertical"
- android:showDividers="middle">
+ <Button
+ android:id="@+id/destroy"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="24dp"
+ android:text="@string/destroy_muc" />
</LinearLayout>
+ </android.support.v7.widget.CardView>
- <Button
- android:id="@+id/invite"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="24dp"
- android:text="@string/invite_contact" />
-
- <Button
- android:id="@+id/destroy"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="24dp"
- android:text="@string/destroy_muc" />
-
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
+ <android.support.v7.widget.CardView
+ android:id="@+id/muc_info_more"
+ android:layout_width="match_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"
- android:id="@+id/muc_info_more"
- android:shrinkColumns="0"
- android:stretchColumns="1"
android:visibility="gone">
- <TableLayout
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:stretchColumns="1">
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_list">
- <TableRow
- android:layout_width="fill_parent"
- android:layout_height="match_parent">
+ <TableLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:stretchColumns="1">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/server_info_mam"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:singleLine="true"
- android:ellipsize="end" />
+ <TableRow
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent">
- <TextView
- android:id="@+id/muc_info_mam"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="4dp"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
- </TableRow>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/server_info_mam"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
- </TableLayout>
- </LinearLayout>
+ <TextView
+ android:id="@+id/muc_info_mam"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:paddingLeft="4dp"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+ </TableRow>
+ </TableLayout>
+ <TextView
+ android:id="@+id/details_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:layout_marginTop="32dp"
+ android:text="@string/using_account"
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 922d1f8f3..c6339604c 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -31,7 +31,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
- android:padding="@dimen/infocard_padding">
+ android:padding="@dimen/card_padding_regular">
<LinearLayout
android:id="@+id/account_image_wrapper"
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 705bba333..1996e6fdf 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -1,76 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/grey200"
- android:id="@+id/scroll_view">
-
- <LinearLayout
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+ <ScrollView
+ android:id="@+id/scroll_view"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_height="fill_parent"
+ android:background="?attr/color_background_secondary">
<LinearLayout
- android:layout_width="match_parent"
+ 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:padding="@dimen/infocard_padding"
android:orientation="vertical">
- <android.support.text.emoji.widget.EmojiEditText
+ <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="textMultiLine"
- android:hint="@string/status_message"
- android:id="@+id/presence_status_message"
- android:textColor="@color/black87"
- android:layout_marginBottom="8dp"
- android:textSize="?attr/TextSizeBody" />
+ 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">
- <Spinner
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/presence_show"
- android:layout_gravity="center_horizontal" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
- <CheckBox
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/all_accounts_on_this_device"
- android:id="@+id/all_accounts"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:visibility="gone" />
+ <android.support.text.emoji.widget.EmojiAppCompatEditText
+ android:id="@+id/presence_status_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ android:hint="@string/status_message"
+ android:inputType="textMultiLine"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody"/>
+
+ <Spinner
+ android:id="@+id/presence_show"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"/>
+
+ <CheckBox
+ android:id="@+id/all_accounts"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:layout_marginTop="16dp"
+ android:text="@string/all_accounts_on_this_device"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody"/>
- <Button
- android:id="@+id/change_presence"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
+ <Button
+ android:id="@+id/change_presence"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:layout_marginBottom="-8dp"
+ android:layout_marginRight="-8dp"
+ android:text="@string/change_presence"
+ android:textColor="@color/accent"/>
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
+ android:id="@+id/templates_card"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:text="@string/change_presence"
- android:textColor="@color/accent" />
- </LinearLayout>
+ 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">
- <LinearLayout
- android:id="@+id/templates"
- android:layout_width="match_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:padding="@dimen/infocard_padding"
- android:orientation="vertical"
- android:divider="?android:dividerHorizontal"
- android:showDividers="middle">
+ <LinearLayout
+ android:id="@+id/templates"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular"/>
+ </android.support.v7.widget.CardView>
</LinearLayout>
- </LinearLayout>
-</ScrollView> \ No newline at end of file
+ </ScrollView>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 28e954b99..c95dc3678 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -1,8 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/start_conversation_view_pager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/grey50">
-
-</android.support.v4.view.ViewPager> \ No newline at end of file
+<layout xmlns:android="http://schemas.android.com/apk/res/android" >
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <android.support.v4.view.ViewPager
+ android:id="@+id/start_conversation_view_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/color_background_primary"/>
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/fab"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end|bottom"
+ android:src="?attr/icon_add_person"
+ android:layout_margin="16dp" />
+ </FrameLayout>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 2ebffb5be..4806f492e 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -1,129 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/grey200">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
- <ScrollView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/button_bar"
- android:layout_alignParentTop="true">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/color_background_secondary">
- <LinearLayout
- android:layout_width="match_parent"
+ <ScrollView
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_above="@+id/button_bar"
+ android:layout_alignParentTop="true">
<LinearLayout
- android:id="@+id/key_error_message_card"
- android:layout_width="fill_parent"
+ android:layout_width="match_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/key_error_message_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:text="@string/error_trustkeys_title" />
-
- <TextView
- android:id="@+id/key_error_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:padding="8dp" />
-
- </LinearLayout>
+ android:orientation="vertical">
- <LinearLayout
- android:id="@+id/own_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"
- android:visibility="gone">
-
- <TextView
- android:id="@+id/own_keys_title"
- android:layout_width="wrap_content"
+ <android.support.v7.widget.CardView
+ android:id="@+id/key_error_message_card"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold" />
+ 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:visibility="gone">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ 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:text="@string/error_trustkeys_title"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeHeadline"
+ android:textStyle="bold"/>
+
+ <TextView
+ android:id="@+id/key_error_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody"/>
+ </LinearLayout>
+
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
+ android:id="@+id/own_keys_card"
+ android:layout_width="match_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:visibility="gone">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
+
+ <TextView
+ android:id="@+id/own_keys_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeHeadline"
+ android:textStyle="bold"/>
+
+ <LinearLayout
+ android:id="@+id/own_keys_details"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle">
+ </LinearLayout>
+ </LinearLayout>
+
+ </android.support.v7.widget.CardView>
<LinearLayout
- android:id="@+id/own_keys_details"
+ android:id="@+id/foreign_keys"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:divider="?android:dividerHorizontal"
- android:showDividers="middle"
- android:orientation="vertical"></LinearLayout>
+ android:orientation="vertical"
+ android:visibility="gone">
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/foreign_keys"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:orientation="vertical">
+ </LinearLayout>
</LinearLayout>
+ </ScrollView>
- </LinearLayout>
- </ScrollView>
-
- <LinearLayout
- android:id="@+id/button_bar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true">
-
- <Button
- android:id="@+id/cancel_button"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/cancel"
- android:textColor="@color/black87" />
-
- <View
- android:layout_width="1dp"
- android:layout_height="fill_parent"
- android:layout_marginBottom="7dp"
- android:layout_marginTop="7dp"
- android:background="@color/black12" />
-
- <Button
- android:id="@+id/save_button"
- style="?android:attr/borderlessButtonStyle"
- android:layout_width="0dp"
+ <LinearLayout
+ android:id="@+id/button_bar"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:enabled="true"
- android:textColor="@color/black54"
- android:text="@string/done" />
- </LinearLayout>
-</RelativeLayout>
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true">
+
+ <Button
+ android:id="@+id/cancel_button"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/cancel"
+ android:textColor="?attr/color_text_primary"/>
+
+ <View
+ android:layout_width="1dp"
+ android:layout_height="fill_parent"
+ android:layout_marginBottom="7dp"
+ android:layout_marginTop="7dp"
+ android:background="?attr/divider"/>
+
+ <Button
+ android:id="@+id/save_button"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:enabled="true"
+ android:text="@string/done"
+ android:textColor="?attr/color_text_secondary"/>
+ </LinearLayout>
+ </RelativeLayout>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 2865f3edf..eea98181e 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -1,62 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/activatedBackgroundIndicator"
- android:padding="8dp">
-
- <com.makeramen.roundedimageview.RoundedImageView
- android:id="@+id/contact_photo"
- android:layout_width="56dp"
- android:layout_height="56dp"
- android:layout_alignParentLeft="true"
- android:src="@drawable/ic_profile"
- app:riv_border_width="1dp"
- app:riv_border_color="@color/grey500"
- app:riv_corner_radius="28dp" />
-
- <LinearLayout
- android:layout_width="wrap_content"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toRightOf="@+id/contact_photo"
- android:orientation="vertical"
- android:paddingLeft="8dp">
+ android:background="?android:attr/activatedBackgroundIndicator"
+ android:padding="@dimen/list_padding">
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/contact_display_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeHeadline" />
+ <com.makeramen.roundedimageview.RoundedImageView
+ android:id="@+id/contact_photo"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:layout_alignParentLeft="true"
+ app:riv_border_color="@color/grey500"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="28dp" />
- <TextView
- android:id="@+id/contact_jid"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:singleLine="true"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody" />
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/contact_photo"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/avatar_item_distance">
- <com.wefika.flowlayout.FlowLayout
- android:id="@+id/tags"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="-2dp"
- android:orientation="horizontal">
- </com.wefika.flowlayout.FlowLayout>
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/contact_display_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
- <TextView
- android:id="@+id/key"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:fontFamily="monospace"
- android:visibility="gone" />
- </LinearLayout>
-
-</RelativeLayout> \ No newline at end of file
+ <TextView
+ android:id="@+id/contact_jid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" />
+
+ <com.wefika.flowlayout.FlowLayout
+ android:id="@+id/tags"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="-2dp"
+ android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout>
+
+ <TextView
+ android:id="@+id/key"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="monospace"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace"
+ android:visibility="gone" />
+ </LinearLayout>
+
+ </RelativeLayout>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 0edd1aea3..0aa695ea8 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -1,91 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:longClickable="true">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
- android:id="@+id/key_data"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:paddingBottom="8dp"
- android:paddingLeft="8dp"
- android:paddingTop="8dp">
+ android:padding="@dimen/list_padding">
- <TextView
- android:id="@+id/key"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/black87"
android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/action_container"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:fontFamily="monospace"
- android:longClickable="true"
- android:clickable="true" />
+ android:orientation="vertical">
- <TextView
- android:id="@+id/key_type"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="@color/black54"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/key"
- android:maxLines="1"
- android:textSize="?attr/TextSizeInfo"
- android:longClickable="true"
- android:clickable="true" />
+ <TextView
+ android:id="@+id/key"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
- <TextView
- android:id="@+id/key_trust"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/key"
- android:visibility="gone"
- android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:longClickable="true" />
+ android:clickable="true"
+ android:fontFamily="monospace"
+ android:longClickable="true"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
+
+ <TextView
+ android:id="@+id/key_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:longClickable="true"
+ android:maxLines="1"
+ android:textColor="?attr/color_text_secondary"
+ android:textSize="?attr/TextSizeInfo" />
+ </LinearLayout>
<LinearLayout
android:id="@+id/action_container"
- android:layout_width="96dp"
- android:layout_marginRight="-32dp"
- android:layout_height="wrap_content"
- android:orientation="vertical"
+ android:layout_width="@dimen/key_action_width"
+ android:layout_height="48dp"
android:layout_alignParentRight="true"
- android:layout_centerVertical="true">
+ android:layout_centerVertical="true"
+ android:gravity="center"
+ android:orientation="vertical">
<ImageButton
- android:layout_gravity="center_horizontal"
android:id="@+id/button_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
+ android:alpha="?attr/icon_alpha"
+ android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove"
- android:layout_marginRight="16dp"
+ android:visibility="gone" />
+
+ <ImageButton
+ android:id="@+id/button_enable_device"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:alpha="?attr/icon_alpha"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_enable_undecided_device"
android:visibility="gone" />
<ImageView
- android:visibility="gone"
android:id="@+id/verified_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginRight="16dp"
- android:src="@drawable/ic_verified_fingerprint" />
+ android:src="@drawable/ic_verified_fingerprint"
+ android:visibility="gone" />
- <de.pixart.messenger.ui.widget.Switch
+ <android.support.v7.widget.SwitchCompat
android:id="@+id/tgl_trust"
- android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- style="@style/MD" />
+ android:visibility="gone" />
</LinearLayout>
+
</RelativeLayout>
-</RelativeLayout> \ No newline at end of file
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 74afeae16..fe5eec4a3 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -18,7 +18,7 @@
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="?android:selectableItemBackground"
+ android:background="?attr/selectableItemBackgroundBorderless"
android:orientation="horizontal"
android:padding="8dp">
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 89c47c904..70f2c12d9 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -1,38 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
-<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">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
- <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" />
+ <android.support.v7.widget.CardView
+ android:id="@+id/foreign_keys_card"
- <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>
+ 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">
- <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
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
+
+ <TextView
+ android:id="@+id/foreign_keys_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="?attr/color_text_primary"
+ 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:orientation="vertical"
+ android:showDividers="middle">
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/no_keys_to_accept"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/no_keys_just_confirm"
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody"/>
+ </LinearLayout>
+ </android.support.v7.widget.CardView>
+</layout> \ No newline at end of file
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 9bfa661e8..df6e8500d 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -48,7 +48,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:alpha="1.0"
- android:background="?android:selectableItemBackground"/>
+ android:background="?attr/selectableItemBackgroundBorderless"/>
<TextView
android:id="@+id/runtime"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 41be316a9..6c50f2bae 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,7 +16,6 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
app:riv_border_width="1dip"
app:riv_border_color="@color/grey500"
app:riv_corner_radius="24dp" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 835830ea9..15a52a797 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -14,7 +14,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index afdf317d7..835e380a5 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,7 +29,6 @@
android:layout_marginRight="-1.5dp"
android:padding="0dp"
android:scaleType="fitXY"
- android:src="@drawable/ic_profile"
app:riv_border_width="1dp"
app:riv_border_color="@color/grey500"
app:riv_corner_radius="16dp"/>
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index 22ce44147..b305f18db 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -47,7 +47,7 @@
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:background="?android:selectableItemBackground"
+ android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_remove" />
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml
deleted file mode 100644
index d7c208610..000000000
--- a/src/main/res/layout/show_location_infowindow.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeBody"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/snippet"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="?attr/TextSizeInfo" />
- </LinearLayout>
-
-</LinearLayout> \ No newline at end of file
diff --git a/src/main/res/layout/tool_bar.xml b/src/main/res/layout/tool_bar.xml
deleted file mode 100644
index 990a00e03..000000000
--- a/src/main/res/layout/tool_bar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/primary"
- android:elevation="2dp"
- android:theme="@style/Base.ThemeOverlay.AppCompat.Dark" /> \ No newline at end of file
diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
deleted file mode 100644
index 1f5ef9c2c..000000000
--- a/src/main/res/menu/attachment_choices.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item
- android:id="@+id/attach_location"
- android:title="@string/send_location"
- android:icon="?attr/ic_attach_location"/>
-
- <item
- android:id="@+id/attach_record_voice"
- android:title="@string/attach_record_voice"
- android:icon="?attr/ic_attach_record"/>
-
- <item
- android:id="@+id/attach_take_picture"
- android:title="@string/attach_take_from_camera"
- android:icon="?attr/ic_attach_camera"/>
-
- <item
- android:id="@+id/attach_choose_picture"
- android:title="@string/attach_choose_picture"
- android:icon="?attr/ic_attach_photo"/>
-
- <item
- android:id="@+id/attach_choose_video"
- android:title="@string/attach_choose_video"
- android:icon="?attr/ic_attach_video"/>
-
- <item
- android:id="@+id/attach_choose_file"
- android:title="@string/choose_file"
- android:icon="?attr/ic_attach_document"/>
-
-</menu> \ No newline at end of file
diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml
index 34af0a679..5417076b6 100644
--- a/src/main/res/menu/change_presence.xml
+++ b/src/main/res/menu/change_presence.xml
@@ -1,12 +1,13 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_account_details"
android:title="@string/account_details"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="@drawable/ic_account_box_white_24dp" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_settings" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index 382e96017..b0f907ffd 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
- android:actionLayout="@layout/actionview_search"
+ app:actionLayout="@layout/actionview_search"
android:icon="?attr/icon_search"
- android:showAsAction="collapseActionView|always"
+ app:showAsAction="collapseActionView|always"
android:title="@string/search" />
<item
android:id="@+id/action_create_contact"
android:icon="?attr/icon_add_person"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/create_contact"
android:visible="false" />
<item
android:id="@+id/action_block_jid"
android:icon="?attr/icon_add_person"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/block_jabber_id"
android:visible="false" />
</menu>
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 29ef166e5..50243150b 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_edit_contact"
android:icon="?attr/icon_edit"
android:orderInCategory="10"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/action_edit_contact" />
<item
android:id="@+id/action_share"
android:icon="?attr/icon_share"
android:orderInCategory="15"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/share_uri_with">
<menu>
<item
@@ -30,14 +31,14 @@
<item
android:id="@+id/action_block"
android:orderInCategory="72"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="@drawable/ic_speaker_notes_off_white_24dp"
android:title="@string/action_block_contact" />
<item
android:id="@+id/action_unblock"
android:orderInCategory="73"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="@drawable/ic_speaker_notes_white_24dp"
android:title="@string/action_unblock_contact" />
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 992371fc7..9687e45ff 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -1,71 +1,116 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_add"
android:icon="?attr/icon_new"
android:orderInCategory="10"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/action_add" />
<item
android:id="@+id/action_security"
android:icon="?attr/icon_not_secure"
android:orderInCategory="20"
- android:showAsAction="always"
- android:title="@string/action_secure" />
+ app:showAsAction="always"
+ android:title="@string/action_secure" >
+ <menu>
+ <group android:checkableBehavior="single">
+ <item
+ android:id="@+id/encryption_choice_none"
+ android:title="@string/encryption_choice_unencrypted" />
+ <item
+ android:id="@+id/encryption_choice_axolotl"
+ android:title="@string/encryption_choice_omemo" />
+ <item
+ android:id="@+id/encryption_choice_otr"
+ android:title="@string/encryption_choice_otr" />
+ <item
+ android:id="@+id/encryption_choice_pgp"
+ android:title="@string/encryption_choice_pgp" />
+ </group>
+ </menu>
+ </item>
<item
android:id="@+id/action_attach_file"
android:icon="?attr/icon_new_attachment"
android:orderInCategory="30"
- android:showAsAction="always"
- android:title="@string/attach_file" />
+ app:showAsAction="always"
+ android:title="@string/attach_file" >
+ <menu>
+
+ <item
+ android:id="@+id/attach_choose_file"
+ android:icon="?attr/ic_attach_document"
+ android:title="@string/choose_file" />
+
+ <item
+ android:id="@+id/attach_choose_picture"
+ android:icon="?attr/ic_attach_photo"
+ android:title="@string/attach_choose_picture" />
+
+ <item
+ android:id="@+id/attach_take_picture"
+ android:icon="?attr/ic_attach_camera"
+ android:title="@string/attach_take_from_camera" />
+ <item
+ android:id="@+id/attach_record_voice"
+ android:icon="?attr/ic_attach_record"
+ android:title="@string/attach_record_voice" />
+
+ <item
+ android:id="@+id/attach_location"
+ android:icon="?attr/ic_attach_location"
+ android:title="@string/send_location" />
+ </menu>
+ </item>
<item
android:id="@+id/action_invite"
android:orderInCategory="45"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/invite_contact" />
<item
android:id="@+id/action_clear_history"
android:orderInCategory="50"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_clear_history" />
<item
android:id="@+id/action_archive_chat"
android:orderInCategory="60"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_end_conversation" />
<item
android:id="@+id/action_archive_muc"
android:orderInCategory="60"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_end_conversation_muc" />
<item
android:id="@+id/action_accounts"
android:orderInCategory="90"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/mgmt_account_edit" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_settings" />
<item
android:id="@+id/action_invite_user"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/invite_user" />
<item
android:id="@+id/action_create_issue"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/create_issue" />
<item
android:id="@+id/action_check_updates"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_check_update" />
<item
android:id="@+id/action_search_history"
android:icon="?attr/icon_search"
- android:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/search" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 698c648ee..13e8db4a6 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -1,9 +1,10 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_share"
android:title="@string/share_uri_with"
android:icon="?attr/icon_share"
- android:showAsAction="always">
+ app:showAsAction="always">
<menu>
<item
android:id="@+id/action_share_uri"
@@ -22,19 +23,19 @@
<item
android:id="@+id/action_change_presence"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/change_presence"
android:icon="@drawable/ic_new_releases_white_24dp" />
<item
android:id="@+id/action_show_block_list"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="@drawable/ic_speaker_notes_off_white_24dp"
android:title="@string/show_block_list" />
<item
android:id="@+id/action_renew_certificate"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_renew_certificate"
android:visible="false" />
@@ -42,28 +43,28 @@
android:id="@+id/action_server_info_show_more"
android:checkable="true"
android:checked="false"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/server_info_show_more" />
<item
android:id="@+id/action_mam_prefs"
android:icon="@drawable/ic_cloud_white_24dp"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/mam_prefs" />
<item
android:id="@+id/action_show_password"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/show_password" />
<item
android:id="@+id/action_change_password_on_server"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="@drawable/ic_vpn_key_white_24dp"
android:title="@string/change_password" />
<item
android:id="@+id/mgmt_account_reconnect"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/mgmt_account_reconnect" />
<item
android:id="@+id/mgmt_account_announce_pgp"
@@ -71,6 +72,6 @@
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_settings" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
deleted file mode 100644
index 89b6761ce..000000000
--- a/src/main/res/menu/encryption_choices.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
- <group android:checkableBehavior="single">
- <item
- android:id="@+id/encryption_choice_none"
- android:title="@string/encryption_choice_unencrypted" />
- <item
- android:id="@+id/encryption_choice_axolotl"
- android:title="@string/encryption_choice_omemo" />
- <item
- android:id="@+id/encryption_choice_otr"
- android:title="@string/encryption_choice_otr" />
- <item
- android:id="@+id/encryption_choice_pgp"
- android:title="@string/encryption_choice_pgp" />
- </group>
-
-</menu> \ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 38b82010b..044c715c5 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_add_account"
android:icon="?attr/icon_add_person"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/action_add_account" />
<item
android:id="@+id/action_add_account_with_cert"
- android:showAsAction="never"
+ app:showAsAction="never"
android:icon="?attr/icon_add_person"
android:title="@string/action_add_account_with_certificate"
android:visible="true" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_settings" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index beca7b8ec..a49b770df 100644
--- a/src/main/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/mgmt_account_change_presence"
@@ -12,7 +13,7 @@
android:title="@string/mgmt_account_publish_pgp" />
<item
android:id="@+id/mgmt_account_reconnect"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/mgmt_account_reconnect" />
<item
android:id="@+id/mgmt_account_delete"
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 585bd1def..910c986ec 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_edit_subject"
android:icon="?attr/icon_edit"
android:orderInCategory="10"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/action_edit_subject" />
<item
android:id="@+id/action_share"
android:icon="?attr/icon_share"
- android:showAsAction="always"
+ app:showAsAction="always"
android:orderInCategory="15"
android:title="@string/share_uri_with" >
<menu>
@@ -29,19 +30,19 @@
<item
android:id="@+id/action_save_as_bookmark"
android:orderInCategory="80"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/save_as_bookmark" />
<item
android:id="@+id/action_delete_bookmark"
android:orderInCategory="80"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/delete_bookmark" />
<item
android:id="@+id/action_advanced_mode"
android:checkable="true"
android:checked="false"
android:orderInCategory="85"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/advanced_mode" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/publish_avatar.xml b/src/main/res/menu/publish_avatar.xml
index 39478c0a4..72ceb2d17 100644
--- a/src/main/res/menu/publish_avatar.xml
+++ b/src/main/res/menu/publish_avatar.xml
@@ -1,8 +1,9 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_crop_image"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="@drawable/ic_crop_white_24dp"
android:title="@string/select_image_and_crop" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml
index efd6e4d0a..51f05e21a 100644
--- a/src/main/res/menu/select_multiple.xml
+++ b/src/main/res/menu/select_multiple.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/selection_submit"
android:title="@string/invite_contact"
- android:showAsAction="always" />
+ app:showAsAction="always" />
</menu>
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index ff87edc1a..5c57eedd8 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_add"
android:icon="?attr/icon_new"
android:orderInCategory="10"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/action_add" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/showlocation.xml b/src/main/res/menu/showlocation.xml
index 3eb0647c9..c7049a5b0 100644
--- a/src/main/res/menu/showlocation.xml
+++ b/src/main/res/menu/showlocation.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_navigate"
- android:showAsAction="always"
+ app:showAsAction="always"
android:title="@string/navigate"
android:icon="@drawable/ic_navigation_white_24dp" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index ea7572b41..12cb941bb 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -1,53 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
- android:actionLayout="@layout/actionview_search"
android:icon="?attr/icon_search"
- android:showAsAction="collapseActionView|always"
- android:title="@string/search" />
+ android:title="@string/search"
+ app:actionLayout="@layout/actionview_search"
+ app:showAsAction="collapseActionView|always" />
<item
- android:id="@+id/action_create_contact"
- android:icon="?attr/icon_add_person"
- android:showAsAction="always"
- android:title="@string/create_contact" />
- <item
- android:id="@+id/action_conference"
- android:icon="?attr/icon_add_group"
- android:showAsAction="always"
- android:title="@string/join_or_create_conference">
- <menu>
- <item
- android:id="@+id/action_join_conference"
- android:title="@string/join_conference" />
- <item
- android:id="@+id/action_create_conference"
- android:title="@string/create_conference" />
-
- </menu>
- </item>
+ android:id="@+id/action_join_conference"
+ android:title="@string/join_conference"
+ app:showAsAction="never" />
<item
android:id="@+id/action_scan_qr_code"
- android:showAsAction="never"
- android:title="@string/scan_qr_code" />
+ android:title="@string/scan_qr_code"
+ app:showAsAction="never" />
<item
android:id="@+id/action_hide_offline"
android:checkable="true"
android:checked="false"
android:orderInCategory="85"
- android:showAsAction="never"
- android:title="@string/hide_offline" />
+ android:title="@string/hide_offline"
+ app:showAsAction="never" />
<item
android:id="@+id/action_accounts"
android:orderInCategory="90"
- android:showAsAction="never"
- android:title="@string/mgmt_account_edit" />
+ android:title="@string/mgmt_account_edit"
+ app:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
- android:title="@string/action_settings" />
+ android:title="@string/action_settings"
+ app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/trust_keys.xml b/src/main/res/menu/trust_keys.xml
index 7c63bd7fe..e40295eea 100644
--- a/src/main/res/menu/trust_keys.xml
+++ b/src/main/res/menu/trust_keys.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_scan_qr_code"
android:title="@string/scan_qr_code"
- android:showAsAction="always"
+ app:showAsAction="always"
android:icon="?attr/icon_scan_qr_code"/>
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
index 7dadffce8..b6dd79610 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_show_qr_code"
android:title="@string/show_qr_code"
- android:showAsAction="never" />
+ app:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/action_settings" />
</menu> \ No newline at end of file
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
index 4a3d93d1b..a82d69bef 100644
--- a/src/main/res/values-v21/dimens.xml
+++ b/src/main/res/values-v21/dimens.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
- <dimen name="image_button_padding">12dp</dimen>
+ <!-- 48dp + 15dp -->
</resources> \ No newline at end of file
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 0c0b3cefb..000000000
--- a/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
- <item name="android:colorPrimary">@color/primary</item>
- <item name="android:colorPrimaryDark">@color/primary_dark</item>
- <item name="android:colorAccent">@color/accent</item>
- <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
-
- <item name="android:windowActionModeOverlay">true</item>
- <item name="android:actionModeBackground">@color/accent</item>
-
- <item name="TextSizeInfo">12sp</item>
- <item name="TextSizeBody">14sp</item>
- <item name="IconSize">16sp</item>
- <item name="TextSizeHeadline">18sp</item>
- <item name="TextSeparation">5sp</item>
-
- <item name="color_text_primary">@color/black87</item>
- <item name="color_text_secondary">@color/black54</item>
-
- <item name="dialog_horizontal_padding">24dp</item>
- <item name="dialog_vertical_padding">16dp</item>
-
- <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
- <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
- <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
- <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
- <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
- <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
- <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
- <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
- <item name="icon_done">@drawable/ic_done_black_24dp</item>
- <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
- <item name="icon_group">@drawable/ic_group_white_24dp</item>
- <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
- <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
- <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
- <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
- <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
- <item name="icon_search">@drawable/ic_search_white_24dp</item>
- <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
- <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
- <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
- <item name="icon_share">@drawable/ic_share_white_24dp</item>
- <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-
- <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
- <item name="ic_attach_document">@drawable/ic_attach_document</item>
- <item name="ic_attach_location">@drawable/ic_attach_location</item>
- <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
- <item name="ic_attach_video">@drawable/ic_attach_video</item>
- <item name="ic_attach_record">@drawable/ic_attach_record</item>
-
- </style>
-
-</resources> \ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 83598c041..f9bdae03a 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -7,6 +7,10 @@
<attr name="TextSeparation" format="dimension"/>
<attr name="IconSize" format="dimension" />
+ <attr name="color_background_secondary" format="reference|color" />
+ <attr name="color_background_primary" format="reference|color" />
+ <attr name="color_warning" format="reference|color"/>
+
<attr name="color_text_primary" format="reference|color" />
<attr name="color_text_secondary" format="reference|color" />
@@ -33,6 +37,7 @@
<attr name="icon_share" format="reference" />
<attr name="icon_import_export" format="reference" />
<attr name="icon_scan_qr_code" format="reference" />
+ <attr name="icon_enable_undecided_device" format="reference" />
<attr name="icon_notifications" format="reference" />
<attr name="icon_notifications_off" format="reference" />
@@ -54,4 +59,6 @@
<attr name="ic_file_vcard" format="reference" />
<attr name="ic_file_calendar" format="reference" />
+ <attr name="icon_alpha" format="float"/>
+
</resources> \ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index cb103131a..933c7daea 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -2,8 +2,12 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">8dp</dimen>
<dimen name="activity_vertical_margin">8dp</dimen>
- <dimen name="infocard_padding">16dp</dimen>
- <dimen name="image_button_padding">8dp</dimen>
- <dimen name="elv_touch_slop">64dp</dimen>
+ <dimen name="card_padding_regular">16dp</dimen>
+ <dimen name="card_padding_list">8dp</dimen> <!-- card_padding_regular minus list_padding -->
+ <dimen name="list_padding">8dp</dimen>
+ <dimen name="image_button_padding">12dp</dimen>
+ <dimen name="key_action_width">48dp</dimen> <!-- icon width (24dp) + 2 * image button padding -->
+ <dimen name="fineprint_size">11sp</dimen>
<dimen name="audio_player_width">224dp</dimen>
+ <dimen name="avatar_item_distance">16dp</dimen>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 16fe709ee..2d5d6fa20 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -428,8 +428,6 @@
<string name="no_application_found_to_display_location">No application found to display location</string>
<string name="location">Location</string>
<string name="received_location">Received location</string>
- <string name="title_undo_swipe_out_conversation">Conversation closed</string>
- <string name="title_undo_swipe_out_muc">Left group chat</string>
<string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
<string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string>
<string name="pref_remove_trusted_certificates_title">Remove certificates</string>
@@ -460,7 +458,6 @@
<string name="download_failed_server_not_found">Download failed: Server not found</string>
<string name="download_failed_file_not_found">Download failed: File not found</string>
<string name="download_failed_could_not_connect">Download failed: Could not connect to host</string>
- <string name="elv_undo">undo</string>
<string name="download_failed_could_not_write_file">Download failed: Could not write file</string>
<string name="pref_use_white_background">Use white background</string>
<string name="pref_use_white_background_summary">Show sent messages as black text on a white background</string>
@@ -763,4 +760,14 @@
<string name="huawei_protected_apps_summary">To keep receiving notifications, even when the screen is turned off, you need to add Pix-Art Messenger to the list of protected apps.</string>
<string name="pref_enable_multi_accounts_title">Enable multiple accounts</string>
<string name="pref_enable_multi_accounts_summary">You want to use multiple accounts, so you have to set a password for daily backups.</string>
+ <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
+ <string name="mtm_trust_anchor">The server certificate is not signed by a known Certificate Authority.</string>
+ <string name="mtm_cert_expired">The server certificate is expired.</string>
+ <string name="mtm_accept_servername">Accept Mismatching Server Name?</string>
+ <string name="mtm_hostname_mismatch">Server could not authenticate as \&quot;%s\&quot;. The certificate is only valid for:</string>
+ <string name="mtm_connect_anyway">Do you want to connect anyway?</string>
+ <string name="mtm_cert_details">Certificate details:</string>
+ <string name="mtm_notification">Certificate Verification</string>
+ <string name="once">Once</string>
+ <string name="theme">Theme</string>
</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 5c0808d04..1b3798eca 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,17 +1,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="MD">
- <item name="animationVelocity">6</item>
- <item name="insetBottom">16dp</item>
- <item name="insetTop">16dp</item>
- <item name="insetLeft">16dp</item>
- <item name="insetRight">16dp</item>
- <item name="measureFactor">1.4</item>
- <item name="offDrawable">@drawable/switch_back_off</item>
- <item name="onDrawable">@drawable/switch_back_on</item>
- <item name="thumbDrawable">@drawable/switch_thumb</item>
- <item name="thumb_margin">-17dp</item>
- <item name="android:padding">16dp</item>
+ <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
+ <item name="android:textColor">?android:textColorSecondary</item>
</style>
-
</resources> \ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index a20b5c6c6..b70fe0bd7 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,19 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
- <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
- <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+ <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="colorPrimary">@color/primary</item>
+ <item name="colorPrimaryDark">@color/primary_dark</item>
+ <item name="colorAccent">@color/accent</item>
+
+ <item name="color_text_primary">@color/black87</item>
+ <item name="color_text_secondary">@color/black54</item>
+
+ <item name="color_background_primary">@color/grey50</item>
+ <item name="color_background_secondary">@color/grey200</item>
+
+ <item name="android:windowActionModeOverlay">true</item>
+ <item name="android:actionModeBackground">@color/accent</item>
+
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
+ <item name="TextSeparation">5sp</item>
<item name="IconSize">16sp</item>
<item name="TextSizeHeadline">18sp</item>
- <item name="TextSeparation">5sp</item>
- <item name="color_text_primary">@color/black87</item>
- <item name="color_text_secondary">@color/black54</item>
+ <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
+ <item name="divider">@color/black12</item>
<item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
<item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
@@ -38,8 +49,10 @@
<item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
<item name="icon_share">@drawable/ic_share_white_24dp</item>
<item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
+ <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item>
<item name="dialog_horizontal_padding">16dp</item>
<item name="dialog_vertical_padding">16dp</item>
+ <item type="float" name="icon_alpha">0.54</item>
<item name="ic_attach_camera">@drawable/ic_attach_camera</item>
<item name="ic_attach_document">@drawable/ic_attach_document</item>
@@ -61,29 +74,15 @@
<item name="TextSizeHeadline">20sp</item>
</style>
- <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@color/primary</item>
- <item name="android:backgroundStacked">@color/primary_dark</item>
- <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
- <item name="android:icon">@android:color/transparent</item>
- </style>
-
- <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
- <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
- <item name="android:dropDownListViewStyle">
- @android:style/Widget.Holo.Light.ListView.DropDown
- </item>
- </style>
-
- <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
- <item name="android:background">@drawable/actionbar_tab_indicator</item>
- </style>
-
- <style name="ConversationsDialog" parent="@android:style/Theme.Holo.Light.Dialog">
+ <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowNoTitle">true</item>
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">18sp</item>
</style>
+ <style name="ConversationsTheme.NoActionBar.FullScreen" parent="Theme.AppCompat.Light.NoActionBar">
+ <item name="android:windowFullscreen">true</item>
+ </style>
+
</resources> \ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 0343d1171..bfcffe012 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -65,6 +65,14 @@
android:key="quiet_hours"
android:summary="@string/pref_quiet_hours_summary"
android:title="@string/title_pref_quiet_hours">
+ <intent
+ android:action="android.intent.action.VIEW"
+ android:targetClass="de.pixart.messenger.ui.SettingsActivity"
+ android:targetPackage="de.pixart.messenger">
+ <extra
+ android:name="page"
+ android:value="quiet_hours" />
+ </intent>
<CheckBoxPreference
android:defaultValue="@bool/enable_quiet_hours"
android:key="enable_quiet_hours"
@@ -247,6 +255,14 @@
android:icon="@drawable/ic_settings_black_24dp"
android:key="expert"
android:title="@string/pref_expert_options">
+ <intent
+ android:action="android.intent.action.VIEW"
+ android:targetClass="de.pixart.messenger.ui.SettingsActivity"
+ android:targetPackage="de.pixart.messenger">
+ <extra
+ android:name="page"
+ android:value="expert" />
+ </intent>
<PreferenceCategory android:title="@string/pref_general"
android:key="general">
<ListPreference