mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-09-26 19:46:57 +02:00
fixed some linting issues
This commit is contained in:
@@ -1,9 +1,7 @@
|
|||||||
package com.vitorpamplona.amethyst.ui.components
|
package com.vitorpamplona.amethyst.ui.components
|
||||||
|
|
||||||
import android.util.Patterns
|
import android.util.Patterns
|
||||||
import androidx.compose.animation.VectorConverter
|
|
||||||
import androidx.compose.animation.animateContentSize
|
import androidx.compose.animation.animateContentSize
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
@@ -13,12 +11,8 @@ import androidx.compose.material.Icon
|
|||||||
import androidx.compose.material.LocalTextStyle
|
import androidx.compose.material.LocalTextStyle
|
||||||
import androidx.compose.material.MaterialTheme
|
import androidx.compose.material.MaterialTheme
|
||||||
import androidx.compose.material.Text
|
import androidx.compose.material.Text
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.filled.Image
|
|
||||||
import androidx.compose.material.icons.filled.MoreVert
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.livedata.observeAsState
|
import androidx.compose.runtime.livedata.observeAsState
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
@@ -30,18 +24,15 @@ import androidx.compose.ui.text.TextStyle
|
|||||||
import androidx.compose.ui.text.font.FontFamily
|
import androidx.compose.ui.text.font.FontFamily
|
||||||
import androidx.compose.ui.text.style.TextDecoration
|
import androidx.compose.ui.text.style.TextDecoration
|
||||||
import androidx.compose.ui.text.style.TextDirection
|
import androidx.compose.ui.text.style.TextDirection
|
||||||
import androidx.compose.ui.text.toLowerCase
|
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
import coil.ImageLoader
|
|
||||||
import com.google.accompanist.flowlayout.FlowRow
|
import com.google.accompanist.flowlayout.FlowRow
|
||||||
import com.halilibo.richtext.markdown.Markdown
|
import com.halilibo.richtext.markdown.Markdown
|
||||||
import com.halilibo.richtext.markdown.MarkdownParseOptions
|
import com.halilibo.richtext.markdown.MarkdownParseOptions
|
||||||
import com.halilibo.richtext.ui.RichTextStyle
|
import com.halilibo.richtext.ui.RichTextStyle
|
||||||
import com.halilibo.richtext.ui.material.MaterialRichText
|
import com.halilibo.richtext.ui.material.MaterialRichText
|
||||||
import com.halilibo.richtext.ui.resolveDefaults
|
import com.halilibo.richtext.ui.resolveDefaults
|
||||||
import com.vitorpamplona.amethyst.R
|
|
||||||
import com.vitorpamplona.amethyst.model.LocalCache
|
import com.vitorpamplona.amethyst.model.LocalCache
|
||||||
import com.vitorpamplona.amethyst.model.checkForHashtagWithIcon
|
import com.vitorpamplona.amethyst.model.checkForHashtagWithIcon
|
||||||
import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
|
import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
|
||||||
@@ -240,11 +231,11 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
|
|||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (tag != null) {
|
if (tag != null) {
|
||||||
var txt = AnnotatedString("#$tag ")
|
var txt = AnnotatedString("#$tag ")
|
||||||
val HashtagIcon = checkForHashtagWithIcon(tag)
|
val hashtagIcon = checkForHashtagWithIcon(tag)
|
||||||
if(HashtagIcon != null){
|
|
||||||
|
if (hashtagIcon != null) {
|
||||||
txt = AnnotatedString("#$tag")
|
txt = AnnotatedString("#$tag")
|
||||||
}
|
}
|
||||||
ClickableText(
|
ClickableText(
|
||||||
@@ -252,12 +243,13 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
|
|||||||
onClick = { navController.navigate("Hashtag/$tag") },
|
onClick = { navController.navigate("Hashtag/$tag") },
|
||||||
style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
|
style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
|
||||||
)
|
)
|
||||||
if(HashtagIcon != null){
|
|
||||||
|
if (hashtagIcon != null) {
|
||||||
Icon(
|
Icon(
|
||||||
painter = painterResource(HashtagIcon.icon),
|
painter = painterResource(hashtagIcon.icon),
|
||||||
HashtagIcon.description,
|
contentDescription = hashtagIcon.description,
|
||||||
tint = HashtagIcon.color,
|
tint = hashtagIcon.color,
|
||||||
modifier = Modifier.size(20.dp).padding(0.dp,5.dp,0.dp,0.dp)
|
modifier = Modifier.size(20.dp).padding(0.dp, 5.dp, 0.dp, 0.dp)
|
||||||
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user