From 6dd2f5de40e246ccb160e15b9caf32626d8bc955 Mon Sep 17 00:00:00 2001 From: Bart Date: Wed, 6 Jan 2021 10:48:23 +0100 Subject: [PATCH] default strings.xml is now English, added more string resources --- .../fragments/CouponFragment.java | 12 +++------ .../fragments/SettingsFragment.java | 14 +++++----- app/src/main/res/values-en/strings.xml | 17 ------------ app/src/main/res/values-nl/strings.xml | 5 +++- app/src/main/res/values/strings.xml | 26 +++++++++++-------- 5 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 app/src/main/res/values-en/strings.xml diff --git a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java index 1faea7f..62c9432 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java @@ -62,22 +62,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(); 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 9b5d16a..9c0f42b 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java @@ -25,8 +25,7 @@ import java.util.Locale; public class SettingsFragment extends Fragment { private SharedPreferences.Editor editor; - private String language; - + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -58,7 +57,7 @@ public class SettingsFragment extends Fragment { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { setLocale(dropdownPositionToLanguage(id)); - if (id != previousID){ + if (id != previousID) { Fragment currentFragment = getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment_layout); FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); fragmentTransaction.detach(currentFragment); @@ -75,11 +74,12 @@ public class SettingsFragment extends Fragment { /** * 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){ + switch ((int) id) { case 0: return "nl"; case 1: @@ -91,6 +91,7 @@ public class SettingsFragment extends Fragment { /** * converts language to the languageDropdown position + * * @param language desired language to convert * @return the position of the language in the languageDropdown */ @@ -108,7 +109,7 @@ public class SettingsFragment extends Fragment { /** * reloads the fragment */ - private void refresh(){ + private void refresh() { Fragment currentFragment = getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment_layout); FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); fragmentTransaction.detach(currentFragment); @@ -118,9 +119,10 @@ public class SettingsFragment extends Fragment { /** * 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){ + private void setLocale(String language) { Locale locale = new Locale(language); Locale.setDefault(locale); Configuration config = new Configuration(); diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml deleted file mode 100644 index 94b8326..0000000 --- a/app/src/main/res/values-en/strings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - Location - Total time: - Total distance: - Language - Statistics - Start Route - Routes - Colorblind - Settings - Imperial system - Coupons collected: - Visited locations: - 65+ mode - Coupons - \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 289db4c..893ffe7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -16,5 +16,8 @@ Coupons gespaard: Coupons Start Route - + Weet je zeker dat je deze coupon wilt activeren? + activeren + Klaar + annuleren \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9b25e32..1cfcd8d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,17 +1,21 @@ Next Location - Locaties + Location Routes - Statistieken - Instellingen - Taal - Imperiaal systeem - 65+ stand - Kleurenblind - Totale afstand: - Bezochte locaties: - Totale tijd: - Coupons gespaard: + Statistics + Settings + Language + Imperial system + 65+ mode + Colorblind + Total distance: + Visited locations: + Total time: + Coupons collected: Coupons Start Route + Are you sure you want to activate this coupon? + activate + Done + cancel \ No newline at end of file