[Android] Add a setting to set the video grouping prefix length

[Nicolas Pomepuy]

vlc-android | branch: 3.2.x | Nicolas Pomepuy <nicolas.pomepuy at gmail.com> | Tue Sep 24 13:57:38 2019 +0200| [041bf19c1949959882169ebc54ed2c457d09d70c] | committer: Geoffrey Métais

Add a setting to set the video grouping prefix length

(cherry picked from commit 16db3dfa6b286ded7d0b70fc208f00ee7127caeb)

> https://code.videolan.org/videolan/vlc-android/commit/041bf19c1949959882169ebc54ed2c457d09d70c
---

 vlc-android/res/values/strings.xml                 |  3 +++
 vlc-android/res/xml/preferences_ui.xml             |  8 ++++++++
 .../videolan/vlc/gui/preferences/PreferencesUi.kt  | 24 ++++++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 8da1be547..1235ffe0d 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -736,4 +736,7 @@
     <string name="report_a_crash">Report a crash</string>
     <string name="describe_crash">Please describe how this crash happened</string>
     <string name="favorite">Favorite</string>
+    <string name="video_group_size_dialog_text">Number of characters used to group by name</string>
+    <string name="video_group_size_summary">Group by %s first letters</string>
+    <string name="video_group_size">Group videos by name</string>
 </resources>
diff --git a/vlc-android/res/xml/preferences_ui.xml b/vlc-android/res/xml/preferences_ui.xml
index 4519852b8..8a3d90461 100644
--- a/vlc-android/res/xml/preferences_ui.xml
+++ b/vlc-android/res/xml/preferences_ui.xml
@@ -69,6 +69,14 @@
                 android:summary="@string/show_video_thumbnails_summary"
                 android:title="@string/show_video_thumbnails"/>
 
+        <EditTextPreference
+                app:singleLineTitle="false"
+                android:defaultValue="true"
+                android:key="video_group_size"
+                app:defaultValue="6"
+                android:title="@string/video_group_size"
+                android:dialogTitle="@string/video_group_size_dialog_text" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.kt b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.kt
index d3afcd708..cad6fbe50 100644
--- a/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.kt
+++ b/vlc-android/src/org/videolan/vlc/gui/preferences/PreferencesUi.kt
@@ -25,12 +25,16 @@ package org.videolan.vlc.gui.preferences
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.text.InputType
+import android.text.TextUtils
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
+import org.videolan.medialibrary.interfaces.AbstractMedialibrary
 import org.videolan.vlc.R
 import org.videolan.vlc.gui.helpers.UiTools
 import org.videolan.vlc.util.*
@@ -50,6 +54,22 @@ class PreferencesUi : BasePreferenceFragment(), SharedPreferences.OnSharedPrefer
         setupTheme()
     }
 
+    override fun onCreatePreferences(bundle: Bundle?, s: String?) {
+        super.onCreatePreferences(bundle, s)
+        val groupVideoPreference = preferenceManager.findPreference<EditTextPreference>("video_group_size")
+        groupVideoPreference?.setOnBindEditTextListener { editText ->
+            editText.inputType = InputType.TYPE_CLASS_NUMBER
+        }
+        groupVideoPreference?.summaryProvider = Preference.SummaryProvider<EditTextPreference> { preference ->
+            val text = preference.text
+            if (TextUtils.isEmpty(text)) {
+                ""
+            } else {
+                getString(R.string.video_group_size_summary, text)
+            }
+        }
+    }
+
     private fun setupTheme() {
         val prefs = preferenceScreen.sharedPreferences
         if (!prefs.contains(KEY_APP_THEME)) {
@@ -108,6 +128,10 @@ class PreferencesUi : BasePreferenceFragment(), SharedPreferences.OnSharedPrefer
                 Settings.listTitleEllipsize = sharedPreferences.getString(LIST_TITLE_ELLIPSIZE, "0").toInt()
                 (activity as PreferencesActivity).setRestart()
             }
+            "video_group_size" -> {
+                AbstractMedialibrary.getInstance().setVideoGroupsPrefixLength(Settings.getInstance(requireActivity()).getString(key, "6").toInt())
+                (activity as PreferencesActivity).setRestart()
+            }
         }
     }