diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
index b40652650..d5380da85 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
@@ -6,11 +6,14 @@ import androidx.compose.ui.unit.dp
import com.vitorpamplona.amethyst.R
fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
return when (tag.lowercase()) {
- "bitcoin", "btc" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
- "nostr" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
- "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
- "zap", "zaps", "zapathon", "zapraiser", "zaplife", "zapper", "zappers", "zapping" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
- "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(4.dp, 2.dp, 0.dp, 0.dp))
+ "bitcoin", "btc" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 3.dp, 0.dp, 0.dp))
+ "nostr", "nostrich", "nostriches", "nostrichs" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
+ "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+ "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+ "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
+ "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 1.dp))
+ "coffee", "coffeechain" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
+
else -> null
}
}
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index 94cc99915..322ba8fa2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -267,8 +267,8 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
myId,
InlineTextContent(
Placeholder(
- width = 16.sp,
- height = 16.sp,
+ width = 17.sp,
+ height = 17.sp,
placeholderVerticalAlign = PlaceholderVerticalAlign.Center
)
) {
diff --git a/app/src/main/res/drawable-xxxhdpi/coffee.xml b/app/src/main/res/drawable-xxxhdpi/coffee.xml
new file mode 100644
index 000000000..61cf17545
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/coffee.xml
@@ -0,0 +1,1183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ht_lightning.xml b/app/src/main/res/drawable/ht_lightning.xml
index e90da2c03..cb20a135b 100644
--- a/app/src/main/res/drawable/ht_lightning.xml
+++ b/app/src/main/res/drawable/ht_lightning.xml
@@ -1,28 +1,32 @@
+ android:width="512dp"
+ android:height="512dp"
+ android:viewportWidth="512"
+ android:viewportHeight="512">
-
-
-
-
+ android:fillColor="#feb804"
+ android:strokeWidth="1"
+ android:pathData="M392,12 L391.976,13.6713 L391.619,15.1605 L390.801,17.0247 L390.249,18.0046 L388.992,20 L388.332,21 L386.333,24 L381,32 L376.975,38 L372.709,44 L363.421,57 L360.579,61 L357.72,65 L353.573,71 L348.424,78 L346.291,81 L343.421,85 L340.576,89 L335.424,96 L331.849,101 L327.424,107 L323.116,113 L317.151,121 L312.116,128 L306.884,135 L302.576,141 L299.626,145 L295.151,151 L290.849,157 L284.884,165 L279.849,172 L276.873,176 L271.627,183 L267.151,189 L262.849,195 C261.637,196.665,260.386,198.301,259.221,200 C258.36,201.254,257.561,202.579,257.005,204 L256.399,206 L256.233,207 L256.191,208.995 L256.333,209.981 L256.607,210.941 L257.603,212.682 L259.148,213.972 L261.019,214.682 L262.005,214.852 L263.001,214.941 L265,214.995 L267,215 L271,215 L274,214.995 L274.999,214.981 C275.991,214.925,276.988,214.923,277.96,214.682 L279.816,213.972 L280.674,213.397 L282.239,211.852 L282.957,210.941 L284.304,208.995 C285.178,207.689,285.982,206.337,286.808,205 L289.319,201 L291.797,197 L295.424,191 L298.576,186 L300.424,183 L303.576,178 L305.424,175 L307.319,172 L310.424,167 L313.576,162 L315.424,159 L318.576,154 L320.424,151 L323.576,146 L325.424,143 L328.576,138 L330.424,135 L333.576,130 L335.424,127 L338.576,122 L340.424,119 L343.576,114 L345.424,111 L348.576,106 L353.424,98 L355.95,94 L358.424,90 L361.576,85 L363.424,82 L366.576,77 L368.424,74 L370.319,71 L373.424,66 L376.576,61 L378.424,58 L381.576,53 L386.424,45 L389.576,40 L392.681,35 L394.576,32 L395.792,30 L396.946,28 L397.939,26 L398.336,25 L398.906,23 L399.087,22 L399.207,21 L399.259,20.0008 L399.145,18.0154 L398.697,16.1088 L398.333,15.2284 L397.858,14.4337 L397.276,13.7423 L396.595,13.179 L395.052,12.4344 L394.115,12.2261 L393.655,12.1181 L392,12 Z" />
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/plebs.xml b/app/src/main/res/drawable/plebs.xml
new file mode 100644
index 000000000..62c67abc0
--- /dev/null
+++ b/app/src/main/res/drawable/plebs.xml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/zap.xml b/app/src/main/res/drawable/zap.xml
index 88901877d..dfa2a311b 100644
--- a/app/src/main/res/drawable/zap.xml
+++ b/app/src/main/res/drawable/zap.xml
@@ -1,28 +1,32 @@
+android:width="512dp"
+android:height="512dp"
+android:viewportWidth="512"
+android:viewportHeight="512">
-
-
-
-
+ android:fillColor="#feb804"
+ android:strokeWidth="1"
+ android:pathData="M392,12 L391.976,13.6713 L391.619,15.1605 L390.801,17.0247 L390.249,18.0046 L388.992,20 L388.332,21 L386.333,24 L381,32 L376.975,38 L372.709,44 L363.421,57 L360.579,61 L357.72,65 L353.573,71 L348.424,78 L346.291,81 L343.421,85 L340.576,89 L335.424,96 L331.849,101 L327.424,107 L323.116,113 L317.151,121 L312.116,128 L306.884,135 L302.576,141 L299.626,145 L295.151,151 L290.849,157 L284.884,165 L279.849,172 L276.873,176 L271.627,183 L267.151,189 L262.849,195 C261.637,196.665,260.386,198.301,259.221,200 C258.36,201.254,257.561,202.579,257.005,204 L256.399,206 L256.233,207 L256.191,208.995 L256.333,209.981 L256.607,210.941 L257.603,212.682 L259.148,213.972 L261.019,214.682 L262.005,214.852 L263.001,214.941 L265,214.995 L267,215 L271,215 L274,214.995 L274.999,214.981 C275.991,214.925,276.988,214.923,277.96,214.682 L279.816,213.972 L280.674,213.397 L282.239,211.852 L282.957,210.941 L284.304,208.995 C285.178,207.689,285.982,206.337,286.808,205 L289.319,201 L291.797,197 L295.424,191 L298.576,186 L300.424,183 L303.576,178 L305.424,175 L307.319,172 L310.424,167 L313.576,162 L315.424,159 L318.576,154 L320.424,151 L323.576,146 L325.424,143 L328.576,138 L330.424,135 L333.576,130 L335.424,127 L338.576,122 L340.424,119 L343.576,114 L345.424,111 L348.576,106 L353.424,98 L355.95,94 L358.424,90 L361.576,85 L363.424,82 L366.576,77 L368.424,74 L370.319,71 L373.424,66 L376.576,61 L378.424,58 L381.576,53 L386.424,45 L389.576,40 L392.681,35 L394.576,32 L395.792,30 L396.946,28 L397.939,26 L398.336,25 L398.906,23 L399.087,22 L399.207,21 L399.259,20.0008 L399.145,18.0154 L398.697,16.1088 L398.333,15.2284 L397.858,14.4337 L397.276,13.7423 L396.595,13.179 L395.052,12.4344 L394.115,12.2261 L393.655,12.1181 L392,12 Z" />
+
+
+
+
+
\ No newline at end of file