Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Settings: restore "Show read receipts" setting and create categories of per Riot-Web

Browse Source
This commit is contained in:
Benoit Marty 2020-01-17 10:10:46 +01:00
parent 34b6dd4270
commit 8c2a55a5a2
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/res/values/strings_riotX.xml
View File

@ -34,5 +34,11 @@
<string name="unignore">Unignore</string> <string name="unignore">Unignore</string>
<!-- Title for category in the settings which affect what is displayed in the timeline (ex: show read receipts, etc.) -->
<string name="settings_category_timeline">Timeline</string>
<!-- Title for category in the settings which affect the behavior of the message editor (ex: enable Markdown, send typing notification, etc.) -->
<string name="settings_category_composer">Message editor</string>
</resources> </resources>

30
vector/src/main/res/xml/vector_settings_preferences.xml
View File

@ -2,7 +2,6 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<im.vector.riotx.core.preference.VectorPreferenceCategory <im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_USER_INTERFACE_KEY" android:key="SETTINGS_USER_INTERFACE_KEY"
android:title="@string/settings_user_interface"> android:title="@string/settings_user_interface">
@ -26,12 +25,15 @@
android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY" android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"
android:title="@string/font_size" /> android:title="@string/font_size" />
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_category_composer">
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true" android:defaultValue="false"
android:key="SETTINGS_SHOW_URL_PREVIEW_KEY" android:key="SETTINGS_ENABLE_MARKDOWN_KEY"
android:summary="@string/settings_inline_url_preview_summary" android:summary="@string/settings_send_markdown_summary"
android:title="@string/settings_inline_url_preview" android:title="@string/settings_send_markdown" />
app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true" android:defaultValue="true"
@ -39,11 +41,16 @@
android:summary="@string/settings_send_typing_notifs_summary" android:summary="@string/settings_send_typing_notifs_summary"
android:title="@string/settings_send_typing_notifs" /> android:title="@string/settings_send_typing_notifs" />
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="false" android:defaultValue="true"
android:key="SETTINGS_ENABLE_MARKDOWN_KEY" android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
android:summary="@string/settings_send_markdown_summary" android:summary="@string/settings_inline_url_preview_summary"
android:title="@string/settings_send_markdown" /> android:title="@string/settings_inline_url_preview"
app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY" android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
@ -59,8 +66,7 @@
android:defaultValue="true" android:defaultValue="true"
android:key="SETTINGS_SHOW_READ_RECEIPTS_KEY" android:key="SETTINGS_SHOW_READ_RECEIPTS_KEY"
android:summary="@string/settings_show_read_receipts_summary" android:summary="@string/settings_show_read_receipts_summary"
android:title="@string/settings_show_read_receipts" android:title="@string/settings_show_read_receipts" />
app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true" android:defaultValue="true"