filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move voice message setting out of labs 

Having no voice message button is actually more thoroughly tested than
the default setting... so let's put it to the other related settings

Change-Id: I82fda959dd8d0798a59d0444cd0cecdcda6b8cd3
This commit is contained in:
SpiritCroc 2022-10-28 18:24:14 +02:00
parent 9269a4442c
commit da5dcd18b0
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
View File

@ -18,6 +18,7 @@ package im.vector.app.features.settings
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build
import android.os.Bundle import android.os.Bundle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference import androidx.preference.Preference
@ -83,6 +84,8 @@ class VectorSettingsPreferencesFragment :
// user interface preferences // user interface preferences
setUserInterfacePreferences() setUserInterfacePreferences()
findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_VOICE_MESSAGE)?.isEnabled = Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP
// Language: follow system // Language: follow system
findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_FOLLOW_SYSTEM_LOCALE)?.onPreferenceChangeListener = findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_FOLLOW_SYSTEM_LOCALE)?.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { _, newValue -> Preference.OnPreferenceChangeListener { _, newValue ->

2
vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
View File

@ -83,8 +83,6 @@ class VectorSettingsLabsFragment :
findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_ALLOW_URL_PREVIEW_IN_ENCRYPTED_ROOM_KEY)?.isEnabled = vectorPreferences.showUrlPreviews() findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_ALLOW_URL_PREVIEW_IN_ENCRYPTED_ROOM_KEY)?.isEnabled = vectorPreferences.showUrlPreviews()
findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_VOICE_MESSAGE)?.isEnabled = Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP
findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_AUTO_REPORT_UISI)?.let { pref -> findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_AUTO_REPORT_UISI)?.let { pref ->
// ensure correct default // ensure correct default
pref.isChecked = vectorPreferences.labsAutoReportUISI() pref.isChecked = vectorPreferences.labsAutoReportUISI()

6
vector/src/main/res/xml/vector_settings_labs.xml
View File

@ -43,12 +43,6 @@
android:title="@string/url_previews_in_encrypted_rooms" android:title="@string/url_previews_in_encrypted_rooms"
android:summary="@string/url_previews_in_encrypted_rooms_summary" /> android:summary="@string/url_previews_in_encrypted_rooms_summary" />
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_VOICE_MESSAGE"
android:title="@string/settings_show_voice_message_recorder_ui"
android:summary="@string/settings_show_voice_message_recorder_ui_summary" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
<im.vector.app.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory

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

@ -185,6 +185,12 @@
android:summary="@string/settings_show_emoji_keyboard_summary" android:summary="@string/settings_show_emoji_keyboard_summary"
android:title="@string/settings_show_emoji_keyboard" /> android:title="@string/settings_show_emoji_keyboard" />
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_VOICE_MESSAGE"
android:title="@string/settings_show_voice_message_recorder_ui"
android:summary="@string/settings_show_voice_message_recorder_ui_summary" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:key="SETTINGS_INTERFACE_TAKE_PHOTO_VIDEO" android:key="SETTINGS_INTERFACE_TAKE_PHOTO_VIDEO"
android:persistent="false" android:persistent="false"