diff --git a/app/src/androidTest/java/com/a1/nextlocation/MainActivityTest.java b/app/src/androidTest/java/com/a1/nextlocation/MainActivityTest.java index b0fa343..c448f9f 100644 --- a/app/src/androidTest/java/com/a1/nextlocation/MainActivityTest.java +++ b/app/src/androidTest/java/com/a1/nextlocation/MainActivityTest.java @@ -41,7 +41,7 @@ public class MainActivityTest { public void clickRouteNavBar() throws Exception{ //Here we click the back button and then we check if the statisticsFragment is shown mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().commit(); - onView(withId(R.id.routes)).perform(NavigationViewActions.navigateTo(R.id.routes)); + onView(withId(R.id.routes)).perform((click())); onView(withId(R.id.routeFragment)).check(matches(isDisplayed())); } 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 0b80f41..232afa9 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java @@ -40,7 +40,7 @@ public class SettingsFragment extends Fragment { // Inflate the layout for this fragment Spinner dropdown = view.findViewById(R.id.dropdown_menu_Settings); - this.imageButton = view.findViewById(R.id.route_detail_back_button); + this.imageButton = view.findViewById(R.id.settings_back_button); this.imageButton.setOnClickListener(v -> { HomeFragment homeFragment = new HomeFragment(); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();