Skip to content

[Feature] Make category selection similar to category filter #866 #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patrickunterwegs wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[Feature] Make category selection similar to category filter #866 #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion app/src/main/java/at/techbee/jtx/ui/detail/DetailsCardCategories.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ import androidx.compose.material3.InputChipDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.ui.Modifier
Expand All @@ -60,6 +63,8 @@ import at.techbee.jtx.database.properties.Category
import at.techbee.jtx.ui.reusable.elements.HeadlineWithIcon
import at.techbee.jtx.ui.theme.getContrastSurfaceColorFor

const val DEFAULT_MAX_CATEGORIES = 5


@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
Expand All @@ -79,6 +84,7 @@ fun DetailsCardCategories(
val mergedCategories = mutableListOf<StoredCategory>()
mergedCategories.addAll(storedCategories)
allCategories.forEach { cat -> if(mergedCategories.none { it.category == cat }) mergedCategories.add(StoredCategory(cat, null)) }
var maxEntries by rememberSaveable { mutableIntStateOf(DEFAULT_MAX_CATEGORIES) }

fun addCategory() {
if (newCategory.isNotEmpty() && categories.none { existing -> existing.text == newCategory }) {
Expand Down Expand Up @@ -148,13 +154,19 @@ fun DetailsCardCategories(
all.category.lowercase().contains(newCategory.lowercase())
&& categories.none { existing -> existing.text.lowercase() == all.category.lowercase() }
}
val categoriesToSelectFilteredSorted =
if(categoriesToSelectFiltered.size > maxEntries)
categoriesToSelectFiltered.subList(0, DEFAULT_MAX_CATEGORIES)
else
categoriesToSelectFiltered.sortedBy { it.category }

AnimatedVisibility(categoriesToSelectFiltered.isNotEmpty() && isEditMode) {
LazyRow(
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.fillMaxWidth()
) {

items(categoriesToSelectFiltered) { category ->
items(categoriesToSelectFilteredSorted) { category ->
InputChip(
onClick = {
categories.add(Category(text = category.category))
Expand All @@ -176,6 +188,21 @@ fun DetailsCardCategories(
modifier = Modifier.alpha(0.4f)
)
}

if(categoriesToSelectFiltered.size > maxEntries) {
item {
TextButton(onClick = { maxEntries = Int.MAX_VALUE }) {
Text(stringResource(R.string.filter_options_more_entries, categoriesToSelectFiltered.size - maxEntries))
}
}
}
if(maxEntries == Int.MAX_VALUE) {
item {
TextButton(onClick = { maxEntries = DEFAULT_MAX_CATEGORIES }) {
Text(stringResource(R.string.filter_options_less_entries))
}
}
}
}
}

Expand Down
31 changes: 30 additions & 1 deletion app/src/main/java/at/techbee/jtx/ui/detail/DetailsCardResources.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ import androidx.compose.material3.InputChipDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.ui.Modifier
Expand All @@ -61,6 +64,8 @@ import at.techbee.jtx.ui.reusable.elements.HeadlineWithIcon
import at.techbee.jtx.ui.theme.getContrastSurfaceColorFor


const val DEFAULT_MAX_RESOURCES = 5

@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
fun DetailsCardResources(
Expand All @@ -79,6 +84,7 @@ fun DetailsCardResources(
val mergedResources = mutableListOf<StoredResource>()
mergedResources.addAll(storedResources)
allResources.forEach { resource -> if(mergedResources.none { it.resource == resource }) mergedResources.add(StoredResource(resource, null)) }
var maxEntries by rememberSaveable { mutableIntStateOf(DEFAULT_MAX_CATEGORIES) }

fun addResource() {
if (newResource.isNotEmpty() && resources.none { existing -> existing.text == newResource }) {
Expand Down Expand Up @@ -148,7 +154,15 @@ fun DetailsCardResources(
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.fillMaxWidth()
) {
items(resourcesToSelectFiltered) { resource ->

val resourcesToSelectFilteredSorted =
if(resourcesToSelectFiltered.size > maxEntries)
resourcesToSelectFiltered.subList(0, DEFAULT_MAX_CATEGORIES)
else
resourcesToSelectFiltered.sortedBy { it.resource }


items(resourcesToSelectFilteredSorted) { resource ->
InputChip(
onClick = {
resources.add(Resource(text = resource.resource))
Expand All @@ -170,6 +184,21 @@ fun DetailsCardResources(
modifier = Modifier.alpha(0.4f)
)
}

if(resourcesToSelectFiltered.size > maxEntries) {
item {
TextButton(onClick = { maxEntries = Int.MAX_VALUE }) {
Text(stringResource(R.string.filter_options_more_entries, resourcesToSelectFiltered.size - maxEntries))
}
}
}
if(maxEntries == Int.MAX_VALUE) {
item {
TextButton(onClick = { maxEntries = DEFAULT_MAX_RESOURCES }) {
Text(stringResource(R.string.filter_options_less_entries))
}
}
}
}
}

Expand Down