Merge remote-tracking branch 'origin/main' into add_stat_clearing

Author: dessalines

app/src/main/java/com/dessalines/rankmyfavs/ui/components/common/AppBars.kt

@@ -32,7 +32,9 @@ fun SimpleTopAppBar(
         actions = { actions?.let { it() } },
         navigationIcon = {
             if (onClickBack != null) {
-                IconButton(onClick = onClickBack) {
+                IconButton(
+                    onClick = onClickBack,
+                ) {
                     Icon(
                         Icons.AutoMirrored.Outlined.ArrowBack,
                         contentDescription = stringResource(R.string.go_back),

app/src/main/java/com/dessalines/rankmyfavs/ui/components/favlist/FavListDetailScreen.kt

@@ -44,6 +44,7 @@ import com.dessalines.rankmyfavs.ui.components.common.LARGE_PADDING
 import com.dessalines.rankmyfavs.ui.components.common.SMALL_PADDING
 import com.dessalines.rankmyfavs.ui.components.common.SimpleTopAppBar
 import com.dessalines.rankmyfavs.utils.numToString
+import dev.jeziellago.compose.markdowntext.MarkdownText
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -170,8 +171,9 @@ fun FavListDetailScreen(
 @Composable
 fun FavListDetails(favList: FavList) {
     if (!favList.description.isNullOrBlank()) {
-        Text(
-            text = favList.description,
+        MarkdownText(
+            markdown = favList.description,
+            linkColor = MaterialTheme.colorScheme.primary,
             modifier = Modifier.padding(top = 0.dp, bottom = SMALL_PADDING, start = LARGE_PADDING, end = LARGE_PADDING),
         )
         HorizontalDivider()

app/src/main/java/com/dessalines/rankmyfavs/ui/components/favlistitem/FavListItemDetailScreen.kt

@@ -16,8 +16,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -36,6 +36,7 @@ import com.dessalines.rankmyfavs.ui.components.common.SimpleTopAppBar
 import com.dessalines.rankmyfavs.utils.GLICKO_WIKI_URL
 import com.dessalines.rankmyfavs.utils.numToString
 import com.dessalines.rankmyfavs.utils.openLink
+import dev.jeziellago.compose.markdowntext.MarkdownText
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -161,9 +162,9 @@ fun StatsPreview() {
 @Composable
 fun FavListItemDetails(favListItem: FavListItem) {
     if (!favListItem.description.isNullOrBlank()) {
-        // TODO do markdown here
-        Text(
-            text = favListItem.description,
+        MarkdownText(
+            markdown = favListItem.description,
+            linkColor = MaterialTheme.colorScheme.primary,
             modifier = Modifier.padding(top = 0.dp, bottom = SMALL_PADDING, start = LARGE_PADDING, end = LARGE_PADDING),
         )
     }