sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d1cfd244b - Show all commits

2
app/src/androidTest/java/com/a1/nextlocation/MainActivityTest.java
View File

@@ -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()));
}

2
app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
View File

@@ -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();