Skip to content

Commit 6267e48

Browse files
committed
Style nearby filter area
1 parent f748399 commit 6267e48

File tree

5 files changed

+38
-32
lines changed

5 files changed

+38
-32
lines changed

app/src/main/res/layout/filter_chip_view.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,36 @@
44
android:orientation="horizontal"
55
android:layout_gravity="center_vertical"
66
xmlns:android="http://schemas.android.com/apk/res/android">
7+
78
<TextView
89
android:layout_width="wrap_content"
910
android:layout_height="wrap_content"
1011
android:layout_gravity="center_vertical"
1112
android:paddingStart="15dp"
12-
android:text="Place state:"/>
13+
android:text="@string/place_state"/>
1314

1415
<com.google.android.material.chip.ChipGroup
1516
android:id="@+id/choice_chip_group"
1617
android:layout_width="match_parent"
1718
android:layout_height="wrap_content"
1819
android:layout_marginStart="15dp"
1920
android:theme="@style/Theme.MaterialComponents.Light"
20-
app:singleSelection="false"
21-
>
21+
app:singleSelection="false">
2222

2323
<com.google.android.material.chip.Chip
2424
android:id="@+id/choice_chip_exists"
2525
style="@style/Widget.MaterialComponents.Chip.Choice"
2626
android:layout_width="wrap_content"
2727
android:layout_height="wrap_content"
28-
android:text="Exists"/>
28+
android:text="@string/place_state_exists"/>
2929

3030
<com.google.android.material.chip.Chip
3131
android:id="@+id/choice_chip_needs_photo"
3232
style="@style/Widget.MaterialComponents.Chip.Choice"
3333
android:layout_width="wrap_content"
3434
android:layout_height="wrap_content"
35-
android:text="Needs photo"/>
35+
android:text="@string/place_state_needs_photo"/>
36+
3637
</com.google.android.material.chip.ChipGroup>
3738

3839
</LinearLayout>

app/src/main/res/layout/fragment_nearby_parent.xml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,18 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<LinearLayout
9-
android:layout_width="match_parent"
10-
android:layout_height="wrap_content"
11-
android:background="@android:color/transparent"
12-
android:orientation="vertical"
13-
>
14-
15-
<include
16-
android:id="@+id/chip_view"
17-
layout="@layout/filter_chip_view"
18-
android:background="@color/deleteRed"
19-
/>
20-
21-
<include android:id="@+id/search_view_layout" layout="@layout/filter_search_view_layout" />
22-
23-
<RelativeLayout
24-
android:layout_width="match_parent"
25-
android:layout_height="match_parent"
26-
android:layout_below="@id/search_view_layout"
27-
android:background="@color/status_bar_blue">
28-
</RelativeLayout>
29-
30-
<include layout="@layout/nearby_filter_list" />
31-
32-
</LinearLayout>
33-
348
<RelativeLayout
359
android:layout_width="match_parent"
3610
android:layout_height="match_parent"
37-
android:background="@color/status_bar_blue">
11+
android:background="@color/status_bar_blue"
12+
android:id="@+id/map_layout">
3813

3914
<LinearLayout
4015
android:orientation="vertical" android:layout_width="match_parent"
4116
android:layout_height="match_parent">
4217

18+
<include layout="@layout/nearby_filter_all_items" />
19+
4320
<FrameLayout
4421
android:id="@+id/container"
4522
android:layout_width="match_parent"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<LinearLayout android:layout_width="match_parent"
2+
android:layout_height="wrap_content"
3+
android:background="@android:color/transparent"
4+
android:orientation="vertical"
5+
xmlns:android="http://schemas.android.com/apk/res/android">
6+
7+
<include
8+
android:id="@+id/chip_view"
9+
layout="@layout/filter_chip_view"
10+
android:background="@color/deleteRed"
11+
/>
12+
13+
<include android:id="@+id/search_view_layout" layout="@layout/filter_search_view_layout" />
14+
15+
<RelativeLayout
16+
android:layout_width="match_parent"
17+
android:layout_height="match_parent"
18+
android:layout_below="@id/search_view_layout"
19+
android:background="@color/status_bar_blue">
20+
</RelativeLayout>
21+
22+
<include layout="@layout/nearby_filter_list" />
23+
24+
</LinearLayout>

app/src/main/res/layout/nearby_filter_list.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
android:layout_height="match_parent"
77
android:layout_alignParentRight="true"
88
android:layout_marginStart="72dp"
9+
android:visibility="gone"
910
android:elevation="6dp">
1011

1112
<ListView

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,4 +581,7 @@ Upload your first media by tapping on the add button.</string>
581581
<string name="text_copy">Text copied to clipboard</string>
582582
<string name="notification_mark_read">Notification marked as read</string>
583583
<string name="some_error">There was some error!</string>
584+
<string name="place_state">Place state:</string>
585+
<string name="place_state_exists">Exists:</string>
586+
<string name="place_state_needs_photo">Needs photo:</string>
584587
</resources>

0 commit comments

Comments
 (0)