From 9a2fd3194d09a453913ee49575cc0b9fc5ee5af3 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Sun, 10 Jul 2016 17:26:45 +0300 Subject: [PATCH] - filters map fixed --- .../matan/ara/sagi/thesocialnotework/GmapFragment.java | 4 +++- app/src/main/res/layout/fragment_explore.xml | 5 ++--- app/src/main/res/layout/fragment_gmap.xml | 2 +- app/src/main/res/layout/fragment_personal.xml | 7 ++----- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java index 7e6ea91..cfcbc2c 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java @@ -65,7 +65,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { private Button map_small_filter; private Button map_medium_filter; private Button map_large_filter; - private LinearLayout mapFilters; + private LinearLayout mapFilters, mainMapFilters; private boolean dateFilterIsVisible = false; private boolean locationFilterIsVisible = false; private boolean userFilterIsVisible = false; @@ -133,6 +133,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { map_large_filter.setOnClickListener(button3ClickListener); mapFilters = (LinearLayout) view.findViewById(R.id.map_filter_options); + mainMapFilters = (LinearLayout) view.findViewById(R.id.map_filters_layout); dateFilter.setOnClickListener(new View.OnClickListener() { @Override @@ -533,6 +534,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { } else { locationFilter.setBackgroundResource(android.R.drawable.btn_default); } + mainMapFilters.setPadding(0, 8, 0, 0); } public void updateShowedNotes() { diff --git a/app/src/main/res/layout/fragment_explore.xml b/app/src/main/res/layout/fragment_explore.xml index cb201a6..1652c24 100644 --- a/app/src/main/res/layout/fragment_explore.xml +++ b/app/src/main/res/layout/fragment_explore.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" tools:context="com.android_app.matan.ara.sagi.thesocialnotework.ExploreFragment" android:orientation="vertical" - android:paddingTop="15dp"> + android:paddingTop="3dp"> @@ -16,8 +16,7 @@ + android:layout_height="wrap_content"> + android:id="@+id/map_filters_layout"> + android:layout_marginBottom="5dp" + android:padding="3dp">