Skip to content

Commit

Permalink
Unify usage of LinkText
Browse files Browse the repository at this point in the history
  • Loading branch information
micbakos-rdx committed Jun 27, 2024
1 parent c5a48da commit 6ab4a80
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 96 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.babylon.wallet.android.presentation.account.composable

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -28,10 +27,10 @@ import androidx.compose.ui.text.style.TextOverflow
import com.babylon.wallet.android.R
import com.babylon.wallet.android.designsystem.theme.RadixTheme
import com.babylon.wallet.android.presentation.ui.composables.ExpandableText
import com.babylon.wallet.android.presentation.ui.composables.LinkText
import com.babylon.wallet.android.presentation.ui.composables.actionableaddress.ActionableAddressView
import com.babylon.wallet.android.presentation.ui.modifier.throttleClickable
import com.babylon.wallet.android.utils.copyToClipboard
import com.babylon.wallet.android.utils.openUrl
import com.radixdlt.sargon.Address
import com.radixdlt.sargon.NonFungibleGlobalId
import com.radixdlt.sargon.NonFungibleLocalId
Expand Down Expand Up @@ -265,32 +264,9 @@ fun MetadataValueView(
maxLines = 2
)

MetadataType.Url -> Text(
modifier = modifier
.fillMaxWidth()
.clickable { context.openUrl(metadata.value) },
text = buildAnnotatedString {
append(metadata.value)
append(" ")
appendInlineContent(id = "link_icon")
},
style = RadixTheme.typography.body1StandaloneLink,
color = RadixTheme.colors.blue1,
inlineContent = mapOf(
"link_icon" to InlineTextContent(
Placeholder(
RadixTheme.typography.body1StandaloneLink.fontSize,
RadixTheme.typography.body1StandaloneLink.fontSize,
PlaceholderVerticalAlign.TextCenter
)
) {
Icon(
painter = painterResource(id = R.drawable.ic_external_link),
contentDescription = null,
tint = color
)
}
)
MetadataType.Url -> LinkText(
modifier = modifier.fillMaxWidth(),
url = metadata.value
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package com.babylon.wallet.android.presentation.settings.approveddapps.dappdetai

import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -26,7 +25,6 @@ import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
Expand All @@ -43,7 +41,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -64,6 +61,7 @@ import com.babylon.wallet.android.presentation.ui.RadixWalletPreviewTheme
import com.babylon.wallet.android.presentation.ui.composables.BasicPromptAlertDialog
import com.babylon.wallet.android.presentation.ui.composables.DefaultModalSheetLayout
import com.babylon.wallet.android.presentation.ui.composables.GrayBackgroundWrapper
import com.babylon.wallet.android.presentation.ui.composables.LinkText
import com.babylon.wallet.android.presentation.ui.composables.PersonaDataFieldRow
import com.babylon.wallet.android.presentation.ui.composables.PersonaDataStringField
import com.babylon.wallet.android.presentation.ui.composables.RadixCenteredTopAppBar
Expand All @@ -75,7 +73,6 @@ import com.babylon.wallet.android.presentation.ui.composables.card.NonFungibleCa
import com.babylon.wallet.android.presentation.ui.composables.card.PersonaCard
import com.babylon.wallet.android.presentation.ui.modifier.radixPlaceholder
import com.babylon.wallet.android.presentation.ui.modifier.throttleClickable
import com.babylon.wallet.android.utils.openUrl
import com.radixdlt.sargon.AccountAddress
import com.radixdlt.sargon.Address
import com.radixdlt.sargon.AppearanceId
Expand Down Expand Up @@ -499,31 +496,14 @@ fun DAppWebsiteAddressRow(
style = RadixTheme.typography.body1Regular,
color = RadixTheme.colors.gray2
)
Row(

LinkText(
modifier = Modifier
.fillMaxWidth()
.clickable(enabled = website != null) {
if (website != null) {
context.openUrl(website)
}
},
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(dimensions.paddingSmall)
) {
Text(
modifier = Modifier
.weight(1f)
.radixPlaceholder(visible = website == null),
text = website.orEmpty(),
style = RadixTheme.typography.body1HighImportance,
color = RadixTheme.colors.blue1
)
Icon(
painter = painterResource(id = com.babylon.wallet.android.designsystem.R.drawable.ic_link_out),
tint = RadixTheme.colors.gray3,
contentDescription = null
)
}
.radixPlaceholder(visible = website == null),
clickable = website != null,
url = website.orEmpty()
)
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.babylon.wallet.android.presentation.status.assets

import android.net.Uri
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
Expand All @@ -13,25 +11,15 @@ import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.InlineTextContent
import androidx.compose.foundation.text.appendInlineContent
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.Placeholder
import androidx.compose.ui.text.PlaceholderVerticalAlign
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.babylon.wallet.android.R
Expand All @@ -43,14 +31,13 @@ import com.babylon.wallet.android.presentation.status.assets.lsu.LSUDialogConten
import com.babylon.wallet.android.presentation.status.assets.nonfungible.NonFungibleAssetDialogContent
import com.babylon.wallet.android.presentation.status.assets.pool.PoolUnitDialogContent
import com.babylon.wallet.android.presentation.ui.composables.BottomSheetDialogWrapper
import com.babylon.wallet.android.presentation.ui.composables.LinkText
import com.babylon.wallet.android.presentation.ui.composables.SnackbarUiMessageHandler
import com.babylon.wallet.android.presentation.ui.composables.assets.Behaviour
import com.babylon.wallet.android.presentation.ui.composables.assets.Tag
import com.babylon.wallet.android.presentation.ui.composables.icon
import com.babylon.wallet.android.presentation.ui.composables.name
import com.babylon.wallet.android.presentation.ui.modifier.applyIf
import com.babylon.wallet.android.presentation.ui.modifier.radixPlaceholder
import com.babylon.wallet.android.utils.openUrl
import kotlinx.collections.immutable.ImmutableList
import rdx.works.core.domain.assets.Asset
import rdx.works.core.domain.assets.AssetBehaviours
Expand Down Expand Up @@ -191,36 +178,12 @@ fun DescriptionSection(
color = RadixTheme.colors.gray2
)

val context = LocalContext.current
Text(
LinkText(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = RadixTheme.dimensions.paddingSmall)
.padding(top = RadixTheme.dimensions.paddingXSmall)
.clickable { context.openUrl(infoUrl) },
text = buildAnnotatedString {
append(infoUrl.toString())
append(" ")
appendInlineContent(id = "link_icon")
},
style = RadixTheme.typography.body1StandaloneLink,
color = RadixTheme.colors.blue1,
inlineContent = mapOf(
"link_icon" to InlineTextContent(
Placeholder(
RadixTheme.typography.body1StandaloneLink.fontSize,
RadixTheme.typography.body1StandaloneLink.fontSize,
PlaceholderVerticalAlign.TextCenter
)
) {
Icon(
painter = painterResource(id = R.drawable.ic_external_link),
contentDescription = null,
tint = RadixTheme.colors.gray2
)
}
),
textAlign = TextAlign.Start,
.padding(top = RadixTheme.dimensions.paddingXSmall),
url = infoUrl
)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package com.babylon.wallet.android.presentation.ui.composables

import android.net.Uri
import androidx.compose.foundation.text.InlineTextContent
import androidx.compose.foundation.text.appendInlineContent
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.Placeholder
import androidx.compose.ui.text.PlaceholderVerticalAlign
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextAlign
import com.babylon.wallet.android.R
import com.babylon.wallet.android.designsystem.theme.RadixTheme
import com.babylon.wallet.android.presentation.ui.modifier.throttleClickable
import com.babylon.wallet.android.utils.openUrl

@Composable
fun LinkText(
modifier: Modifier = Modifier,
url: Uri,
clickable: Boolean = true,
linkStyle: TextStyle = RadixTheme.typography.body1StandaloneLink,
linkColor: Color = RadixTheme.colors.blue1,
linkIconColor: Color = RadixTheme.colors.gray2
) {
LinkText(
modifier = modifier,
url = url.toString(),
clickable = clickable,
linkStyle = linkStyle,
linkColor = linkColor,
linkIconColor = linkIconColor
)
}

@Composable
fun LinkText(
modifier: Modifier = Modifier,
url: String,
clickable: Boolean = true,
linkStyle: TextStyle = RadixTheme.typography.body1StandaloneLink,
linkColor: Color = RadixTheme.colors.blue1,
linkIconColor: Color = RadixTheme.colors.gray2
) {
val context = LocalContext.current
Text(
modifier = modifier.throttleClickable(enabled = clickable) {
context.openUrl(url)
},
text = buildAnnotatedString {
append(url)
append(" ")
appendInlineContent(id = "link_icon")
},
style = linkStyle,
color = linkColor,
inlineContent = mapOf(
"link_icon" to InlineTextContent(
Placeholder(
linkStyle.fontSize,
linkStyle.fontSize,
PlaceholderVerticalAlign.TextCenter
)
) {
Icon(
painter = painterResource(id = R.drawable.ic_external_link),
contentDescription = null,
tint = linkIconColor
)
}
),
textAlign = TextAlign.Start,
)
}

0 comments on commit 6ab4a80

Please sign in to comment.