From 6267e488b0591e17845b02cfa1347a761e32bff0 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Wed, 9 Oct 2019 10:30:02 +0300
Subject: [PATCH] Style nearby filter area

---
 app/src/main/res/layout/filter_chip_view.xml  | 11 ++++---
 .../res/layout/fragment_nearby_parent.xml     | 31 +++----------------
 .../res/layout/nearby_filter_all_items.xml    | 24 ++++++++++++++
 .../main/res/layout/nearby_filter_list.xml    |  1 +
 app/src/main/res/values/strings.xml           |  3 ++
 5 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/res/layout/nearby_filter_all_items.xml

diff --git a/app/src/main/res/layout/filter_chip_view.xml b/app/src/main/res/layout/filter_chip_view.xml
index 489255585..89df898f5 100644
--- a/app/src/main/res/layout/filter_chip_view.xml
+++ b/app/src/main/res/layout/filter_chip_view.xml
@@ -4,12 +4,13 @@
     android:orientation="horizontal"
     android:layout_gravity="center_vertical"
     xmlns:android="http://schemas.android.com/apk/res/android">
+    
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:paddingStart="15dp"
-        android:text="Place state:"/>
+        android:text="@string/place_state"/>
 
     <com.google.android.material.chip.ChipGroup
         android:id="@+id/choice_chip_group"
@@ -17,22 +18,22 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
         android:theme="@style/Theme.MaterialComponents.Light"
-        app:singleSelection="false"
-        >
+        app:singleSelection="false">
 
         <com.google.android.material.chip.Chip
             android:id="@+id/choice_chip_exists"
             style="@style/Widget.MaterialComponents.Chip.Choice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Exists"/>
+            android:text="@string/place_state_exists"/>
 
         <com.google.android.material.chip.Chip
             android:id="@+id/choice_chip_needs_photo"
             style="@style/Widget.MaterialComponents.Chip.Choice"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Needs photo"/>
+            android:text="@string/place_state_needs_photo"/>
+
     </com.google.android.material.chip.ChipGroup>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_nearby_parent.xml b/app/src/main/res/layout/fragment_nearby_parent.xml
index acf877a63..50f1eb2d8 100644
--- a/app/src/main/res/layout/fragment_nearby_parent.xml
+++ b/app/src/main/res/layout/fragment_nearby_parent.xml
@@ -5,41 +5,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:orientation="vertical"
-        >
-
-        <include
-            android:id="@+id/chip_view"
-            layout="@layout/filter_chip_view"
-            android:background="@color/deleteRed"
-            />
-
-        <include android:id="@+id/search_view_layout" layout="@layout/filter_search_view_layout" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/search_view_layout"
-            android:background="@color/status_bar_blue">
-        </RelativeLayout>
-
-        <include layout="@layout/nearby_filter_list" />
-
-    </LinearLayout>
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/status_bar_blue">
+        android:background="@color/status_bar_blue"
+        android:id="@+id/map_layout">
 
         <LinearLayout
             android:orientation="vertical" android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+            <include layout="@layout/nearby_filter_all_items" />
+
             <FrameLayout
                 android:id="@+id/container"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/nearby_filter_all_items.xml b/app/src/main/res/layout/nearby_filter_all_items.xml
new file mode 100644
index 000000000..1b28a5e45
--- /dev/null
+++ b/app/src/main/res/layout/nearby_filter_all_items.xml
@@ -0,0 +1,24 @@
+<LinearLayout android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent"
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <include
+        android:id="@+id/chip_view"
+        layout="@layout/filter_chip_view"
+        android:background="@color/deleteRed"
+        />
+
+    <include android:id="@+id/search_view_layout" layout="@layout/filter_search_view_layout" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/search_view_layout"
+        android:background="@color/status_bar_blue">
+    </RelativeLayout>
+
+    <include layout="@layout/nearby_filter_list" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_filter_list.xml b/app/src/main/res/layout/nearby_filter_list.xml
index 296749292..7b8edbfec 100644
--- a/app/src/main/res/layout/nearby_filter_list.xml
+++ b/app/src/main/res/layout/nearby_filter_list.xml
@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     android:layout_alignParentRight="true"
     android:layout_marginStart="72dp"
+    android:visibility="gone"
     android:elevation="6dp">
 
     <ListView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index faf97ca1a..c3d820c38 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -581,4 +581,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="text_copy">Text copied to clipboard</string>
   <string name="notification_mark_read">Notification marked as read</string>
   <string name="some_error">There was some error!</string>
+  <string name="place_state">Place state:</string>
+  <string name="place_state_exists">Exists:</string>
+  <string name="place_state_needs_photo">Needs photo:</string>
 </resources>