Developer mode: UI

And some cleanup

vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsDeveloperModeFragment.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotx.features.settings
+
+import im.vector.riotx.R
+
+class VectorSettingsDeveloperModeFragment : VectorSettingsBaseFragment() {
+
+    override var titleRes = R.string.settings_developer_mode
+    override val preferenceXmlRes = R.xml.vector_settings_developer_mode
+
+    override fun bindPref() {
+        // Nothing to do
+    }
+}

vector/src/main/res/values/strings_riotX.xml

@@ -6,7 +6,8 @@
     <string name="notification_initial_sync">Initial Sync…</string>
 
 
-
     <string name="settings_show_devices_list">See all my devices</string>
+    <string name="settings_developer_mode">Developer mode</string>
+    <string name="settings_developer_mode_summary">The developer mode activates hidden features and may also make the application less stable. For developers only!</string>
 
 </resources>

vector/src/main/res/xml/vector_settings_developer_mode.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <im.vector.riotx.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_DEVELOPER_MODE_KEY"
+        android:summary="@string/settings_developer_mode_summary"
+        android:title="@string/settings_developer_mode" />
+
+    <im.vector.riotx.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:dependency="SETTINGS_DEVELOPER_MODE_KEY"
+        android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
+        android:title="@string/settings_labs_show_hidden_events_in_timeline" />
+
+    <im.vector.riotx.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:dependency="SETTINGS_DEVELOPER_MODE_KEY"
+        android:key="SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
+        android:summary="@string/labs_allow_extended_logging_summary"
+        android:title="@string/labs_allow_extended_logging" />
+
+    <!-- TODO Display unsupported events -->
+
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
+        android:dependency="SETTINGS_DEVELOPER_MODE_KEY"
+        android:title="@string/settings_notifications">
+
+        <im.vector.riotx.core.preference.VectorPreference
+            android:persistent="false"
+            android:title="@string/settings_notifications_targets"
+            app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
+
+        <im.vector.riotx.core.preference.VectorPreference
+            android:persistent="false"
+            android:title="@string/settings_push_rules"
+            app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
+
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+
+</androidx.preference.PreferenceScreen>

vector/src/main/res/xml/vector_settings_labs.xml

@@ -34,24 +34,12 @@
     <!--android:summary="@string/settings_labs_enable_send_voice_summary"-->
     <!--android:title="@string/settings_labs_enable_send_voice" />-->
 
-    <im.vector.riotx.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
-        android:title="@string/settings_labs_show_hidden_events_in_timeline" />
-
-
     <im.vector.riotx.core.preference.VectorSwitchPreference
         android:defaultValue="true"
         android:key="SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         android:title="@string/labs_swipe_to_reply_in_timeline" />
 
 
-    <im.vector.riotx.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
-        android:summary="@string/labs_allow_extended_logging_summary"
-        android:title="@string/labs_allow_extended_logging" />
-
     <!--</im.vector.riotx.core.preference.VectorPreferenceCategory>-->
 
 </androidx.preference.PreferenceScreen>

vector/src/main/res/xml/vector_settings_notifications.xml

@@ -75,19 +75,4 @@
 
     <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY" /-->
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_expert">
-
-        <im.vector.riotx.core.preference.VectorPreference
-            android:layout_width="match_parent"
-            android:persistent="false"
-            android:title="@string/settings_notifications_targets"
-            app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
-
-        <im.vector.riotx.core.preference.VectorPreference
-            android:layout_width="match_parent"
-            android:persistent="false"
-            android:title="@string/settings_push_rules"
-            app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
-
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>

vector/src/main/res/xml/vector_settings_root.xml

@@ -3,58 +3,54 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_general"
         android:title="@string/settings_general_title"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsGeneralFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:enabled="@bool/false_not_implemented"
         android:icon="@drawable/ic_settings_root_flair"
         android:title="@string/settings_flair"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_notification"
         android:key="SETTINGS_NOTIFICATIONS_KEY"
         android:title="@string/settings_notifications"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_preferences"
         android:title="@string/settings_preferences"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsPreferencesFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:enabled="@bool/false_not_implemented"
         android:icon="@drawable/ic_settings_root_call"
         android:title="@string/preference_voice_and_video"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsVoiceVideoFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_ignored_users"
         android:title="@string/settings_ignored_users"
         app:fragment="im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_security_privacy"
         android:title="@string/settings_security_and_privacy"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_labs"
         android:title="@string/room_settings_labs_pref_title"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:layout_width="match_parent"
+        android:icon="@drawable/ic_settings_root_general"
+        android:title="@string/settings_developer_mode"
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsDeveloperModeFragment" />
+
+    <im.vector.riotx.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_help_about"
         android:title="@string/preference_root_help_about"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment" />