Remove Preference divider and cleanup prefs

vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt

@@ -1,36 +0,0 @@
-/*
- * Copyright 2018 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.core.preference
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.preference.Preference
-import im.vector.riotx.R
-
-/**
- * Divider for Preference screen
- */
-class VectorPreferenceDivider @JvmOverloads constructor(context: Context,
-                                                        attrs: AttributeSet? = null,
-                                                        defStyleAttr: Int = 0,
-                                                        defStyleRes: Int = 0
-) : Preference(context, attrs, defStyleAttr, defStyleRes) {
-
-    init {
-        layoutResource = R.layout.vector_preference_divider
-    }
-}

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

@@ -743,17 +743,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getInt(SETTINGS_RAGE_SHAKE_DETECTION_THRESHOLD_KEY, ShakeDetector.SENSITIVITY_MEDIUM)
     }
 
-    /**
-     * Update the rage shake  status.
-     *
-     * @param isEnabled true to enable the rage shake
-     */
-    fun setUseRageshake(isEnabled: Boolean) {
-        defaultPrefs.edit {
-            putBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, isEnabled)
-        }
-    }
-
     /**
      * Tells if all the events must be displayed ie even the redacted events.
      *

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

@@ -38,7 +38,6 @@ import im.vector.riotx.core.intent.analyseIntent
 import im.vector.riotx.core.intent.getFilenameFromUri
 import im.vector.riotx.core.platform.SimpleTextWatcher
 import im.vector.riotx.core.preference.VectorPreference
-import im.vector.riotx.core.preference.VectorPreferenceDivider
 import im.vector.riotx.core.utils.*
 import im.vector.riotx.features.crypto.keys.KeysExporter
 import im.vector.riotx.features.crypto.keys.KeysImporter
@@ -61,20 +60,11 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
     private val mCryptographyCategory by lazy {
         findPreference<PreferenceCategory>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY)!!
     }
-    private val mCryptographyCategoryDivider by lazy {
-        findPreference<VectorPreferenceDivider>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY)!!
-    }
     // cryptography manage
     private val mCryptographyManageCategory by lazy {
         findPreference<PreferenceCategory>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY)!!
     }
-    private val mCryptographyManageCategoryDivider by lazy {
-        findPreference<VectorPreferenceDivider>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY)!!
-    }
     // displayed pushers
-    private val mPushersSettingsDivider by lazy {
-        findPreference<VectorPreferenceDivider>(VectorPreferences.SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY)!!
-    }
     private val mPushersSettingsCategory by lazy {
         findPreference<PreferenceCategory>(VectorPreferences.SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY)!!
     }
@@ -131,16 +121,6 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                 true
             }
         }
-
-        // Rageshake Management
-        findPreference<SwitchPreference>(VectorPreferences.SETTINGS_USE_RAGE_SHAKE_KEY)!!.let {
-            it.isChecked = vectorPreferences.useRageshake()
-
-            it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                vectorPreferences.setUseRageshake(newValue as Boolean)
-                true
-            }
-        }
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
@@ -333,11 +313,9 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
     private fun removeCryptographyPreference() {
         preferenceScreen.let {
             it.removePreference(mCryptographyCategory)
-            it.removePreference(mCryptographyCategoryDivider)
 
             // Also remove keys management section
             it.removePreference(mCryptographyManageCategory)
-            it.removePreference(mCryptographyManageCategoryDivider)
         }
     }
 

vector/src/main/res/layout/vector_preference_divider.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:background="?vctr_shadow_bottom" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="?vctr_preference_divider_color" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:background="?vctr_shadow_top" />
-</LinearLayout>

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

@@ -63,9 +63,6 @@
         <!-- room notification text color (typing, unsent...) -->
         <attr name="vctr_room_notification_text_color" format="color" />
 
-        <!-- color for dividers in settings -->
-        <attr name="vctr_preference_divider_color" format="color" />
-
         <!-- icon colors -->
         <attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
         <attr name="vctr_icon_tint_on_dark_action_bar_color" format="color" />

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

@@ -72,9 +72,6 @@
         <item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item>
         <item name="vctr_list_divider_color">@color/list_divider_color_black</item>
 
-        <!-- color for dividers in settings -->
-        <item name="vctr_preference_divider_color">@color/list_divider_color_black</item>
-
         <item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
 
         <item name="vctr_pill_receipt">@drawable/pill_receipt_black</item>

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

@@ -139,9 +139,6 @@
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>
 
-        <!-- color for dividers in settings -->
-        <item name="vctr_preference_divider_color">@color/list_divider_color_dark</item>
-
         <!-- icon colors -->
         <item name="vctr_settings_icon_tint_color">@android:color/white</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>

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

@@ -139,9 +139,6 @@
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>
 
-        <!-- color for dividers in settings -->
-        <item name="vctr_preference_divider_color">@color/list_divider_color_light</item>
-
         <!-- icon colors -->
         <item name="vctr_settings_icon_tint_color">@android:color/black</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>

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

@@ -88,9 +88,6 @@
         <!-- room notification text color (typing, unsent...) -->
         <item name="vctr_room_notification_text_color">#a0a29f</item>
 
-        <!-- color for dividers in settings -->
-        <item name="vctr_preference_divider_color">#e1e1e1</item>
-
         <!-- icon colors -->
         <item name="vctr_settings_icon_tint_color">@color/accent_color_status</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>

vector/src/main/res/xml/vector_settings_general.xml

@@ -45,8 +45,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CONTACT_PREFERENCE_KEYS"
         android:title="@string/settings_contact"
@@ -63,8 +61,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
 
         <im.vector.riotx.core.preference.VectorPreference
@@ -93,8 +89,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/action_sign_out">
 
         <im.vector.riotx.core.preference.VectorPreference

vector/src/main/res/xml/vector_settings_help_about.xml

@@ -2,50 +2,44 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreference
-        android:key="SETTINGS_OTHERS_PREFERENCE_KEY"
+        android:key="APP_INFO_LINK_PREFERENCE_KEY"
-        android:title="@string/settings_other">
+        android:summary="@string/settings_app_info_link_summary"
+        android:title="@string/settings_app_info_link_title" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="APP_INFO_LINK_PREFERENCE_KEY"
+        android:key="SETTINGS_VERSION_PREFERENCE_KEY"
-            android:summary="@string/settings_app_info_link_summary"
+        android:title="@string/settings_version"
-            android:title="@string/settings_app_info_link_title" />
+        tools:summary="1.2.3" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_VERSION_PREFERENCE_KEY"
+        android:key="SETTINGS_SDK_VERSION_PREFERENCE_KEY"
-            android:title="@string/settings_version"
+        android:title="@string/settings_sdk_version"
-            tools:summary="1.2.3" />
+        tools:summary="4.5.6" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_SDK_VERSION_PREFERENCE_KEY"
+        android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"
-            android:title="@string/settings_sdk_version"
+        android:title="@string/settings_olm_version"
-            tools:summary="4.5.6" />
+        tools:summary="7.8.9" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"
+        android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"
-            android:title="@string/settings_olm_version"
+        android:title="@string/settings_copyright" />
-            tools:summary="7.8.9" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"
+        android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"
-            android:title="@string/settings_copyright" />
+        android:title="@string/settings_app_term_conditions" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"
+        android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
-            android:title="@string/settings_app_term_conditions" />
+        android:title="@string/settings_privacy_policy" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
+        android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
-            android:title="@string/settings_privacy_policy" />
+        android:title="@string/settings_third_party_notices" />
 
-        <im.vector.riotx.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
+        android:key="SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
-            android:title="@string/settings_third_party_notices" />
+        android:title="@string/settings_other_third_party_notices" />
-
-        <im.vector.riotx.core.preference.VectorPreference
-            android:key="SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
-            android:title="@string/settings_other_third_party_notices" />
-
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>

vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml

@@ -36,8 +36,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider />
-
     <!-- For API < 26 -->
     <im.vector.riotx.core.preference.VectorPreference
         android:dialogTitle="@string/settings_notification_ringtone"

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

@@ -67,12 +67,8 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY" />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY"
-        android:title="@string/settings_notifications_targets" />
+        android:title="@string/settings_notifications_targets" /-->
-
-    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY" /-->
 
 </androidx.preference.PreferenceScreen>

vector/src/main/res/xml/vector_settings_preferences.xml

@@ -99,8 +99,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider app:isPreferenceVisible="@bool/false_not_implemented" />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_HOME_DISPLAY_KEY"
         android:title="@string/settings_home_display"
@@ -118,8 +116,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider app:isPreferenceVisible="@bool/false_not_implemented" />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:title="@string/settings_media"
         app:isPreferenceVisible="@bool/false_not_implemented">

vector/src/main/res/xml/vector_settings_security_privacy.xml

@@ -27,8 +27,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY" />
-
     <!-- devices list entry point -->
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_DEVICES_LIST_PREFERENCE_KEY"
@@ -41,8 +39,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY" />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
         android:title="@string/settings_cryptography_manage_keys">
@@ -64,10 +60,6 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider
-        android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY"
-        app:isPreferenceVisible="@bool/false_not_implemented" />
-
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
         android:title="@string/settings_analytics"