Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions apps/flipcash/core/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -764,4 +764,8 @@

<string name="action_sendCash">Send Cash</string>
<string name="action_sendMessage">Send Message</string>

<string name="subtitle_verb_youSent">You sent</string>
<string name="subtitle_verb_youReceived">You received</string>

</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewWrapper
import androidx.compose.ui.unit.Dp
Expand All @@ -28,6 +29,7 @@ import androidx.paging.compose.LazyPagingItems
import com.flipcash.app.core.ui.TokenIconWithName
import com.flipcash.app.theme.FlipcashThemeWrapper
import com.flipcash.services.models.chat.MessageContent
import com.flipcash.shared.flags.R
import com.getcode.opencode.compose.ExchangeStub
import com.getcode.opencode.compose.LocalExchange
import com.getcode.opencode.model.financial.Fiat
Expand Down Expand Up @@ -118,20 +120,34 @@ private fun CashBubble(
)
}

PriceWithFlag(
Column(
modifier = Modifier
.padding(vertical = CodeTheme.dimens.grid.x5),
amount = amount.formatted(),
currencyCode = amount.currencyCode.name,
flag = exchange.getFlagByCurrency(amount.currencyCode.name),
text = { text ->
Text(
text = text,
style = CodeTheme.typography.displayMedium,
color = CodeTheme.colors.textMain,
)
}
)
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(
text = if (isFromSelf) {
stringResource(R.string.subtitle_youSent)
} else {
stringResource(R.string.subtitle_youReceived)
},
style = CodeTheme.typography.caption,
color = CodeTheme.colors.textSecondary,
)
PriceWithFlag(
modifier = Modifier.padding(top = CodeTheme.dimens.grid.x1),
amount = amount.formatted(),
currencyCode = amount.currencyCode.name,
flag = exchange.getFlagByCurrency(amount.currencyCode.name),
text = { text ->
Text(
text = text,
style = CodeTheme.typography.displayMedium,
color = CodeTheme.colors.textMain,
)
}
)
}
}
}
}
Expand Down
Loading