highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-08 20:08:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reusing common icons for Cashu's Redemption

Browse Source
This commit is contained in:
Vitor Pamplona 2023-12-04 13:23:19 -05:00
parent 619b59357b
commit 95bcbfdded
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/vitorpamplona/amethyst/ui/components/CashuRedeem.kt
View File

@ -42,8 +42,14 @@ import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.service.CashuProcessor
import com.vitorpamplona.amethyst.service.CashuToken
import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
import com.vitorpamplona.amethyst.ui.note.CashuIcon
import com.vitorpamplona.amethyst.ui.note.CopyIcon
import com.vitorpamplona.amethyst.ui.note.ZapIcon
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
import com.vitorpamplona.amethyst.ui.theme.Size20dp
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.subtleBorder
import kotlinx.coroutines.Dispatchers
@ -173,10 +179,13 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
) {
if (isRedeeming) {
LoadingAnimation()
} else {
ZapIcon(Size20dp, tint = Color.White)
}
Spacer(DoubleHorzSpacer)
Text(
"⚡ Send to Zap Wallet",
stringResource(id = R.string.cashu_redeem_to_zap),
color = Color.White,
fontSize = 16.sp
)
@ -200,7 +209,9 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
containerColor = MaterialTheme.colorScheme.primary
)
) {
Text("\uD83E\uDD5C Open in Cashu Wallet", color = Color.White, fontSize = 16.sp)
CashuIcon(Size20Modifier)
Spacer(DoubleHorzSpacer)
Text(stringResource(id = R.string.cashu_redeem_to_cachu), color = Color.White, fontSize = 16.sp)
}
Spacer(modifier = StdHorzSpacer)
Button(
@ -213,7 +224,9 @@ fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
containerColor = MaterialTheme.colorScheme.primary
)
) {
Text("⎘ Copy ", color = Color.White, fontSize = 16.sp)
CopyIcon(Size20Modifier, Color.White)
Spacer(DoubleHorzSpacer)
Text(stringResource(id = R.string.cashu_copy_token), color = Color.White, fontSize = 16.sp)
}
Spacer(modifier = StdHorzSpacer)
}

21
app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt
View File

@ -6,6 +6,7 @@ import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Bolt
import androidx.compose.material.icons.filled.Cancel
import androidx.compose.material.icons.filled.Clear
import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material.icons.filled.DownloadForOffline
import androidx.compose.material.icons.filled.Downloading
import androidx.compose.material.icons.filled.ExpandLess
@ -175,6 +176,26 @@ fun ZapIcon(modifier: Modifier, tint: Color = Color.Unspecified) {
)
}
@Composable
fun CashuIcon(modifier: Modifier) {
Icon(
painter = painterResource(R.drawable.cashu),
"Cashu",
tint = Color.Unspecified,
modifier = modifier
)
}
@Composable
fun CopyIcon(modifier: Modifier, tint: Color = Color.Unspecified) {
Icon(
imageVector = Icons.Default.ContentCopy,
stringResource(id = R.string.copy_to_clipboard),
tint = tint,
modifier = modifier
)
}
@Composable
fun ExpandLessIcon(modifier: Modifier) {
Icon(

5
app/src/main/res/values/strings.xml
View File

@ -470,6 +470,10 @@
<string name="payment">Payment</string>
<string name="cashu">Cashu Token</string>
<string name="cashu_redeem">Redeem</string>
<string name="cashu_redeem_to_zap">Send to Zap Wallet</string>
<string name="cashu_redeem_to_cachu">Open in Cashu Wallet</string>
<string name="cashu_copy_token">Copy Token</string>
<string name="no_lightning_address_set">No Lightning Address set</string>
<string name="copied_token_to_clipboard">Copied token to clipboard</string>
@ -558,6 +562,7 @@
<string name="automatically_show_url_preview_description">Show URL previews</string>
<string name="load_image_description">When to load images</string>
<string name="copy_to_clipboard">Copy to clipboard</string>
<string name="copy_url_to_clipboard">Copy URL to clipboard</string>
<string name="copy_the_note_id_to_the_clipboard">Copy Note ID to clipboard</string>