avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: Convert Description to generic HtmlTextBlock

Browse Source
This commit is contained in:
machiav3lli 2022-05-29 02:55:11 +02:00
parent d3bded8e29
commit bc9840b429
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@ -189,6 +189,7 @@ dependencies {
// Markdown // Markdown
implementation("org.jetbrains:markdown:0.3.1") implementation("org.jetbrains:markdown:0.3.1")
implementation("de.charlex.compose:html-text:1.1.0")
// Coroutines / Lifecycle // Coroutines / Lifecycle
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-rc01") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-rc01")

37
src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Description.kt → src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/TextBlock.kt
View File

@ -4,52 +4,63 @@ import androidx.compose.animation.animateContentSize
import androidx.compose.animation.core.animateIntAsState import androidx.compose.animation.core.animateIntAsState
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.MaterialTheme
import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.* import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.compositeOver import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.looker.droidify.R
import de.charlex.compose.HtmlText
/* /*
* Annotate String in this way https://stackoverflow.com/questions/65567412/jetpack-compose-text-hyperlink-some-section-of-the-text/69549929#69549929 * Annotate String in this way https://stackoverflow.com/questions/65567412/jetpack-compose-text-hyperlink-some-section-of-the-text/69549929#69549929
* TODO REMOVE usage of HtmlText
* */ * */
@Composable @Composable
fun Description( fun HtmlTextBlock(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
description: AnnotatedString description: String
) { ) {
Column( Column(
horizontalAlignment = Alignment.CenterHorizontally modifier = modifier.fillMaxWidth(),
horizontalAlignment = Alignment.Start
) { ) {
var isExpanded by remember { mutableStateOf(false) } var isExpanded by remember { mutableStateOf(false) }
Surface( Surface(
modifier = modifier.animateContentSize(), modifier = modifier.animateContentSize(),
shape = MaterialTheme.shapes.large, shape = MaterialTheme.shapes.large,
color = MaterialTheme.colors.primary.copy(0.3f) color = Color.Transparent
.compositeOver(MaterialTheme.colors.background)
) { ) {
val maxLines by animateIntAsState( val maxLines by animateIntAsState(
targetValue = if (isExpanded) Int.MAX_VALUE else 12, targetValue = if (isExpanded) Int.MAX_VALUE else 12,
animationSpec = tween(durationMillis = 1000) animationSpec = tween(durationMillis = 200)
) )
Text( HtmlText(
modifier = Modifier modifier = Modifier
.padding(16.dp) .padding(16.dp)
.animateContentSize(), .animateContentSize(),
text = description, text = description,
color = MaterialTheme.colorScheme.onBackground,
maxLines = maxLines, maxLines = maxLines,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
} }
FilledTonalButton(onClick = { isExpanded = !isExpanded }) { if (description.length >= 500) {
Text(text = "Show More") FilledTonalButton(onClick = { isExpanded = !isExpanded }) {
Text(text = stringResource(id = if (isExpanded) R.string.show_less else R.string.show_more))
}
} }
} }
} }