Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit 678b179e04 - Show all commits

View File

@@ -42,11 +42,11 @@ public class LocationFragment extends Fragment {
this.locationRecyclerView.setHasFixedSize(true); this.locationRecyclerView.setHasFixedSize(true);
this.layoutManager = new LinearLayoutManager(this.getContext()); this.layoutManager = new LinearLayoutManager(this.getContext());
// this.imageButton = view.findViewById(R.id.locationBackButton); this.imageButton = view.findViewById(R.id.locationBackButton);
// this.imageButton.setOnClickListener(v -> { this.imageButton.setOnClickListener(v -> {
// HomeFragment homeFragment = new HomeFragment(); HomeFragment homeFragment = new HomeFragment();
// ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
// }); });
LocationListManager.INSTANCE.setContext(this.getContext()); LocationListManager.INSTANCE.setContext(this.getContext());
LocationListManager.INSTANCE.load(); LocationListManager.INSTANCE.load();