Merge pull request #2123 from session-foundation/release/1.33.4

Release/1.33.4 in dev

Author: ThomasSession

app/build.gradle.kts

@@ -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(

app/src/main/java/org/thoughtcrime/securesms/home/HomeDialogs.kt

@@ -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
@@ -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
 
@@ -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
@@ -384,8 +391,10 @@ fun DonationDialog(
 
 @Preview
 @Composable
-fun PreviewDonationDialog() {
-    PreviewTheme {
+fun PreviewDonationDialog(
+    @PreviewParameter(SessionColorsParameterProvider::class) colors: ThemeColors
+) {
+    PreviewTheme(colors) {
         Column(
             modifier = Modifier.fillMaxSize()
         ) {

app/src/main/java/org/thoughtcrime/securesms/ui/ProComponents.kt

@@ -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,