diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/drawable-hdpi/ic_chat_white_24dp.png | bin | 0 -> 223 bytes | |||
| -rw-r--r-- | src/main/res/drawable-mdpi/ic_chat_white_24dp.png | bin | 0 -> 154 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xhdpi/ic_chat_white_24dp.png | bin | 0 -> 239 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png | bin | 0 -> 354 bytes | |||
| -rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_chat_white_24dp.png | bin | 0 -> 416 bytes | |||
| -rw-r--r-- | src/main/res/layout/fragment_conversations_overview.xml | 2 | ||||
| -rw-r--r-- | src/main/res/menu/activity_conversations.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values-w945dp/defaults.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 1 |
9 files changed, 13 insertions, 1 deletions
diff --git a/src/main/res/drawable-hdpi/ic_chat_white_24dp.png b/src/main/res/drawable-hdpi/ic_chat_white_24dp.png Binary files differnew file mode 100644 index 000000000..6cdc66caf --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_chat_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_chat_white_24dp.png b/src/main/res/drawable-mdpi/ic_chat_white_24dp.png Binary files differnew file mode 100644 index 000000000..96cfcfe58 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_chat_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_24dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_24dp.png Binary files differnew file mode 100644 index 000000000..a63bccd85 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_chat_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png Binary files differnew file mode 100644 index 000000000..ab5600da7 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_chat_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_24dp.png Binary files differnew file mode 100644 index 000000000..2d51842d5 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_chat_white_24dp.png diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 1f3d9e4e2..339514059 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -20,6 +20,6 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="16dp" - android:src="?attr/icon_new" /> + android:src="@drawable/ic_chat_white_24dp" /> </FrameLayout> </layout>
\ No newline at end of file diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml index 6cd9000fd..136dd8458 100644 --- a/src/main/res/menu/activity_conversations.xml +++ b/src/main/res/menu/activity_conversations.xml @@ -2,6 +2,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item + android:id="@+id/action_scan_qr_code" + android:icon="?attr/icon_scan_qr_code" + android:title="@string/scan_qr_code" + android:visible="@bool/show_qr_code_scan" + app:showAsAction="always" /> + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:title="@string/action_accounts" diff --git a/src/main/res/values-w945dp/defaults.xml b/src/main/res/values-w945dp/defaults.xml new file mode 100644 index 000000000..855f5b520 --- /dev/null +++ b/src/main/res/values-w945dp/defaults.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <bool name="show_qr_code_scan">false</bool> +</resources> + diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 869072f84..71f1d5937 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -101,5 +101,6 @@ <bool name="warn_unencrypted_chat">true</bool> <bool name="use_bundled_emoji">true</bool> <bool name="enable_multi_accounts">false</bool> + <bool name="show_qr_code_scan">true</bool> </resources> |
