Skip to content

Commit 700eabb

Browse files
khcho226khcho226
committed
style: PlaceSearchFragment UI 변경
1 parent 8638d01 commit 700eabb

14 files changed

+126
-86
lines changed

‎presentation/src/main/res/drawable/ic_baseline_map_16.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
<vector android:height="16dp" android:tint="#000000"
2-
android:viewportHeight="24" android:viewportWidth="24"
3-
android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
4-
<path android:fillColor="@android:color/white" android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="15dp"
3+
android:height="15dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="@color/main_dark_grey">
7+
8+
<path
9+
android:fillColor="@android:color/white"
10+
android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
511
</vector>

‎presentation/src/main/res/drawable/ic_location_mini.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="15dp"
3+
android:height="15dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="@color/main_dark_grey">
7+
8+
<path
9+
android:fillColor="@android:color/white"
10+
android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
11+
</vector>

‎presentation/src/main/res/drawable/ic_round_star.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="@color/main_yellow">
7+
8+
<path
9+
android:fillColor="@android:color/white"
10+
android:pathData="M12,17.27l4.15,2.51c0.76,0.46 1.69,-0.22 1.49,-1.08l-1.1,-4.72l3.67,-3.18c0.67,-0.58 0.31,-1.68 -0.57,-1.75l-4.83,-0.41l-1.89,-4.46c-0.34,-0.81 -1.5,-0.81 -1.84,0L9.19,8.63L4.36,9.04c-0.88,0.07 -1.24,1.17 -0.57,1.75l3.67,3.18l-1.1,4.72c-0.2,0.86 0.73,1.54 1.49,1.08L12,17.27z"/>
11+
</vector>

‎presentation/src/main/res/drawable/ic_search.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
android:width="25dp"
33
android:height="25dp"
4-
android:tint="#404550"
4+
android:tint="@color/main_dark_grey"
55
android:viewportWidth="24"
66
android:viewportHeight="24">
77

‎presentation/src/main/res/drawable/icon_error.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
android:pathData="M0,0h48v48h-48z"/>
99
<path
1010
android:pathData="M22,30H26V34H22V30ZM22,14H26V26H22V14ZM23.98,4C12.94,4 4,12.96 4,24C4,35.04 12.94,44 23.98,44C35.04,44 44,35.04 44,24C44,12.96 35.04,4 23.98,4ZM24,40C15.16,40 8,32.84 8,24C8,15.16 15.16,8 24,8C32.84,8 40,15.16 40,24C40,32.84 32.84,40 24,40Z"
11-
android:fillColor="#CCCCCC"/>
11+
android:fillColor="@color/main_light_grey_2"/>
1212
</group>
1313
</vector>

‎presentation/src/main/res/layout/fragment_map.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<TextView
6363
android:id="@+id/text_view_search"
6464
android:layout_width="0dp"
65-
android:layout_height="50dp"
65+
android:layout_height="55dp"
6666
android:background="@drawable/background_search"
6767
android:drawablePadding="13dp"
6868
android:elevation="15dp"
@@ -72,7 +72,7 @@
7272
android:paddingEnd="0dp"
7373
android:text="@string/search_hint"
7474
android:textColor="@color/hint_text_color"
75-
android:textSize="16sp"
75+
android:textSize="17sp"
7676
app:drawableStartCompat="@drawable/ic_search"
7777
app:layout_constraintEnd_toEndOf="@id/guideline_end"
7878
app:layout_constraintStart_toStartOf="@id/guideline_start"

‎presentation/src/main/res/layout/fragment_place_search.xml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
2525
android:orientation="vertical"
26-
app:layout_constraintGuide_begin="16dp" />
26+
app:layout_constraintGuide_begin="15dp" />
2727

2828
<androidx.constraintlayout.widget.Guideline
2929
android:id="@+id/guide_line_end"
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
3232
android:orientation="vertical"
33-
app:layout_constraintGuide_end="16dp" />
33+
app:layout_constraintGuide_end="15dp" />
3434

3535
<androidx.constraintlayout.widget.Guideline
3636
android:id="@+id/guideline_top"
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
3939
android:orientation="horizontal"
40-
app:layout_constraintGuide_begin="35dp" />
40+
app:layout_constraintGuide_begin="50dp" />
4141

4242
<com.google.android.material.textfield.TextInputLayout
4343
android:id="@+id/text_input_layout_place_search"
@@ -49,7 +49,10 @@
4949
app:layout_constraintEnd_toEndOf="@id/guide_line_end"
5050
app:layout_constraintStart_toStartOf="@id/guide_line_start"
5151
app:layout_constraintTop_toTopOf="@id/guideline_top"
52-
app:startIconDrawable="@drawable/ic_search">
52+
app:boxCornerRadiusBottomEnd="15dp"
53+
app:boxCornerRadiusBottomStart="15dp"
54+
app:boxCornerRadiusTopEnd="15dp"
55+
app:boxCornerRadiusTopStart="15dp">
5356

5457
<com.google.android.material.textfield.TextInputEditText
5558
android:id="@+id/text_input_edit_text_place_search"
@@ -58,10 +61,21 @@
5861
android:hint="@string/search_hint"
5962
android:imeOptions="actionSearch"
6063
android:inputType="text"
61-
android:textSize="17sp" />
62-
64+
android:textSize="17sp"
65+
android:paddingStart="50dp"
66+
android:paddingEnd="0dp" />
6367
</com.google.android.material.textfield.TextInputLayout>
6468

69+
<ImageView
70+
android:layout_width="23dp"
71+
android:layout_height="23dp"
72+
android:src="@drawable/ic_search"
73+
android:layout_marginStart="17dp"
74+
android:layout_marginTop="5dp"
75+
app:layout_constraintBottom_toBottomOf="@id/text_input_layout_place_search"
76+
app:layout_constraintStart_toStartOf="@id/text_input_layout_place_search"
77+
app:layout_constraintTop_toTopOf="@id/text_input_layout_place_search" />
78+
6579
<androidx.recyclerview.widget.RecyclerView
6680
android:id="@+id/recycler_view_place"
6781
android:layout_width="0dp"

‎presentation/src/main/res/layout/home_panel.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
android:text="@{placeSearchViewModel.distance.toString()}"
7171
android:textColor="@color/white"
7272
android:textSize="32sp"
73-
android:textStyle="bold"
7473
app:layout_constraintBottom_toBottomOf="parent"
7574
app:layout_constraintStart_toStartOf="parent"
7675
tools:text="1.6" />

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

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,70 +13,68 @@
1313
<androidx.constraintlayout.widget.ConstraintLayout
1414
android:layout_width="match_parent"
1515
android:layout_height="wrap_content"
16-
android:layout_marginBottom="8dp">
16+
tools:theme="@style/Theme.Material3.Light.NoActionBar">
1717

1818
<ImageView
1919
android:id="@+id/image_view_location"
2020
android:layout_width="30dp"
2121
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"
22+
android:layout_marginStart="10dp"
23+
android:layout_marginTop="10dp"
24+
android:src="@drawable/ic_round_star"
25+
app:layout_constraintStart_toStartOf="parent"
2626
app:layout_constraintTop_toTopOf="parent" />
2727

2828
<TextView
2929
android:id="@+id/text_view_distance"
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
32-
android:layout_marginVertical="8dp"
3332
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"
33+
android:textColor="@color/main_light_grey_2"
34+
android:textSize="11sp"
35+
app:layout_constraintStart_toStartOf="@id/image_view_location"
36+
app:layout_constraintEnd_toEndOf="@id/image_view_location"
37+
app:layout_constraintTop_toTopOf="@id/text_view_road_address_name"
38+
app:layout_constraintBottom_toBottomOf="@id/text_view_road_address_name"
3939
tools:text="15km" />
4040

4141
<TextView
4242
android:id="@+id/text_view_near_place_name"
4343
android:layout_width="0dp"
4444
android:layout_height="wrap_content"
45-
android:layout_marginStart="8dp"
46-
android:layout_marginTop="8dp"
45+
android:layout_marginStart="23dp"
4746
android:ellipsize="end"
4847
android:maxLines="1"
4948
android:text="@{place.name}"
50-
android:textColor="@color/black"
49+
android:textColor="@color/main_dark_grey"
5150
android:textSize="16sp"
52-
android:textStyle="bold"
5351
app:layout_constraintEnd_toEndOf="parent"
54-
app:layout_constraintStart_toEndOf="@id/text_view_distance"
55-
app:layout_constraintTop_toTopOf="parent"
52+
app:layout_constraintStart_toEndOf="@id/image_view_location"
53+
app:layout_constraintTop_toTopOf="@id/image_view_location"
54+
app:layout_constraintBottom_toBottomOf="@id/image_view_location"
5655
tools:text="현대아남타워" />
5756

5857
<TextView
5958
android:id="@+id/text_view_road_address_name"
6059
android:layout_width="0dp"
6160
android:layout_height="wrap_content"
6261
android:layout_marginTop="8dp"
62+
android:layout_marginBottom="15dp"
6363
android:ellipsize="end"
6464
android:maxLines="1"
6565
android:text="@{place.fullAddressRoad}"
66-
android:textColor="@color/black"
67-
android:textSize="14sp"
66+
android:textColor="@color/main_light_grey"
67+
android:textSize="13sp"
6868
app:layout_constraintEnd_toEndOf="parent"
6969
app:layout_constraintStart_toStartOf="@id/text_view_near_place_name"
7070
app:layout_constraintTop_toBottomOf="@id/text_view_near_place_name"
71+
app:layout_constraintBottom_toBottomOf="parent"
7172
tools:text="쑥고개로 2다길 1" />
7273

7374
<com.google.android.material.divider.MaterialDivider
74-
android:layout_width="0dp"
75+
android:layout_width="match_parent"
7576
android:layout_height="1dp"
76-
android:layout_marginVertical="8dp"
77-
app:layout_constraintStart_toStartOf="@id/text_view_road_address_name"
78-
app:layout_constraintEnd_toEndOf="parent"
79-
app:layout_constraintTop_toBottomOf="@id/text_view_road_address_name"
77+
app:dividerColor="@color/main_lighter_grey"
8078
app:layout_constraintBottom_toBottomOf="parent"/>
8179

8280
</androidx.constraintlayout.widget.ConstraintLayout>

‎presentation/src/main/res/layout/item_recent_search.xml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,37 @@
1616
android:layout_height="wrap_content"
1717
tools:theme="@style/Theme.Material3.Light.NoActionBar">
1818

19-
<ImageView
19+
<androidx.appcompat.widget.AppCompatImageView
2020
android:id="@+id/image_view_recent_search"
2121
android:layout_width="30dp"
2222
android:layout_height="30dp"
23-
android:layout_marginTop="8dp"
24-
android:src="@drawable/ic_baseline_search_24"
23+
android:layout_marginStart="10dp"
24+
android:layout_marginTop="10dp"
25+
android:src="@drawable/ic_round_star"
26+
android:tint="@color/mint"
2527
app:layout_constraintStart_toStartOf="parent"
2628
app:layout_constraintTop_toTopOf="parent" />
2729

2830
<TextView
2931
android:id="@+id/text_view_recent_search_title"
3032
android:layout_width="0dp"
3133
android:layout_height="wrap_content"
32-
android:layout_marginStart="12dp"
34+
android:layout_marginStart="15dp"
3335
android:text="@{placeItem.name}"
34-
android:textColor="@color/black"
35-
android:textSize="24sp"
36+
android:textColor="@color/main_dark_grey"
37+
android:textSize="16sp"
3638
app:layout_constraintBottom_toBottomOf="@id/image_view_recent_search"
3739
app:layout_constraintEnd_toEndOf="parent"
3840
app:layout_constraintStart_toEndOf="@id/image_view_recent_search"
3941
app:layout_constraintTop_toTopOf="@id/image_view_recent_search"
4042
tools:text="아남타워" />
4143

4244
<com.google.android.material.divider.MaterialDivider
43-
android:layout_width="0dp"
45+
android:layout_width="match_parent"
4446
android:layout_height="1dp"
45-
android:layout_marginVertical="8dp"
46-
app:dividerColor="@color/light_grey"
47-
app:layout_constraintBaseline_toBottomOf="parent"
47+
android:layout_marginTop="15dp"
48+
app:dividerColor="@color/main_lighter_grey"
4849
app:layout_constraintBottom_toBottomOf="parent"
49-
app:layout_constraintEnd_toEndOf="parent"
50-
app:layout_constraintStart_toStartOf="@id/text_view_recent_search_title"
5150
app:layout_constraintTop_toBottomOf="@id/text_view_recent_search_title" />
5251

5352
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)