-
Notifications
You must be signed in to change notification settings - Fork 2
[Feat/#38] 지역 관리 뷰 구현 #41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c5bc68b
feat/#38: 지역 관리 뷰 - 서버용 엔티티
sonms 1deed93
feat/#38: 지역 관리 뷰 - 뷰모델(지역 변경, 좌표받기)
sonms 37d819c
feat/#38: 지역 관리 뷰 - state
sonms b856d82
feat/#38: 지역 관리 뷰 - 네비게이션
sonms 44cf672
feat/#38: 지역 관리 뷰 - 맵뷰 구현
sonms 8188490
feat/#38: 지역 관리 뷰 구현
sonms 33dad2f
feat/#38: 지역 관리 - 커스텀 스낵바 구현
sonms 639e19f
chore/#38: 코스 루트 색상 변경
sonms 8cd8ff4
chore/#38: requiresApi 변경,
sonms 820183b
chore/#38: 카카오맵 루트용 색상추가
sonms File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
app/src/main/java/com/paw/key/core/designsystem/component/CustomSnackBar.kt
This file contains hidden or 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,38 @@ | ||
| package com.paw.key.core.designsystem.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.SnackbarData | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.unit.dp | ||
| import com.paw.key.core.designsystem.theme.PawKeyTheme | ||
|
|
||
| @Composable | ||
| fun CustomSnackBar( | ||
| data: SnackbarData, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| Box( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 36.dp) | ||
| .clip(RoundedCornerShape(12.dp)) | ||
| .background(PawKeyTheme.colors.black.copy(alpha = 0.6f)) | ||
| .padding(16.dp) | ||
| ) { | ||
| Text( | ||
| text = data.visuals.message, | ||
| style = PawKeyTheme.typography.body14M, | ||
| color = PawKeyTheme.colors.white1, | ||
| modifier = Modifier | ||
| .align(Alignment.Center) | ||
| ) | ||
| } | ||
| } | ||
19 changes: 19 additions & 0 deletions
19
app/src/main/java/com/paw/key/domain/model/entity/region/RegionEntity.kt
This file contains hidden or 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,19 @@ | ||
| package com.paw.key.domain.model.entity.region | ||
|
|
||
| import com.kakao.vectormap.LatLng | ||
|
|
||
| data class RegionResponse( | ||
| val code: String, | ||
| val message: String, | ||
| val data: RegionData | ||
| ) | ||
|
|
||
| data class RegionData( | ||
| val regionName: String, | ||
| val geometryDto: GeometryDto | ||
| ) | ||
|
|
||
| data class GeometryDto( | ||
| val type: String, | ||
| val coordinates: List<List<List<Pair<Double, Double>>>> // MultiPolygon은 여러 폴리곤의 리스트를 가짐 | ||
| ) |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이거 padding 2번 넣은건 무슨 의미에용?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
inner padding과 바깥쪽패딩입니당!