JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- filters map fixed

Browse source
This commit is contained in:
Matan Bar Yosef 2016-07-10 17:26:45 +03:00
parent bf397919ef
commit 9a2fd3194d
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
View file

@ -65,7 +65,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
private Button map_small_filter; private Button map_small_filter;
private Button map_medium_filter; private Button map_medium_filter;
private Button map_large_filter; private Button map_large_filter;
private LinearLayout mapFilters; private LinearLayout mapFilters, mainMapFilters;
private boolean dateFilterIsVisible = false; private boolean dateFilterIsVisible = false;
private boolean locationFilterIsVisible = false; private boolean locationFilterIsVisible = false;
private boolean userFilterIsVisible = false; private boolean userFilterIsVisible = false;
@ -133,6 +133,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
map_large_filter.setOnClickListener(button3ClickListener); map_large_filter.setOnClickListener(button3ClickListener);
mapFilters = (LinearLayout) view.findViewById(R.id.map_filter_options); mapFilters = (LinearLayout) view.findViewById(R.id.map_filter_options);
mainMapFilters = (LinearLayout) view.findViewById(R.id.map_filters_layout);
dateFilter.setOnClickListener(new View.OnClickListener() { dateFilter.setOnClickListener(new View.OnClickListener() {
@Override @Override
@ -533,6 +534,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
} else { } else {
locationFilter.setBackgroundResource(android.R.drawable.btn_default); locationFilter.setBackgroundResource(android.R.drawable.btn_default);
} }
mainMapFilters.setPadding(0, 8, 0, 0);
} }
public void updateShowedNotes() { public void updateShowedNotes() {

5
app/src/main/res/layout/fragment_explore.xml
View file

@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.android_app.matan.ara.sagi.thesocialnotework.ExploreFragment" tools:context="com.android_app.matan.ara.sagi.thesocialnotework.ExploreFragment"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="15dp"> android:paddingTop="3dp">
<!-- TODO: Update blank fragment layout --> <!-- TODO: Update blank fragment layout -->
@ -16,8 +16,7 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:paddingTop="15dp" >
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"

2
app/src/main/res/layout/fragment_gmap.xml
View file

@ -18,7 +18,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="15dp"> android:id="@+id/map_filters_layout">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"

7
app/src/main/res/layout/fragment_personal.xml
View file

@ -10,12 +10,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.android_app.matan.ara.sagi.thesocialnotework.PersonalSpaceActivity" tools:context="com.android_app.matan.ara.sagi.thesocialnotework.PersonalSpaceActivity"
android:layout_marginBottom="5dp"> android:layout_marginBottom="5dp"
android:padding="3dp">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"