From 38e701a3630a5efb52445a94a5f16e999fb8d923 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 25 Mar 2024 16:41:38 -0400 Subject: [PATCH] Moves the Following Vector to a native composable. --- .../vitorpamplona/amethyst/ui/note/Icons.kt | 21 ++- .../ui/screen/loggedOff/LoginScreen.kt | 4 +- .../ui/screen/loggedOff/SignUpScreen.kt | 5 +- app/src/main/res/drawable/giftwrap_off.xml | 19 --- app/src/main/res/drawable/giftwrap_on.xml | 10 -- .../res/drawable/verified_follow_shield.png | Bin 3088 -> 0 bytes .../amethyst/commons/labels/Following.kt | 131 ++++++++++++++++++ 7 files changed, 151 insertions(+), 39 deletions(-) delete mode 100644 app/src/main/res/drawable/giftwrap_off.xml delete mode 100644 app/src/main/res/drawable/giftwrap_on.xml delete mode 100644 app/src/main/res/drawable/verified_follow_shield.png create mode 100644 commons/src/main/java/com/vitorpamplona/amethyst/commons/labels/Following.kt diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index 471235002..0233622a3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -20,6 +20,7 @@ */ package com.vitorpamplona.amethyst.ui.note +import Following import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -63,6 +64,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.R +import com.vitorpamplona.amethyst.commons.hashtags.Amethyst import com.vitorpamplona.amethyst.commons.hashtags.Cashu import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange @@ -72,11 +74,12 @@ import com.vitorpamplona.amethyst.ui.theme.Size30Modifier import com.vitorpamplona.amethyst.ui.theme.grayText import com.vitorpamplona.amethyst.ui.theme.placeholderText import com.vitorpamplona.amethyst.ui.theme.subtleButton +import kotlin.time.measureTimedValue @Composable fun AmethystIcon(iconSize: Dp) { Icon( - painter = painterResource(R.drawable.amethyst), + imageVector = CustomHashTagIcons.Amethyst, contentDescription = stringResource(id = R.string.app_logo), modifier = Modifier.size(iconSize), tint = Color.Unspecified, @@ -85,12 +88,16 @@ fun AmethystIcon(iconSize: Dp) { @Composable fun FollowingIcon(iconSize: Dp) { - Icon( - painter = painterResource(R.drawable.following), - contentDescription = stringResource(id = R.string.following), - modifier = Modifier.size(iconSize), - tint = Color.Unspecified, - ) + val (value, elapsed) = + measureTimedValue { + Icon( + imageVector = Following, + contentDescription = stringResource(id = R.string.following), + modifier = Modifier.size(iconSize), + tint = Color.Unspecified, + ) + } + println("FollowingIcon $elapsed") } @Composable diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt index 936251823..de25e75d4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt @@ -89,6 +89,8 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.amethyst.Amethyst import com.vitorpamplona.amethyst.R +import com.vitorpamplona.amethyst.commons.hashtags.Amethyst +import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons import com.vitorpamplona.amethyst.service.PackageUtils import com.vitorpamplona.amethyst.ui.MainActivity import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation @@ -245,7 +247,7 @@ fun LoginPage( horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - painterResource(id = R.drawable.amethyst), + imageVector = CustomHashTagIcons.Amethyst, contentDescription = stringResource(R.string.app_logo), modifier = Modifier.size(150.dp), contentScale = ContentScale.Inside, diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt index b92faa5be..d15789244 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt @@ -54,7 +54,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalUriHandler -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString @@ -66,6 +65,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import com.vitorpamplona.amethyst.R +import com.vitorpamplona.amethyst.commons.hashtags.Amethyst +import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons import com.vitorpamplona.amethyst.service.PackageUtils import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog @@ -116,7 +117,7 @@ fun SignUpPage( horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - painterResource(id = R.drawable.amethyst), + imageVector = CustomHashTagIcons.Amethyst, contentDescription = stringResource(R.string.app_logo), modifier = Modifier.size(150.dp), contentScale = ContentScale.Inside, diff --git a/app/src/main/res/drawable/giftwrap_off.xml b/app/src/main/res/drawable/giftwrap_off.xml deleted file mode 100644 index f3348f8ca..000000000 --- a/app/src/main/res/drawable/giftwrap_off.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/giftwrap_on.xml b/app/src/main/res/drawable/giftwrap_on.xml deleted file mode 100644 index 6ee6d4274..000000000 --- a/app/src/main/res/drawable/giftwrap_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/verified_follow_shield.png b/app/src/main/res/drawable/verified_follow_shield.png deleted file mode 100644 index 0aa45cd5fdee1b6927d88a24c21b58f7068e9727..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3088 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 e4Q~~C3;ze{$C;TRpRQB@0000