Skip to content

Commit 0486e72

Browse files
committed
feat : 검색 결과 뷰 수정
1 parent fa00a22 commit 0486e72

File tree

2 files changed

+41
-18
lines changed

2 files changed

+41
-18
lines changed

data/src/main/java/com/stop/data/remote/model/nearplace/Poi.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.stop.data.remote.model.nearplace
22

33
import com.squareup.moshi.JsonClass
44
import com.stop.data.model.nearplace.PlaceRepositoryItem
5+
import kotlin.math.round
56

67
@JsonClass(generateAdapter = true)
78
data class Poi(
@@ -45,7 +46,7 @@ data class Poi(
4546
val road = newAddressList.newAddress.firstOrNull()
4647
return PlaceRepositoryItem(
4748
name = name,
48-
radius = radius,
49+
radius = (round(radius.toDouble() * 100) / 100).toString(),
4950
fullAddressRoad = road?.fullAddressRoad ?: "",
5051
centerLat = road?.centerLat?.toDouble() ?: 0.0,
5152
centerLon = road?.centerLon?.toDouble() ?: 0.0

presentation/src/main/res/layout/item_near_place.xml

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,71 @@
1313
<androidx.constraintlayout.widget.ConstraintLayout
1414
android:layout_width="match_parent"
1515
android:layout_height="wrap_content"
16-
android:layout_marginBottom="8dp"
17-
android:background="@drawable/background_gray_d9_8">
16+
android:layout_marginBottom="8dp">
17+
18+
<ImageView
19+
android:id="@+id/image_view_location"
20+
android:layout_width="30dp"
21+
android:layout_height="30dp"
22+
android:layout_marginTop="8dp"
23+
android:src="@drawable/ic_baseline_location_on_22"
24+
app:layout_constraintStart_toStartOf="@id/text_view_distance"
25+
app:layout_constraintEnd_toEndOf="@id/text_view_distance"
26+
app:layout_constraintTop_toTopOf="parent" />
1827

1928
<TextView
20-
android:id="@+id/text_view_near_place_name"
29+
android:id="@+id/text_view_distance"
2130
android:layout_width="wrap_content"
2231
android:layout_height="wrap_content"
32+
android:layout_marginVertical="8dp"
33+
android:text="@{@string/distance_km(place.radius)}"
34+
android:textColor="@color/hint_text_color"
35+
android:textSize="14sp"
36+
app:layout_constraintBottom_toBottomOf="parent"
37+
app:layout_constraintStart_toStartOf="parent"
38+
app:layout_constraintTop_toBottomOf="@id/image_view_location"
39+
tools:text="15km" />
40+
41+
<TextView
42+
android:id="@+id/text_view_near_place_name"
43+
android:layout_width="0dp"
44+
android:layout_height="wrap_content"
2345
android:layout_marginStart="8dp"
2446
android:layout_marginTop="8dp"
47+
android:ellipsize="end"
48+
android:maxLines="1"
2549
android:text="@{place.name}"
2650
android:textColor="@color/black"
2751
android:textSize="16sp"
2852
android:textStyle="bold"
29-
app:layout_constraintStart_toStartOf="parent"
53+
app:layout_constraintEnd_toEndOf="parent"
54+
app:layout_constraintStart_toEndOf="@id/text_view_distance"
3055
app:layout_constraintTop_toTopOf="parent"
3156
tools:text="현대아남타워" />
3257

3358
<TextView
3459
android:id="@+id/text_view_road_address_name"
35-
android:layout_width="wrap_content"
60+
android:layout_width="0dp"
3661
android:layout_height="wrap_content"
3762
android:layout_marginTop="8dp"
63+
android:ellipsize="end"
64+
android:maxLines="1"
3865
android:text="@{place.fullAddressRoad}"
3966
android:textColor="@color/black"
4067
android:textSize="14sp"
68+
app:layout_constraintEnd_toEndOf="parent"
4169
app:layout_constraintStart_toStartOf="@id/text_view_near_place_name"
4270
app:layout_constraintTop_toBottomOf="@id/text_view_near_place_name"
4371
tools:text="쑥고개로 2다길 1" />
4472

45-
<TextView
46-
android:id="@+id/text_view_distance"
47-
android:layout_width="wrap_content"
48-
android:layout_height="wrap_content"
49-
android:layout_marginTop="8dp"
50-
android:layout_marginEnd="8dp"
51-
android:layout_marginBottom="8dp"
52-
android:text="@{@string/distance_km(place.radius)}"
53-
android:textColor="@color/black"
54-
android:textSize="14sp"
55-
app:layout_constraintBottom_toBottomOf="parent"
73+
<com.google.android.material.divider.MaterialDivider
74+
android:layout_width="0dp"
75+
android:layout_height="1dp"
76+
android:layout_marginVertical="8dp"
77+
app:layout_constraintStart_toStartOf="@id/text_view_road_address_name"
5678
app:layout_constraintEnd_toEndOf="parent"
5779
app:layout_constraintTop_toBottomOf="@id/text_view_road_address_name"
58-
tools:text="15km" />
80+
app:layout_constraintBottom_toBottomOf="parent"/>
5981

6082
</androidx.constraintlayout.widget.ConstraintLayout>
6183

0 commit comments

Comments
 (0)