Fix thumbnails, category sorting, trailing-space split, and settings field

Author: errorcodeQQ

SKTechProvider/src/main/kotlin/com/sktech/plugin/SKTech.kt

@@ -263,7 +263,7 @@ class SKTech : MainAPI() {
                 }
             }
 
-            // Group by sport for sport rows (show both live and upcoming events)
+            // Group by sport — use trimmed category to avoid trailing-space duplicates
             val sport = ev.category.trim()
             if (sport.isNotEmpty() && isSportEnabled(sport)) {
                 if (evMs >= now - 4 * 3600_000L) { // Live or upcoming
@@ -277,12 +277,14 @@ class SKTech : MainAPI() {
             lists.add(HomePageList("🔴 LIVE NOW", live, isHorizontalImages = true))
         }
 
-        // Sport sections sorted by name
-        byCategory.entries.sortedBy { it.key }.forEach { (sport, items) ->
-            if (items.isNotEmpty()) {
-                lists.add(HomePageList(sport, items.take(20), isHorizontalImages = true))
+        // Sport sections sorted by event count (most events first), then alphabetically
+        byCategory.entries
+            .sortedWith(compareByDescending<Map.Entry<String, MutableList<SearchResponse>>> { it.value.size }.thenBy { it.key })
+            .forEach { (sport, items) ->
+                if (items.isNotEmpty()) {
+                    lists.add(HomePageList(sport, items.take(20), isHorizontalImages = true))
+                }
             }
-        }
 
         return newHomePageResponse(lists)
     }
@@ -304,6 +306,7 @@ class SKTech : MainAPI() {
             if (evMs != null && evMs > now) {
                 if (isUpcomingEventsEnabled()) {
                     upcoming.add(item)
+                    // Trim category to avoid trailing-space duplicates
                     val sport = ev.category.trim()
                     if (sport.isNotEmpty() && isSportEnabled(sport)) {
                         byCategory.getOrPut(sport) { mutableListOf() }.add(item)
@@ -317,12 +320,14 @@ class SKTech : MainAPI() {
             lists.add(HomePageList("📅 UPCOMING", upcoming.take(30), isHorizontalImages = true))
         }
 
-        // Sport sections sorted by name
-        byCategory.entries.sortedBy { it.key }.forEach { (sport, items) ->
-            if (items.isNotEmpty()) {
-                lists.add(HomePageList(sport, items.take(20), isHorizontalImages = true))
+        // Sport sections sorted by event count (most events first), then alphabetically
+        byCategory.entries
+            .sortedWith(compareByDescending<Map.Entry<String, MutableList<SearchResponse>>> { it.value.size }.thenBy { it.key })
+            .forEach { (sport, items) ->
+                if (items.isNotEmpty()) {
+                    lists.add(HomePageList(sport, items.take(20), isHorizontalImages = true))
+                }
             }
-        }
 
         return newHomePageResponse(lists)
     }
@@ -438,13 +443,22 @@ class SKTech : MainAPI() {
     private fun SKTechEventData.toSearchResponse(): SearchResponse? {
         return try {
             val style = getThumbnailStyle()
-            val logo = if (style == "logos") {
-                teamAFlag?.takeIf { it.isNotEmpty() }
-                    ?: teamBFlag?.takeIf { it.isNotEmpty() }
-                    ?: eventLogo?.takeIf { it.isNotEmpty() }
-                    ?: getCategoryFallbackLogo(category)
-            } else {
-                getCategoryFallbackLogo(category)
+            // Always prefer real images from the server — use fallback only as last resort
+            val logo = when (style) {
+                "logos" -> {
+                    // logos mode: prefer team flags (face/kit images)
+                    teamAFlag?.takeIf { it.isNotEmpty() }
+                        ?: teamBFlag?.takeIf { it.isNotEmpty() }
+                        ?: eventLogo?.takeIf { it.isNotEmpty() }
+                        ?: getCategoryFallbackLogo(category)
+                }
+                else -> {
+                    // banners mode (default): prefer event logo, then team flags
+                    eventLogo?.takeIf { it.isNotEmpty() }
+                        ?: teamAFlag?.takeIf { it.isNotEmpty() }
+                        ?: teamBFlag?.takeIf { it.isNotEmpty() }
+                        ?: getCategoryFallbackLogo(category)
+                }
             }
             val title = buildTitle()
             val cd = ChannelData(name = eventName, logo = logo, linksPath = links)

SKTechProvider/src/main/kotlin/com/sktech/plugin/SKTechPlugin.kt

@@ -12,14 +12,13 @@ import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
 
 @CloudstreamPlugin
 class SKTechPlugin : BasePlugin() {
-    var openSettings: ((Context) -> Unit)? = null
+    // CloudStream (pre-release) reads this field via reflection to show the ⚙️ settings icon
+    var openSettings: ((Context) -> Unit)? = { context ->
+        showSettingsDialog(context)
+    }
 
     override fun load() {
         registerMainAPI(SKTech())
-
-        openSettings = { context ->
-            showSettingsDialog(context)
-        }
     }
 
     private fun showSettingsDialog(context: Context) {