Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a9e2509
[feat] #76 : ์กฐํšŒํ•˜๊ธฐ - ๋ฐฐ๋„ˆ ์ถ”๊ฐ€, ํ•„ํ„ฐ+์นฉ ๋ถ€๋ถ„ ์ˆ˜์ • ๋ฐ ์‚ญ์ œ
nasohee Aug 18, 2025
0d867ed
[feat] #76 : ์กฐํšŒ - ํ•„ํ„ฐ ํŽ˜์ด์ง€ xml
nasohee Aug 18, 2025
7fbd6c4
[feat] #76 : ์กฐํšŒ-ํ•„ํ„ฐ navigation ์—ฐ๊ฒฐ
nasohee Aug 18, 2025
9e73752
[feat] #76 : ์กฐํšŒ-ํ•„ํ„ฐ-๋‚ ์งœ?
nasohee Aug 20, 2025
2e71ec1
[feat] #76 : ์กฐํšŒ-ํ•„ํ„ฐ-์ถ•์ข…
nasohee Aug 20, 2025
e015c09
[feat] #76 : ์กฐํšŒ ํ•„ํ„ฐ - ์œ„์น˜ ์„ ํƒ
nasohee Aug 24, 2025
00decb1
[feat] #76 : ์กฐํšŒ ํ•„ํ„ฐ - ์ดˆ๊ธฐํ™”, ํ™•์ธ ๊ธฐ๋Šฅ
nasohee Aug 24, 2025
59a770a
[feat] #76 : ์กฐํšŒ ํ•„ํ„ฐ - ํ’ˆ์ข…
nasohee Aug 27, 2025
2ff91de
[feat] #76 : ์กฐํšŒ ํ•„ํ„ฐ - ํ† ๊ธ€ ํ™”์‚ดํ‘œ ํšŒ์ „๋˜๊ฒŒํ•จ
nasohee Aug 27, 2025
7771315
[feat] #76 : ์กฐํšŒ ์ƒ์„ธํŽ˜์ด์ง€ xml
nasohee Aug 27, 2025
607f69f
[feat] #76 : ์กฐํšŒ ui ํ™•์ธ์ฐจ ๋”๋ฏธ๋ฐ์ดํ„ฐ ์ƒ์„ฑ..
nasohee Sep 1, 2025
e219188
[feat] #76 : ์กฐํšŒ - ์ƒ์„ธํŽ˜์ด์ง€ ๋ทฐํŽ˜์ด์ € ์ด๋ฏธ์ง€
nasohee Sep 1, 2025
98c71ef
[feat] #76 : ์กฐํšŒ - ์ƒ์„ธํŽ˜์ด์ง€ ๋ถ๋งˆํฌ
nasohee Sep 1, 2025
b3ca469
[refactor] #76 : ์กฐํšŒ - ์ƒ์„ธํŽ˜์ด์ง€-ํ•˜๋‹จ view ์œ„์น˜ ์ด๋™
nasohee Sep 1, 2025
8b90db8
[feat] #76 : ์กฐํšŒ-์ƒ์„ธํŽ˜์ด์ง€-ํ•˜๋‹จ(์ „ํ™”,๋ฉ”์‹œ์ง€,์ง€๋„) ๊ธฐ๋Šฅ
nasohee Sep 1, 2025
7835e2e
[feat] #76 : ์กฐํšŒ-์ƒ์„ธํŽ˜์ด์ง€-์ง€๋„ ์—ฐ๊ฒฐ
nasohee Sep 1, 2025
b6e0070
[refactor] #76 : ์กฐํšŒํŽ˜์ด์ง€ - ์Šคํฌ๋กค ์˜์—ญ ์ˆ˜์ •.. adapter ๋ณ€๊ฒฝ
nasohee Sep 8, 2025
fc38a28
[refactor] #76 ์กฐํšŒ : ์ƒ์„ธํŽ˜์ด์ง€ - ๋„ค์ด๋ฒ„๋งต ์ƒ๋ช…์ฃผ๊ธฐ ์ถ”๊ฐ€, ํ•„์š”์—†๋Š” ๋ฉ”์„œ๋“œ๋“ค ์‚ญ์ œ..
nasohee Sep 8, 2025
e6a673f
[refactor] #76 ์กฐํšŒ : ๋„ค์ด๋ฒ„๋งต ์˜ˆ์™ธ ์ˆ˜์ •
nasohee Sep 8, 2025
9093d92
[refactor] #76 ์กฐํšŒ : ๋”๋ฏธ๋ฐ์ดํ„ฐ dummyprovider๋กœ ๋ถ„๋ฆฌ
nasohee Sep 8, 2025
c35b366
[refactor] #76 ์กฐํšŒ : ํ•˜๋“œ์ฝ”๋”ฉ ์ˆ˜์ •...
nasohee Sep 8, 2025
bbca0b1
[refactor] #76 ์กฐํšŒ : ์ „์ฒด๋ณด๊ธฐ ํƒญ ๋ฐ‘์— ์ž˜๋ฆฌ๋Š” ์ด์Šˆ ํ•ด๊ฒฐ
nasohee Sep 8, 2025
f446f6c
.'
nasohee Sep 9, 2025
9589246
Merge branch 'develop' into feat-search-ui
nasohee Sep 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ dependencies {
implementation(libs.material)
implementation(libs.androidx.activity)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.material3.android)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,17 @@ data class DetailReportResponseDto(
@SerialName("additionalDescription")
val additionalDescription: String,
@SerialName("interest")
val interest: Boolean
val interest: Boolean,
@SerialName("age")
val age: String? = null,
@SerialName("rfid")
val rfid: String? = null,
@SerialName("userPhone")
val userPhone: String? = null,
@SerialName("surroundPlace")
val surroundPlace: String? = null,


){
val location: String
get() = foundLocation ?: eventLocation ?: "์œ„์น˜ ์ •๋ณด ์—†์Œ"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fun DetailProtectResponseDto.toDomain() = DetailProtectData(
happenDate = this.happenDate,
furColor = this.furColor,
neutering = this.neutering,
significant = this.significant,
specialNote = this.significant,
noticeNumber = this.noticeNumber,
noticeDuration = this.noticeDuration,
foundLocation = this.foundLocation,
Expand All @@ -39,10 +39,14 @@ fun DetailReportResponseDto.toDomain() = DetailReportData(
writeDate = this.writeDate,
eventDate = this.eventDate,
eventLocation = this.eventLocation ?: "์œ„์น˜ ์ •๋ณด ์—†์Œ",
foundLocation = this.foundLocation?:"์œ„์น˜ ์ •๋ณด ์—†์Œ",
foundLocation = this.foundLocation ?: "์œ„์น˜ ์ •๋ณด ์—†์Œ",
features = this.features,
additionalDescription = this.additionalDescription,
specialNote = this.additionalDescription,
interest = this.interest,
age = this.age ?: "์ •๋ณด ์—†์Œ",
rfid = this.rfid ?: "์ •๋ณด ์—†์Œ",
userPhone = this.userPhone ?: "์ •๋ณด ์—†์Œ",
surroundPlace = this.surroundPlace ?: "์ •๋ณด ์—†์Œ"
)

fun String.toDetailSearchStatus(): SearchStatus {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data class DetailProtectData(
val happenDate: String,
val furColor: String,
val neutering: String,
val significant: String,
val specialNote: String,
val noticeNumber: String,
val noticeDuration: String,
val foundLocation: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ data class DetailReportData(
val breed: String,
val tag: SearchStatus,
val sex: String?,
val age : String?,
val rfid : String?,
val furColor: String,
val userName: String,
val userPhone : String,
val surroundPlace : String,
val writeDate: String,
val eventDate: String,
val eventLocation: String,
val foundLocation: String,
val features: List<String>,
val additionalDescription: String,
val specialNote: String,
var interest: Boolean
) : Serializable

Loading