Skip to content

Replace search icon with initial letter and apply topic sorting #14

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

Merged
merged 4 commits into from
Jun 7, 2025
Merged

Replace search icon with initial letter and apply topic sorting #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c56955
- In `TopicCard`, replace the search icon with the first letter of th…
yesshreyes Jun 5, 2025
6a86cbe
- Introduce `TopicUi` data class to represent topic data for the UI l…
yesshreyes Jun 6, 2025
f5a46d0
Make `topicUi` parameter non-nullable in `TopicCard`.
yesshreyes Jun 7, 2025
2d6ee9f
Remove null check in `TopicCard` as `topicUi` is non-nullable.
yesshreyes Jun 7, 2025
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
9 changes: 6 additions & 3 deletions ...n/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Bookmark
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.outlined.BookmarkBorder
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand All @@ -30,7 +29,6 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import kotlindictionarymultiplatform.composeapp.generated.resources.Res
import kotlindictionarymultiplatform.composeapp.generated.resources.add_bookmark
import kotlindictionarymultiplatform.composeapp.generated.resources.icon
import kotlindictionarymultiplatform.composeapp.generated.resources.remove_bookmark
import org.jetbrains.compose.resources.stringResource

Expand Down Expand Up @@ -63,7 +61,12 @@ fun TopicCard(
.background(MaterialTheme.colorScheme.primary, CircleShape),
contentAlignment = Alignment.Center,
) {
Icon(Icons.Filled.Search, contentDescription = stringResource(Res.string.icon))
Text(
text = topic.firstOrNull()?.uppercase() ?: "?",
style = MaterialTheme.typography.bodyLarge.copy(
color = MaterialTheme.colorScheme.onPrimary,
),
)
}

Spacer(modifier = Modifier.width(12.dp))
Expand Down
7 changes: 4 additions & 3 deletions ...lin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ class TopicViewModel(
val result = repository.getTopics()
_topics.value = result.fold(
ifLeft = { UiState.Error(it) },
ifRight = {
_bookmarkedStates.value = List(it.size) { true }
UiState.Success(it)
ifRight = { list ->
val sortedList = list.sortedBy { it.name.lowercase() }
_bookmarkedStates.value = List(sortedList.size) { true }
UiState.Success(sortedList)
},
)
}
Expand Down
Loading