Skip to content

Commit cd6b56a

Browse files
committed
Update: landscape styling for celebration dialog.
1 parent 013bfc4 commit cd6b56a

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import javax.inject.Inject
2323
@AndroidEntryPoint
2424
class JetpackBenefitsDialog : DialogFragment() {
2525
companion object {
26-
private const val TABLET_LANDSCAPE_WIDTH_RATIO = 0.35f
26+
private const val TABLET_LANDSCAPE_WIDTH_RATIO = 0.5f
2727
private const val TABLET_LANDSCAPE_HEIGHT_RATIO = 0.8f
2828
}
2929

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/FirstProductCelebrationScreen.kt

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.woocommerce.android.ui.products
22

3+
import android.content.res.Configuration
34
import androidx.compose.foundation.Image
45
import androidx.compose.foundation.background
56
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.Row
68
import androidx.compose.foundation.layout.Spacer
79
import androidx.compose.foundation.layout.fillMaxWidth
810
import androidx.compose.foundation.layout.height
@@ -15,6 +17,7 @@ import androidx.compose.runtime.Composable
1517
import androidx.compose.ui.Alignment
1618
import androidx.compose.ui.Modifier
1719
import androidx.compose.ui.layout.ContentScale
20+
import androidx.compose.ui.platform.LocalConfiguration
1821
import androidx.compose.ui.res.dimensionResource
1922
import androidx.compose.ui.res.painterResource
2023
import androidx.compose.ui.res.stringResource
@@ -56,10 +59,14 @@ fun FirstProductCelebrationScreen(
5659
)
5760
Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.minor_100)))
5861

62+
val configuration = LocalConfiguration.current
63+
val isLandscape = configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
64+
val imageSize = if (isLandscape) 100.dp else 250.dp
65+
5966
Image(
6067
modifier = Modifier
6168
.align(Alignment.CenterHorizontally)
62-
.height(250.dp)
69+
.height(imageSize)
6370
.padding(
6471
top = dimensionResource(id = R.dimen.major_150),
6572
bottom = dimensionResource(id = R.dimen.major_100)
@@ -76,12 +83,26 @@ fun FirstProductCelebrationScreen(
7683
)
7784
Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_200)))
7885

79-
WCColoredButton(onClick = onShareClick, modifier = Modifier.fillMaxWidth()) {
80-
Text(text = stringResource(R.string.share_product))
81-
}
86+
if (isLandscape) {
87+
Row {
88+
WCOutlinedButton(onClick = onDismissClick) {
89+
Text(text = stringResource(id = R.string.jetpack_benefits_modal_dismiss))
90+
}
91+
92+
Spacer(modifier = Modifier.weight(1f))
93+
94+
WCColoredButton(onClick = onShareClick) {
95+
Text(text = stringResource(R.string.share_product))
96+
}
97+
}
98+
} else {
99+
WCColoredButton(onClick = onShareClick, modifier = Modifier.fillMaxWidth()) {
100+
Text(text = stringResource(R.string.share_product))
101+
}
82102

83-
WCOutlinedButton(onClick = onDismissClick, modifier = Modifier.fillMaxWidth()) {
84-
Text(text = stringResource(id = R.string.jetpack_benefits_modal_dismiss))
103+
WCOutlinedButton(onClick = onDismissClick, modifier = Modifier.fillMaxWidth()) {
104+
Text(text = stringResource(id = R.string.jetpack_benefits_modal_dismiss))
105+
}
85106
}
86107
}
87108
}

0 commit comments

Comments
 (0)