From c6184f1b975133207ac41c8ba8afbe80d3467af1 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Sat, 9 Jul 2016 19:04:11 +0300 Subject: [PATCH] - filter text changed --- .../matan/ara/sagi/thesocialnotework/GmapFragment.java | 9 +++++---- .../ara/sagi/thesocialnotework/PersonalFragment.java | 3 +-- 2 files changed, 6 insertions(+), 6 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 62f6e0d..68b7f09 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 @@ -85,8 +85,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { private final String kilometer = "1 Km"; private final String threeKilometer = "3 Km"; private final String mine = "mine"; - private final String everyoneButMine = "all w/o me"; - private final String everyone = "everyone's"; + private final String others = "others"; + private final String all = "all"; @@ -144,6 +144,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { dateFilter.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { +// Log.d(TAG, "" + v.getId()); if (dateFilterIsVisible) { dateFilterIsVisible = false; mapFilters.setVisibility(View.INVISIBLE); @@ -195,8 +196,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { // set text button in the right filter string map_small_filter.setText(mine); - map_medium_filter.setText(everyoneButMine); - map_large_filter.setText(everyone); + map_medium_filter.setText(others); + map_large_filter.setText(all); } } }); diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java index 6636b88..9a5fe67 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java @@ -85,8 +85,7 @@ public class PersonalFragment extends Fragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_personal, container, false); // Inflate the layout for this fragment activity = (MainActivity) getActivity();