-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: View conversations, read/unread messages, conversation deleting (…
…#56) - view conversations - read/unread state for the conversations - conversation deleting - support conversations with an empty subject - counters in the tab bar - fixed blinks on the conversation list screen - fixed bug with chip displaying the wrong text
- Loading branch information
Showing
30 changed files
with
813 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
app/src/main/java/tech/relaycorp/letro/home/tabs/LetroTabs.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package tech.relaycorp.letro.home.tabs | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.ScrollableTabRow | ||
| import androidx.compose.material3.Tab | ||
| import androidx.compose.material3.TabRowDefaults | ||
| import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.alpha | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import tech.relaycorp.letro.R | ||
| import tech.relaycorp.letro.home.HomeViewModel | ||
| import tech.relaycorp.letro.ui.theme.LetroColor | ||
|
|
||
| @SuppressLint | ||
| @Composable | ||
| fun LetroTabs( | ||
| viewModel: HomeViewModel, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| val uiState by viewModel.uiState.collectAsState() | ||
|
|
||
| val tabTitles = listOf( | ||
| stringResource(id = R.string.top_bar_tab_conversations), | ||
| stringResource(id = R.string.top_bar_tab_contacts), | ||
| stringResource(id = R.string.top_bar_tab_notifications), | ||
| ) | ||
| val tabCounters = uiState.tabCounters | ||
|
|
||
| ScrollableTabRow( | ||
| selectedTabIndex = uiState.currentTab, | ||
| containerColor = LetroColor.SurfaceContainerHigh, | ||
| contentColor = LetroColor.OnSurfaceContainerHigh, | ||
| edgePadding = 9.dp, | ||
| indicator = { | ||
| TabRowDefaults.Indicator( | ||
| color = LetroColor.OnSurfaceContainerHigh, | ||
| modifier = Modifier.tabIndicatorOffset(it[uiState.currentTab]), | ||
| ) | ||
| }, | ||
| modifier = modifier, | ||
| ) { | ||
| tabTitles.forEachIndexed { index, title -> | ||
| BadgedTab( | ||
| selected = uiState.currentTab == index, | ||
| onClick = { | ||
| viewModel.onTabClick(index) | ||
| }, | ||
| text = title, | ||
| badge = tabCounters[index], | ||
| modifier = Modifier | ||
| .padding(horizontal = 0.dp) | ||
| .alpha(if (uiState.currentTab == index) 1f else 0.6f), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun BadgedTab( | ||
| modifier: Modifier = Modifier, | ||
| selected: Boolean, | ||
| onClick: () -> Unit, | ||
| text: String, | ||
| badge: String? = null, | ||
| ) { | ||
| Tab( | ||
| selected = selected, | ||
| onClick = { onClick() }, | ||
| text = { | ||
| Row( | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Text( | ||
| text = text, | ||
| style = MaterialTheme.typography.labelLarge, | ||
| color = LetroColor.OnSurfaceContainerHigh, | ||
| maxLines = 1, | ||
| ) | ||
| if (badge != null) { | ||
| Spacer(modifier = Modifier.width(4.dp)) | ||
| TabBadge(text = badge) | ||
| } | ||
| } | ||
| }, | ||
| selectedContentColor = LetroColor.OnSurfaceContainerHigh, | ||
| unselectedContentColor = MaterialTheme.colorScheme.error, | ||
| modifier = modifier, | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| private fun TabBadge( | ||
| text: String, | ||
| ) { | ||
| Box( | ||
| contentAlignment = Alignment.Center, | ||
| modifier = Modifier | ||
| .background( | ||
| color = LetroColor.OnSurfaceContainerHigh, | ||
| shape = CircleShape, | ||
| ) | ||
| .size(16.dp), | ||
| ) { | ||
| Text( | ||
| text = text, | ||
| style = MaterialTheme.typography.labelSmall, | ||
| color = LetroColor.SurfaceContainerHigh, | ||
| maxLines = 1, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| fun PreviewTabBadge() { | ||
| TabBadge(text = "1") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.