From 1883a8c7cfd5ed013e169cfdedb63c49cb2616ad Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Sat, 24 Oct 2026 11:15:35 -0400 Subject: [PATCH] itch.io browse: drop code comments --- .../com/droiddeck/launcher/stores/itch/ItchBrowse.kt | 10 ---------- .../java/com/droiddeck/launcher/ui/ItchBrowseBar.kt | 3 --- .../droiddeck/launcher/stores/itch/ItchBrowseTest.kt | 1 - 3 files changed, 14 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index 781f918ec9..f820be6d23 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -10,7 +10,6 @@ import org.json.JSONArray import java.io.File import java.security.MessageDigest -/** What the Store tab is showing: an order, a price filter and, later, platforms and tags. The default is the front page. */ internal data class BrowseQuery( val sort: String = ItchBrowse.SORT_POPULAR, val price: String = ItchBrowse.PRICE_ANY, @@ -38,7 +37,6 @@ internal object ItchBrowse { const val PRICE_UNDER_15 = "15-dollars-or-less" val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15) - /** Platform names as itch spells them in `platform-`. */ val platformNames = listOf("windows", "osx", "linux", "android", "ios", "web", "mobile-web") private const val BASE = "https://itch.io/games" @@ -50,12 +48,10 @@ internal object ItchBrowse { @Volatile private var lastRequestAt = 0L private val lock = Any() - /** The path piece itch uses for each choice; the default sort and price have none. */ private fun sortSegment(sort: String): String? = sort.takeIf { it != SORT_POPULAR && it in sorts } private fun priceSegment(price: String): String? = price.takeIf { it != PRICE_ANY && it in prices } - /** The address of [query]'s page on itch: sort, price, platforms, then tags, as itch's own links spell them. */ fun path(query: BrowseQuery): String { val segments = listOfNotNull(sortSegment(query.sort), priceSegment(query.price)) + query.platforms.sorted().map { "platform-$it" } + @@ -63,12 +59,10 @@ internal object ItchBrowse { return if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") } - /** The listing feed for [query]'s [page]. */ fun url(query: BrowseQuery, page: Int): String = path(query) + ".xml" + if (page > 1) "?page=$page" else "" fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') - /** Page [page] of [query]: the disk copy when it is fresh, otherwise the feed, one request at a time and spaced out. */ fun page(context: Context, query: BrowseQuery, page: Int, force: Boolean = false): BrowsePage { val app = context.applicationContext val url = url(query, page) @@ -120,7 +114,6 @@ internal object ItchBrowse { } } -/** The Store tab's result list: the query, the games loaded so far, and whether more can be asked for. */ internal object ItchBrowseState { var query by mutableStateOf(BrowseQuery()) private set @@ -136,7 +129,6 @@ internal object ItchBrowseState { private var next = 1 private var generation = 0 - /** Whether the tab shows these results instead of the front page shelves. */ val active: Boolean get() = !query.isDefault fun choose(context: Context, wanted: BrowseQuery) { @@ -151,7 +143,6 @@ internal object ItchBrowseState { if (active) more(context) } - /** Asks for the next page. A page that failed is only asked for again when [retry] is set, so scrolling can't loop on it. */ fun more(context: Context, retry: Boolean = false) { if (loading || ended || !active || (failed && !retry)) return loading = true @@ -165,7 +156,6 @@ internal object ItchBrowseState { StoresState.post { if (mine != generation) return@post loading = false - // A thrown or non-2xx fetch leaves the list open so the same page can be asked for again. if (answer == null || answer.code !in 200..299) { failed = true return@post diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index fd73344512..e1e170fdeb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -34,7 +34,6 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.itch.ItchBrowse import com.droiddeck.launcher.stores.itch.ItchBrowseState -/** Sort and price chips above the itch Store tab; picking anything but the defaults swaps the shelves for results. */ @Composable internal fun ItchBrowseBar() { val ctx = LocalContext.current @@ -49,12 +48,10 @@ internal fun ItchBrowseBar() { } } -/** The end of the result list: it asks for the next page as it scrolls into view. */ @Composable internal fun ItchLoadMore() { val ctx = LocalContext.current val count = ItchBrowseState.items.size - // Keyed on nothing that changes with a page, so appending games never re-fires it while this end item stays composed; scrolling it back into view does. LaunchedEffect(Unit) { ItchBrowseState.more(ctx) } if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt index 8ee4f83346..6b73153345 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -5,7 +5,6 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -/** Every address here was copied from itch.io's own links, not worked out. */ class ItchBrowseTest { private fun path(sort: String = ItchBrowse.SORT_POPULAR, price: String = ItchBrowse.PRICE_ANY, platforms: Set = emptySet(), tags: List = emptyList()) = ItchBrowse.path(BrowseQuery(sort, price, platforms, tags))