Skip to content

Commit 6ab57ea

Browse files
committed
[Refactor/#17] 비율 확장함수 적용
1 parent 8f30da8 commit 6ab57ea

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

app/src/main/java/com/poti/android/core/designsystem/component/modal/PotiLargeModal.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.ColumnScope
88
import androidx.compose.foundation.layout.fillMaxWidth
99
import androidx.compose.foundation.layout.height
1010
import androidx.compose.foundation.layout.padding
11-
import androidx.compose.foundation.layout.size
1211
import androidx.compose.material3.Text
1312
import androidx.compose.runtime.Composable
1413
import androidx.compose.ui.Alignment
@@ -18,6 +17,9 @@ import androidx.compose.ui.res.painterResource
1817
import androidx.compose.ui.tooling.preview.Preview
1918
import androidx.compose.ui.unit.dp
2019
import com.poti.android.R
20+
import com.poti.android.core.common.extension.heightForScreenPercentage
21+
import com.poti.android.core.common.extension.widthForScreenPercentage
22+
import com.poti.android.core.common.util.screenWidthDp
2123
import com.poti.android.core.designsystem.component.button.ModalButtonType
2224
import com.poti.android.core.designsystem.component.button.PotiModalButton
2325
import com.poti.android.core.designsystem.theme.PotiTheme
@@ -60,14 +62,14 @@ fun PotiLargeModal(
6062

6163
PotiModal(
6264
onDismissRequest = onDismissRequest,
63-
modifier = modifier.padding(horizontal = 36.dp),
65+
modifier = modifier.padding(horizontal = screenWidthDp(36.dp)),
6466
dismissOnBackPress = dismissOnBackPress,
6567
dismissOnClickOutside = dismissOnClickOutside,
6668
) {
6769
Column(
6870
modifier = Modifier
6971
.fillMaxWidth()
70-
.padding(horizontal = 16.dp)
72+
.padding(horizontal = screenWidthDp(16.dp))
7173
.padding(top = 36.dp, bottom = if (hasSubBtn) 12.dp else 16.dp),
7274
horizontalAlignment = Alignment.CenterHorizontally,
7375
) {
@@ -93,7 +95,8 @@ fun PotiLargeModal(
9395
contentDescription = null,
9496
modifier = Modifier
9597
.padding(vertical = 24.dp)
96-
.size(180.dp),
98+
.heightForScreenPercentage(180.dp)
99+
.widthForScreenPercentage(180.dp),
97100
contentScale = ContentScale.Crop,
98101
)
99102
}

app/src/main/java/com/poti/android/core/designsystem/component/modal/PotiSmallModal.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import androidx.compose.ui.Alignment
1717
import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.tooling.preview.Preview
1919
import androidx.compose.ui.unit.dp
20+
import com.poti.android.core.common.util.screenHeightDp
21+
import com.poti.android.core.common.util.screenWidthDp
2022
import com.poti.android.core.designsystem.component.button.ModalButtonType
2123
import com.poti.android.core.designsystem.component.button.PotiFloatingButton
2224
import com.poti.android.core.designsystem.component.button.PotiModalButton
@@ -58,7 +60,10 @@ fun PotiSmallModal(
5860
Column(
5961
modifier = Modifier
6062
.fillMaxWidth()
61-
.padding(all = 16.dp),
63+
.padding(
64+
vertical = screenHeightDp(16.dp),
65+
horizontal = screenWidthDp(16.dp),
66+
),
6267
horizontalAlignment = Alignment.CenterHorizontally,
6368
) {
6469
Text(

0 commit comments

Comments
 (0)