-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #66 from Hyesung82/feature/location
[develop] 위치 확인하기 화면에서 위치 선택 기능 구현
- Loading branch information
Showing
22 changed files
with
527 additions
and
109 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
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
6 changes: 6 additions & 0 deletions
6
presentation/src/main/java/com/cheocharm/presentation/common/Extensions.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,6 @@ | ||
package com.cheocharm.presentation.common | ||
|
||
import android.location.Location | ||
import com.google.android.gms.maps.model.LatLng | ||
|
||
fun Location.toLatLng() = LatLng(this.latitude, this.longitude) |
11 changes: 0 additions & 11 deletions
11
presentation/src/main/java/com/cheocharm/presentation/common/ext.kt
This file was deleted.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
presentation/src/main/java/com/cheocharm/presentation/enum/LatLngSelectionType.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,7 @@ | ||
package com.cheocharm.presentation.enum | ||
|
||
enum class LatLngSelectionType(val locationString: String) { | ||
DEFAULT("대한민국"), | ||
CURRENT("현재 위치"), | ||
SPECIFIED("") | ||
} |
5 changes: 0 additions & 5 deletions
5
presentation/src/main/java/com/cheocharm/presentation/model/Picture.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 |
---|---|---|
@@ -1,13 +1,8 @@ | ||
package com.cheocharm.presentation.model | ||
|
||
import android.net.Uri | ||
import com.cheocharm.presentation.common.toCoordString | ||
import com.google.android.gms.maps.model.LatLng | ||
|
||
data class Picture(val uri: Uri, val latLng: LatLng?) { | ||
var address: String? = null | ||
|
||
fun getLocationString(): String { | ||
return address ?: latLng.toCoordString() ?: "현재 위치" | ||
} | ||
} |
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
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
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
Oops, something went wrong.