Skip to content

Chore/balance chat UI tweaks #144

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
bmc08gt merged 2 commits into from
Feb 7, 2024
Merged

Chore/balance chat UI tweaks #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31303e6
fix(balance): reenable navigation to bucket debugger
bmc08gt Feb 7, 2024
83013d8
chore(chats): tweak contentPadding of screen
bmc08gt Feb 7, 2024
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
12 changes: 5 additions & 7 deletions app/src/main/java/com/getcode/view/main/balance/BalanceSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fun BalanceContent(
}

val canClickBalance by remember(state.isDebugBucketsEnabled) {
derivedStateOf { state.isDebugBucketsVisible }
derivedStateOf { state.isDebugBucketsEnabled }
}

LazyColumn(
Expand Down Expand Up @@ -131,12 +131,10 @@ fun BalanceContent(
key = { _, item -> item.id },
contentType = { _, item -> item }) { index, event ->
ChatNode(chat = event, onClick = { openChat(event.id) })
if (index < state.chats.lastIndex) {
Divider(
modifier = Modifier.padding(start = CodeTheme.dimens.inset),
color = White10,
)
}
Divider(
modifier = Modifier.padding(start = CodeTheme.dimens.inset),
color = White10,
)
}

when {
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/getcode/view/main/chat/ChatScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.itemContentType
import androidx.paging.compose.itemKey
Expand All @@ -33,6 +34,7 @@ import com.getcode.ui.components.CodeButton
import com.getcode.ui.components.Pill
import com.getcode.ui.components.chat.MessageNode
import com.getcode.ui.components.chat.localized
import timber.log.Timber

@Composable
fun ChatScreen(
Expand All @@ -49,7 +51,7 @@ fun ChatScreen(
reverseLayout = true,
contentPadding = PaddingValues(
horizontal = CodeTheme.dimens.inset,
vertical = CodeTheme.dimens.grid.x6,
vertical = CodeTheme.dimens.inset,
),
verticalArrangement = Arrangement.Top,
) {
Expand Down Expand Up @@ -102,7 +104,7 @@ fun ChatScreen(
date.formatDateRelatively()
}
DateBubble(
modifier = Modifier.padding(vertical = CodeTheme.dimens.grid.x2),
modifier = Modifier.padding(bottom = CodeTheme.dimens.grid.x2),
date = dateString
)
}
Expand Down