Skip to content

Commit 8af9131

Browse files
authored
Merge pull request #144 from code-payments/chore/balance-chat-ui-tweaks
Chore/balance chat UI tweaks
2 parents b3dc37f + 83013d8 commit 8af9131

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

app/src/main/java/com/getcode/view/main/balance/BalanceSheet.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ fun BalanceContent(
9797
}
9898

9999
val canClickBalance by remember(state.isDebugBucketsEnabled) {
100-
derivedStateOf { state.isDebugBucketsVisible }
100+
derivedStateOf { state.isDebugBucketsEnabled }
101101
}
102102

103103
LazyColumn(
@@ -131,12 +131,10 @@ fun BalanceContent(
131131
key = { _, item -> item.id },
132132
contentType = { _, item -> item }) { index, event ->
133133
ChatNode(chat = event, onClick = { openChat(event.id) })
134-
if (index < state.chats.lastIndex) {
135-
Divider(
136-
modifier = Modifier.padding(start = CodeTheme.dimens.inset),
137-
color = White10,
138-
)
139-
}
134+
Divider(
135+
modifier = Modifier.padding(start = CodeTheme.dimens.inset),
136+
color = White10,
137+
)
140138
}
141139

142140
when {

app/src/main/java/com/getcode/view/main/chat/ChatScreen.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.ui.graphics.RectangleShape
1919
import androidx.compose.ui.platform.LocalContext
2020
import androidx.compose.ui.res.stringResource
2121
import androidx.compose.ui.unit.Dp
22+
import androidx.compose.ui.unit.dp
2223
import androidx.paging.compose.LazyPagingItems
2324
import androidx.paging.compose.itemContentType
2425
import androidx.paging.compose.itemKey
@@ -33,6 +34,7 @@ import com.getcode.ui.components.CodeButton
3334
import com.getcode.ui.components.Pill
3435
import com.getcode.ui.components.chat.MessageNode
3536
import com.getcode.ui.components.chat.localized
37+
import timber.log.Timber
3638

3739
@Composable
3840
fun ChatScreen(
@@ -49,7 +51,7 @@ fun ChatScreen(
4951
reverseLayout = true,
5052
contentPadding = PaddingValues(
5153
horizontal = CodeTheme.dimens.inset,
52-
vertical = CodeTheme.dimens.grid.x6,
54+
vertical = CodeTheme.dimens.inset,
5355
),
5456
verticalArrangement = Arrangement.Top,
5557
) {
@@ -102,7 +104,7 @@ fun ChatScreen(
102104
date.formatDateRelatively()
103105
}
104106
DateBubble(
105-
modifier = Modifier.padding(vertical = CodeTheme.dimens.grid.x2),
107+
modifier = Modifier.padding(bottom = CodeTheme.dimens.grid.x2),
106108
date = dateString
107109
)
108110
}

0 commit comments

Comments
 (0)