diff --git a/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java b/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java index e405785..98a3548 100644 --- a/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java +++ b/app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java @@ -56,15 +56,12 @@ public class SettingsFragmentTest { mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new SettingsFragment()).commit(); onView(withId(R.id.settingsImperialButton)).check(matches(isClickable())); onView(withId(R.id.settingsImperialButton)).check(matches(isClickable())); - onView(withId(R.id.settingsEyesButton)).check(matches(isClickable())); + onView(withId(R.id.settingsImperialButton)).perform(click()); onView(withId(R.id.settingsImperialButton)).check(matches(isChecked())); onView(withId(R.id.settingsImperialButton)).perform(click()); onView(withId(R.id.settingsImperialButton)).check(matches(isChecked())); - - onView(withId(R.id.settingsEyesButton)).perform(click()); - onView(withId(R.id.settingsEyesButton)).check(matches(isChecked())); } } diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 343de74..95ab677 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -132,7 +132,7 @@ android:layout_height="70dp" android:layout_marginHorizontal="20dp" android:background="@color/secondaryColour" - app:layout_constraintBottom_toTopOf="@id/Box4" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/Box2" @@ -171,52 +171,4 @@ - - - - - - - - - - - \ No newline at end of file