-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into feat/#117-place-se…
…arch-api
Showing
7 changed files
with
323 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
413 changes: 172 additions & 241 deletions
413
app/src/main/java/com/spoony/spoony/presentation/placeDetail/PlaceDetailRoute.kt
Large diffs are not rendered by default.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
app/src/main/java/com/spoony/spoony/presentation/placeDetail/PlaceDetailSideEffect.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package com.spoony.spoony.presentation.placeDetail | ||
|
|
||
| sealed class PlaceDetailSideEffect { | ||
| data class ShowSnackbar(val message: String) : PlaceDetailSideEffect() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
...rc/main/java/com/spoony/spoony/presentation/placeDetail/component/PlaceDetailBottomBar.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| package com.spoony.spoony.presentation.placeDetail.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.IntrinsicSize | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.sizeIn | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import androidx.compose.ui.res.vectorResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.spoony.spoony.R | ||
| import com.spoony.spoony.core.designsystem.component.button.SpoonyButton | ||
| import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme | ||
| import com.spoony.spoony.core.designsystem.type.ButtonSize | ||
| import com.spoony.spoony.core.designsystem.type.ButtonStyle | ||
| import com.spoony.spoony.core.util.extension.noRippleClickable | ||
|
|
||
| @Composable | ||
| fun PlaceDetailBottomBar( | ||
| addMapCount: Int, | ||
| onScoopButtonClick: () -> Unit, | ||
| onSearchMapClick: () -> Unit, | ||
| onAddMapButtonClick: () -> Unit, | ||
| onDeletePinMapButtonClick: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| isScooped: Boolean = false, | ||
| isAddMap: Boolean = false | ||
| ) { | ||
| Row( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .background(SpoonyAndroidTheme.colors.white) | ||
| .padding( | ||
| horizontal = 20.dp, | ||
| vertical = 10.dp | ||
| ) | ||
| .height(IntrinsicSize.Max), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| if (isScooped) { | ||
| SpoonyButton( | ||
| text = "길찾기", | ||
| onClick = onSearchMapClick, | ||
| style = ButtonStyle.Secondary, | ||
| size = ButtonSize.Medium, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.width(15.dp)) | ||
|
|
||
| Column( | ||
| modifier = Modifier | ||
| .fillMaxHeight() | ||
| .sizeIn(minWidth = 56.dp) | ||
| .noRippleClickable( | ||
| if (isAddMap) { | ||
| onDeletePinMapButtonClick | ||
| } else { | ||
| onAddMapButtonClick | ||
| } | ||
| ), | ||
| verticalArrangement = Arrangement.Center, | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
| ) { | ||
| Icon( | ||
| imageVector = ImageVector.vectorResource(id = if (isAddMap) R.drawable.ic_add_map_main400_24 else R.drawable.ic_add_map_gray400_24), | ||
| modifier = Modifier | ||
| .size(32.dp), | ||
| contentDescription = null, | ||
| tint = Color.Unspecified | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(4.dp)) | ||
|
|
||
| Text( | ||
| text = addMapCount.toString(), | ||
| style = SpoonyAndroidTheme.typography.caption1m, | ||
| color = if (isAddMap) SpoonyAndroidTheme.colors.main400 else SpoonyAndroidTheme.colors.gray800 | ||
| ) | ||
| } | ||
| } else { | ||
| SpoonyButton( | ||
| text = "떠먹기", | ||
| style = ButtonStyle.Secondary, | ||
| size = ButtonSize.Medium, | ||
| onClick = onScoopButtonClick, | ||
| modifier = Modifier.weight(1f), | ||
| icon = { | ||
| Icon( | ||
| imageVector = ImageVector.vectorResource(R.drawable.ic_button_spoon_32), | ||
| modifier = Modifier.size(32.dp), | ||
| contentDescription = null, | ||
| tint = Color.Unspecified | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters