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

mergeeee

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-06 13:59:59 +01:00
parent 216f48cc0f 8a758f1d8d
commit 1aee93cd0c
34 changed files with 714 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@@ -53,7 +53,14 @@ dependencies {
//osm bonus pack
implementation 'com.github.MKergall:osmbonuspack:6.6.0'
//BeforeEach
testImplementation(platform('org.junit:junit-bom:5.7.0'))
testImplementation 'org.junit.jupiter:junit-jupiter'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
testImplementation 'org.mockito:mockito-core:2.7.22'
androidTestImplementation 'com.21buttons:fragment-test-rule:2.0.1'
androidTestImplementation 'androidx.test:rules:1.3.0-beta01'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0-alpha02'
}

50
app/src/androidTest/java/com/a1/nextlocation/CouponFragmentTest.java Normal file
View File

@@ -0,0 +1,50 @@
package com.a1.nextlocation;
import androidx.test.espresso.Root;
import androidx.test.espresso.contrib.RecyclerViewActions;
import androidx.test.espresso.matcher.RootMatchers;
import androidx.test.espresso.matcher.ViewMatchers;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.CouponFragment;
import com.a1.nextlocation.fragments.LocationFragment;
import org.junit.Rule;
import org.junit.Test;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isChecked;
import static androidx.test.espresso.matcher.ViewMatchers.isClickable;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
public class CouponFragmentTest {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
@Test
public void clickBackButton() throws Exception{
//Here we click the back button and then we check if the statisticsFragment is shown
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new CouponFragment()).commit();
onView(withId(R.id.coupon_back_button)).perform(click());
onView(withId(R.id.statisticsFragment)).check(matches(isDisplayed()));
}
@Test
public void clickDetailButton() throws Exception{
//Here we click a coupon and then a popup dialog shows, we press the "activeren" button in it and if the next dialog with the code and with
//the button "Klaar" is shown then the test works
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new CouponFragment()).commit();
onView(withId(R.id.coupon_recyclerview)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click()));
onView(withText("activeren")).inRoot(RootMatchers.isDialog()).perform(click());
onView(withText("Klaar")).inRoot(RootMatchers.isDialog()).check(matches(isDisplayed()));
}
}

27
app/src/androidTest/java/com/a1/nextlocation/LocationDetailFragment.java Normal file
View File

@@ -0,0 +1,27 @@
package com.a1.nextlocation;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.CouponFragment;
import org.junit.Rule;
import org.junit.Test;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
public class LocationDetailFragment {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
@Test
public void clickBackButton() throws Exception{
//Here we click the back button and then we check if the locationFragment is shown
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new com.a1.nextlocation.fragments.LocationDetailFragment()).commit();
onView(withId(R.id.detail_location_back_button)).perform(click());
onView(withId(R.id.locationFragment)).check(matches(isDisplayed()));
}
}

42
app/src/androidTest/java/com/a1/nextlocation/LocationFragmentTest.java Normal file
View File

@@ -0,0 +1,42 @@
package com.a1.nextlocation;
import androidx.test.espresso.contrib.RecyclerViewActions;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.LocationFragment;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.inject.Inject;
import static androidx.test.espresso.Espresso.*;
import static androidx.test.espresso.action.ViewActions.*;
import static androidx.test.espresso.assertion.ViewAssertions.*;
import static androidx.test.espresso.matcher.ViewMatchers.*;
public class LocationFragmentTest {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
@Test
public void clickBackButton() throws Exception{
//Here we click the back button and then we check if the homeFragment is shown
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new LocationFragment()).commit();
onView(withId(R.id.location_back_button)).perform(click());
onView(withId(R.id.homeFragment)).check(matches(isDisplayed()));
}
@Test
public void clickDetailButton() throws Exception{
//Here we click an item in the recyclerview and then check if the routeDetailFragment is called
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new LocationFragment()).commit();
onView(withId(R.id.location_recyclerview)).perform(RecyclerViewActions.actionOnItemAtPosition(1, click()));
onView(withId(R.id.locationDetailFragment)).check(matches(isDisplayed()));
}
}

64
app/src/androidTest/java/com/a1/nextlocation/MainActivityTest.java Normal file
View File

@@ -0,0 +1,64 @@
package com.a1.nextlocation;
import android.app.LauncherActivity;
import android.widget.Button;
import androidx.test.espresso.contrib.NavigationViewActions;
import androidx.test.espresso.contrib.RecyclerViewActions;
import androidx.test.espresso.matcher.RootMatchers;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.CouponFragment;
import com.google.android.material.bottomnavigation.BottomNavigationItemView;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
public class MainActivityTest {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
@Test
public void clickLocationsNavBar() 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.locations)).perform(click());
onView(withId(R.id.homeFragment)).check(matches(isDisplayed()));
}
@Test
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((click()));
onView(withId(R.id.routeFragment)).check(matches(isDisplayed()));
}
@Test
public void clickStatisticsNavBar() 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.statistics)).perform(click());
onView(withId(R.id.statisticsFragment)).check(matches(isDisplayed()));
}
@Test
public void clickSettingNavBar() 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.settings)).perform(click());
onView(withId(R.id.settingFragment)).check(matches(isDisplayed()));
}
}

39
app/src/androidTest/java/com/a1/nextlocation/RouteFragmentTest.java Normal file
View File

@@ -0,0 +1,39 @@
package com.a1.nextlocation;
import androidx.test.espresso.contrib.RecyclerViewActions;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.LocationFragment;
import com.a1.nextlocation.fragments.RouteFragment;
import org.junit.Rule;
import org.junit.Test;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
public class RouteFragmentTest {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
@Test
public void clickBackButton() throws Exception{
//Here we click the back button and then we check if the homeFragment is shown
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new RouteFragment()).commit();
onView(withId(R.id.route_back_button)).perform(click());
onView(withId(R.id.homeFragment)).check(matches(isDisplayed()));
}
@Test
public void clickDetailButton() throws Exception{
//Here we click an item in the recyclerview and then check if the routeDetailFragment is called
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new RouteFragment()).commit();
onView(withId(R.id.route_recyclerview)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
onView(withId(R.id.routeDetailFragment)).check(matches(isDisplayed()));
}
}

70
app/src/androidTest/java/com/a1/nextlocation/SettingsFragmentTest.java Normal file
View File

@@ -0,0 +1,70 @@
package com.a1.nextlocation;
import androidx.test.espresso.action.ViewActions;
import androidx.test.espresso.contrib.RecyclerViewActions;
import androidx.test.espresso.matcher.RootMatchers;
import androidx.test.espresso.matcher.ViewMatchers;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.LocationFragment;
import com.a1.nextlocation.fragments.SettingsFragment;
import com.a1.nextlocation.fragments.StatisticFragment;
import org.hamcrest.core.AllOf;
import org.hamcrest.core.Is;
import org.hamcrest.core.IsInstanceOf;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.inject.Inject;
import static androidx.test.espresso.Espresso.*;
import static androidx.test.espresso.action.ViewActions.*;
import static androidx.test.espresso.assertion.ViewAssertions.*;
import static androidx.test.espresso.matcher.RootMatchers.isPlatformPopup;
import static androidx.test.espresso.matcher.ViewMatchers.*;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.is;
public class SettingsFragmentTest {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
//Tests if the back button sends you back home
@Test
public void clickBackButton() throws Exception{
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new SettingsFragment()).commit();
onView(withId(R.id.settings_back_button)).perform(click());
onView(withId(R.id.homeFragment)).check(matches(isDisplayed()));
}
//Checks if the dropdown is clickable, and checks if it has children
@Test
public void dropdownTest(){
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new SettingsFragment()).commit();
onView(withId(R.id.dropdown_menu_Settings)).check(matches(isClickable()));
onView(withId(R.id.dropdown_menu_Settings)).check(matches(hasMinimumChildCount(1)));
}
//Tests if all buttons are clickable, and if they get checked after being clicked.
@Test
public void buttonTest(){
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new SettingsFragment()).commit();
onView(withId(R.id.settingsImperialButton)).check(matches(isClickable()));
onView(withId(R.id.settingsOldButton)).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.settingsOldButton)).perform(click());
onView(withId(R.id.settingsOldButton)).check(matches(isChecked()));
onView(withId(R.id.settingsEyesButton)).perform(click());
onView(withId(R.id.settingsEyesButton)).check(matches(isChecked()));
}
}

38
app/src/androidTest/java/com/a1/nextlocation/StatisticFragmentTest.java Normal file
View File

@@ -0,0 +1,38 @@
package com.a1.nextlocation;
import androidx.test.espresso.contrib.RecyclerViewActions;
import androidx.test.rule.ActivityTestRule;
import com.a1.nextlocation.fragments.LocationFragment;
import com.a1.nextlocation.fragments.StatisticFragment;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.inject.Inject;
import static androidx.test.espresso.Espresso.*;
import static androidx.test.espresso.action.ViewActions.*;
import static androidx.test.espresso.assertion.ViewAssertions.*;
import static androidx.test.espresso.matcher.ViewMatchers.*;
public class StatisticFragmentTest {
@Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);
//Tests to see if all boxes get created
@Test
public void checkText() throws Exception{
mActivityTestRule.getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.mainActivity, new StatisticFragment()).commit();
onView(withId(R.id.textView)).check(matches(isDisplayed()));
onView(withId(R.id.name_box)).check(matches(isDisplayed()));
onView(withId(R.id.Box2)).check(matches(isDisplayed()));
onView(withId(R.id.Box3)).check(matches(isDisplayed()));
onView(withId(R.id.Box4)).check(matches(isDisplayed()));
}
}

28
app/src/main/java/com/a1/nextlocation/MainActivity.java
View File

@@ -3,6 +3,9 @@ package com.a1.nextlocation;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import android.app.Activity;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import android.util.Log;
import android.view.MenuItem;
@@ -23,6 +26,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
import java.io.File;
import java.util.Arrays;
import java.util.Locale;
public class MainActivity extends AppCompatActivity {
private static final String TAG = MainActivity.class.getName();
@@ -52,9 +56,33 @@ public class MainActivity extends AppCompatActivity {
RouteListManager.INSTANCE.setContext(this);
RouteListManager.INSTANCE.load();
// initialize saved language from sharedPreferences
setLocale(loadLocale());
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit();
}
/**
* loads the saved language from SharedPreferences
* @return the language as string
*/
private String loadLocale(){
SharedPreferences sharedPreferences = getSharedPreferences("Settings", Activity.MODE_PRIVATE);
return sharedPreferences.getString("Language", "nl");
}
/**
* sets the language of the application to the desired one
* @param language the desired language
*/
private void setLocale(String language){
Locale locale = new Locale(language);
Locale.setDefault(locale);
Configuration configuration = new Configuration();
configuration.setLocale(locale);
getBaseContext().getResources().updateConfiguration(configuration, getBaseContext().getResources().getDisplayMetrics());
}
private BottomNavigationView.OnNavigationItemSelectedListener navListener = item -> {
Fragment selectedFragment = null;

12
app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
View File

@@ -61,22 +61,18 @@ public class CouponFragment extends Fragment {
private void showPopup(Coupon coupon) {
AlertDialog.Builder activateBuilder = new AlertDialog.Builder(getContext());
AlertDialog.Builder couponCodeBuilder = new AlertDialog.Builder(getContext());
// TODO: use string resources instead of hardcoded strings
activateBuilder.setMessage("Weet je zeker dat je deze coupon wilt activeren?");
activateBuilder.setMessage(getResources().getString(R.string.activate_question));
activateBuilder.setCancelable(true);
// TODO: use string resources instead of hardcoded strings
activateBuilder.setPositiveButton("activeren", (dialog, which) -> {
// TODO: use string resources instead of hardcoded strings
activateBuilder.setPositiveButton(R.string.activate, (dialog, which) -> {
dialog.cancel();
couponCodeBuilder.setMessage("Code: " + coupon.getCode());
couponCodeBuilder.setPositiveButton("Klaar", (dialog1, which1) -> {
couponCodeBuilder.setPositiveButton(R.string.done, (dialog1, which1) -> {
dialog.cancel();
});
AlertDialog couponCodePopup = couponCodeBuilder.create();
couponCodePopup.show();
});
// TODO: use string resources instead of hardcoded strings
activateBuilder.setNegativeButton("annuleren", (dialog, which) -> dialog.cancel());
activateBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.cancel());
AlertDialog couponPopup = activateBuilder.create();
couponPopup.show();

1
app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
View File

@@ -28,6 +28,7 @@ import com.a1.nextlocation.data.RouteHandler;
import com.a1.nextlocation.data.StaticData;
import com.a1.nextlocation.json.DirectionsResult;
import com.a1.nextlocation.network.ApiHandler;
import com.a1.nextlocation.network.DirectionsListener;
import com.a1.nextlocation.recyclerview.LocationListManager;
import org.osmdroid.api.IMapController;

4
app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
View File

@@ -49,4 +49,8 @@ public class LocationDetailFragment extends Fragment {
}
return view;
}
public void setLocation(Location location) {
this.location = location;
}
}

16
app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
View File

@@ -8,6 +8,7 @@ import androidx.fragment.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
@@ -15,13 +16,14 @@ import android.widget.Toast;
import com.a1.nextlocation.R;
import com.a1.nextlocation.data.Route;
import com.a1.nextlocation.data.RouteHandler;
import com.a1.nextlocation.data.StaticData;
import com.a1.nextlocation.network.ApiHandler;
public class RouteDetailFragment extends Fragment {
private Route route;
private TextView routeDetailText;
private TextView routeName;
private ImageButton imageButton;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -36,8 +38,18 @@ public class RouteDetailFragment extends Fragment {
this.route = getArguments().getParcelable("route");
}
this.routeName = view.findViewById(R.id.route_title);
this.routeName.setText(this.route.getName());
this.routeDetailText = view.findViewById(R.id.reoute_detail_tekst);
this.routeDetailText.setText(this.route.getName());
this.routeDetailText.setText(this.route.getDescription());
this.imageButton = view.findViewById(R.id.route_detail_back_button);
this.imageButton.setOnClickListener(v -> {
RouteFragment routeFragment = new RouteFragment();
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeFragment).addToBackStack(null).commit();
});
Button startButton = view.findViewById(R.id.start_route_button);
startButton.setOnClickListener(this::startRoute);

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

@@ -1,6 +1,8 @@
package com.a1.nextlocation.fragments;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -8,10 +10,12 @@ import androidx.annotation.Nullable;
import androidx.appcompat.widget.SwitchCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.Spinner;
@@ -19,8 +23,12 @@ import android.widget.Spinner;
import com.a1.nextlocation.MainActivity;
import com.a1.nextlocation.R;
import java.util.Locale;
public class SettingsFragment extends Fragment {
private SharedPreferences.Editor editor;
private ImageView imageButton;
SwitchCompat fontChanger;
@@ -28,21 +36,16 @@ public class SettingsFragment extends Fragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
editor = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).edit();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_settings, container, false);
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
View view = inflater.inflate(R.layout.fragment_settings, container, false);
// Inflate the layout for this fragment
Spinner dropdown = view.findViewById(R.id.dropdown_menu_Settings);
initializeLanguageDropdown(view);
this.imageButton = view.findViewById(R.id.settings_back_button);
this.imageButton.setOnClickListener(v -> {
@@ -79,9 +82,95 @@ public class SettingsFragment extends Fragment {
editor.commit();
});
return view;
}
private void initializeLanguageDropdown(View view) {
Spinner languageDropdown = view.findViewById(R.id.dropdown_menu_Settings);
String[] items = new String[]{"Nederlands", "Engels", "Chinees"};
ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items);
languageDropdown.setAdapter(arrayAdapter);
dropdown.setAdapter(arrayAdapter);
// set the language dropdown on the currently selected language stored in the sharedPreferences
languageDropdown.setSelection(languageToDropdownPosition(getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", "")));
long previousID = languageDropdown.getSelectedItemId();
languageDropdown.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
setLocale(dropdownPositionToLanguage(id));
if (id != previousID) {
Fragment currentFragment = getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment_layout);
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.detach(currentFragment);
fragmentTransaction.attach(currentFragment);
fragmentTransaction.commit();
}
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}
/**
* converts the languageDropdown position to the belonging language
*
* @param id desired position to convert
* @return the language belonging to the position of the languageDropdown
*/
private String dropdownPositionToLanguage(long id) {
switch ((int) id) {
case 0:
return "nl";
case 1:
return "en";
default:
return "";
}
}
/**
* converts language to the languageDropdown position
*
* @param language desired language to convert
* @return the position of the language in the languageDropdown
*/
private int languageToDropdownPosition(String language) {
switch (language) {
case "nl":
return 0;
case "en":
return 1;
default:
return 1;
}
}
/**
* reloads the fragment
*/
private void refresh() {
Fragment currentFragment = getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment_layout);
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.detach(currentFragment);
fragmentTransaction.attach(currentFragment);
fragmentTransaction.commit();
}
/**
* changes the current language to the desired language and saves this setting in SharedPreferences
*
* @param language the desired language to translate to
*/
private void setLocale(String language) {
Locale locale = new Locale(language);
Locale.setDefault(locale);
Configuration config = new Configuration();
config.setLocale(locale);
getContext().getResources().updateConfiguration(config, getContext().getResources().getDisplayMetrics());
editor.putString("Language", language);
editor.apply();
}
}

4
app/src/main/res/layout-land/fragment_location_detail.xml
View File

@@ -12,7 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/locatie_detail"
android:text=""
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +35,7 @@
android:layout_height="283dp"
android:layout_marginEnd="30dp"
android:background="@color/secondaryColour"
android:text="@string/locatie_detail_tekst"
android:text=""
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/detail_location_name" />

3
app/src/main/res/layout-land/fragment_route_detail.xml
View File

@@ -38,7 +38,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="250dp"
android:text="titel"
android:textSize="20sp"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintBottom_toTopOf="@+id/route_detail_image"
app:layout_constraintEnd_toStartOf="@+id/reoute_detail_tekst"
app:layout_constraintStart_toEndOf="@id/routeDetailBackButton"

1
app/src/main/res/layout/activity_main.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/mainActivity"
tools:context=".MainActivity">
<FrameLayout

3
app/src/main/res/layout/coupon_item.xml
View File

@@ -2,6 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:id="@+id/couponItem"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -24,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text="@string/app_name"
android:text=""
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"

4
app/src/main/res/layout/fragment_coupon.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/primaryColour"
android:id="@+id/couponFragment"
tools:context=".fragments.LocationFragment">
<TextView
@@ -13,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_margin="9dp"
android:layout_marginTop="20dp"
android:text="@string/statistieken"
android:text="@string/statistics"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/coupon_back_button"
app:layout_constraintTop_toTopOf="parent" />
@@ -26,7 +27,6 @@
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
android:text="@string/terug"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

1
app/src/main/res/layout/fragment_home.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/homeFragment"
tools:context=".fragments.HomeFragment">
<org.osmdroid.views.MapView

4
app/src/main/res/layout/fragment_location.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/primaryColour"
android:id="@+id/locationFragment"
tools:context=".fragments.LocationFragment">
<TextView
@@ -13,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_margin="9dp"
android:layout_marginTop="20dp"
android:text="@string/locaties"
android:text="@string/locations"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/location_back_button"
app:layout_constraintTop_toTopOf="parent" />
@@ -26,7 +27,6 @@
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
android:text="@string/terug"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

7
app/src/main/res/layout/fragment_location_detail.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/primaryColour"
android:id="@+id/locationDetailFragment"
tools:context=".fragments.LocationDetailFragment">
<TextView
@@ -12,7 +13,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/locatie_detail"
android:text=""
android:textColor="@color/white"
android:textSize="30sp"
android:gravity="center"
@@ -34,6 +35,8 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="20dp"
android:background="@color/secondaryColour"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/detail_location_image">
@@ -43,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/secondaryColour"
android:text="@string/locatie_detail_tekst"
android:text=""
/>
</ScrollView>

4
app/src/main/res/layout/fragment_route.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/primaryColour"
android:id="@+id/routeFragment"
tools:context=".fragments.RouteFragment">
<ImageButton
@@ -13,7 +14,6 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_back_button_24"
android:text="@string/terug"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="9dp"
android:text="@string/titel"
android:text="@string/routes"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@id/route_back_button"
app:layout_constraintTop_toTopOf="parent" />

6
app/src/main/res/layout/fragment_route_detail.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
android:id="@+id/routeDetailFragment"
tools:context=".fragments.RouteDetailFragment">
<ImageButton
@@ -21,9 +22,10 @@
android:id="@+id/route_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/titel"
android:textSize="20sp"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintBottom_toTopOf="@+id/route_detail_image"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

13
app/src/main/res/layout/fragment_settings.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
android:id="@+id/settingFragment"
tools:context=".fragments.SettingsFragment">
<androidx.appcompat.widget.AppCompatImageButton
@@ -23,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/instellingen"
android:text="@string/settings"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +47,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/taal"
android:text="@string/language"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -94,7 +95,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/imperiaal_systeem"
android:text="@string/imperial_system"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -114,6 +115,7 @@
app:layout_constraintVertical_bias="0.0" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/settingsImperialButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
@@ -139,7 +141,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/_65_stand"
android:text="@string/_65_mode"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -185,7 +187,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/kleurenblind"
android:text="@string/colorblind"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -205,6 +207,7 @@
/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/settingsEyesButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"

21
app/src/main/res/layout/fragment_statistic.xml
View File

@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/primaryColour"
android:id="@+id/statisticsFragment"
tools:context=".fragments.StatisticFragment">
<TextView
@@ -12,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/statistieken"
android:text="@string/statistics"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +36,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/totale_afstand"
android:text="@string/total_distance"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -57,7 +58,7 @@
android:id="@+id/statistics_km"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/km"
android:text=""
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -84,7 +85,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bezochte_locaties"
android:text="@string/visited_locations"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -106,7 +107,7 @@
android:id="@+id/statistics_locations_visited"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/getal"
android:text=""
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -131,7 +132,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/totale_tijd"
android:text="@string/total_time"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -152,7 +153,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/minuten"
android:text=""
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -179,7 +180,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/coupons_gespaard"
android:text="@string/coupons_collected"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -201,7 +202,7 @@
android:id="@+id/couponAmount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/getal"
android:text=""
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -216,7 +217,6 @@
android:layout_marginEnd="20dp"
android:background="@drawable/ic_back_button_24"
android:scaleX="-1"
android:text="@string/terug"
app:layout_constraintBottom_toBottomOf="@+id/couponAmount"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/couponAmount" />
@@ -232,7 +232,6 @@
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
android:src="@drawable/ic_back_button_24"
android:text="@string/terug"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

3
app/src/main/res/layout/location_item.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="50dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/secondaryColour"
android:id="@+id/locationItem"
android:layout_margin="20dp">
<ImageView
@@ -21,7 +22,7 @@
android:layout_width="321dp"
android:layout_height="47dp"
android:gravity="left"
android:text="@string/locaties"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

3
app/src/main/res/layout/route_item.xml
View File

@@ -5,6 +5,7 @@
android:layout_height="50dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/secondaryColour"
android:id="@+id/routeItem"
android:layout_margin="20dp">
<ImageView
@@ -20,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/titel"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/route_Image"

6
app/src/main/res/menu/navmenu.xml
View File

@@ -3,7 +3,7 @@
<item
android:id="@+id/locations"
android:title="@string/locaties"
android:title="@string/locations"
android:icon="@drawable/ic_baseline_outlined_flag_24"
/>
@@ -15,13 +15,13 @@
<item
android:id="@+id/statistics"
android:title="@string/statistieken"
android:title="@string/statistics"
android:icon="@drawable/ic_baseline_graphic_eq_24"
/>
<item
android:id="@+id/settings"
android:title="@string/instellingen"
android:title="@string/settings"
android:icon="@drawable/ic_baseline_settings_24"
/>

23
app/src/main/res/values-nl/strings.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Next Location</string>
<string name="locations">Locaties</string>
<string name="routes">Routes</string>
<string name="statistics">Statistieken</string>
<string name="settings">Instellingen</string>
<string name="language">Taal</string>
<string name="imperial_system">Imperiaal systeem</string>
<string name="_65_mode">65+ stand</string>
<string name="colorblind">Kleurenblind</string>
<string name="total_distance">Totale afstand:</string>
<string name="visited_locations">Bezochte locaties:</string>
<string name="total_time">Totale tijd:</string>
<string name="coupons_collected">Coupons gespaard:</string>
<string name="coupons">Coupons</string>
<string name="start_route">Start Route</string>
<string name="activate_question">Weet je zeker dat je deze coupon wilt activeren?</string>
<string name="activate">activeren</string>
<string name="done">Klaar</string>
<string name="cancel">annuleren</string>
</resources>

31
app/src/main/res/values/strings.xml
View File

@@ -1,21 +1,22 @@
<resources>
<string name="app_name">Next Location</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="locations">Locaties</string>
<string name="app_name" translatable="false">Next Location</string>
<string name="locations">Location</string>
<string name="routes">Routes</string>
<string name="statistics">Statistieken</string>
<string name="settings">Instellingen</string>
<string name="taal">Taal</string>
<string name="imperiaal_systeem">Imperiaal systeem</string>
<string name="_65_stand">65+ stand</string>
<string name="kleurenblind">Kleurenblind</string>
<string name="statistieken">Statistieken</string>
<string name="totale_afstand">Totale afstand:</string>
<string name="bezochte_locaties">Bezochte locaties:</string>
<string name="totale_tijd">Totale tijd:</string>
<string name="coupons_gespaard">Coupons gespaard:</string>
<string name="statistics">Statistics</string>
<string name="settings">Settings</string>
<string name="language">Language</string>
<string name="imperial_system">Imperial system</string>
<string name="_65_mode">65+ mode</string>
<string name="colorblind">Colorblind</string>
<string name="total_distance">Total distance:</string>
<string name="visited_locations">Visited locations:</string>
<string name="total_time">Total time:</string>
<string name="coupons_collected">Coupons collected:</string>
<string name="coupons">Coupons</string>
<string name="start_route">Start Route</string>
<string name="activate_question">Are you sure you want to activate this coupon?</string>
<string name="activate">activate</string>
<string name="done">Done</string>
<string name="cancel">cancel</string>
<string name="route_stop_toast">Route stopped!</string>
</resources>

50
app/src/test/java/com/a1/nextlocation/DirectionsResultTest.java Normal file
View File

@@ -0,0 +1,50 @@
package com.a1.nextlocation;
import com.a1.nextlocation.json.DirectionsResult;
import com.a1.nextlocation.json.DirectionsStep;
import org.junit.Before;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
public class DirectionsResultTest {
private DirectionsResult directionsResult;
@Before
public void init(){
directionsResult = new DirectionsResult();
}
@Test
public void testDistance(){
directionsResult.setDistance(45.32);
double expected = 45.32;
assertEquals(expected, directionsResult.getDistance(), 0.01);
}
@Test
public void testDuration(){
directionsResult.setDuration(95.123);
double expected = 95.123;
assertEquals(expected, directionsResult.getDuration(), 0.01);
}
@Test
public void testSteps(){
List<DirectionsStep> expected = new ArrayList<>();
directionsResult.addStep(new DirectionsStep());
directionsResult.addStep(new DirectionsStep());
directionsResult.addStep(new DirectionsStep());
directionsResult.setSteps(expected);
assertEquals(expected, directionsResult.getSteps());
}
}

69
app/src/test/java/com/a1/nextlocation/DirectionsStepTest.java Normal file
View File

@@ -0,0 +1,69 @@
package com.a1.nextlocation;
import com.a1.nextlocation.json.DirectionsStep;
import org.junit.Before;
import org.junit.Test;
import org.osmdroid.util.GeoPoint;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
public class DirectionsStepTest {
private DirectionsStep directionsStep;
@Before
public void init(){
directionsStep = new DirectionsStep();
}
@Test
public void testDistance(){
directionsStep.setDistance(432.56);
double expected = 432.56;
assertEquals(expected, directionsStep.getDistance(), 0.01);
}
@Test
public void testDuration(){
directionsStep.setDuration(531.89);
double expected = 531.89;
assertEquals(expected, directionsStep.getDuration(), 0.01);
}
@Test
public void testInstuction(){
directionsStep.setInstruction("TESTINGINSTUCTION");
String expected = "TESTINGINSTUCTION";
assertEquals(expected, directionsStep.getInstruction());
}
@Test
public void testName(){
directionsStep.setName("TESTINGNAME");
String expected = "TESTINGNAME";
assertEquals(expected, directionsStep.getName());
}
@Test
public void testWay_Points(){
ArrayList<Integer> expected = new ArrayList<>();
expected.add(56);
expected.add(1123);
expected.add(23);
expected.add(73);
directionsStep.setWay_points(expected);
assertEquals(expected, directionsStep.getWay_points());
}
@Test
public void testWayPoints(){
GeoPoint[] expected = {new GeoPoint(5.1658, 4.163), new GeoPoint(2.0896, 7.158),
new GeoPoint(4.0168, 6.1450), new GeoPoint(7.1498, 9.1586), };
directionsStep.setWaypoints(expected);
assertEquals(expected, directionsStep.getWaypoints());
}
}

22
app/src/test/java/com/a1/nextlocation/GeometryDecoderTest.java Normal file
View File

@@ -0,0 +1,22 @@
package com.a1.nextlocation;
import com.a1.nextlocation.json.GeometryDecoder;
import com.google.gson.JsonArray;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class GeometryDecoderTest {
@Test
public void geometryDecoderTest(){
String encodedGeometryTest = "";
JsonArray expected = new JsonArray();
assertEquals(expected, GeometryDecoder.decodeGeometry(encodedGeometryTest, true));
}
}