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 0569bd0ab..fcaca3e82 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
@@ -336,7 +336,7 @@ fun NIP05CheckingIcon(modifier: Modifier) {
@Composable
fun NIP05VerifiedIcon(modifier: Modifier) {
Icon(
- painter = painterResource(R.drawable.nip_05_light),
+ painter = painterResource(R.drawable.nip_05),
contentDescription = stringResource(id = R.string.nip05_verified),
modifier = modifier,
tint = Color.Unspecified
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
index 088d40f6c..31dda31f3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.text.ClickableText
import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
@@ -32,8 +33,8 @@ import com.vitorpamplona.amethyst.ui.note.NIP05CheckingIcon
import com.vitorpamplona.amethyst.ui.note.NIP05FailedVerification
import com.vitorpamplona.amethyst.ui.note.NIP05VerifiedIcon
import com.vitorpamplona.amethyst.ui.theme.NIP05IconSize
-import com.vitorpamplona.amethyst.ui.theme.Nip05EmailColor
import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
+import com.vitorpamplona.amethyst.ui.theme.nip05
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -148,7 +149,7 @@ private fun DisplayNIP05(
if (user != "_") {
Text(
text = remember(nip05) { AnnotatedString(user) },
- color = Nip05EmailColor,
+ color = MaterialTheme.colors.nip05,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
@@ -159,7 +160,7 @@ private fun DisplayNIP05(
ClickableText(
text = remember(nip05) { AnnotatedString(domain) },
onClick = { runCatching { uri.openUri("https://$domain") } },
- style = LocalTextStyle.current.copy(color = Nip05EmailColor),
+ style = LocalTextStyle.current.copy(color = MaterialTheme.colors.nip05),
maxLines = 1,
overflow = TextOverflow.Visible
)
@@ -199,7 +200,7 @@ fun DisplayNip05ProfileStatus(user: User) {
if (user != "_") {
Text(
text = remember { AnnotatedString(user + "@") },
- color = Nip05EmailColor,
+ color = MaterialTheme.colors.nip05,
modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = 5.dp),
maxLines = 1,
overflow = TextOverflow.Ellipsis
@@ -210,7 +211,7 @@ fun DisplayNip05ProfileStatus(user: User) {
ClickableText(
text = AnnotatedString(domain),
onClick = { nip05.let { runCatching { uri.openUri("https://${it.split("@")[1]}") } } },
- style = LocalTextStyle.current.copy(color = Nip05EmailColor),
+ style = LocalTextStyle.current.copy(color = MaterialTheme.colors.nip05),
modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = domainPadStart),
maxLines = 1,
overflow = TextOverflow.Ellipsis
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt
index f4f7effd9..e4b1d22bb 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt
@@ -12,10 +12,13 @@ val BitcoinOrange = Color(0xFFF7931A)
val RoyalBlue = Color(0xFF4169E1)
val Following = Color(0xFF03DAC5)
-val Nip05EmailColor = Color(0xFFb198ec)
val FollowsFollow = Color.Yellow
val NIP05Verified = Color.Blue
+val Nip05EmailColor = Color(0xFFb198ec)
+val Nip05EmailColorDark = Color(0xFF6e5490)
+val Nip05EmailColorLight = Color(0xFFa770f3)
+
val DarkerGreen = Color.Green.copy(alpha = 0.32f)
val WarningColor = Color(0xFFC62828)
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
index 984d1a603..a5a61edc3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
@@ -260,6 +260,9 @@ val Colors.veryImportantLink: Color
val Colors.placeholderText: Color
get() = if (isLight) LightPlaceholderText else DarkPlaceholderText
+val Colors.nip05: Color
+ get() = if (isLight) Nip05EmailColorLight else Nip05EmailColorDark
+
val Colors.placeholderTextColorFilter: ColorFilter
get() = if (isLight) LightPlaceholderTextColorFilter else DarkPlaceholderTextColorFilter
diff --git a/app/src/main/res/drawable/nip_05_light.xml b/app/src/main/res/drawable-night/nip_05.xml
similarity index 92%
rename from app/src/main/res/drawable/nip_05_light.xml
rename to app/src/main/res/drawable-night/nip_05.xml
index a36966143..bc7967c17 100644
--- a/app/src/main/res/drawable/nip_05_light.xml
+++ b/app/src/main/res/drawable-night/nip_05.xml
@@ -5,8 +5,8 @@
android:viewportHeight="30">
+ android:fillColor="#6e5490"/>
+ android:fillColor="#6e5490"/>
diff --git a/app/src/main/res/drawable/nip_05.xml b/app/src/main/res/drawable/nip_05.xml
index 07a77fd8b..3729fe60d 100644
--- a/app/src/main/res/drawable/nip_05.xml
+++ b/app/src/main/res/drawable/nip_05.xml
@@ -4,20 +4,9 @@
android:viewportWidth="30"
android:viewportHeight="30">
+ android:pathData="m15.408,21.113 l-5.57,-5.026c-0.679,-0.679 -0.815,-1.766 -0.136,-2.445 0.679,-0.679 1.766,-0.815 2.445,-0.136L15,16.087 19.619,10.924c0.679,-0.679 1.766,-0.815 2.445,-0.136 0.679,0.679 0.815,1.766 0.136,2.445z"
+ android:fillColor="#a770f3"/>
-
-
-
+ android:pathData="M15,0.056C6.849,0.056 0.056,6.713 0.056,15c0,8.287 6.657,14.944 14.944,14.944 0.951,0 1.766,-0.815 1.766,-1.766 0,-0.951 -0.815,-1.766 -1.766,-1.766 -6.249,0 -11.411,-5.162 -11.411,-11.411 0,-6.249 5.162,-11.411 11.411,-11.411 6.249,0 11.411,5.162 11.411,11.411 0,2.717 -1.494,5.298 -3.396,6.113 -1.223,0.543 -2.445,0.136 -3.668,-0.951l0,0l-2.309,2.581c2.174,2.038 4.755,2.717 7.336,1.63C27.634,23.015 29.944,19.211 29.944,15 29.808,6.713 23.151,0.056 15,0.056Z"
+ android:fillColor="#a770f3"/>
-
-
diff --git a/app/src/main/res/drawable/nip_05_full.xml b/app/src/main/res/drawable/nip_05_full.xml
new file mode 100644
index 000000000..07a77fd8b
--- /dev/null
+++ b/app/src/main/res/drawable/nip_05_full.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+