Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-10 23:21:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

tristate starred filter, filter-aware empty state, keyboard-safe search bar

Browse Source
This commit is contained in:
austinried
2026-10-04 00:29:55 +00:00
parent a2d42f7957
commit 63f0549181
14 changed files with 401 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/test/kotlin/com/subtracks/data/db/LibraryDaoTest.kt
+11 -10
View File
@@ -50,17 +50,17 @@ class LibraryDaoTest {
assertEquals(
listOf("Alpha", "Beta", "Gamma"),
dao.albumsByName(sourceId, starredOnly = false, search = "").page().map { it.name },
dao.albumsByName(sourceId, starredFilter = 0, search = "").page().map { it.name },
)
assertEquals(
listOf("Gamma", "Beta", "Alpha"),
dao.albumsByNameReversed(sourceId, starredOnly = false, search = "").page().map { it.name },
dao.albumsByNameReversed(sourceId, starredFilter = 0, search = "").page().map { it.name },
)
assertEquals(
listOf("Alpha", "Beta", "Gamma"),
dao.albumsByYear(sourceId, starredOnly = false, search = "").page().map { it.name },
dao.albumsByYear(sourceId, starredFilter = 0, search = "").page().map { it.name },
)
assertEquals(listOf("Alpha"), dao.albumsByName(sourceId, starredOnly = true, search = "").page().map { it.name })
assertEquals(listOf("Alpha"), dao.albumsByName(sourceId, starredFilter = 1, search = "").page().map { it.name })
}
@Test
@@ -77,13 +77,13 @@ class LibraryDaoTest {
assertEquals(
listOf("Apple", "Zebra"),
dao.songsByTitle(sourceId, starredOnly = false, search = "").page().map { it.song.title },
dao.songsByTitle(sourceId, starredFilter = 0, search = "").page().map { it.song.title },
)
assertEquals(
listOf("Zebra", "Apple"),
dao.songsByTitleReversed(sourceId, starredOnly = false, search = "").page().map { it.song.title },
dao.songsByTitleReversed(sourceId, starredFilter = 0, search = "").page().map { it.song.title },
)
assertEquals(listOf("Apple"), dao.songsByTitle(sourceId, starredOnly = true, search = "").page().map { it.song.title })
assertEquals(listOf("Apple"), dao.songsByTitle(sourceId, starredFilter = 1, search = "").page().map { it.song.title })
}
@Test
@@ -101,13 +101,14 @@ class LibraryDaoTest {
assertEquals(
listOf("Beta", "Gamma", "Alpha"),
dao.albumsByRecentlyAdded(sourceId, starredOnly = false, search = "").page().map { it.name },
dao.albumsByRecentlyAdded(sourceId, starredFilter = 0, search = "").page().map { it.name },
)
assertEquals(
listOf("Alpha", "Gamma", "Beta"),
dao.albumsByStarred(sourceId, starredOnly = false, search = "").page().map { it.name },
dao.albumsByStarred(sourceId, starredFilter = 0, search = "").page().map { it.name },
)
assertEquals(listOf("Gamma"), dao.albumsByName(sourceId, starredOnly = false, search = "gam").page().map { it.name })
assertEquals(listOf("Gamma"), dao.albumsByName(sourceId, starredFilter = 0, search = "gam").page().map { it.name })
assertEquals(listOf("Beta"), dao.albumsByName(sourceId, starredFilter = 2, search = "").page().map { it.name })
}
private suspend fun source(): Long =
app/src/test/kotlin/com/subtracks/data/prefs/UserPreferencesTest.kt
+5 -2
View File
@@ -23,9 +23,12 @@ class UserPreferencesTest {
assertEquals(ListQuery("Name"), prefs.listQuery(LibraryListTab.Albums).first())
assertEquals(ListQuery("Album"), prefs.listQuery(LibraryListTab.Songs).first())
prefs.setListQuery(LibraryListTab.Albums, ListQuery("Added", descending = true, starredOnly = true))
prefs.setListQuery(LibraryListTab.Albums, ListQuery("Added", descending = true, starred = StarredFilter.Starred))
assertEquals(ListQuery("Added", descending = true, starredOnly = true), prefs.listQuery(LibraryListTab.Albums).first())
assertEquals(
ListQuery("Added", descending = true, starred = StarredFilter.Starred),
prefs.listQuery(LibraryListTab.Albums).first(),
)
assertEquals(ListQuery("Album"), prefs.listQuery(LibraryListTab.Songs).first())
file.delete()
app/src/test/kotlin/com/subtracks/data/sync/SyncServiceTest.kt
+6 -6
View File
@@ -60,7 +60,7 @@ class SyncServiceTest {
2,
db
.libraryDao()
.artistsByName(1, false, "")
.artistsByName(1, 0, "")
.allRows()
.size,
)
@@ -68,7 +68,7 @@ class SyncServiceTest {
2,
db
.libraryDao()
.songs(1, false, "")
.songs(1, 0, "")
.allRows()
.size,
)
@@ -90,7 +90,7 @@ class SyncServiceTest {
listOf("a1"),
db
.libraryDao()
.artistsByName(1, false, "")
.artistsByName(1, 0, "")
.allRows()
.map { it.id },
)
@@ -98,7 +98,7 @@ class SyncServiceTest {
listOf("s1"),
db
.libraryDao()
.songs(1, false, "")
.songs(1, 0, "")
.allRows()
.map { it.song.id },
)
@@ -200,7 +200,7 @@ class SyncServiceTest {
"Old",
db
.libraryDao()
.artistsByName(1, false, "")
.artistsByName(1, 0, "")
.allRows()
.single()
.name,
@@ -213,7 +213,7 @@ class SyncServiceTest {
"New",
db
.libraryDao()
.artistsByName(1, false, "")
.artistsByName(1, 0, "")
.allRows()
.single()
.name,
app/src/test/kotlin/com/subtracks/ui/LibraryOptionsTest.kt
+121
View File
@@ -0,0 +1,121 @@
package com.subtracks.ui
import androidx.activity.ComponentActivity
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
import androidx.compose.ui.test.onAllNodesWithTag
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.paging.PagingData
import androidx.paging.compose.collectAsLazyPagingItems
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
import com.subtracks.data.model.Album
import com.subtracks.data.model.Artist
import com.subtracks.data.model.Playlist
import com.subtracks.data.model.SongListItem
import com.subtracks.data.prefs.ListQuery
import com.subtracks.data.prefs.StarredFilter
import com.subtracks.ui.library.ALBUM_COVER_TAG
import com.subtracks.ui.library.LibraryScreen
import com.subtracks.ui.library.LibraryTab
import com.subtracks.ui.library.sortOptionsFor
import com.subtracks.ui.theme.SubtracksTheme
import kotlinx.coroutines.flow.flowOf
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.annotation.Config
import org.robolectric.annotation.GraphicsMode
@RunWith(AndroidJUnit4::class)
@GraphicsMode(GraphicsMode.Mode.NATIVE)
@Config(qualifiers = RobolectricDeviceQualifiers.PixelXL)
class LibraryOptionsTest {
@get:Rule
val composeRule = createAndroidComposeRule<ComponentActivity>()
@Test
fun theOptionsSheetAppliesSortFilterAndClear() {
var query by mutableStateOf(ListQuery("Name"))
composeRule.setContent {
SubtracksTheme {
LibraryScreen(
selectedTab = LibraryTab.Albums,
onTabSelected = {},
albums = remember { flowOf(PagingData.from(albums())) }.collectAsLazyPagingItems(),
artists = remember { flowOf(PagingData.empty<Artist>()) }.collectAsLazyPagingItems(),
songs = remember { flowOf(PagingData.empty<SongListItem>()) }.collectAsLazyPagingItems(),
playlists = remember { flowOf(PagingData.empty<Playlist>()) }.collectAsLazyPagingItems(),
coverArt = { _, _ -> null },
onAlbumClick = {},
onArtistClick = {},
onPlaylistClick = {},
onSongClick = {},
onSync = {},
onOpenSettings = {},
listQuery = query,
sortOptions = sortOptionsFor(LibraryTab.Albums),
starredSupported = true,
onSortChange = { query = query.copy(sort = it) },
onCycleStarred = {
query =
query.copy(
starred =
when (query.starred) {
StarredFilter.Any -> StarredFilter.Starred
StarredFilter.Starred -> StarredFilter.NotStarred
StarredFilter.NotStarred -> StarredFilter.Any
},
)
},
onClearFilters = { query = query.copy(starred = StarredFilter.Any) },
)
}
}
composeRule.waitUntil(timeoutMillis = 5_000) {
composeRule.onAllNodesWithTag(ALBUM_COVER_TAG).fetchSemanticsNodes().isNotEmpty()
}
composeRule.onNodeWithContentDescription("List options").performClick()
composeRule.mainClock.advanceTimeBy(1_000)
composeRule.waitForIdle()
composeRule.onNodeWithText("Added").performClick()
composeRule.waitForIdle()
assertEquals("Added", query.sort)
composeRule.onAllNodesWithText("Starred")[1].performClick()
composeRule.waitForIdle()
assertEquals(StarredFilter.Starred, query.starred)
composeRule.onNodeWithText("Clear filters").performClick()
composeRule.waitForIdle()
assertEquals(StarredFilter.Any, query.starred)
}
private fun albums() =
(1..3).map { index ->
Album(
sourceId = 1,
id = "al-$index",
artistId = "ar-1",
name = "Album $index",
albumArtist = "Artist",
created = 0,
coverArt = null,
genre = null,
year = null,
starred = null,
songCount = 1,
frequentRank = null,
recentRank = null,
)
}
}