Feature: emoji on subtitles / sources selection

* Show flag and translated name when choosing subtitles / sources
* Group by language code instead of name on sources / mirrors selection

Author: diogob003

app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt

@@ -1162,24 +1162,25 @@ class GeneratorPlayer : FullScreenPlayer() {
                     ArrayAdapter<Spanned>(ctx, R.layout.sort_bottom_single_choice)
                 subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())
 
-                val subtitlesGrouped =
-                    currentSubtitles.groupBy { it.originalName }.map { (key, value) ->
-                        key to value.sortedBy { it.nameSuffix.toIntOrNull() ?: 0 }
-                    }.toMap()
+                val subtitlesGrouped = currentSubtitles
+                                        .groupBy { it.languageCode }
+                                        .mapValues { it.value.sortedWith(
+                                            compareBy({ it.localizedName.substringAfter("\u00a0").lowercase() }, { it.nameSuffix.toIntOrNull() ?: 0 })) }
+                                        .toMap()
                 val subtitlesGroupedList = subtitlesGrouped.entries.toList()
 
-                val subtitles = subtitlesGrouped.map { it.key.html() }
+                val subtitlesDisplayNames = subtitlesGrouped.map { it.value.first().localizedName.html() }
 
                 val subtitleGroupIndexStart =
-                    subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName) + 1
+                    subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.languageCode) + 1
                 var subtitleGroupIndex = subtitleGroupIndexStart
 
                 val subtitleOptionIndexStart =
-                    subtitlesGrouped[currentSelectedSubtitles?.originalName]?.indexOfFirst { it.nameSuffix == currentSelectedSubtitles?.nameSuffix }
-                        ?: 0
+                    subtitlesGrouped[currentSelectedSubtitles?.languageCode]
+                    ?.indexOfFirst { it.nameSuffix == currentSelectedSubtitles?.nameSuffix } ?: 0
                 var subtitleOptionIndex = subtitleOptionIndexStart
 
-                subsArrayAdapter.addAll(subtitles)
+                subsArrayAdapter.addAll(subtitlesDisplayNames)
 
                 subtitleList.adapter = subsArrayAdapter
                 subtitleList.choiceMode = AbsListView.CHOICE_MODE_SINGLE

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt

@@ -11,6 +11,7 @@ import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
+import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 enum class SubtitleStatus {
@@ -49,6 +50,9 @@ data class SubtitleData(
 
     val name = "$originalName $nameSuffix"
 
+    val localizedName
+        get() = getNameNextToFlagEmoji(languageCode) ?: originalName
+
     /**
      * Gets the URL, but tries to fix it if it is malformed.
      */

app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt

@@ -64,7 +64,6 @@ class RepoLinkGenerator(
         // these act as a general filter to prevent duplication of links or names
         val currentLinksUrls = mutableSetOf<String>()       // makes all urls unique
         val currentSubsUrls = mutableSetOf<String>()    // makes all subs urls unique
-        val currentSubsNames = mutableSetOf<String>()   // makes all subs names unique
 
         synchronized(currentCache) {
             val outdatedCache =
@@ -88,7 +87,6 @@ class RepoLinkGenerator(
 
             currentCache.subtitleCache.forEach { sub ->
                 currentSubsUrls.add(sub.url)
-                currentSubsNames.add(sub.name)
                 subtitleCallback(sub)
             }
 
@@ -116,12 +114,11 @@ class RepoLinkGenerator(
 
                 val nameDecoded = correctFile.originalName.html().toString().trim() // `%3Ch1%3Esub%20name…` → `<h1>sub name…` → `sub name…`
 
-                val suffixCount = currentSubsNames.count { it.contains(nameDecoded) } +1
+                val suffixCount = currentCache.subtitleCache.count {
+                    it.languageCode == correctFile.languageCode
+                } + 1
 
-                val updatedFile =
-                    correctFile.copy(originalName = nameDecoded, nameSuffix = "$suffixCount")
-
-                currentSubsNames.add(updatedFile.name)
+                val updatedFile = correctFile.copy(originalName = nameDecoded, nameSuffix = "$suffixCount")
 
                 synchronized(currentCache) {
                     if (currentCache.subtitleCache.add(updatedFile)) {

app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt

@@ -377,7 +377,9 @@ object AppContextUtils {
     }
 
     fun sortSubs(subs: Set<SubtitleData>): List<SubtitleData> {
-        return subs.sortedBy { it.name }
+        return subs.sortedWith(
+            compareBy({ it.localizedName.substringAfter("\u00a0").lowercase() }, { it.nameSuffix.toIntOrNull() ?: 0 })
+        )
     }
 
     fun Context.getApiSettings(): HashSet<String> {