diff --git a/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java index e0cea4f..912c585 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java @@ -1,5 +1,6 @@ package com.a1.nextlocation.fragments; +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -17,12 +18,21 @@ import com.a1.nextlocation.data.Route; import com.a1.nextlocation.recyclerview.RouteAdapter; import com.a1.nextlocation.recyclerview.RouteListManager; +import org.jetbrains.annotations.NotNull; + import java.util.List; public class RouteFragment extends Fragment { private static final String TAG = RouteFragment.class.getCanonicalName(); private List routeList; + private Refreshable refreshable; + + @Override + public void onAttach(@NotNull Context context) { + super.onAttach(context); + refreshable = (Refreshable) context; + } @Override public void onCreate(Bundle savedInstanceState) { @@ -55,8 +65,10 @@ public class RouteFragment extends Fragment { ImageButton backButton = view.findViewById(R.id.route_back_button); backButton.setOnClickListener(v -> { HomeFragment homeFragment = new HomeFragment(); - if (getActivity() != null) + if (getActivity() != null) { getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); + refreshable.refreshAndNavigateTo(R.id.map_view); + } }); routeRecyclerView.setLayoutManager(layoutManager); diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java index ced92c7..f2db668 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java @@ -65,9 +65,10 @@ public class SettingsFragment extends Fragment { ImageView backButton = view.findViewById(R.id.settings_back_button); backButton.setOnClickListener(v -> { HomeFragment homeFragment = new HomeFragment(); - if (getActivity() != null) + if (getActivity() != null) { getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); - }); + refreshable.refreshAndNavigateTo(R.id.map_view); + }}); SharedPreferences sharedPreferences = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE); diff --git a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java index 4da5466..cd334cb 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java @@ -19,10 +19,19 @@ import com.a1.nextlocation.data.Data; import com.a1.nextlocation.recyclerview.CouponAdapter; import com.a1.nextlocation.recyclerview.CouponListManager; +import org.jetbrains.annotations.NotNull; + import java.util.List; public class StatisticFragment extends Fragment { private TextView distance; + private Refreshable refreshable; + + @Override + public void onAttach(@NotNull Context context) { + super.onAttach(context); + refreshable = (Refreshable) context; + } @Override public void onCreate(Bundle savedInstanceState) { @@ -60,6 +69,7 @@ public class StatisticFragment extends Fragment { HomeFragment homeFragment = new HomeFragment(); if (getActivity() != null) getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); + refreshable.refreshAndNavigateTo(R.id.map_view); }); //Initialises the coupon button