Merge remote-tracking branch 'origin/HEAD' into recommendation-engine

# Conflicts:
#	app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 146
-        versionName "0.42.4"
+        versionCode 147
+        versionName "0.42.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -380,8 +380,7 @@ fun BechLink(word: String, canPreview: Boolean, backgroundColor: Color, accountV
                         MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
                         RoundedCornerShape(15.dp)
                     ),
-                parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
-                    .compositeOver(backgroundColor),
+                parentBackgroundColor = backgroundColor,
                 isQuotedNote = true,
                 navController = navController
             )
@@ -530,8 +529,7 @@ fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgro
                         MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
                         RoundedCornerShape(15.dp)
                     ),
-                parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
-                    .compositeOver(backgroundColor),
+                parentBackgroundColor = backgroundColor,
                 isQuotedNote = true,
                 navController = navController
             )