diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3ec55924..d3b2bfd9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,8 +22,8 @@ android { defaultConfig { applicationId = "dev.typetype.android" - versionCode = 11121 - versionName = "1.14.0-beta.1" + versionCode = 11122 + versionName = "1.14.0-beta.2" } signingConfigs { diff --git a/core/data/src/main/java/dev/typetype/android/data/livechat/TwitchChatSseParser.kt b/core/data/src/main/java/dev/typetype/android/data/livechat/TwitchChatSseParser.kt index c90d128f..dd448306 100644 --- a/core/data/src/main/java/dev/typetype/android/data/livechat/TwitchChatSseParser.kt +++ b/core/data/src/main/java/dev/typetype/android/data/livechat/TwitchChatSseParser.kt @@ -1,5 +1,6 @@ package dev.typetype.android.data.livechat +import dev.typetype.android.domain.livechat.ChatEmoteRange import dev.typetype.android.data.network.dto.TwitchChatEventDto import dev.typetype.android.domain.livechat.LiveChatEvent import dev.typetype.android.domain.livechat.LiveChatMessage @@ -32,6 +33,11 @@ internal class TwitchChatSseParser(private val json: Json) { authorName = event.displayName?.ifBlank { null } ?: event.login, authorAvatarUrl = null, moderator = event.badges.any { it.startsWith("moderator/") || it.startsWith("broadcaster/") }, + login = event.login, + color = event.color, + emotes = event.emotes.map { ChatEmoteRange(it.id, it.start, it.end) }, + badges = event.badges, + action = event.action, ), ) } diff --git a/core/data/src/main/java/dev/typetype/android/data/network/dto/TwitchChatDto.kt b/core/data/src/main/java/dev/typetype/android/data/network/dto/TwitchChatDto.kt index a32d0a67..1d44e8e5 100644 --- a/core/data/src/main/java/dev/typetype/android/data/network/dto/TwitchChatDto.kt +++ b/core/data/src/main/java/dev/typetype/android/data/network/dto/TwitchChatDto.kt @@ -88,6 +88,8 @@ data class TwitchVideoCommentDto( val offset: Long = 0, val login: String? = null, val displayName: String? = null, + val color: String? = null, val text: String = "", + val emotes: List = emptyList(), val badges: List = emptyList(), ) diff --git a/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchAccountRepository.kt b/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchAccountRepository.kt index 00d9b570..64596752 100644 --- a/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchAccountRepository.kt +++ b/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchAccountRepository.kt @@ -1,5 +1,6 @@ package dev.typetype.android.data.twitch +import dev.typetype.android.domain.twitch.TwitchChannel import dev.typetype.android.core.error.suspendRunCatching import dev.typetype.android.data.account.ActiveAccountScope import dev.typetype.android.data.network.TypeTypeApi @@ -54,6 +55,12 @@ class RemoteTwitchAccountRepository @Inject constructor( override suspend fun followedLives(cursor: String?): Result> = call { twitchFollowedLives(cursor) } .map { page -> TwitchPage(page.items.map { it.toVideo() }, page.cursor?.takeIf { page.hasMore && it.isNotBlank() }) } + override suspend fun followedVideos(cursor: String?): Result> = call { twitchFollowedVideos(cursor) } + .map { page -> TwitchPage(page.items.map { it.toVideo() }, page.cursor?.takeIf { page.hasMore && it.isNotBlank() }) } + + override suspend fun followedChannels(cursor: String?): Result> = call { twitchFollows(cursor) } + .map { page -> TwitchPage(page.items.map { it.toChannel() }, page.cursor?.takeIf { page.hasMore && it.isNotBlank() }) } + override suspend fun isFollowing(login: String): Result = call { twitchFollowState(login) }.map { it.following } override suspend fun setFollowing(login: String, follow: Boolean): Result = diff --git a/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchRepository.kt b/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchRepository.kt index 8578ae91..d195cd16 100644 --- a/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchRepository.kt +++ b/core/data/src/main/java/dev/typetype/android/data/twitch/RemoteTwitchRepository.kt @@ -1,5 +1,9 @@ package dev.typetype.android.data.twitch +import dev.typetype.android.data.network.dto.TwitchChatAssetsDto +import dev.typetype.android.domain.twitch.TwitchChatAssets +import kotlinx.coroutines.async +import kotlinx.coroutines.coroutineScope import dev.typetype.android.core.error.suspendRunCatching import dev.typetype.android.data.account.ActiveAccountScope import dev.typetype.android.data.network.TypeTypeApi @@ -30,6 +34,9 @@ class RemoteTwitchRepository @Inject constructor( private val activeAccountScope: ActiveAccountScope, private val serverRepository: ServerRepository, ) : TwitchRepository { + @Volatile + private var globalChatAssets: TwitchChatAssetsDto? = null + override suspend fun popular(cursor: String?): Result> = call { twitchStreams(cursor) }.map { page -> page.map { it.toVideo() } } @@ -101,6 +108,15 @@ class RemoteTwitchRepository @Inject constructor( override suspend fun chatHighlights(login: String): Result = call { twitchChatHighlights(login) }.map { it.toDomain() } + // The global set is the same for every channel and large: it is fetched once per app run. + override suspend fun chatAssets(login: String): Result = suspendRunCatching { + coroutineScope { + val global = async { globalChatAssets ?: call { twitchChatAssets() }.getOrNull()?.also { globalChatAssets = it } } + val channel = async { call { twitchChannelChatAssets(segment(login)) }.getOrNull() } + mergeChatAssets(channel.await(), global.await()) + } + } + override suspend fun videoComments(id: String, offsetSeconds: Long?, cursor: String?): Result> = call { twitchVideoComments(segment(id), offset = offsetSeconds.takeIf { cursor == null }, cursor = cursor) } .map { page -> page.map { it.toDomain() } } diff --git a/core/data/src/main/java/dev/typetype/android/data/twitch/TwitchMappers.kt b/core/data/src/main/java/dev/typetype/android/data/twitch/TwitchMappers.kt index 0fd65115..eb53251e 100644 --- a/core/data/src/main/java/dev/typetype/android/data/twitch/TwitchMappers.kt +++ b/core/data/src/main/java/dev/typetype/android/data/twitch/TwitchMappers.kt @@ -1,5 +1,11 @@ package dev.typetype.android.data.twitch +import dev.typetype.android.domain.livechat.ChatEmoteRange +import dev.typetype.android.data.network.dto.TwitchChatAssetsDto +import dev.typetype.android.domain.livechat.ChatEmote +import dev.typetype.android.domain.livechat.ChatImage +import dev.typetype.android.domain.twitch.TwitchChatAssets +import dev.typetype.android.domain.twitch.TwitchLiveInfo import dev.typetype.android.data.network.dto.TwitchChannelDto import dev.typetype.android.data.network.dto.TwitchChatHighlightsDto import dev.typetype.android.data.network.dto.TwitchClipDto @@ -64,8 +70,24 @@ internal fun TwitchChannelDto.toChannel(): TwitchChannel = TwitchChannel( bannerUrl = bannerUrl?.ifBlank { null }, followers = followers, live = live?.toVideo(), + liveInfo = live?.let { + TwitchLiveInfo(it.title, it.viewers, twitchMillis(it.startedAt), it.game?.name?.ifBlank { null }, it.tags) + }, ) +internal fun mergeChatAssets(channel: TwitchChatAssetsDto?, global: TwitchChatAssetsDto?): TwitchChatAssets { + val emotes = LinkedHashMap() + for (emote in channel?.emotes.orEmpty() + global?.emotes.orEmpty()) { + if (emote.name.isBlank() || emote.url.isBlank()) continue + emotes.putIfAbsent(emote.name, ChatEmote(emote.name, emote.url2x ?: emote.url, emote.zeroWidth)) + } + val badges = HashMap() + for ((id, badge) in global?.badges.orEmpty() + channel?.badges.orEmpty()) { + if (badge.url.isNotBlank()) badges[id] = ChatImage(badge.title, badge.url2x ?: badge.url) + } + return TwitchChatAssets(emotes, badges) +} + internal fun TwitchGameDto.toCategory(): TwitchCategory = TwitchCategory(id = id, name = name, slug = slug, boxArtUrl = boxArtUrl?.ifBlank { null }, viewers = viewers) @@ -145,4 +167,8 @@ internal fun TwitchVideoCommentDto.toDomain() = TwitchVideoComment( author = displayName?.ifBlank { null } ?: login, text = text, moderator = badges.any { it.startsWith("moderator/") || it.startsWith("broadcaster/") }, + login = login?.ifBlank { null }, + color = color, + emotes = emotes.map { ChatEmoteRange(it.id, it.start, it.end) }, + badges = badges, ) diff --git a/core/data/src/test/java/dev/typetype/android/data/stream/FakeTwitchRepository.kt b/core/data/src/test/java/dev/typetype/android/data/stream/FakeTwitchRepository.kt index 98a6958d..8c2cf636 100644 --- a/core/data/src/test/java/dev/typetype/android/data/stream/FakeTwitchRepository.kt +++ b/core/data/src/test/java/dev/typetype/android/data/stream/FakeTwitchRepository.kt @@ -1,5 +1,6 @@ package dev.typetype.android.data.stream +import dev.typetype.android.domain.twitch.TwitchChatAssets import dev.typetype.android.domain.feed.Video import dev.typetype.android.domain.stream.Chapter import dev.typetype.android.domain.twitch.TwitchCategory @@ -32,4 +33,5 @@ internal class FakeTwitchRepository( override suspend fun videoComments(id: String, offsetSeconds: Long?, cursor: String?): Result> = Result.success(TwitchPage(emptyList(), null)) override suspend fun chatHighlights(login: String): Result = Result.success(TwitchChatHighlights(null, null)) + override suspend fun chatAssets(login: String): Result = Result.success(TwitchChatAssets()) } diff --git a/core/model/src/main/java/dev/typetype/android/core/url/ImageUrls.kt b/core/model/src/main/java/dev/typetype/android/core/url/ImageUrls.kt index 7af73eed..e819f69e 100644 --- a/core/model/src/main/java/dev/typetype/android/core/url/ImageUrls.kt +++ b/core/model/src/main/java/dev/typetype/android/core/url/ImageUrls.kt @@ -28,9 +28,14 @@ private fun needsImageProxy(source: String): Boolean { return host.endsWith("ggpht.com") || host.endsWith("googleusercontent.com") || host.endsWith("hdslb.com") || - host.endsWith("ytimg.com") + host.endsWith("ytimg.com") || + host == "static-cdn.jtvnw.net" || + host in TWITCH_CHAT_IMAGE_HOSTS } +// The web proxies the same Twitch hosts: avatars, previews and emotes, and the BTTV, FFZ and 7TV emote CDNs. +private val TWITCH_CHAT_IMAGE_HOSTS = setOf("cdn.7tv.app", "cdn.betterttv.net", "cdn.frankerfacez.com") + // Bilibili covers and avatars are several hundred kilobytes at full size; its image service scales // them on request, to the sizes the web client asks for. private fun sizedBilibiliImage(source: String): String { diff --git a/core/model/src/main/java/dev/typetype/android/domain/livechat/LiveChat.kt b/core/model/src/main/java/dev/typetype/android/domain/livechat/LiveChat.kt index e8e6aa81..f7bfc5c9 100644 --- a/core/model/src/main/java/dev/typetype/android/domain/livechat/LiveChat.kt +++ b/core/model/src/main/java/dev/typetype/android/domain/livechat/LiveChat.kt @@ -8,6 +8,11 @@ data class LiveChatMessage( val authorName: String?, val authorAvatarUrl: String?, val moderator: Boolean, + val login: String? = null, + val color: String? = null, + val emotes: List = emptyList(), + val badges: List = emptyList(), + val action: Boolean = false, ) sealed interface LiveChatEvent { diff --git a/core/model/src/main/java/dev/typetype/android/domain/livechat/TwitchChatColor.kt b/core/model/src/main/java/dev/typetype/android/domain/livechat/TwitchChatColor.kt new file mode 100644 index 00000000..8a8a9226 --- /dev/null +++ b/core/model/src/main/java/dev/typetype/android/domain/livechat/TwitchChatColor.kt @@ -0,0 +1,52 @@ +package dev.typetype.android.domain.livechat + +import kotlin.math.abs +import kotlin.math.min +import kotlin.math.pow +import kotlin.math.roundToInt + +// The web chat's rule: a viewer without a color gets one from their login, and a color too dark for a dark theme (or +// too light for a light one) is mixed toward white (or black) until it reads. Returns an opaque ARGB value. +object TwitchChatColor { + private val DEFAULTS = listOf( + "#FF0000", "#0000FF", "#008000", "#B22222", "#FF7F50", "#9ACD32", "#FF4500", "#2E8B57", + "#DAA520", "#D2691E", "#5F9EA0", "#1E90FF", "#FF69B4", "#8A2BE2", "#00FF7F", + ) + + private val FALLBACK = intArrayOf(0x91, 0x46, 0xFF) + + fun name(color: String?, login: String, dark: Boolean): Int { + val rgb = rgb(color?.takeIf { it.isNotBlank() } ?: DEFAULTS[hash(login)]) ?: FALLBACK + val lum = luminance(rgb) + val mixed = when { + dark && lum < 0.18 -> mix(rgb, 255, min(0.75, (0.18 - lum) * 4 + 0.25)) + !dark && lum > 0.45 -> mix(rgb, 0, min(0.6, (lum - 0.45) * 2 + 0.2)) + else -> rgb + } + return (0xFF shl 24) or (mixed[0] shl 16) or (mixed[1] shl 8) or mixed[2] + } + + private fun hash(text: String): Int { + var value = 0 + codePoints(text).forEach { value = value * 31 + it } + return abs(value % DEFAULTS.size) + } + + private fun rgb(hex: String): IntArray? { + val digits = hex.removePrefix("#") + if (digits.length != 6) return null + val n = digits.toIntOrNull(16) ?: return null + return intArrayOf((n shr 16) and 255, (n shr 8) and 255, n and 255) + } + + private fun luminance(rgb: IntArray): Double { + fun channel(v: Int): Double { + val c = v / 255.0 + return if (c <= 0.03928) c / 12.92 else ((c + 0.055) / 1.055).pow(2.4) + } + return 0.2126 * channel(rgb[0]) + 0.7152 * channel(rgb[1]) + 0.0722 * channel(rgb[2]) + } + + private fun mix(rgb: IntArray, target: Int, amount: Double): IntArray = + IntArray(3) { (rgb[it] + (target - rgb[it]) * amount).roundToInt() } +} diff --git a/core/model/src/main/java/dev/typetype/android/domain/livechat/TwitchChatParts.kt b/core/model/src/main/java/dev/typetype/android/domain/livechat/TwitchChatParts.kt new file mode 100644 index 00000000..1d08f84f --- /dev/null +++ b/core/model/src/main/java/dev/typetype/android/domain/livechat/TwitchChatParts.kt @@ -0,0 +1,131 @@ +package dev.typetype.android.domain.livechat + +data class ChatEmoteRange(val id: String, val start: Int, val end: Int) + +data class ChatImage(val name: String, val url: String) + +data class ChatEmote(val name: String, val url: String, val zeroWidth: Boolean = false) + +sealed interface ChatPart { + data class Text(val text: String) : ChatPart + data class Emote(val image: ChatImage, val overlays: List = emptyList()) : ChatPart + data class Mention(val text: String, val self: Boolean) : ChatPart + data class Link(val text: String, val href: String) : ChatPart +} + +// Same split as the web chat: Twitch's own emotes come as code point ranges, BTTV/FFZ/7TV ones as whole words, and a +// zero-width emote sits on top of the emote before it. +object TwitchChatParts { + private const val TWITCH_EMOTE_BASE = "https://static-cdn.jtvnw.net/emoticons/v2/" + private val LINK = Regex("""^(?:https?://)?(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d{2,5})?(?:[/?#]\S*)?$""", RegexOption.IGNORE_CASE) + private val TRAILING = Regex("""[),.!?:;'"\]]+$""") + private val SPACES = Regex("""(\s+)""") + private val BARE_TLDS = ( + "com net org info biz xyz io co app dev me tv gg ly to sh so ai fm am " + + "video live stream games game fun art blog club online site store shop tech link page news wiki social media " + + "be fr de uk es it nl eu ru jp cn kr br ca us au ch at se no dk fi pl pt cz ie in mx ar" + ).split(" ").toSet() + + fun twitchEmote(id: String, name: String): ChatImage = + ChatImage(name, "$TWITCH_EMOTE_BASE$id/default/dark/2.0") + + fun parts( + text: String, + native: List = emptyList(), + emotes: Map = emptyMap(), + selfLogin: String = "", + ): List { + val points = codePoints(text) + fun slice(from: Int, to: Int) = String(points, from, to - from) + val ranges = native.filter { it.start >= 0 && it.end < points.size && it.start <= it.end }.sortedBy { it.start } + val builder = Builder(emotes, selfLogin.lowercase()) + var cursor = 0 + for (range in ranges) { + if (range.start < cursor) continue + builder.segment(slice(cursor, range.start)) + builder.parts += ChatPart.Emote(twitchEmote(range.id, slice(range.start, range.end + 1))) + cursor = range.end + 1 + } + builder.segment(slice(cursor, points.size)) + return builder.parts + } + + fun linkHref(word: String): String? { + if (!LINK.matches(word)) return null + val schemed = word.startsWith("http://", ignoreCase = true) || word.startsWith("https://", ignoreCase = true) + val host = word.substringAfter("://").substringBefore('/').substringBefore('?').substringBefore('#') + .substringBefore(':').lowercase() + if (!schemed && !host.startsWith("www.") && host.substringAfterLast('.') !in BARE_TLDS) return null + return if (schemed) word else "https://$word" + } + + private class Builder(val emotes: Map, val self: String) { + val parts = mutableListOf() + + fun segment(text: String) { + var index = 0 + for (match in SPACES.findAll(text)) { + word(text.substring(index, match.range.first)) + pushText(match.value) + index = match.range.last + 1 + } + word(text.substring(index)) + } + + private fun word(word: String) { + if (word.isEmpty()) return + val emote = emotes[word] + if (emote != null) { + val image = ChatImage(emote.name, emote.url) + val base = if (emote.zeroWidth) lastEmoteIndex() else -1 + if (base >= 0) { + if (parts.lastOrNull() is ChatPart.Text) parts.removeAt(parts.lastIndex) + val target = parts[base] as ChatPart.Emote + parts[base] = target.copy(overlays = target.overlays + image) + } else { + parts += ChatPart.Emote(image) + } + return + } + if (word.startsWith("@") && word.length > 1) { + val name = word.drop(1).replace(TRAILING, "") + parts += ChatPart.Mention("@$name", name.lowercase() == self) + pushText(word.drop(name.length + 1)) + return + } + val trimmed = word.replace(TRAILING, "") + val href = linkHref(trimmed) + if (href != null) { + parts += ChatPart.Link(trimmed, href) + pushText(word.drop(trimmed.length)) + return + } + pushText(word) + } + + private fun lastEmoteIndex(): Int { + val last = parts.lastIndex + val index = if (last >= 0 && (parts[last] as? ChatPart.Text)?.text?.isBlank() == true) last - 1 else last + return if (index >= 0 && parts[index] is ChatPart.Emote) index else -1 + } + + private fun pushText(text: String) { + if (text.isEmpty()) return + val last = parts.lastOrNull() + if (last is ChatPart.Text) parts[parts.lastIndex] = ChatPart.Text(last.text + text) else parts += ChatPart.Text(text) + } + } +} + +// String.codePoints() needs API 24; the app still runs on 23. +internal fun codePoints(text: String): IntArray { + val out = IntArray(text.codePointCount(0, text.length)) + var index = 0 + var count = 0 + while (index < text.length) { + val point = text.codePointAt(index) + out[count++] = point + index += Character.charCount(point) + } + return out +} diff --git a/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchAccountRepository.kt b/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchAccountRepository.kt index 2ef0a396..fac97657 100644 --- a/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchAccountRepository.kt +++ b/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchAccountRepository.kt @@ -32,6 +32,10 @@ interface TwitchAccountRepository { suspend fun followedLives(cursor: String? = null): Result> + suspend fun followedVideos(cursor: String? = null): Result> + + suspend fun followedChannels(cursor: String? = null): Result> + suspend fun isFollowing(login: String): Result suspend fun setFollowing(login: String, follow: Boolean): Result diff --git a/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchModels.kt b/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchModels.kt index 2daced18..68c7bdf3 100644 --- a/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchModels.kt +++ b/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchModels.kt @@ -1,5 +1,9 @@ package dev.typetype.android.domain.twitch +import dev.typetype.android.domain.livechat.ChatEmote +import dev.typetype.android.domain.livechat.ChatEmoteRange +import dev.typetype.android.domain.livechat.ChatImage + import dev.typetype.android.domain.feed.Video data class TwitchCategory( @@ -20,6 +24,7 @@ data class TwitchChannel( val bannerUrl: String?, val followers: Long, val live: Video?, + val liveInfo: TwitchLiveInfo? = null, ) { val url: String get() = TwitchUrls.live(login) } @@ -50,4 +55,23 @@ data class TwitchVideoComment( val author: String?, val text: String, val moderator: Boolean, + val login: String? = null, + val color: String? = null, + val emotes: List = emptyList(), + val badges: List = emptyList(), +) + +data class TwitchLiveInfo( + val title: String, + val viewers: Long, + val startedAtMillis: Long, + val category: String?, + val tags: List, +) + +// The emotes of BTTV, FFZ and 7TV keyed by the word that shows them, and the chat badges keyed as Twitch sends them +// on a message ("moderator/1"); the channel's own come before the global ones. +data class TwitchChatAssets( + val emotes: Map = emptyMap(), + val badges: Map = emptyMap(), ) diff --git a/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchRepository.kt b/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchRepository.kt index 531fdda2..563982e2 100644 --- a/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchRepository.kt +++ b/core/model/src/main/java/dev/typetype/android/domain/twitch/TwitchRepository.kt @@ -30,5 +30,7 @@ interface TwitchRepository { suspend fun chatHighlights(login: String): Result + suspend fun chatAssets(login: String): Result + suspend fun videoComments(id: String, offsetSeconds: Long?, cursor: String?): Result> } diff --git a/core/model/src/test/java/dev/typetype/android/core/url/TwitchImageProxyTest.kt b/core/model/src/test/java/dev/typetype/android/core/url/TwitchImageProxyTest.kt new file mode 100644 index 00000000..3ccfdd1f --- /dev/null +++ b/core/model/src/test/java/dev/typetype/android/core/url/TwitchImageProxyTest.kt @@ -0,0 +1,17 @@ +package dev.typetype.android.core.url + +import org.junit.Assert.assertEquals +import org.junit.Test + +class TwitchImageProxyTest { + @Test + fun twitchImagesAndEmoteCdnsGoThroughTheInstanceProxy() { + val base = "https://tube.example/api" + val emote = "https://cdn.7tv.app/emote/abc/2x.webp" + val avatar = "https://static-cdn.jtvnw.net/jtv_user_pictures/a.png" + + assertEquals("$base/proxy?url=https%3A%2F%2Fcdn.7tv.app%2Femote%2Fabc%2F2x.webp", buildImageUrl(base, emote)) + assertEquals(true, buildImageUrl(base, avatar).startsWith("$base/proxy?url=")) + assertEquals("https://other.example/a.png", buildImageUrl(base, "https://other.example/a.png")) + } +} diff --git a/core/model/src/test/java/dev/typetype/android/domain/livechat/TwitchChatPartsTest.kt b/core/model/src/test/java/dev/typetype/android/domain/livechat/TwitchChatPartsTest.kt new file mode 100644 index 00000000..23deea1a --- /dev/null +++ b/core/model/src/test/java/dev/typetype/android/domain/livechat/TwitchChatPartsTest.kt @@ -0,0 +1,55 @@ +package dev.typetype.android.domain.livechat + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class TwitchChatPartsTest { + @Test + fun nativeEmoteRangesCountCodePointsNotUtf16Units() { + val parts = TwitchChatParts.parts("๐Ÿ˜€ Kappa hi", listOf(ChatEmoteRange("25", 2, 6))) + + assertEquals(ChatPart.Text("๐Ÿ˜€ "), parts[0]) + assertEquals("Kappa", (parts[1] as ChatPart.Emote).image.name) + assertEquals("https://static-cdn.jtvnw.net/emoticons/v2/25/default/dark/2.0", (parts[1] as ChatPart.Emote).image.url) + assertEquals(ChatPart.Text(" hi"), parts[2]) + } + + @Test + fun thirdPartyEmotesMatchWholeWordsAndZeroWidthOnesStackOnTheEmoteBefore() { + val emotes = mapOf( + "catJAM" to ChatEmote("catJAM", "https://cdn/cat"), + "RainTime" to ChatEmote("RainTime", "https://cdn/rain", zeroWidth = true), + ) + + val parts = TwitchChatParts.parts("catJAM RainTime catJAMs", emotes = emotes) + + val emote = parts[0] as ChatPart.Emote + assertEquals(listOf(ChatImage("RainTime", "https://cdn/rain")), emote.overlays) + assertEquals(ChatPart.Text(" catJAMs"), parts[1]) + } + + @Test + fun mentionsAndLinksAreTheirOwnParts() { + val parts = TwitchChatParts.parts("hey @Toasty, see typetype.tv!", selfLogin = "toasty") + + assertEquals(ChatPart.Mention("@Toasty", self = true), parts[1]) + assertEquals(ChatPart.Link("typetype.tv", "https://typetype.tv"), parts[3]) + assertEquals(ChatPart.Text("!"), parts[4]) + } + + @Test + fun bareWordsWithUnknownEndingsAreNotLinks() { + assertNull(TwitchChatParts.linkHref("file.txt")) + assertEquals("https://example.com/a", TwitchChatParts.linkHref("https://example.com/a")) + } + + @Test + fun darkNamesAreLightenedOnADarkThemeAndKeptOnALightOne() { + val navy = TwitchChatColor.name("#000080", "viewer", dark = true) + val red = TwitchChatColor.name("#FF0000", "viewer", dark = false) + + assertEquals(true, (navy and 0xFF) > 0x80) + assertEquals(0xFFFF0000.toInt(), red) + } +} diff --git a/core/resources/src/main/res/values/strings.xml b/core/resources/src/main/res/values/strings.xml index 103527fd..2a3c7c27 100644 --- a/core/resources/src/main/res/values/strings.xml +++ b/core/resources/src/main/res/values/strings.xml @@ -91,10 +91,14 @@ Nothing here yet Search Twitch channels Live now + %1$s, live now + Past broadcasts of followed channels + Followed channels All Followed channels live Follow Following + Live for %1$s Couldn\'t load Shorts Couldn\'t load more Shorts No Shorts are available yet. diff --git a/feature/live/src/main/java/dev/typetype/android/feature/live/LiveRails.kt b/feature/live/src/main/java/dev/typetype/android/feature/live/LiveRails.kt new file mode 100644 index 00000000..bc27c7c3 --- /dev/null +++ b/feature/live/src/main/java/dev/typetype/android/feature/live/LiveRails.kt @@ -0,0 +1,89 @@ +package dev.typetype.android.feature.live + +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import dev.typetype.android.R +import dev.typetype.android.core.ui.components.ProfileAvatar +import dev.typetype.android.core.ui.components.VideoCard +import dev.typetype.android.domain.feed.Video +import dev.typetype.android.domain.twitch.TwitchChannel + +// A row that scrolls sideways, so the followed sections stay short and the popular lives stay in sight below them. +@Composable +internal fun LiveVideoRail(videos: List