Merge branch 'main' into main

greenart7c3 · Mar 18, 2024 · d682518 · d682518
2 parents f949d56 + 688abee
commit d682518
Show file tree

Hide file tree

Showing 127 changed files with 1,452 additions and 1,038 deletions.
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
@@ -28,8 +28,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.commons.HashTagSegment
-import com.vitorpamplona.amethyst.commons.RegularTextSegment
+import com.vitorpamplona.amethyst.commons.richtext.HashTagSegment
+import com.vitorpamplona.amethyst.commons.richtext.RegularTextSegment
 import com.vitorpamplona.amethyst.ui.components.HashTag
 import com.vitorpamplona.amethyst.ui.components.RenderRegular
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn