android, desktop: sync ios changes

This commit is contained in:
shum
2026-08-15 14:59:18 +00:00
parent 8f2eb3dc90
commit 5d3e749b19
3 changed files with 22 additions and 8 deletions
@@ -31,7 +31,8 @@ fun AppBarTitle(
val connection = if (enableAlphaChanges) handler?.connection else null
LaunchedEffect(title) {
if (enableAlphaChanges) {
handler?.title?.value = title
// the app bar shows a single line, so the line breaks of the large title are replaced with spaces
handler?.title?.value = title.replace("\n", " ")
} else {
handler?.connection?.scrollTrackingEnabled = false
}
@@ -23,10 +23,12 @@ import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalUriHandler
import dev.icerock.moko.resources.compose.painterResource
import dev.icerock.moko.resources.compose.stringResource
import androidx.compose.ui.text.LinkAnnotation
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.text.withLink
import androidx.compose.ui.text.withStyle
import androidx.compose.desktop.ui.tooling.preview.Preview
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -974,9 +976,9 @@ fun shouldShowWhatsNew(m: ChatModel): Boolean {
return v != lastVersion
}
private const val WEFUNDER_URL = "https://wefunder.com/simplexchat"
private const val WEFUNDER_URL = "https://wefunder.com/simplex.chat?utm_source=app"
private const val CROWDFUNDING_CONTACT_URI = "https://smp11.simplex.im/a#JxGcOA1_QhlmVFzYYabloMbvMZk5Y9d9iS3ITDnhzYo"
private const val CROWDFUNDING_CONTACT_URI = "simplex:/a#JxGcOA1_QhlmVFzYYabloMbvMZk5Y9d9iS3ITDnhzYo?h=smp11.simplex.im"
// the center modal takes the remaining width of the window, so the image is limited to its design width
private val MAX_CROWDFUNDING_IMAGE_WIDTH = DEFAULT_MIN_CENTER_MODAL_WIDTH
@@ -1098,8 +1100,19 @@ fun GetStakeView(close: () -> Unit) {
val uriHandler = LocalUriHandler.current
val stopped = chatModel.chatRunning.value == false
ColumnWithScrollBar(Modifier.pinchZoom().padding(horizontal = DEFAULT_PADDING)) {
AppBarTitle("Get a stake in SimpleX Chat", withPadding = false)
Text("By investing, you can benefit from the company growth, and help us build the future of private and secure communications.", lineHeight = 24.sp)
AppBarTitle("Get a stake in\nSimpleX Chat", withPadding = false)
Text(
buildAnnotatedString {
append("By investing, you can benefit from the company growth, and help us build the future of private and secure communications.")
// only the link is clickable, the rest of the paragraph is not
withLink(LinkAnnotation.Url(WEFUNDER_URL) { uriHandler.openExternalLink(WEFUNDER_URL) }) {
withStyle(SpanStyle(color = MaterialTheme.colors.primary, fontWeight = FontWeight.Bold)) {
append(" Learn more and invest on Wefunder.")
}
}
},
lineHeight = 24.sp
)
getStakeSlides.forEach { slide ->
Column(Modifier.padding(top = DEFAULT_PADDING * 1.5f)) {
@@ -2736,9 +2736,9 @@
<string name="v6_5_safe_web_links_descr">- opt-in to send link previews.\n- use SOCKS proxy if enabled.\n- prevent hyperlink phishing.\n- remove link tracking.</string>
<string name="v6_5_non_profit_governance">Non-profit governance</string>
<string name="v6_5_non_profit_governance_descr">To make SimpleX Network last.</string>
<string name="v7_0_invest">You can now invest in SimpleX Chat</string>
<string name="v7_0_invest_descr">Crowdfunding on Wefunder.</string>
<string name="v7_0_crowdfunding">Crowdfunding on Wefunder</string>
<string name="v7_0_invest" translatable="false">You can now invest in SimpleX Chat! 🚀</string>
<string name="v7_0_invest_descr" translatable="false">Crowdfunding on Wefunder.</string>
<string name="v7_0_crowdfunding" translatable="false">Crowdfunding on Wefunder</string>
<string name="v7_0_invest_learn_more" translatable="false">Learn more on Wefunder</string>
<string name="v7_0_simplex_names">SimpleX public names (BETA)</string>
<string name="v7_0_simplex_names_descr">Public names for your channel or business.</string>