From 7f36142bf5c5f27b37914e5d42c2c56bfbdd3fc1 Mon Sep 17 00:00:00 2001 From: Tax_Tux <138765817+Priveetee@users.noreply.github.com> Date: Mon, 16 Nov 2026 13:22:13 +0100 Subject: [PATCH 01/30] ci: post releases to Discord --- .github/workflows/discord-app-release.yml | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/discord-app-release.yml diff --git a/.github/workflows/discord-app-release.yml b/.github/workflows/discord-app-release.yml new file mode 100644 index 00000000..a75c2405 --- /dev/null +++ b/.github/workflows/discord-app-release.yml @@ -0,0 +1,43 @@ +# For app repos (TypeType-Android, TypeType-IOS, TypeType-TV, TypeType-tvOS). +# Pre-releases (-beta.N, -rc.N) go to #🧪・releases-rc, stable releases go to #🚀・releases-main, +# with the release notes. Needs the secrets DISCORD_WEBHOOK_RC and DISCORD_WEBHOOK_MAIN. +name: Discord release notify + +on: + release: + types: [published] + +permissions: + contents: read + +jobs: + notify: + runs-on: ubuntu-latest + steps: + - name: Post to Discord + env: + WEBHOOK_RC: ${{ secrets.DISCORD_WEBHOOK_RC }} + WEBHOOK_MAIN: ${{ secrets.DISCORD_WEBHOOK_MAIN }} + PRERELEASE: ${{ github.event.release.prerelease }} + TAG: ${{ github.event.release.tag_name }} + RNAME: ${{ github.event.release.name }} + URL: ${{ github.event.release.html_url }} + BODY: ${{ github.event.release.body }} + REPO: ${{ github.repository }} + run: | + set -euo pipefail + if [ "$PRERELEASE" = "true" ]; then + WEBHOOK="$WEBHOOK_RC"; EMOJI="🧪"; COLOR=15105570; INTRO="Beta build, might break, have fun (・ω・)" + else + WEBHOOK="$WEBHOOK_MAIN"; EMOJI="🚀"; COLOR=5763719; INTRO="New release (。•̀ᴗ-)✧" + fi + [ -n "$WEBHOOK" ] || { echo "webhook secret not set"; exit 0; } + TITLE="${EMOJI} ${RNAME:-${REPO#*/} ${TAG}}" + jq -n \ + --arg title "$TITLE" \ + --arg url "$URL" \ + --arg desc "$(printf '%s\n\n%s' "$INTRO" "${BODY:-}" | cut -c1-3900)" \ + --argjson color "$COLOR" \ + '{username: "TypeType Releases", embeds: [{title: $title, url: $url, description: $desc, color: $color}]}' \ + > payload.json + curl -fsS -H "Content-Type: application/json" -d @payload.json "$WEBHOOK" From 92c7277c96d334263b488c7dc1b017567cabce33 Mon Sep 17 00:00:00 2001 From: Tax_Tux <138765817+Priveetee@users.noreply.github.com> Date: Mon, 16 Nov 2026 13:47:53 +0100 Subject: [PATCH 02/30] ci: rename the Discord release bots --- .github/workflows/discord-app-release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/discord-app-release.yml b/.github/workflows/discord-app-release.yml index a75c2405..7ccb0bee 100644 --- a/.github/workflows/discord-app-release.yml +++ b/.github/workflows/discord-app-release.yml @@ -27,9 +27,9 @@ jobs: run: | set -euo pipefail if [ "$PRERELEASE" = "true" ]; then - WEBHOOK="$WEBHOOK_RC"; EMOJI="🧪"; COLOR=15105570; INTRO="Beta build, might break, have fun (・ω・)" + WEBHOOK="$WEBHOOK_RC"; BOT="The Lab TV"; EMOJI="🧪"; COLOR=15105570; INTRO="Beta build, might break, have fun (・ω・)" else - WEBHOOK="$WEBHOOK_MAIN"; EMOJI="🚀"; COLOR=5763719; INTRO="New release (。•̀ᴗ-)✧" + WEBHOOK="$WEBHOOK_MAIN"; BOT="Rocket TV"; EMOJI="🚀"; COLOR=5763719; INTRO="New release (。•̀ᴗ-)✧" fi [ -n "$WEBHOOK" ] || { echo "webhook secret not set"; exit 0; } TITLE="${EMOJI} ${RNAME:-${REPO#*/} ${TAG}}" @@ -38,6 +38,7 @@ jobs: --arg url "$URL" \ --arg desc "$(printf '%s\n\n%s' "$INTRO" "${BODY:-}" | cut -c1-3900)" \ --argjson color "$COLOR" \ - '{username: "TypeType Releases", embeds: [{title: $title, url: $url, description: $desc, color: $color}]}' \ + --arg bot "$BOT" \ + '{username: $bot, embeds: [{title: $title, url: $url, description: $desc, color: $color}]}' \ > payload.json curl -fsS -H "Content-Type: application/json" -d @payload.json "$WEBHOOK" From f41de9c65cda46a53b4bebbd8e2083698f8c1c9c Mon Sep 17 00:00:00 2001 From: Priveetee <138765817+Priveetee@users.noreply.github.com> Date: Tue, 17 Nov 2026 21:54:34 +0100 Subject: [PATCH 03/30] feat: let the home show recommendations as one grid or by category --- .../DataStorePreferencesRepository.kt | 5 +++ .../domain/preferences/AppPreferences.kt | 1 + .../android/domain/preferences/HomeLayout.kt | 3 ++ .../preferences/PreferencesRepository.kt | 1 + .../resources/src/main/res/values/strings.xml | 3 ++ .../android/feature/home/HomeAction.kt | 2 + .../android/feature/home/HomeLayoutToggle.kt | 38 ++++++++++++++++ .../feature/home/HomeRecommenderGrid.kt | 30 ++++++++++++- .../android/feature/home/HomeScreen.kt | 17 +++---- .../android/feature/home/HomeState.kt | 2 + .../android/feature/home/HomeViewModel.kt | 8 ++++ .../home/HomeRecommenderFlatVideosTest.kt | 44 +++++++++++++++++++ 12 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 core/model/src/main/java/dev/typetype/android/domain/preferences/HomeLayout.kt create mode 100644 feature/home/src/main/java/dev/typetype/android/feature/home/HomeLayoutToggle.kt create mode 100644 feature/home/src/test/java/dev/typetype/android/feature/home/HomeRecommenderFlatVideosTest.kt diff --git a/core/data/src/main/java/dev/typetype/android/data/preferences/DataStorePreferencesRepository.kt b/core/data/src/main/java/dev/typetype/android/data/preferences/DataStorePreferencesRepository.kt index 90f4f22c..6c0ff42e 100644 --- a/core/data/src/main/java/dev/typetype/android/data/preferences/DataStorePreferencesRepository.kt +++ b/core/data/src/main/java/dev/typetype/android/data/preferences/DataStorePreferencesRepository.kt @@ -14,6 +14,7 @@ import dev.typetype.android.domain.preferences.AppearanceMotion import dev.typetype.android.domain.preferences.AppearancePersonality import dev.typetype.android.domain.preferences.AppearanceTheme import dev.typetype.android.domain.preferences.AppPreferences +import dev.typetype.android.domain.preferences.HomeLayout import dev.typetype.android.domain.preferences.MangaHeadlineMarker import dev.typetype.android.domain.preferences.MangaPaper import dev.typetype.android.domain.preferences.PreferencesRepository @@ -73,6 +74,7 @@ class DataStorePreferencesRepository @Inject constructor( danmakuEnabled = prefs[KEY_DANMAKU_ENABLED] ?: false, danmakuSpeed = (prefs[KEY_DANMAKU_SPEED] ?: 1f).coerceIn(0.5f, 2f), danmakuSize = (prefs[KEY_DANMAKU_SIZE] ?: 1f).coerceIn(0.5f, 2f), + homeLayout = prefs.enum(KEY_HOME_LAYOUT, HomeLayout.Rows), ) } @@ -189,6 +191,8 @@ class DataStorePreferencesRepository @Inject constructor( dataStore.edit { it[KEY_DANMAKU_SIZE] = size.coerceIn(0.5f, 2f) } } + override suspend fun setHomeLayout(layout: HomeLayout) = store(KEY_HOME_LAYOUT, layout.name) + private suspend fun store(key: Preferences.Key, value: String) { dataStore.edit { it[key] = value } } @@ -230,6 +234,7 @@ class DataStorePreferencesRepository @Inject constructor( val KEY_DANMAKU_ENABLED = booleanPreferencesKey("player_danmaku_enabled") val KEY_DANMAKU_SPEED = floatPreferencesKey("player_danmaku_speed") val KEY_DANMAKU_SIZE = floatPreferencesKey("player_danmaku_size") + val KEY_HOME_LAYOUT = stringPreferencesKey("home_layout") const val DEFAULT_AUTOPLAY_COUNTDOWN_SECONDS = 10 const val MAX_AUTOPLAY_COUNTDOWN_SECONDS = 60 val ALLOWED_DOUBLE_TAP_SEEK_SECONDS = setOf(5, 10, 15, 20, 30) diff --git a/core/model/src/main/java/dev/typetype/android/domain/preferences/AppPreferences.kt b/core/model/src/main/java/dev/typetype/android/domain/preferences/AppPreferences.kt index 5a80d7dd..ecee1f22 100644 --- a/core/model/src/main/java/dev/typetype/android/domain/preferences/AppPreferences.kt +++ b/core/model/src/main/java/dev/typetype/android/domain/preferences/AppPreferences.kt @@ -33,4 +33,5 @@ data class AppPreferences( val danmakuEnabled: Boolean = false, val danmakuSpeed: Float = 1f, val danmakuSize: Float = 1f, + val homeLayout: HomeLayout = HomeLayout.Rows, ) diff --git a/core/model/src/main/java/dev/typetype/android/domain/preferences/HomeLayout.kt b/core/model/src/main/java/dev/typetype/android/domain/preferences/HomeLayout.kt new file mode 100644 index 00000000..67fa13bd --- /dev/null +++ b/core/model/src/main/java/dev/typetype/android/domain/preferences/HomeLayout.kt @@ -0,0 +1,3 @@ +package dev.typetype.android.domain.preferences + +enum class HomeLayout { Grid, Rows } diff --git a/core/model/src/main/java/dev/typetype/android/domain/preferences/PreferencesRepository.kt b/core/model/src/main/java/dev/typetype/android/domain/preferences/PreferencesRepository.kt index 53402da6..9c00abdb 100644 --- a/core/model/src/main/java/dev/typetype/android/domain/preferences/PreferencesRepository.kt +++ b/core/model/src/main/java/dev/typetype/android/domain/preferences/PreferencesRepository.kt @@ -36,4 +36,5 @@ interface PreferencesRepository { suspend fun setDanmakuEnabled(enabled: Boolean) suspend fun setDanmakuSpeed(speed: Float) suspend fun setDanmakuSize(size: Float) + suspend fun setHomeLayout(layout: HomeLayout) } diff --git a/core/resources/src/main/res/values/strings.xml b/core/resources/src/main/res/values/strings.xml index 91628585..9f821e84 100644 --- a/core/resources/src/main/res/values/strings.xml +++ b/core/resources/src/main/res/values/strings.xml @@ -1059,6 +1059,9 @@ Nothing from the family list yet No family-list results. Try a channel you already trust. Trending + Home page layout + As usual + By category Recommended Recommendations Choose the algorithm, its settings, your interests and the data it reads diff --git a/feature/home/src/main/java/dev/typetype/android/feature/home/HomeAction.kt b/feature/home/src/main/java/dev/typetype/android/feature/home/HomeAction.kt index e0241670..ae2cf1f4 100644 --- a/feature/home/src/main/java/dev/typetype/android/feature/home/HomeAction.kt +++ b/feature/home/src/main/java/dev/typetype/android/feature/home/HomeAction.kt @@ -1,6 +1,7 @@ package dev.typetype.android.feature.home import dev.typetype.android.domain.feed.Video +import dev.typetype.android.domain.preferences.HomeLayout import dev.typetype.android.domain.recommendations.PageRefusalReason import dev.typetype.android.domain.recommendations.VideoRefusalReason @@ -15,4 +16,5 @@ sealed interface HomeAction { data class RatePage(val good: Boolean) : HomeAction data class ChoosePageReason(val reason: PageRefusalReason) : HomeAction data class SendPageVerdict(val comment: String) : HomeAction + data class SetLayout(val layout: HomeLayout) : HomeAction } diff --git a/feature/home/src/main/java/dev/typetype/android/feature/home/HomeLayoutToggle.kt b/feature/home/src/main/java/dev/typetype/android/feature/home/HomeLayoutToggle.kt new file mode 100644 index 00000000..8a7c64d0 --- /dev/null +++ b/feature/home/src/main/java/dev/typetype/android/feature/home/HomeLayoutToggle.kt @@ -0,0 +1,38 @@ +package dev.typetype.android.feature.home + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.SegmentedButton +import androidx.compose.material3.SegmentedButtonDefaults +import androidx.compose.material3.SingleChoiceSegmentedButtonRow +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import dev.typetype.android.R +import dev.typetype.android.domain.preferences.HomeLayout + +@Composable +internal fun HomeLayoutToggle(layout: HomeLayout, onLayout: (HomeLayout) -> Unit) { + val label = stringResource(R.string.home_layout_label) + val options = listOf( + HomeLayout.Grid to stringResource(R.string.home_layout_grid), + HomeLayout.Rows to stringResource(R.string.home_layout_rows), + ) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + SingleChoiceSegmentedButtonRow(modifier = Modifier.semantics { contentDescription = label }) { + options.forEachIndexed { index, (value, text) -> + SegmentedButton( + selected = layout == value, + onClick = { onLayout(value) }, + shape = SegmentedButtonDefaults.itemShape(index = index, count = options.size), + ) { + Text(text) + } + } + } + } +} diff --git a/feature/home/src/main/java/dev/typetype/android/feature/home/HomeRecommenderGrid.kt b/feature/home/src/main/java/dev/typetype/android/feature/home/HomeRecommenderGrid.kt index 49251412..ca80f83d 100644 --- a/feature/home/src/main/java/dev/typetype/android/feature/home/HomeRecommenderGrid.kt +++ b/feature/home/src/main/java/dev/typetype/android/feature/home/HomeRecommenderGrid.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.LazyGridScope +import androidx.compose.foundation.lazy.grid.items as gridItems import androidx.compose.foundation.lazy.items import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp @@ -37,6 +38,7 @@ internal fun LazyGridScope.recommendedRows( onPlayVideo = onPlayVideo, onOpenChannel = onOpenChannel, onAction = onAction, + modifier = Modifier.width(ROW_CARD_WIDTH), ) } } @@ -45,6 +47,26 @@ internal fun LazyGridScope.recommendedRows( } } +internal fun LazyGridScope.recommendedGrid( + recommender: HomeRecommenderState, + videos: List