Skip to content

Commit 1e8fcf0

Browse files
committed
Merge branch 'release/release-1.0.0' of https://github.com/YAPP-Github/23rd-Android-Team-2-Android into release/release-1.0.0
2 parents 4eee289 + 2452439 commit 1e8fcf0

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/button/ButtonSize.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import androidx.compose.ui.unit.dp
55

66
enum class MDSButtonSize(val verticalPadding: Dp) {
77

8-
LARGE(verticalPadding = 14.dp),
8+
LARGE(verticalPadding = 16.dp),
99
MEDIUM(verticalPadding = 12.dp),
1010
SMALL(verticalPadding = 10.dp)
1111
}

feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/register/AgencyRegisterScreen.kt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ import androidx.compose.foundation.layout.size
1212
import androidx.compose.material.Icon
1313
import androidx.compose.runtime.Composable
1414
import androidx.compose.runtime.getValue
15+
import androidx.compose.runtime.mutableStateOf
16+
import androidx.compose.runtime.remember
17+
import androidx.compose.runtime.setValue
1518
import androidx.compose.ui.Alignment
1619
import androidx.compose.ui.Modifier
1720
import androidx.compose.ui.input.pointer.pointerInput
21+
import androidx.compose.ui.layout.onSizeChanged
22+
import androidx.compose.ui.platform.LocalDensity
1823
import androidx.compose.ui.platform.LocalFocusManager
1924
import androidx.compose.ui.res.painterResource
2025
import androidx.compose.ui.tooling.preview.Preview
@@ -41,6 +46,7 @@ fun AgencyRegisterScreen(
4146
) {
4247
val state by viewModel.collectAsState()
4348
val focusManager = LocalFocusManager.current
49+
val density = LocalDensity.current
4450

4551
viewModel.collectSideEffect {
4652
when (it) {
@@ -93,14 +99,26 @@ fun AgencyRegisterScreen(
9399
contentDescription = null
94100
)
95101
Spacer(modifier = Modifier.height(8.dp))
102+
103+
var contentHeight by remember { mutableStateOf(0.dp) }
104+
val contentModifier = if (contentHeight == 0.dp) Modifier.weight(1f) else Modifier
96105
AgencyResisterContentView(
97-
modifier = Modifier.weight(1f),
106+
modifier = contentModifier
107+
.onSizeChanged {
108+
if (contentHeight == 0.dp) {
109+
with(density) {
110+
contentHeight = it.height.toDp()
111+
}
112+
}
113+
}
114+
.height(contentHeight),
98115
agencyType = state.agencyType,
99116
onAgencyTypeChange = viewModel::changeAgencyType,
100117
agencyName = state.agencyName,
101118
onAgencyNameChange = viewModel::changeAgencyName,
102119
changeNameTextFieldIsError = viewModel::changeNameTextFieldIsError,
103120
)
121+
104122
val canRegister = state.agencyName.text.isNotEmpty() && state.nameTextFieldIsError.not()
105123
MDSButton(
106124
modifier = Modifier

feature/agency/src/main/java/com/moneymong/moneymong/feature/agency/search/AgencySearchScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private fun ContentViewWithAgencies(
177177
LazyColumn(
178178
modifier = modifier,
179179
verticalArrangement = Arrangement.spacedBy(12.dp),
180-
contentPadding = PaddingValues(vertical = 12.dp)
180+
contentPadding = PaddingValues(vertical = 4.dp)
181181
) {
182182
items(
183183
count = pagingItems.itemCount, key = pagingItems.itemKey { it.id }

0 commit comments

Comments
 (0)