Skip to content

Feature/donationsv2 #2058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasSession merged 6 commits into from
Mar 19, 2026
Merged

Feature/donationsv2 #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c745629
New Donation
ThomasSession Mar 19, 2026
12e176b
Fixing Landing page
ThomasSession Mar 19, 2026
178ec4d
New donate URL
ThomasSession Mar 19, 2026
a9fe4dd
Merge branch 'dev' into feature/donationsv2
ThomasSession Mar 19, 2026
93afcbd
Merge branch 'dev' into feature/donationsv2
ThomasSession Mar 19, 2026
b046e3f
Donation v2 strings
ThomasSession Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/org/session/libsession/utilities/StringSubKeys.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,5 @@ object StringSubstitutionConstants {
const val ACTION_TYPE_KEY: StringSubKey = "action_type"
const val ACTIVATION_TYPE_KEY: StringSubKey = "activation_type"
const val ENTITY_KEY: StringSubKey = "entity"
const val DONATE_APPEAL_KEY: StringSubKey = "donate_appeal_name"
}
10 changes: 5 additions & 5 deletions app/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,11 @@ interface TextSecurePreferences {


// Donation
const val HAS_DONATED = "has_donated"
const val HAS_COPIED_DONATION_URL = "has_copied_donation_url"
const val SEEN_DONATION_CTA_AMOUNT = "seen_donation_cta_amount"
const val LAST_SEEN_DONATION_CTA = "last_seen_donation_cta"
const val SHOW_DONATION_CTA_FROM_POSITIVE_REVIEW = "show_donation_cta_from_positive_review"
const val HAS_DONATED = "has_donated_v2"
const val HAS_COPIED_DONATION_URL = "has_copied_donation_url_v2"
const val SEEN_DONATION_CTA_AMOUNT = "seen_donation_cta_amount_v2"
const val LAST_SEEN_DONATION_CTA = "last_seen_donation_cta_v2"
const val SHOW_DONATION_CTA_FROM_POSITIVE_REVIEW = "show_donation_cta_from_positive_review_v2"

const val DEBUG_HAS_DONATED = "debug_has_donated"
const val DEBUG_HAS_COPIED_DONATION_URL = "debug_has_copied_donation_url"
Expand Down
194 changes: 170 additions & 24 deletions app/src/main/java/org/thoughtcrime/securesms/home/HomeDialogs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,39 @@
package org.thoughtcrime.securesms.home

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.retain.retain
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
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.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.squareup.phrase.Phrase
import kotlinx.coroutines.delay
import network.loki.messenger.R
Expand All @@ -26,22 +52,32 @@ import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HideUrlDialog
import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HideUserProfileModal
import org.thoughtcrime.securesms.home.HomeViewModel.Commands.OnLinkCopied
import org.thoughtcrime.securesms.home.HomeViewModel.Commands.OnLinkOpened
import org.thoughtcrime.securesms.home.HomeViewModel.Commands.ShowDonationConfirmation
import org.thoughtcrime.securesms.home.startconversation.StartConversationSheet
import org.thoughtcrime.securesms.preferences.prosettings.ProSettingsDestination
import org.thoughtcrime.securesms.ui.dialog.AlertDialog
import org.thoughtcrime.securesms.ui.AnimatedSessionProCTA
import org.thoughtcrime.securesms.ui.BottomFadingEdgeBox
import org.thoughtcrime.securesms.ui.CTAFeature
import org.thoughtcrime.securesms.ui.CTAImage
import org.thoughtcrime.securesms.ui.dialog.DialogButtonData
import org.thoughtcrime.securesms.ui.GetString
import org.thoughtcrime.securesms.ui.dialog.OpenURLAlertDialog
import org.thoughtcrime.securesms.ui.PinProCTA
import org.thoughtcrime.securesms.ui.SimpleSessionProCTA
import org.thoughtcrime.securesms.ui.UserProfileModal
import org.thoughtcrime.securesms.ui.components.AccentFillButtonRect
import org.thoughtcrime.securesms.ui.components.annotatedStringResource
import org.thoughtcrime.securesms.ui.dialog.BasicSessionAlertDialog
import org.thoughtcrime.securesms.ui.dialog.DialogBg
import org.thoughtcrime.securesms.ui.dialog.LinkAlertDialog
import org.thoughtcrime.securesms.ui.openUrl
import org.thoughtcrime.securesms.ui.qaTag
import org.thoughtcrime.securesms.ui.shimmerOverlay
import org.thoughtcrime.securesms.ui.theme.LocalColors
import org.thoughtcrime.securesms.ui.theme.LocalDimensions
import org.thoughtcrime.securesms.ui.theme.LocalType
import org.thoughtcrime.securesms.ui.theme.PreviewTheme
import org.thoughtcrime.securesms.ui.theme.SessionMaterialTheme
import org.thoughtcrime.securesms.ui.theme.blackAlpha40
import org.thoughtcrime.securesms.util.DonationManager.Companion.URL_DONATE

@Composable
fun HomeDialogs(
Expand Down Expand Up @@ -211,27 +247,8 @@ fun HomeDialogs(
}

if (showDonation && dialogsState.donationCTA) {
val context = LocalContext.current
SimpleSessionProCTA(
heroImage = R.drawable.cta_hero_flower,
title = Phrase.from(context,R.string.donateSessionHelp)
.put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
.format()
.toString(),
showProBadge = false,
text = Phrase.from(context,R.string.donateSessionDescription)
.put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
.format()
.toString(),
positiveButtonText = stringResource(R.string.donate),
negativeButtonText = stringResource(R.string.maybeLater),
onUpgrade = {
sendCommand(HideDonationCTADialog)
sendCommand(ShowDonationConfirmation)
},
onCancel = {
sendCommand(HideDonationCTADialog)
}
DonationDialog(
sendCommand = sendCommand
)
}

Expand All @@ -247,3 +264,132 @@ fun HomeDialogs(
}
}

@Composable
fun DonationDialog(
sendCommand: (HomeViewModel.Commands) -> Unit
) {
val context = LocalContext.current
val onCancel = {
sendCommand(HideDonationCTADialog)
}

val title = Phrase.from(context,R.string.donateSessionAppealTitle)
.put(StringSubstitutionConstants.DONATE_APPEAL_KEY, NonTranslatableStringConstants.DONATE_APPEAL_NAME)
.format()

val text = Phrase.from(context,R.string.donateSessionAppealDescription)
.put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
.format()

val titleColor: Color = LocalColors.current.text

BasicSessionAlertDialog(
onDismissRequest = onCancel,
content = {
DialogBg {
BoxWithConstraints(Modifier.fillMaxWidth()) {
val heroMaxHeight = maxHeight * 0.4f
Column(
modifier = Modifier.fillMaxWidth()
.verticalScroll(rememberScrollState())
) {
// hero image
BottomFadingEdgeBox(
modifier = Modifier.heightIn(max = heroMaxHeight),
fadingEdgeHeight = 70.dp,
fadingColor = LocalColors.current.backgroundSecondary,
content = { _ ->
CTAImage(heroImage = R.drawable.cta_hero_donation)
},
)

// content
Column(
modifier = Modifier
.fillMaxWidth()
.padding(LocalDimensions.current.smallSpacing)
) {
// title
Text(
modifier = Modifier
.align(Alignment.CenterHorizontally),
text = annotatedStringResource(title),
textAlign = TextAlign.Center,
style = LocalType.current.h5.copy(color = titleColor),
)

Spacer(Modifier.height(LocalDimensions.current.contentSpacing))

// main message
Text(
modifier = Modifier
.qaTag(R.string.qa_cta_body)
.align(Alignment.CenterHorizontally),
text = annotatedStringResource(text),
textAlign = TextAlign.Center,
style = LocalType.current.base.copy(
color = LocalColors.current.textSecondary
)
)

Spacer(Modifier.height(LocalDimensions.current.contentSpacing))

// buttons
Row(
Modifier.height(IntrinsicSize.Min)
.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(
LocalDimensions.current.xsSpacing,
Alignment.CenterHorizontally
),
) {
AccentFillButtonRect(
modifier = Modifier
.qaTag(R.string.qa_cta_button_positive)
.weight(1f)
.shimmerOverlay(),
text = stringResource(R.string.donateSessionAppealReadMore),
onClick = {
context.openUrl(URL_DONATE)
sendCommand(HomeViewModel.Commands.OnDonationLinkClicked)
}
)
}
}
}

IconButton(
onClick = onCancel,
modifier = Modifier
.align(Alignment.TopEnd)
.padding(LocalDimensions.current.xxsSpacing)
.background(
color = blackAlpha40,
shape = CircleShape,
).size(34.dp),
) {
Icon(
painter = painterResource(id = R.drawable.ic_x),
tint = Color.White,
contentDescription = stringResource(R.string.close)
)
}
}
}
}
)
}


@Preview
@Composable
fun PreviewDonationDialog() {
PreviewTheme {
Column(
modifier = Modifier.fillMaxSize()
) {
DonationDialog {}
}
}
}

9 changes: 4 additions & 5 deletions app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onStart
Expand All @@ -42,7 +41,6 @@ import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.audio.AudioPlaybackManager
import org.thoughtcrime.securesms.audio.model.AudioPlaybackState
import org.thoughtcrime.securesms.auth.LoginStateRepository
import org.thoughtcrime.securesms.conversation.v3.ConversationV3Destination
import org.thoughtcrime.securesms.database.RecipientRepository
import org.thoughtcrime.securesms.database.model.ThreadRecord
import org.thoughtcrime.securesms.debugmenu.DebugLogGroup
Expand Down Expand Up @@ -412,8 +410,9 @@ class HomeViewModel @Inject constructor(
_dialogsState.update { it.copy(donationCTA = false) }
}

is Commands.ShowDonationConfirmation -> {
showUrlDialog(URL_DONATE)
is Commands.OnDonationLinkClicked -> {
donationManager.onDonationSeen()
_dialogsState.update { it.copy(donationCTA = false) }
}

is Commands.HideUrlDialog -> {
Expand Down Expand Up @@ -600,7 +599,7 @@ class HomeViewModel @Inject constructor(
data object HidePinCTADialog : Commands
data object HideExpiringCTADialog : Commands
data object HideExpiredCTADialog : Commands
data object ShowDonationConfirmation : Commands
data object OnDonationLinkClicked : Commands
data object HideDonationCTADialog : Commands
data object HideUserProfileModal : Commands
data object HideUrlDialog : Commands
Expand Down
28 changes: 15 additions & 13 deletions app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ import androidx.compose.runtime.retain.retain
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalWindowInfo
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextAlign
Expand Down Expand Up @@ -53,7 +55,7 @@ import org.thoughtcrime.securesms.ui.theme.SessionColorsParameterProvider
import org.thoughtcrime.securesms.ui.theme.ThemeColors
import kotlin.time.Duration.Companion.milliseconds

@Preview
@Preview(heightDp = 800)
@Composable
private fun PreviewLandingScreen(
@PreviewParameter(SessionColorsParameterProvider::class) colors: ThemeColors
Expand Down Expand Up @@ -139,25 +141,27 @@ internal fun LandingScreen(
}

Column {
Spacer(modifier = Modifier.height(LocalWindowInfo.current.containerDpSize.height / 40))

Text(
stringResource(R.string.onboardingBubblePrivacyInYourPocket),
modifier = Modifier.align(Alignment.CenterHorizontally),
style = LocalType.current.h4,
textAlign = TextAlign.Center
)

Column(modifier = Modifier
.weight(1f)
.padding(horizontal = LocalDimensions.current.mediumSpacing)
.padding(top = LocalDimensions.current.xxxsSpacing),
verticalArrangement = Arrangement.Center
) {
Spacer(modifier = Modifier.weight(1f))
Text(
stringResource(R.string.onboardingBubblePrivacyInYourPocket),
modifier = Modifier.align(Alignment.CenterHorizontally),
style = LocalType.current.h4,
textAlign = TextAlign.Center
)
Spacer(modifier = Modifier.weight(1f))

LazyColumn(
state = listState,
modifier = Modifier
.heightIn(min = 200.dp)
.fillMaxWidth()
.weight(3f),
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing)
) {
items(
Expand All @@ -170,8 +174,6 @@ internal fun LandingScreen(
)
}
}

Spacer(modifier = Modifier.weight(1f))
}

Column(modifier = Modifier.padding(horizontal = LocalDimensions.current.xlargeSpacing)) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/thoughtcrime/securesms/util/DonationManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DonationManager @Inject constructor(
val prefs: TextSecurePreferences
){
companion object {
const val URL_DONATE = "https://getsession.org/donate#app"
const val URL_DONATE = "https://getsession.org/donate"
}

// increment in days between showing the donation CTA, matching the list index to the number of views of the CTA
Expand Down
Binary file added app/src/main/res/drawable-nodpi/cta_hero_donation.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-nodpi/cta_hero_flower.webp
View file
Open in desktop
Binary file not shown.