laantungir/Amber
1
0
Fork 0
mirror of https://github.com/greenart7c3/Amber.git synced 2026-10-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update richtext-ui library and refactor markdown parsing

Browse Source 
- Update `richtextUi` dependency to version `a02a03a3e9`.
- Migrate `MarkdownParseOptions` to `CommonMarkdownParseOptions` across several UI components.
- Refactor link styling to use `TextLinkStyles` instead of a direct `SpanStyle` in `ConnectOrbotDialog` and `LoginScreen`.
- Update markdown parsing logic in `ExportAllAccountsScreen`, `AccountBackupDialog`, and `LoginScreen` to align with the new library version.
This commit is contained in:
greenart7c3
2026-01-28 16:40:18 -03:00
parent c35d9c82b7
commit 8e9d52580f
5 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/greenart7c3/nostrsigner/ui/LoginScreen.kt
+13 -11
View File
@@ -111,8 +111,8 @@ import com.greenart7c3.nostrsigner.ui.components.IconRow
import com.greenart7c3.nostrsigner.ui.components.TitleExplainer
import com.greenart7c3.nostrsigner.ui.navigation.Route
import com.greenart7c3.nostrsigner.ui.theme.RichTextDefaults
import com.halilibo.richtext.commonmark.CommonMarkdownParseOptions
import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
import com.halilibo.richtext.commonmark.MarkdownParseOptions
import com.halilibo.richtext.markdown.BasicMarkdown
import com.halilibo.richtext.ui.material3.RichText
import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
@@ -678,10 +678,11 @@ fun SignUpPage(
val myMarkDownStyle =
RichTextDefaults.copy(
stringStyle = RichTextDefaults.stringStyle?.copy(
linkStyle =
SpanStyle(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary,
linkStyle = TextLinkStyles(
SpanStyle(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary,
),
),
),
)
@@ -689,7 +690,7 @@ fun SignUpPage(
val astNode1 =
remember {
CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(content1)
CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(content1)
}
RichText(
@@ -1168,10 +1169,11 @@ fun LoginPage(
val myMarkDownStyle =
RichTextDefaults.copy(
stringStyle = RichTextDefaults.stringStyle?.copy(
linkStyle =
SpanStyle(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary,
linkStyle = TextLinkStyles(
SpanStyle(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary,
),
),
),
)
@@ -1179,7 +1181,7 @@ fun LoginPage(
val astNode1 =
remember {
CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(content1)
CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(content1)
}
RichText(
app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupDialog.kt
+3 -3
View File
@@ -89,8 +89,8 @@ import com.greenart7c3.nostrsigner.ui.components.SeedWordsPage
import com.greenart7c3.nostrsigner.ui.navigation.Route
import com.greenart7c3.nostrsigner.ui.theme.Size35dp
import com.greenart7c3.nostrsigner.ui.theme.fromHex
import com.halilibo.richtext.commonmark.CommonMarkdownParseOptions
import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
import com.halilibo.richtext.commonmark.MarkdownParseOptions
import com.halilibo.richtext.markdown.BasicMarkdown
import com.halilibo.richtext.ui.RichTextStyle
import com.halilibo.richtext.ui.material3.RichText
@@ -128,7 +128,7 @@ fun AccountBackupScreen(
val astNode =
remember {
CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(content)
CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(content)
}
RichText(
@@ -144,7 +144,7 @@ fun AccountBackupScreen(
val astNode1 =
remember {
CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(content1)
CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(content1)
}
RichText(
app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/ConnectOrbotDialog.kt
+8 -6
View File
@@ -38,6 +38,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextLinkStyles
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextDecoration
@@ -46,8 +47,8 @@ import com.greenart7c3.nostrsigner.Amber
import com.greenart7c3.nostrsigner.R
import com.greenart7c3.nostrsigner.ui.components.AmberButton
import com.greenart7c3.nostrsigner.ui.theme.RichTextDefaults
import com.halilibo.richtext.commonmark.CommonMarkdownParseOptions
import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
import com.halilibo.richtext.commonmark.MarkdownParseOptions
import com.halilibo.richtext.markdown.BasicMarkdown
import com.halilibo.richtext.ui.material3.RichText
import kotlinx.coroutines.CancellationException
@@ -66,10 +67,11 @@ fun ConnectOrbotScreen(
val myMarkDownStyle =
RichTextDefaults.copy(
stringStyle = RichTextDefaults.stringStyle?.copy(
linkStyle =
SpanStyle(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary,
linkStyle = TextLinkStyles(
SpanStyle(
textDecoration = TextDecoration.Underline,
color = MaterialTheme.colorScheme.primary,
),
),
),
)
@@ -79,7 +81,7 @@ fun ConnectOrbotScreen(
val astNode1 =
remember {
CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(content1)
CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(content1)
}
RichText(
app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/ExportAllAccountsScreen.kt
+2 -2
View File
@@ -55,8 +55,8 @@ import com.greenart7c3.nostrsigner.service.AccountExportService
import com.greenart7c3.nostrsigner.service.Biometrics.authenticate
import com.greenart7c3.nostrsigner.ui.CenterCircularProgressIndicator
import com.greenart7c3.nostrsigner.ui.components.AmberButton
import com.halilibo.richtext.commonmark.CommonMarkdownParseOptions
import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
import com.halilibo.richtext.commonmark.MarkdownParseOptions
import com.halilibo.richtext.markdown.BasicMarkdown
import com.halilibo.richtext.ui.RichTextStyle
import com.halilibo.richtext.ui.material3.RichText
@@ -189,7 +189,7 @@ fun ExportAllAccountsScreen(
// Security warning
val warningContent = stringResource(R.string.export_all_accounts_warning)
val astNode = remember {
CommonmarkAstNodeParser(MarkdownParseOptions.MarkdownWithLinks).parse(warningContent)
CommonmarkAstNodeParser(CommonMarkdownParseOptions.MarkdownWithLinks).parse(warningContent)
}
RichText(
gradle/libs.versions.toml
+1 -1
View File
@@ -13,7 +13,7 @@ material3 = "1.4.0"
nav_version = "2.9.6"
quartz = "1.05.1"
compose_ui = "1.10.0"
richtextUi = "e1151c8"
richtextUi = "a02a03a3e9"
roomKtx = "2.8.4"
securityCryptoKtx = "1.1.0"
zxingAndroidEmbedded = "4.3.0"