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

Merge branch 'master' of github.com:sagidayan/TheSocialNotework-Android

Browse source
This commit is contained in:
Sagi Dayan 2016-07-09 19:14:12 +03:00
commit 2eff535e7e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,8 +85,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
private final String kilometer = "1 Km"; private final String kilometer = "1 Km";
private final String threeKilometer = "3 Km"; private final String threeKilometer = "3 Km";
private final String mine = "mine"; private final String mine = "mine";
private final String everyoneButMine = "all w/o me"; private final String others = "others";
private final String everyone = "everyone's"; private final String all = "all";
@ -144,6 +144,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
dateFilter.setOnClickListener(new View.OnClickListener() { dateFilter.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// Log.d(TAG, "" + v.getId());
if (dateFilterIsVisible) { if (dateFilterIsVisible) {
dateFilterIsVisible = false; dateFilterIsVisible = false;
mapFilters.setVisibility(View.INVISIBLE); mapFilters.setVisibility(View.INVISIBLE);
@ -195,8 +196,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
// set text button in the right filter string // set text button in the right filter string
map_small_filter.setText(mine); map_small_filter.setText(mine);
map_medium_filter.setText(everyoneButMine); map_medium_filter.setText(others);
map_large_filter.setText(everyone); map_large_filter.setText(all);
} }
} }
}); });

3
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
View file

@ -85,8 +85,7 @@ public class PersonalFragment extends Fragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_personal, container, false); View view = inflater.inflate(R.layout.fragment_personal, container, false);
// Inflate the layout for this fragment // Inflate the layout for this fragment
activity = (MainActivity) getActivity(); activity = (MainActivity) getActivity();