Skip to content

Release/1.33.4 in dev #2123

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 5 commits into from
Apr 9, 2026
Merged

Release/1.33.4 in dev #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
757113d
Merge pull request #2117 from session-foundation/release/1.33.3
ThomasSession Apr 8, 2026
467530c
Version bump
ThomasSession Apr 9, 2026
723daf5
Merge branch 'dev' into release/1.33.4
ThomasSession Apr 9, 2026
0a341d4
Removing fade
ThomasSession Apr 9, 2026
9059c6c
Bump
ThomasSession Apr 9, 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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ configurations.configureEach {
exclude(module = "commons-logging")
}

val canonicalVersionCode = 449
val canonicalVersionName = "1.33.3"
val canonicalVersionCode = 451
val canonicalVersionName = "1.33.4"

val postFixSize = 10
val abiPostFix = mapOf(
Expand Down
15 changes: 12 additions & 3 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
Expand Up @@ -33,6 +33,7 @@ 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.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import com.squareup.phrase.Phrase
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -75,7 +76,9 @@ 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.SessionColorsParameterProvider
import org.thoughtcrime.securesms.ui.theme.SessionMaterialTheme
import org.thoughtcrime.securesms.ui.theme.ThemeColors
import org.thoughtcrime.securesms.ui.theme.blackAlpha40
import org.thoughtcrime.securesms.util.DonationManager.Companion.URL_DONATE

Expand Down Expand Up @@ -295,13 +298,17 @@ fun DonationDialog(
.verticalScroll(rememberScrollState())
) {
// hero image
BottomFadingEdgeBox(
/*BottomFadingEdgeBox(
modifier = Modifier.heightIn(max = heroMaxHeight),
fadingEdgeHeight = 70.dp,
fadingColor = LocalColors.current.backgroundSecondary,
content = { _ ->
CTAImage(heroImage = R.drawable.cta_hero_donation)
},
)*/
CTAImage(
modifier = Modifier.background(LocalColors.current.backgroundSecondary),
heroImage = R.drawable.cta_hero_donation
)

// content
Expand Down Expand Up @@ -384,8 +391,10 @@ fun DonationDialog(

@Preview
@Composable
fun PreviewDonationDialog() {
PreviewTheme {
fun PreviewDonationDialog(
@PreviewParameter(SessionColorsParameterProvider::class) colors: ThemeColors
) {
PreviewTheme(colors) {
Column(
modifier = Modifier.fillMaxSize()
) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,11 @@ fun SimpleSessionProCTA(

@Composable
fun CTAImage(
modifier: Modifier = Modifier,
@DrawableRes heroImage: Int,
){
AsyncImage(
modifier = Modifier
modifier = modifier
.fillMaxWidth()
.background(LocalColors.current.accent),
contentScale = ContentScale.FillWidth,
Expand Down