refactor filtering, add option to hide traces

res/layout/bottom_map_sheet.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="165dp"
+    android:layout_height="230dp"
     android:id="@+id/bottom_sheet"
     app:behavior_hideable="false"
     app:behavior_peekHeight="35dp"
@@ -36,12 +36,13 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="135dp"
+        android:layout_height="200dp"
         android:orientation="vertical"
         android:clickable="true"
         android:focusable="true"
         android:background="@android:color/white"
         android:layout_marginTop="-35dp"
+        android:layout_gravity="top"
         >
 
         <TextView
@@ -50,21 +51,35 @@
             android:gravity="center"
             android:text="@string/filter_map_on_time"
             android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:background="@color/white"
             android:textColor="@android:color/black" />
 
         <org.thoughtcrime.securesms.components.rangeslider.TimeRangeSlider
             android:id="@+id/timeRangeSlider"
-            android:layout_marginBottom="15dp"
-
             android:paddingStart="40dp"
             android:paddingEnd="40dp"
             android:paddingLeft="40dp"
             android:paddingRight="40dp"
             android:layout_width="match_parent"
+            android:layout_height="120dp"
+
+            />
+
+        <android.support.v7.widget.SwitchCompat
+            android:id="@+id/locationTraceSwitch"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingLeft="40dp"
+            android:paddingRight="20dp"
+            android:paddingStart="40dp"
+            android:paddingEnd="20dp"
+            android:text="@string/show_location_traces"
+            android:background="@color/white"
+            android:visibility="visible"
+            android:theme="@style/SwitchTheme"
             />
 
     </LinearLayout>
+
+
 </LinearLayout>

res/values/strings.xml

@@ -220,8 +220,9 @@
     <string name="chat_no_contact_requests">No contact requests.\n\nIf you want classic emails to appear here as contact requests, you can change the corresponding setting in the app settings.</string>
 
     <!-- map -->
-    <string name="filter_map_on_time">Show location traces in time frame</string>
+    <string name="filter_map_on_time">Show locations in time frame</string>
     <string name="filter_last_position">Last position</string>
+    <string name="show_location_traces">Show traces</string>
 
 
     <!-- search -->

res/values/styles.xml

@@ -106,4 +106,8 @@
         <item name="android:padding">12dp</item>
     </style>
 
+    <style name="SwitchTheme" parent="Theme.AppCompat.Light">
+        <item name="colorControlActivated">#ff2090ea</item>
+    </style>
+
 </resources>